Merge pull request rails#55058 from flavorjones/flavorjones/extract-trix-gem

Drop vendored Trix files in favor of the `action_text-trix` gem

Author: byroot

Gemfile.lock

@@ -42,6 +42,7 @@ PATH
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
     actiontext (8.1.0.alpha)
+      action_text-trix (~> 2.1.15)
       actionpack (= 8.1.0.alpha)
       activerecord (= 8.1.0.alpha)
       activestorage (= 8.1.0.alpha)
@@ -115,6 +116,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    action_text-trix (2.1.15)
+      railties
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amq-protocol (2.3.2)

actiontext/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   The Trix dependency is now satisfied by a gem, `action_text-trix`, rather than vendored
+    files. This allows applications to bump Trix versions independently of Rails
+    releases. Effectively this also upgrades Trix to `>= 2.1.15`.
+
+    *Mike Dalessio*
+
 *   Change `ActionText::RichText#embeds` assignment from `before_save` to `before_validation`
 
     *Sean Doyle*

actiontext/Rakefile

@@ -28,27 +28,4 @@ namespace :test do
   end
 end
 
-task :vendor_trix do
-  require "importmap-rails"
-  require "importmap/packager"
-
-  packager = Importmap::Packager.new(vendor_path: "app/assets/javascripts")
-  imports = packager.import("trix", from: "unpkg")
-  imports.each do |package, url|
-    url.gsub!("esm.min.js", "umd.js")
-    puts %(Vendoring "#{package}" to #{packager.vendor_path}/#{package}.js via download from #{url})
-    packager.download(package, url)
-
-    css_url = url.gsub("umd.js", "css")
-    puts %(Vendoring "#{package}" to #{packager.vendor_path}/#{package}.css via download from #{css_url})
-
-    response = Net::HTTP.get_response(URI(css_url))
-    if response.code == "200"
-      File.open(Pathname.new("app/assets/stylesheets/trix.css"), "w+") do |file|
-        file.write response.body
-      end
-    end
-  end
-end
-
 task default: :test

actiontext/actiontext.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "nokogiri", ">= 1.8.5"
   s.add_dependency "globalid", ">= 0.6.0"
+  s.add_dependency "action_text-trix", "~> 2.1.15"
 end

actiontext/app/assets/javascripts/.gitattributes

@@ -1,3 +1,2 @@
 actiontext.js linguist-generated
 actiontext.esm.js linguist-generated
-trix.js linguist-vendored