From 8a816840ce999afea088885612ba809d0bb3017c Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 15:17:49 -0600
Subject: [PATCH 01/12] update job references

---
 .github/workflows/pro-integration-tests.yml    | 4 ++--
 .github/workflows/pro-test-package-and-gem.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pro-integration-tests.yml b/.github/workflows/pro-integration-tests.yml
index 1c5cde1a4a..22caa3d897 100644
--- a/.github/workflows/pro-integration-tests.yml
+++ b/.github/workflows/pro-integration-tests.yml
@@ -150,7 +150,7 @@ jobs:
   rspec-dummy-app-node-renderer:
     needs:
       - detect-changes
-      - build-dummy-app-webpack-test-bundles
+      - pro-build-dummy-app-webpack-test-bundles
     if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_pro_tests == 'true'
     runs-on: ubuntu-22.04
     env:
@@ -327,7 +327,7 @@ jobs:
   dummy-app-node-renderer-e2e-tests:
     needs:
       - detect-changes
-      - build-dummy-app-webpack-test-bundles
+      - pro-build-dummy-app-webpack-test-bundles
     if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_pro_tests == 'true'
     runs-on: ubuntu-22.04
     env:
diff --git a/.github/workflows/pro-test-package-and-gem.yml b/.github/workflows/pro-test-package-and-gem.yml
index 386d26c2cf..1e12d98d4f 100644
--- a/.github/workflows/pro-test-package-and-gem.yml
+++ b/.github/workflows/pro-test-package-and-gem.yml
@@ -150,7 +150,7 @@ jobs:
   package-js-tests:
     needs:
       - detect-changes
-      - build-dummy-app-webpack-test-bundles
+      - pro-build-dummy-app-webpack-test-bundles
     if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_pro_tests == 'true'
     runs-on: ubuntu-22.04
     # Redis service container

From 08da9f5d377b03516d5af1854b39fc0dc322f6a4 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 15:18:14 -0600
Subject: [PATCH 02/12] try using arrays in workflow expression for matrix

---
 .github/workflows/examples.yml          | 28 ++++-----
 .github/workflows/gem-tests.yml         | 20 ++-----
 .github/workflows/integration-tests.yml | 77 +++++++++++++------------
 .github/workflows/package-js-tests.yml  | 10 +---
 4 files changed, 61 insertions(+), 74 deletions(-)

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 3846462ea7..d130a80e30 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -65,29 +65,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          # Always run: Latest versions (fast feedback on PRs)
-          - ruby-version: '3.4'
-            dependency-level: 'latest'
-          # Master and workflow_dispatch: Minimum supported versions (full coverage)
-          - ruby-version: '3.2'
-            dependency-level: 'minimum'
-        exclude:
-          # Skip minimum dependency matrix on regular PRs (run only on master/workflow_dispatch/force_run/full-ci label)
-          - ruby-version: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && inputs.force_run != true && needs.detect-changes.outputs.has_full_ci_label != 'true' && '3.2' || '' }}
-            dependency-level: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && inputs.force_run != true && needs.detect-changes.outputs.has_full_ci_label != 'true' && 'minimum' || '' }}
+        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
     env:
       SKIP_YARN_COREPACK_CHECK: 0
       BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
     runs-on: ubuntu-22.04
     steps:
+      - name: Translate matrix for Ruby and Node versions
+        id: translate-matrix
+        run: |
+          if [ "${{ matrix.dependency-level }}" == "latest" ]; then
+            echo "ruby-version=3.4" >> "$GITHUB_OUTPUT"
+            echo "node-version=22" >> "$GITHUB_OUTPUT"
+          else
+            echo "ruby-version=3.2" >> "$GITHUB_OUTPUT"
+            echo "node-version=20" >> "$GITHUB_OUTPUT"
+          fi
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby-version }}
+          ruby-version: ${{ steps.translate-matrix.outputs.ruby-version }}
           bundler: 2.5.9
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -113,7 +113,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
       - id: get-sha
         run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
       - name: Install Node modules with Yarn for renderer package
