Merge branch 'main' into v4

Author: joelhawksley

.github/workflows/ci.yml

@@ -9,17 +9,19 @@ on:
 jobs:
   benchmark:
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_8.0.gemfile
     steps:
     - uses: actions/[email protected]
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.4
         bundler-cache: true
     - name: Run benchmarks
       run: |
-        bundle exec rake partial_benchmark
-        bundle exec rake translatable_benchmark
+        bundle exec appraisal rails-8.0 rake partial_benchmark
+        bundle exec appraisal rails-8.0 rake translatable_benchmark
   test:
     name: test (${{ matrix.rails_version }}, ${{ matrix.ruby_version }}, ${{ matrix.mode }})
     runs-on: ubuntu-latest
@@ -39,6 +41,18 @@ jobs:
           - ruby_version: "3.3"
             rails_version: "7.2"
             mode: "capture_patch_enabled"
+          - ruby_version: "3.3"
+            rails_version: "8.0"
+            mode: "capture_patch_disabled"
+          - ruby_version: "3.3"
+            rails_version: "8.0"
+            mode: "capture_patch_enabled"
+          - ruby_version: "3.4"
+            rails_version: "8.0"
+            mode: "capture_patch_disabled"
+          - ruby_version: "3.4"
+            rails_version: "8.0"
+            mode: "capture_patch_enabled"
           - ruby_version: "head"
             rails_version: "main"
             mode: "capture_patch_disabled"
@@ -87,7 +101,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.4
         bundler-cache: true
         working-directory: 'view_component'
     - uses: actions/setup-node@v4
@@ -113,7 +127,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.4
         bundler-cache: true
     - name: Download coverage results
       uses: actions/[email protected]

.github/workflows/lint.yml

@@ -70,7 +70,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.4
     - uses: actions/cache@v4
       with:
         path: vendor/bundle

.tool-versions

@@ -1 +1 @@
-ruby 3.3.0
+ruby 3.4.1

Appraisals

@@ -4,11 +4,19 @@ appraise "rails-7.1" do
   gem "rails", "~> 7.1"
   gem "tailwindcss-rails", "~> 2.0"
   gem "turbo-rails", "~> 1"
+  gem "sprockets-rails", "~> 3.4.2"
 end
 
 appraise "rails-7.2" do
   gem "rails", "~> 7.2"
   gem "tailwindcss-rails", "~> 2.0"
+  gem "sprockets-rails", "~> 3.4.2"
+end
+
+appraise "rails-8.0" do
+  gem "rails", "~> 8.0"
+  gem "tailwindcss-rails", "~> 2.0"
+  gem "propshaft", "~> 1.1.0"
 end
 
 appraise "rails-main" do

Gemfile

@@ -3,8 +3,9 @@
 source "https://rubygems.org"
 gemspec
 
-rails_version = (ENV["RAILS_VERSION"] || "~> 7.1.0").to_s
+rails_version = (ENV["RAILS_VERSION"] || "~> 8").to_s
+
 gem "rails", (rails_version == "main") ? {git: "https://github.com/rails/rails", ref: "main"} : rails_version
 
-ruby_version = (ENV["RUBY_VERSION"] || "~> 3.3").to_s
+ruby_version = (ENV["RUBY_VERSION"] || "~> 3.4").to_s
 ruby ruby_version