Default to rails 8

- update gemfile.locks for new jsbundling-rails version
rails · Jan 29, 2025 · 0bb5f54 · 0bb5f54
1 parent d9dcae2
commit 0bb5f54
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 93 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,11 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-# Specify your gem's dependencies in importmap-rails.gemspec.
+# Specify your gem's dependencies in jsbundling-rails.gemspec.
 gemspec
 
 gem "appraisal"
-gem "rails", "~> 7.2.0"
-gem "sprockets-rails"
+gem "rails", "~> 8.0.0"
 gem "sqlite3"
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,72 +1,71 @@
 PATH
   remote: .
   specs:
-    jsbundling-rails (1.3.1)
-      railties (>= 6.0.0)
+    jsbundling-rails (1.4.0)
+      railties (>= 7.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailbox (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailer (8.0.1)
+      actionpack (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activesupport (= 8.0.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actiontext (8.0.1)
+      actionpack (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (8.0.1)
+      activesupport (= 8.0.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (8.0.1)
+      activesupport (= 8.0.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (8.0.1)
+      activesupport (= 8.0.1)
+    activerecord (8.0.1)
+      activemodel (= 8.0.1)
+      activesupport (= 8.0.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activestorage (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activesupport (= 8.0.1)
       marcel (~> 1.0)
-    activesupport (7.2.2.1)
+    activesupport (8.0.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -78,6 +77,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     appraisal (2.5.0)
@@ -135,7 +135,6 @@ GEM
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.0)
-      net-protocol
     nio4r (2.7.4)
     nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
@@ -172,30 +171,30 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    rails (8.0.1)
+      actioncable (= 8.0.1)
+      actionmailbox (= 8.0.1)
+      actionmailer (= 8.0.1)
+      actionpack (= 8.0.1)
+      actiontext (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activemodel (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 8.0.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -214,13 +213,6 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
     sqlite3 (2.5.0-aarch64-linux-gnu)
     sqlite3 (2.5.0-aarch64-linux-musl)
     sqlite3 (2.5.0-arm-linux-gnu)
@@ -241,6 +233,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.0.2)
     useragent (0.16.11)
     webdrivers (5.3.1)
       nokogiri (~> 1.6)
@@ -275,10 +268,9 @@ DEPENDENCIES
   byebug
   capybara
   jsbundling-rails!
-  rails (~> 7.2.0)
+  rails (~> 8.0.0)
   rexml
   selenium-webdriver
-  sprockets-rails
   sqlite3
   stimulus-rails
   turbo-rails

diff --git a/gemfiles/rails_7_0.gemfile.lock b/gemfiles/rails_7_0.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    jsbundling-rails (1.3.1)
-      railties (>= 6.0.0)
+    jsbundling-rails (1.4.0)
+      railties (>= 7.0.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    jsbundling-rails (1.3.1)
-      railties (>= 6.0.0)
+    jsbundling-rails (1.4.0)
+      railties (>= 7.0.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails_7_2.gemfile.lock b/gemfiles/rails_7_2.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    jsbundling-rails (1.3.1)
-      railties (>= 6.0.0)
+    jsbundling-rails (1.4.0)
+      railties (>= 7.0.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rails", "~> 8.0.0"
 gem "sqlite3"
-gem "propshaft"
 
 group :test do
   gem "turbo-rails"

diff --git a/gemfiles/rails_8_0.gemfile.lock b/gemfiles/rails_8_0.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    jsbundling-rails (1.3.1)
-      railties (>= 6.0.0)
+    jsbundling-rails (1.4.0)
+      railties (>= 7.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -154,11 +154,6 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    propshaft (1.1.0)
-      actionpack (>= 7.0.0)
-      activesupport (>= 7.0.0)
-      rack
-      railties (>= 7.0.0)
     psych (5.2.3)
       date
       stringio
@@ -262,7 +257,6 @@ DEPENDENCIES
   byebug
   capybara
   jsbundling-rails!
-  propshaft
   rails (~> 8.0.0)
   rexml
   selenium-webdriver

diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile
@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rails", branch: "main", git: "https://github.com/rails/rails.git"
 gem "sqlite3"
-gem "propshaft"
 
 group :test do
   gem "turbo-rails"

diff --git a/test/shared_installer_tests.rb b/test/shared_installer_tests.rb
@@ -75,7 +75,7 @@ module SharedInstallerTests
 
     if Rails::VERSION::MAJOR < 8
       test "basic installation with Sprockets" do
-        with_new_rails_app(*("--asset-pipeline=sprockets" if Rails::VERSION::MAJOR == 7)) do
+        with_new_rails_app("--asset-pipeline=sprockets") do
           File.write("app/assets/config/manifest.js", "// pre-existing\n", mode: "a+")
 
           run_installer
@@ -88,13 +88,11 @@ module SharedInstallerTests
       end
     end
 
-    if Rails::VERSION::MAJOR >= 7
-      test "basic installation with Propshaft" do
-        with_new_rails_app("--asset-pipeline=propshaft") do
-          run_installer
+    test "basic installation with Propshaft" do
+      with_new_rails_app("--asset-pipeline=propshaft") do
+        run_installer
 
-          assert_not File.exist?("app/assets/config/manifest.js")
-        end
+        assert_not File.exist?("app/assets/config/manifest.js")
       end
     end
   end