🚀 React on Rails v15 Generator Overhaul & Developer Experience Enhancement for v16 #1770
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,20 @@ jobs: | |
| build-dummy-app-webpack-test-bundles: | ||
| strategy: | ||
| matrix: | ||
| 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.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.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.dependency-level == 'minimum' | ||
| run: script/convert | ||
| - name: Install Node modules with Yarn for renderer package | ||
| run: | | ||
| 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.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') }}-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/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 }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }} | ||
|
|
||
| dummy-app-integration-tests: | ||
| needs: build-dummy-app-webpack-test-bundles | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| 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.ruby-version }} | ||
| bundler: 2.5.9 | ||
| - name: Setup Node | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| 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.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') }}-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') }}-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 }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }} | ||
| - name: Install Node modules with Yarn | ||
| run: | | ||
| yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }} | ||
| sudo yarn global add yalc | ||
| - name: yalc publish for react-on-rails | ||
|
Comment on lines
158
to
161
Contributor
There was a problem hiding this comment. 🛠️ Refactor suggestion Integration job: update JS steps to npm as well. Mirror the Yarn→npm changes here for consistency. Proposed diffs: Root install: - yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
- sudo yarn global add yalc
+ npm ci --no-audit --no-fund
+ sudo npm i -g yalcDummy app install: - run: cd spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
+ run: cd spec/dummy && npm ci --no-audit --no-fundDummy JS tests: - yarn run test:js
+ npm run test:jsUpdate setup-node cache in this job similarly to npm and package-lock.json. Also applies to: 166-167, 170-170 🤖 Prompt for AI Agents |
||
| 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.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.dependency-level == 'minimum' | ||
| run: | | ||
| git config user.email "[email protected]" | ||
| 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_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 }}-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 }}-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 }}-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 }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }} | ||
| path: spec/dummy/yarn-error.log | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,9 +11,10 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| ruby-version: ['3.2', '3.4'] | ||
| dependency-level: ['minimum', 'latest'] | ||
| env: | ||
| 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.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 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.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.dependency-level == 'minimum' | ||
| run: | | ||
| git config user.email "[email protected]" | ||
| git config user.name "Your Name" | ||
| git commit -am "stop generators from complaining about uncommitted code" | ||
| - name: Set dependency level environment variable | ||
| run: | | ||
| 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 }}-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 }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }} | ||
| path: log/test.log | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dummy app still uses Yarn; migrate these steps to npm to meet PR objective.
The PR description says: “Switch generator and dummy app to use npm (remove Yarn requirement).” These steps keep a hard Yarn dependency.
Proposed diffs:
Renderer/package install step:
Dummy app install step:
Build step:
Also change setup-node cache to npm (see previous comment) and artifact naming that references Yarn logs (see below).
Also applies to: 68-68, 84-84
🤖 Prompt for AI Agents