@@ -150,5 +150,5 @@ jobs:
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:
-          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
           path: ~/rspec
diff --git a/.github/workflows/gem-tests.yml b/.github/workflows/gem-tests.yml
index 62773d5bf2..1998e40036 100644
--- a/.github/workflows/gem-tests.yml
+++ b/.github/workflows/gem-tests.yml
@@ -69,17 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          # Always run: Latest versions (fast feedback on PRs)
-          - ruby-version: '3.4'
-            dependency-level: 'latest'
-          # Master and full-ci label: Minimum supported versions (full coverage)
-          - ruby-version: '3.2'
-            dependency-level: 'minimum'
-        exclude:
-          # Skip minimum dependency matrix on regular PRs (run only on master or with full-ci label)
-          - ruby-version: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && needs.detect-changes.outputs.has_full_ci_label != 'true' && '3.2' || '' }}
-            dependency-level: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && needs.detect-changes.outputs.has_full_ci_label != 'true' && 'minimum' || '' }}
+        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
     env:
       BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
     runs-on: ubuntu-22.04
@@ -90,7 +80,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby-version }}
+          ruby-version: ${{ steps.translate-matrix.outputs.ruby-version }}
           bundler: 2.5.9
       - name: Print system information
         run: |
@@ -108,7 +98,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Ruby Gems for package
         run: bundle check --path=vendor/bundle || bundle  _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
       - name: Git Stuff
@@ -125,10 +115,10 @@ jobs:
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:
-          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
           path: ~/rspec
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: main-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          name: main-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
           path: log/test.log
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 03231da3ca..198199c9fb 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -64,24 +64,28 @@ jobs:
     if: |
       github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_dummy_tests == 'true'
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['3.4']
-        node-version: ['22']
-        dependency-level: ['latest']
-        include:
-          # Skip minimum dependency matrix on regular PRs (run only on master/workflow_dispatch/force_run/full-ci label)
-          - ruby-version: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && '3.2'}}
-            node-version: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && '20'}}
-            dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && 'minimum'}}
+        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
     runs-on: ubuntu-22.04
     steps:
+      - name: Translate matrix for Ruby and Node versions
+        id: translate-matrix
+        run: |
+          if [ "${{ matrix.dependency-level }}" == "latest" ]; then
+            echo "ruby-version=3.4" >> "$GITHUB_OUTPUT"
+            echo "node-version=22" >> "$GITHUB_OUTPUT"
+          else
+            echo "ruby-version=3.2" >> "$GITHUB_OUTPUT"
+            echo "node-version=20" >> "$GITHUB_OUTPUT"
+          fi
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby-version }}
+          ruby-version: ${{ steps.translate-matrix.outputs.ruby-version }}
           bundler: 2.5.9
       # libyaml-dev is needed for psych v5
       # this gem depends on sdoc which depends on rdoc which depends on psych
@@ -90,10 +94,10 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ steps.translate-matrix.outputs.node-version }}
           # Disable cache for Node 22 due to V8 bug in 22.21.0
           # https://github.com/nodejs/node/issues/56010
-          cache: ${{ matrix.node-version != '22' && 'yarn' || '' }}
+          cache: yarn
           cache-dependency-path: '**/yarn.lock'
       - name: Print system information
         run: |
@@ -121,7 +125,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: spec/dummy/vendor/bundle
-          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Ruby Gems for dummy app
         run: |
           cd spec/dummy
@@ -139,7 +143,7 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: spec/dummy/public/webpack
-          key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
 
   dummy-app-integration-tests:
     needs: [detect-changes, build-dummy-app-webpack-test-bundles]
