🚀 React on Rails v15 Generator Overhaul & Developer Experience Enhancement for v16

.github/workflows/examples.yml

@@ -11,10 +11,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        versions: ['oldest', 'newest']
+        ruby-version: ['3.2', '3.4']
+        dependency-level: ['minimum', 'latest']
+        include:
+          - ruby-version: '3.2'
+            dependency-level: 'minimum'
+          - ruby-version: '3.4'
+            dependency-level: 'latest'
+        exclude:
+          - ruby-version: '3.2'
+            dependency-level: 'latest'
+          - ruby-version: '3.4'
+            dependency-level: 'minimum'
     env:
       SKIP_YARN_COREPACK_CHECK: 0
-      BUNDLE_FROZEN: ${{ matrix.versions == 'oldest' && 'false' || 'true' }}
+      BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -40,7 +51,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.versions == 'oldest' && '3.0' || '3.3' }}
+          ruby-version: ${{ matrix.ruby-version }}
           bundler: 2.5.9
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -58,18 +69,18 @@ jobs:
           echo "Yarn version: "; yarn --version
           echo "Bundler version: "; bundle --version
       - name: run conversion script to support shakapacker v6
-        if: matrix.versions == 'oldest'
+        if: matrix.dependency-level == 'minimum'
         run: script/convert
       - name: Save root ruby gems to cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ matrix.versions }}
+          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ matrix.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
         run: |
-          yarn install --no-progress --no-emoji ${{ matrix.versions == 'newest' && '--frozen-lockfile' || '' }}
+          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
@@ -95,12 +106,12 @@ jobs:
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Set packer version environment variable
         run: |
-          echo "CI_PACKER_VERSION=${{ matrix.versions }}" >> $GITHUB_ENV
+          echo "CI_DEPENDENCY_LEVEL=${{ matrix.dependency-level }}" >> $GITHUB_ENV
       - name: Main CI
         if: steps.changed-files.outputs.any_changed == 'true'
-        run: bundle exec rake run_rspec:${{ matrix.versions == 'oldest' && 'web' || 'shaka' }}packer_examples
+        run: bundle exec rake run_rspec:shakapacker_examples
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:
-          name: main-rspec-${{ github.run_id }}-${{ github.job }}-${{ matrix.versions }}
+          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
           path: ~/rspec

.github/workflows/main.yml

@@ -10,7 +10,20 @@ jobs:
   build-dummy-app-webpack-test-bundles:
     strategy:
       matrix:
-        versions: ['oldest', 'newest']
+        ruby-version: ['3.2', '3.4']
+        node-version: ['20', '22']
+        include:
+          - ruby-version: '3.2'
+            node-version: '20'
+            dependency-level: 'minimum'
+          - ruby-version: '3.4'
+            node-version: '22'
+            dependency-level: 'latest'
+        exclude:
+          - ruby-version: '3.2'
+            node-version: '22'
+          - ruby-version: '3.4'
+            node-version: '20'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -19,7 +32,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.versions == 'oldest' && '3.0' || '3.3' }}
+          ruby-version: ${{ matrix.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
@@ -28,7 +41,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.versions == 'oldest' && '16' || '20' }}
+          node-version: ${{ matrix.node-version }}
           cache: yarn
           cache-dependency-path: '**/yarn.lock'
       - name: Print system information
@@ -41,23 +54,23 @@ jobs:
           echo "Yarn version: "; yarn --version
           echo "Bundler version: "; bundle --version
       - name: run conversion script to support shakapacker v6
-        if: matrix.versions == 'oldest'
+        if: matrix.dependency-level == 'minimum'
         run: script/convert
       - name: Install Node modules with Yarn for renderer package
         run: |
-          yarn install --no-progress --no-emoji ${{ matrix.versions == 'newest' && '--frozen-lockfile' || '' }}
+          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
       - name: yalc add react-on-rails
         run: cd spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app
-        run: cd spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.versions == 'newest' && '--frozen-lockfile' || '' }}
+        run: cd spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
       - 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') }}-${{ matrix.versions }}
+          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Ruby Gems for dummy app
         run: |
           cd spec/dummy
@@ -68,21 +81,34 @@ jobs:
       - name: generate file system-based packs
         run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
       - name: Build test bundles for dummy app
-        run: cd spec/dummy && rm -rf public/webpack/test && yarn run build:rescript && RAILS_ENV="test" NODE_ENV="test" bin/${{ matrix.versions == 'oldest' && 'web' || 'shaka' }}packer
+        run: cd spec/dummy && rm -rf public/webpack/test && yarn run build:rescript && RAILS_ENV="test" NODE_ENV="test" bin/shakapacker
       - 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/save@v4
         with:
           path: spec/dummy/public/webpack
-          key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-${{ matrix.versions }}
+          key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
 
   dummy-app-integration-tests:
     needs: build-dummy-app-webpack-test-bundles
     strategy:
       fail-fast: false
       matrix:
-        versions: ['oldest', 'newest']
+        ruby-version: ['3.2', '3.4']
+        node-version: ['20', '22']
+        include:
+          - ruby-version: '3.2'
+            node-version: '20'
+            dependency-level: 'minimum'
+          - ruby-version: '3.4'
+            node-version: '22'
+            dependency-level: 'latest'
+        exclude:
+          - ruby-version: '3.2'
+            node-version: '22'
+          - ruby-version: '3.4'
+            node-version: '20'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -91,12 +117,12 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.versions == 'oldest' && '3.0' || '3.3' }}
+          ruby-version: ${{ matrix.ruby-version }}
           bundler: 2.5.9
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.versions == 'oldest' && '16' || '20' }}
+          node-version: ${{ matrix.node-version }}
           cache: yarn
           cache-dependency-path: '**/yarn.lock'
       - name: Print system information