@@ -147,37 +151,36 @@ jobs:
     if: |
       github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_dummy_tests == 'true'
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['3.4']
-        node-version: ['22']
-        dependency-level: ['latest']
-        include:
-          # Skip minimum dependency matrix on regular PRs (run only on master/workflow_dispatch/force_run/full-ci label)
-          - ruby-version: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && '3.2'}}
-            node-version: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && '20'}}
-            dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && 'minimum'}}
-        exclude:
-          # Skip minimum dependency matrix on regular PRs (run only on master/workflow_dispatch/force_run/full-ci label)
-          - ruby-version: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && inputs.force_run != true && needs.detect-changes.outputs.has_full_ci_label != 'true' && '3.2' || '' }}
-            node-version: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && inputs.force_run != true && needs.detect-changes.outputs.has_full_ci_label != 'true' && '20' || '' }}
-            dependency-level: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && inputs.force_run != true && needs.detect-changes.outputs.has_full_ci_label != 'true' && 'minimum' || '' }}
+        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
     runs-on: ubuntu-22.04
     steps:
+      - name: Translate matrix for Ruby and Node versions
+        id: translate-matrix
+        run: |
+          if [ "${{ matrix.dependency-level }}" == "latest" ]; then
+            echo "ruby-version=3.4" >> "$GITHUB_OUTPUT"
+            echo "node-version=22" >> "$GITHUB_OUTPUT"
+          else
+            echo "ruby-version=3.2" >> "$GITHUB_OUTPUT"
+            echo "node-version=20" >> "$GITHUB_OUTPUT"
+          fi
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby-version }}
+          ruby-version: ${{ steps.translate-matrix.outputs.ruby-version }}
           bundler: 2.5.9
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ steps.translate-matrix.outputs.node-version }}
           # Disable cache for Node 22 due to V8 bug in 22.21.0
           # https://github.com/nodejs/node/issues/56010
-          cache: ${{ matrix.node-version != '22' && 'yarn' || '' }}
+          cache: yarn
           cache-dependency-path: '**/yarn.lock'
       - name: Print system information
         run: |
@@ -195,19 +198,19 @@ jobs:
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
       - name: Save dummy app ruby gems to cache
         uses: actions/cache@v4
         with:
           path: spec/dummy/vendor/bundle
-          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
       - id: get-sha
         run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
       - name: Save test Webpack bundles to cache (for build number checksum used by RSpec job)
         uses: actions/cache@v4
         with:
           path: spec/dummy/public/webpack
-          key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Node modules with Yarn
         run: |
           yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
@@ -260,26 +263,26 @@ jobs:
       - run: cd spec/dummy && bundle info shakapacker
       - name: Set packer version environment variable
         run: |
-          echo "CI_DEPENDENCY_LEVEL=ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}" >> $GITHUB_ENV
+          echo "CI_DEPENDENCY_LEVEL=ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}" >> $GITHUB_ENV
       - name: Main CI
         run: bundle exec rake run_rspec:all_dummy
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:
-          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
           path: ~/rspec
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: dummy-app-capybara-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          name: dummy-app-capybara-${{ github.run_id }}-${{ github.job }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
           path: spec/dummy/tmp/capybara
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: dummy-app-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          name: dummy-app-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
           path: spec/dummy/log/test.log
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: dummy-app-yarn-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          name: dummy-app-yarn-log-${{ github.run_id }}-${{ github.job }}-ruby${{ steps.translate-matrix.outputs.ruby-version }}-${{ matrix.dependency-level }}
           path: spec/dummy/yarn-error.log
diff --git a/.github/workflows/package-js-tests.yml b/.github/workflows/package-js-tests.yml
index 24bb2d0830..1a9ab65f15 100644
--- a/.github/workflows/package-js-tests.yml
+++ b/.github/workflows/package-js-tests.yml
@@ -69,15 +69,9 @@ jobs:
     if: |
       (github.ref == 'refs/heads/master' || needs.detect-changes.outputs.run_js_tests == 'true')
     strategy:
+      fail-fast: false
       matrix:
-        include:
-          # Always run: Latest Node version (fast feedback on PRs)
-          - node-version: '22'
-          # Master and full-ci label: Minimum supported Node version (full coverage)
-          - node-version: '20'
-        exclude:
-          # Skip minimum dependency matrix on regular PRs (run only on master or with full-ci label)
-          - node-version: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && needs.detect-changes.outputs.has_full_ci_label != 'true' && '20' || '' }}
+        node-version: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['20'] || ['22', '20']}}
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4