@@ -109,35 +135,35 @@ jobs:
           echo "Yarn version: "; yarn --version
           echo "Bundler version: "; bundle --version
       - name: run conversion script to support shakapacker v6
-        if: matrix.versions == 'oldest'
+        if: matrix.dependency-level == 'minimum'
         run: script/convert
       - name: Save root ruby gems to cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ matrix.versions }}
+          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ matrix.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') }}-${{ matrix.versions }}
+          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ matrix.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 }}-${{ matrix.versions }}
+          key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Node modules with Yarn
         run: |
-          yarn install --no-progress --no-emoji ${{ matrix.versions == 'newest' && '--frozen-lockfile' || '' }}
+          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
       - name: yalc add react-on-rails
         run: cd spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app
-        run: cd spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.versions == 'newest' && '--frozen-lockfile' || '' }}
+        run: cd spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
       - name: Dummy JS tests
         run: |
           cd spec/dummy
@@ -172,34 +198,34 @@ jobs:
       - name: generate file system-based packs
         run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
       - name: Git Stuff
-        if: matrix.versions == 'oldest'
+        if: matrix.dependency-level == 'minimum'
         run: |
           git config user.email "you@example.com"
           git config user.name "Your Name"
           git commit -am "stop generators from complaining about uncommitted code"
       - run: cd spec/dummy && bundle info shakapacker
       - name: Set packer version environment variable
         run: |
-          echo "CI_PACKER_VERSION=${{ matrix.versions }}" >> $GITHUB_ENV
+          echo "CI_DEPENDENCY_LEVEL=ruby${{ matrix.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 }}-${{ matrix.versions }}
+          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.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 }}-${{ matrix.versions }}
+          name: dummy-app-capybara-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.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 }}-${{ matrix.versions }}
+          name: dummy-app-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.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 }}-${{ matrix.versions }}
+          name: dummy-app-yarn-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
           path: spec/dummy/yarn-error.log

.github/workflows/package-js-tests.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        versions: ['oldest', 'newest']
+        node-version: ['20', '22']
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.versions == 'oldest' && '16' || '20' }}
+          node-version: ${{ matrix.node-version }}
           cache: yarn
           cache-dependency-path: '**/yarn.lock'
       - name: Print system information
@@ -30,11 +30,11 @@ jobs:
           echo "Node version: "; node -v
           echo "Yarn version: "; yarn --version
       - name: run conversion script
-        if: matrix.versions == 'oldest'
+        if: matrix.node-version == '20'
         run: script/convert
       - name: Install Node modules with Yarn for renderer package
         run: |
-          yarn install --no-progress --no-emoji ${{ matrix.versions == 'newest' && '--frozen-lockfile' || '' }}
+          yarn install --no-progress --no-emoji ${{ matrix.node-version == '22' && '--frozen-lockfile' || '' }}
           sudo yarn global add yalc
       - name: Run JS unit tests for Renderer package
         run: yarn test

.github/workflows/rspec-package-specs.yml

@@ -11,9 +11,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        versions: ['oldest', 'newest']
+        ruby-version: ['3.2', '3.4']
+        dependency-level: ['minimum', 'latest']
     env:
-      BUNDLE_FROZEN: ${{ matrix.versions == 'oldest' && 'false' || 'true' }}
+      BUNDLE_FROZEN: ${{ matrix.dependency-level == 'minimum' && 'false' || 'true' }}
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -22,7 +23,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.versions == 'oldest' && '3.0' || '3.3' }}
+          ruby-version: ${{ matrix.ruby-version }}
           bundler: 2.5.9
       - name: Print system information
         run: |
@@ -33,34 +34,34 @@ jobs:
           echo "Node version: "; node -v
           echo "Yarn version: "; yarn --version
           echo "Bundler version: "; bundle --version
-      - name: run conversion script to support shakapacker v6
-        if: matrix.versions == 'oldest'
+      - name: run conversion script to use minimum supported dependency versions
+        if: matrix.dependency-level == 'minimum'
         run: script/convert
       - name: Save root ruby gems to cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ matrix.versions }}
+          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ matrix.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
-        if: matrix.versions == 'oldest'
+        if: matrix.dependency-level == 'minimum'
         run: |
           git config user.email "you@example.com"
           git config user.name "Your Name"
           git commit -am "stop generators from complaining about uncommitted code"
-      - name: Set packer version environment variable
+      - name: Set dependency level environment variable
         run: |
-          echo "CI_PACKER_VERSION=${{ matrix.versions }}" >> $GITHUB_ENV
+          echo "CI_DEPENDENCY_LEVEL=${{ matrix.dependency-level }}" >> $GITHUB_ENV
       - name: Run rspec tests
         run: bundle exec rspec spec/react_on_rails
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:
-          name: main-rspec-${{ github.run_id }}-${{ github.job }}-${{ matrix.versions }}
+          name: main-rspec-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.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 }}-${{ matrix.versions }}
+          name: main-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
           path: log/test.log

.prettierignore

@@ -13,7 +13,9 @@ spec/dummy/public
 **/*generated*
 *.res.js
 
-# Prettier doesn't understand ERB syntax in YAML files
+# Prettier doesn't understand ERB syntax in YAML files and can damage templates
 .rubocop.yml
+*.yml
+*.yaml
 # Intentionally invalid
 spec/react_on_rails/fixtures/i18n/locales_symbols/