From 6b16c4ed906107105768523dd184ee18a7f05d2e Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 16:05:32 -0600
Subject: [PATCH 03/12] try a json conversion

---
 .github/workflows/examples.yml          | 2 +-
 .github/workflows/gem-tests.yml         | 2 +-
 .github/workflows/integration-tests.yml | 4 ++--
 .github/workflows/package-js-tests.yml  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index d130a80e30..4d89737b27 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -65,7 +65,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
+        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
     env:
       SKIP_YARN_COREPACK_CHECK: 0
       BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
diff --git a/.github/workflows/gem-tests.yml b/.github/workflows/gem-tests.yml
index 1998e40036..3ae412cbf4 100644
--- a/.github/workflows/gem-tests.yml
+++ b/.github/workflows/gem-tests.yml
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
+        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
     env:
       BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 198199c9fb..08923bdc10 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -66,7 +66,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
+        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
     runs-on: ubuntu-22.04
     steps:
       - name: Translate matrix for Ruby and Node versions
@@ -153,7 +153,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['minimum'] || ['latest', 'minimum']}}
+        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
     runs-on: ubuntu-22.04
     steps:
       - name: Translate matrix for Ruby and Node versions
diff --git a/.github/workflows/package-js-tests.yml b/.github/workflows/package-js-tests.yml
index 1a9ab65f15..62c723c6e6 100644
--- a/.github/workflows/package-js-tests.yml
+++ b/.github/workflows/package-js-tests.yml
@@ -71,7 +71,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: ${{ (github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && ['20'] || ['22', '20']}}
+        node-version: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['20']) || toJSON(['22', '20'])) }}
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4

From aa0287810e8af2b1e1fe58c401f405721a42e4ac Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 16:34:25 -0600
Subject: [PATCH 04/12] try processing the conditional logic in another job

---
 .github/workflows/examples.yml          | 11 ++++++++++-
 .github/workflows/gem-tests.yml         | 11 ++++++++++-
 .github/workflows/integration-tests.yml | 13 +++++++++++--
 .github/workflows/package-js-tests.yml  | 11 ++++++++++-
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 4d89737b27..a232e034b9 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -30,6 +30,7 @@ jobs:
       run_dummy_tests: ${{ steps.detect.outputs.run_dummy_tests }}
       run_generators: ${{ steps.detect.outputs.run_generators }}
       has_full_ci_label: ${{ steps.check-label.outputs.result }}
+      matrix_array: ${{ steps.determine-matrix.outputs.result }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -39,6 +40,14 @@ jobs:
       - name: Check for full-ci label
         id: check-label
         uses: ./.github/actions/check-full-ci-label
+      - name: Determine matrix strategy
+        id: determine-matrix
+        run: |
+          if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
+            echo 'result=["latest"]' | jq -c . >> "$GITHUB_OUTPUT"
+          else
+            echo 'result=["latest","minimum"]' | jq -c . >> "$GITHUB_OUTPUT"
+          fi
       - name: Detect relevant changes
         id: detect
         run: |
@@ -65,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
+        dependency-level: ${{ fromJson(needs.detect-changes.outputs.matrix_array) }}
     env:
       SKIP_YARN_COREPACK_CHECK: 0
       BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
diff --git a/.github/workflows/gem-tests.yml b/.github/workflows/gem-tests.yml
index 3ae412cbf4..2fc7fa4660 100644
--- a/.github/workflows/gem-tests.yml
+++ b/.github/workflows/gem-tests.yml
@@ -34,6 +34,7 @@ jobs:
       run_dummy_tests: ${{ steps.detect.outputs.run_dummy_tests }}
       run_generators: ${{ steps.detect.outputs.run_generators }}
       has_full_ci_label: ${{ steps.check-label.outputs.result }}
+      matrix_array: ${{ steps.determine-matrix.outputs.result }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -43,6 +44,14 @@ jobs:
       - name: Check for full-ci label
         id: check-label
         uses: ./.github/actions/check-full-ci-label
+      - name: Determine matrix strategy
+        id: determine-matrix
+        run: |
+          if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
+            echo 'result=["latest"]' | jq -c . >> "$GITHUB_OUTPUT"
+          else
+            echo 'result=["latest","minimum"]' | jq -c . >> "$GITHUB_OUTPUT"
+          fi
       - name: Detect relevant changes
         id: detect
         run: |
@@ -69,7 +78,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
+        dependency-level: ${{ fromJson(needs.detect-changes.outputs.matrix_array) }}
     env:
       BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 08923bdc10..2ffb120fa5 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -32,6 +32,7 @@ jobs:
       run_dummy_tests: ${{ steps.detect.outputs.run_dummy_tests }}
       run_generators: ${{ steps.detect.outputs.run_generators }}
       has_full_ci_label: ${{ steps.check-label.outputs.result }}
+      matrix_array: ${{ steps.determine-matrix.outputs.result }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -41,6 +42,14 @@ jobs:
       - name: Check for full-ci label
         id: check-label
         uses: ./.github/actions/check-full-ci-label
+      - name: Determine matrix strategy
+        id: determine-matrix
+        run: |
+          if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
+            echo 'result=["latest"]' | jq -c . >> "$GITHUB_OUTPUT"
+          else
+            echo 'result=["latest","minimum"]' | jq -c . >> "$GITHUB_OUTPUT"
+          fi
       - name: Detect relevant changes
         id: detect
         run: |
@@ -66,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
+        dependency-level: ${{ fromJson(needs.detect-changes.outputs.matrix_array) }}
     runs-on: ubuntu-22.04
     steps:
       - name: Translate matrix for Ruby and Node versions
@@ -153,7 +162,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dependency-level: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['minimum']) || toJSON(['latest', 'minimum'])) }}
+        dependency-level: ${{ fromJson(needs.detect-changes.outputs.matrix_array) }}
     runs-on: ubuntu-22.04
     steps:
       - name: Translate matrix for Ruby and Node versions
diff --git a/.github/workflows/package-js-tests.yml b/.github/workflows/package-js-tests.yml
index 62c723c6e6..bbf83bae11 100644
--- a/.github/workflows/package-js-tests.yml
+++ b/.github/workflows/package-js-tests.yml
@@ -36,6 +36,7 @@ jobs:
       run_dummy_tests: ${{ steps.detect.outputs.run_dummy_tests }}
       run_generators: ${{ steps.detect.outputs.run_generators }}
       has_full_ci_label: ${{ steps.check-label.outputs.result }}
+      matrix_array: ${{ steps.determine-matrix.outputs.result }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -45,6 +46,14 @@ jobs:
       - name: Check for full-ci label
         id: check-label
         uses: ./.github/actions/check-full-ci-label
+      - name: Determine matrix strategy
+        id: determine-matrix
+        run: |
+          if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
+            echo 'result=["22"]' | jq -c . >> "$GITHUB_OUTPUT"
+          else
+            echo 'result=["22","20"]' | jq -c . >> "$GITHUB_OUTPUT"
+          fi
       - name: Detect relevant changes
         id: detect
         run: |
@@ -71,7 +80,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: ${{ fromJSON((github.ref == 'refs/heads/master' || inputs.force_run == true || needs.detect-changes.outputs.has_full_ci_label == 'true') && toJSON(['20']) || toJSON(['22', '20'])) }}
+        node-version: ${{ fromJson(needs.detect-changes.outputs.matrix_array) }}
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4

From 25a9badee0437a6e953ec5d3a91a0c1538fc4d75 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 16:40:29 -0600
Subject: [PATCH 05/12] fix step output

---
 .github/workflows/examples.yml          | 4 ++--
 .github/workflows/gem-tests.yml         | 4 ++--
 .github/workflows/integration-tests.yml | 4 ++--
 .github/workflows/package-js-tests.yml  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index a232e034b9..a1a9695fc6 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -44,9 +44,9 @@ jobs:
         id: determine-matrix
         run: |
           if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
-            echo 'result=["latest"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"latest\"]" >> "$GITHUB_OUTPUT"
           else
-            echo 'result=["latest","minimum"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"latest\",\"minimum\"]" >> "$GITHUB_OUTPUT"
           fi
       - name: Detect relevant changes
         id: detect
diff --git a/.github/workflows/gem-tests.yml b/.github/workflows/gem-tests.yml
index 2fc7fa4660..28bb0d1623 100644
--- a/.github/workflows/gem-tests.yml
+++ b/.github/workflows/gem-tests.yml
@@ -48,9 +48,9 @@ jobs:
         id: determine-matrix
         run: |
           if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
-            echo 'result=["latest"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"latest\"]" >> "$GITHUB_OUTPUT"
           else
-            echo 'result=["latest","minimum"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"latest\",\"minimum\"]" >> "$GITHUB_OUTPUT"
           fi
       - name: Detect relevant changes
         id: detect
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 2ffb120fa5..9d43eaf0e8 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -46,9 +46,9 @@ jobs:
         id: determine-matrix
         run: |
           if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
-            echo 'result=["latest"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"latest\"]" >> "$GITHUB_OUTPUT"
           else
-            echo 'result=["latest","minimum"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"latest\",\"minimum\"]" >> "$GITHUB_OUTPUT"
           fi
       - name: Detect relevant changes
         id: detect
diff --git a/.github/workflows/package-js-tests.yml b/.github/workflows/package-js-tests.yml
index bbf83bae11..c091e9588b 100644
--- a/.github/workflows/package-js-tests.yml
+++ b/.github/workflows/package-js-tests.yml
@@ -50,9 +50,9 @@ jobs:
         id: determine-matrix
         run: |
           if [ "${{ inputs.force_run }}" = "true" ] || [ "${{ steps.check-label.outputs.result }}" = "true" ] || [ "${{ github.ref }}" = "refs/heads/master" ]; then
-            echo 'result=["22"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"22\"]" >> "$GITHUB_OUTPUT"
           else
-            echo 'result=["22","20"]' | jq -c . >> "$GITHUB_OUTPUT"
+            echo "result=[\"22\",\"20\"]" >> "$GITHUB_OUTPUT"
           fi
       - name: Detect relevant changes
         id: detect

From 396581e72951f29eb1ed449210f0b1646ee0037a Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 17:07:18 -0600
Subject: [PATCH 06/12] CI fixes

---
 .github/workflows/gem-tests.yml   | 10 +++++++++-
 rakelib/shakapacker_examples.rake |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gem-tests.yml b/.github/workflows/gem-tests.yml
index 28bb0d1623..886f2a43c2 100644
--- a/.github/workflows/gem-tests.yml
+++ b/.github/workflows/gem-tests.yml
@@ -70,7 +70,7 @@ jobs:
           script/ci-changes-detector "$BASE_REF"
         shell: bash
 
-  rspec-package-tests:
+  basic-gem-tests:
     needs: detect-changes
     # Run on master OR when Ruby tests needed on PR
     if: |
@@ -83,6 +83,14 @@ jobs:
       BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
     runs-on: ubuntu-22.04
     steps:
+      - name: Translate matrix for Ruby and Node versions
+        id: translate-matrix
+        run: |
+          if [ "${{ matrix.dependency-level }}" == "latest" ]; then
+            echo "ruby-version=3.4" >> "$GITHUB_OUTPUT"
+          else
+            echo "ruby-version=3.2" >> "$GITHUB_OUTPUT"
+          fi
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
diff --git a/rakelib/shakapacker_examples.rake b/rakelib/shakapacker_examples.rake
index 165bbfc0d2..acffc4a6ea 100644
--- a/rakelib/shakapacker_examples.rake
+++ b/rakelib/shakapacker_examples.rake
@@ -36,7 +36,11 @@ namespace :shakapacker_examples do # rubocop:disable Metrics/BlockLength
       sh_in_dir(example_type.dir, "echo \"gem 'shakapacker', '>= 8.2.0'\" >> #{example_type.gemfile}")
       bundle_install_in(example_type.dir)
       sh_in_dir(example_type.dir, "rake shakapacker:install")
-      sh_in_dir(example_type.dir, example_type.generator_shell_commands)
+      # TODO: Remove REACT_ON_RAILS_SKIP_VALIDATION after generators start using next release
+      generator_commands = example_type.generator_shell_commands.map do |cmd|
+        "REACT_ON_RAILS_SKIP_VALIDATION=true #{cmd}"
+      end
+      sh_in_dir(example_type.dir, generator_commands)
       sh_in_dir(example_type.dir, "npm install")
     end
   end

From 2659bfd87eb65fc35a63ea2042f80324d097d514 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 19:26:06 -0600
Subject: [PATCH 07/12] re-enable build_test_command since generators configure
 TestHelper

---
 .../base/base/config/initializers/react_on_rails.rb.tt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt b/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
index 8015f38971..d77e1702c2 100644
--- a/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
+++ b/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
@@ -26,7 +26,7 @@ ReactOnRails.configure do |config|
   # - Requires adding ReactOnRails::TestHelper to spec/rails_helper.rb
   # - See: https://github.com/shakacode/react_on_rails/blob/master/docs/guides/testing-configuration.md
   #
-  # config.build_test_command = "RAILS_ENV=test bin/shakapacker"
+  config.build_test_command = "RAILS_ENV=test bin/shakapacker"
 
   ################################################################################
   # Advanced Configuration

From 604370f8940813260f0922ce29157448e5b63efb Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 20:17:11 -0600
Subject: [PATCH 08/12] make sure generate_packs runs

---
 rakelib/shakapacker_examples.rake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rakelib/shakapacker_examples.rake b/rakelib/shakapacker_examples.rake
index acffc4a6ea..6b2e30b011 100644
--- a/rakelib/shakapacker_examples.rake
+++ b/rakelib/shakapacker_examples.rake
@@ -42,6 +42,7 @@ namespace :shakapacker_examples do # rubocop:disable Metrics/BlockLength
       end
       sh_in_dir(example_type.dir, generator_commands)
       sh_in_dir(example_type.dir, "npm install")
+      sh_in_dir(example_type.dir, "bin/rake react_on_rails:generate_packs")
     end
   end
 

From 6653342a9660cfb3cb4bd1b57dadc4b6ca40e2e5 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 21:03:39 -0600
Subject: [PATCH 09/12] add yarn prefix

---
 lib/generators/react_on_rails/dev_tests_generator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/react_on_rails/dev_tests_generator.rb b/lib/generators/react_on_rails/dev_tests_generator.rb
index 253a2e2476..43b1471566 100644
--- a/lib/generators/react_on_rails/dev_tests_generator.rb
+++ b/lib/generators/react_on_rails/dev_tests_generator.rb
@@ -50,7 +50,7 @@ def add_yarn_relative_install_script_in_package_json
         package_json = File.join(destination_root, "package.json")
         contents = JSON.parse(File.read(package_json))
         contents["scripts"] ||= {}
-        contents["scripts"]["postinstall"] = "yalc link react-on-rails"
+        contents["scripts"]["postinstall"] = "yarn yalc link react-on-rails"
         File.open(package_json, "w+") { |f| f.puts JSON.pretty_generate(contents) }
       end
     end

From 05e045e2f4db35dd5fcf27cbe7381700160107ec Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 21:09:20 -0600
Subject: [PATCH 10/12] add yarn prefix to publish, not link

---
 .github/workflows/examples.yml                       | 2 +-
 lib/generators/react_on_rails/dev_tests_generator.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index a1a9695fc6..339a6d2385 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -130,7 +130,7 @@ jobs:
           yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
           sudo yarn global add yalc
       - name: yalc publish for react-on-rails
-        run: yalc publish
+        run: yarn yalc publish
       - name: Install Ruby Gems for package
         run: |
           bundle lock --add-platform 'x86_64-linux'
diff --git a/lib/generators/react_on_rails/dev_tests_generator.rb b/lib/generators/react_on_rails/dev_tests_generator.rb
index 43b1471566..253a2e2476 100644
--- a/lib/generators/react_on_rails/dev_tests_generator.rb
+++ b/lib/generators/react_on_rails/dev_tests_generator.rb
@@ -50,7 +50,7 @@ def add_yarn_relative_install_script_in_package_json
         package_json = File.join(destination_root, "package.json")
         contents = JSON.parse(File.read(package_json))
         contents["scripts"] ||= {}
-        contents["scripts"]["postinstall"] = "yarn yalc link react-on-rails"
+        contents["scripts"]["postinstall"] = "yalc link react-on-rails"
         File.open(package_json, "w+") { |f| f.puts JSON.pretty_generate(contents) }
       end
     end

From 94780197deba355fbed53d8ca0bcbf10c5beb181 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Sun, 16 Nov 2025 21:32:53 -0600
Subject: [PATCH 11/12] reenable auto_load_bundle for generator

---
 .../base/base/config/initializers/react_on_rails.rb.tt          | 2 ++
 rakelib/shakapacker_examples.rake                               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt b/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
index d77e1702c2..e063171d21 100644
--- a/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
+++ b/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
@@ -28,6 +28,8 @@ ReactOnRails.configure do |config|
   #
   config.build_test_command = "RAILS_ENV=test bin/shakapacker"
 
+  config.auto_load_bundle = true
+  config.components_subdirectory = "ror_components"
   ################################################################################
   # Advanced Configuration
   ################################################################################
diff --git a/rakelib/shakapacker_examples.rake b/rakelib/shakapacker_examples.rake
index 6b2e30b011..f43ef45260 100644
--- a/rakelib/shakapacker_examples.rake
+++ b/rakelib/shakapacker_examples.rake
@@ -42,7 +42,7 @@ namespace :shakapacker_examples do # rubocop:disable Metrics/BlockLength
       end
       sh_in_dir(example_type.dir, generator_commands)
       sh_in_dir(example_type.dir, "npm install")
-      sh_in_dir(example_type.dir, "bin/rake react_on_rails:generate_packs")
+      sh_in_dir(example_type.dir, "bundle exec rake react_on_rails:generate_packs")
     end
   end
 

From 7bb4f23bda0975a9aca4c5408257674c4074c7ec Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Sun, 16 Nov 2025 18:25:01 -1000
Subject: [PATCH 12/12] Fix Pro workflow job dependency references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correct job name from 'pro-build-dummy-app-webpack-test-bundles' to 'build-dummy-app-webpack-test-bundles' in job dependencies.

The job was renamed in the workflow refactoring but the reference updates were missed, causing actionlint failures.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .github/workflows/pro-integration-tests.yml    | 4 ++--
 .github/workflows/pro-test-package-and-gem.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pro-integration-tests.yml b/.github/workflows/pro-integration-tests.yml
index 22caa3d897..1c5cde1a4a 100644
--- a/.github/workflows/pro-integration-tests.yml
+++ b/.github/workflows/pro-integration-tests.yml
@@ -150,7 +150,7 @@ jobs:
   rspec-dummy-app-node-renderer:
     needs:
       - detect-changes
-      - pro-build-dummy-app-webpack-test-bundles
+      - build-dummy-app-webpack-test-bundles
     if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_pro_tests == 'true'
     runs-on: ubuntu-22.04
     env:
@@ -327,7 +327,7 @@ jobs:
   dummy-app-node-renderer-e2e-tests:
     needs:
       - detect-changes
-      - pro-build-dummy-app-webpack-test-bundles
+      - build-dummy-app-webpack-test-bundles
     if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_pro_tests == 'true'
     runs-on: ubuntu-22.04
     env:
diff --git a/.github/workflows/pro-test-package-and-gem.yml b/.github/workflows/pro-test-package-and-gem.yml
index 1e12d98d4f..386d26c2cf 100644
--- a/.github/workflows/pro-test-package-and-gem.yml
+++ b/.github/workflows/pro-test-package-and-gem.yml
@@ -150,7 +150,7 @@ jobs:
   package-js-tests:
     needs:
       - detect-changes
-      - pro-build-dummy-app-webpack-test-bundles
+      - build-dummy-app-webpack-test-bundles
     if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.run_pro_tests == 'true'
     runs-on: ubuntu-22.04
     # Redis service container