Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.4.6"

gem "react_on_rails", "16.4.0"
gem "shakapacker", "9.7.0"
gem "react_on_rails", "16.6.0.rc.0"
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinning to an RC version on the main branch is risky if this gem is used as a dependency reference by downstream projects. Consider whether this should live on a dedicated rc-testing branch until both gems reach stable release, or at minimum add a comment explaining the temporary nature of this pin.

gem "shakapacker", "10.0.0.rc.0"
Comment on lines +8 to +9
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Build is broken per the PR description

The PR description's own build output shows a hard error that prevents the app from functioning:

ERROR in ./client/app/packs/server-bundle.js 4:1-52
  × Module not found: Can't resolve './../generated/server-bundle-generated.js'

The server-bundle-generated.js file, which is expected to be produced by the react_on_rails:generate_packs rake task, is missing. The upgrade to react_on_rails 16.6.0.rc.0 / shakapacker 10.0.0.rc.0 appears to require this generated artefact, and it hasn't been committed or regenerated here. Merging this as-is will leave the repo in a broken state for anyone who pulls master.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Major version bump (9 → 10). Shakapacker 10.x may include breaking changes beyond just the version pin. The PR includes no code changes to configuration files (e.g. shakapacker.yml, webpack config) — please confirm that no configuration schema changes are required for v10, or link to the shakapacker migration guide.


# Bundle edge Rails instead: gem "rails", github: "rails/rails"
gem "rails", "~> 8.1.2"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ GEM
erb
psych (>= 4.0.0)
tsort
react_on_rails (16.4.0)
react_on_rails (16.6.0.rc.0)
addressable
connection_pool
execjs (~> 2.5)
Expand Down Expand Up @@ -387,7 +387,7 @@ GEM
websocket (~> 1.0)
semantic_range (3.1.1)
sexp_processor (4.17.1)
shakapacker (9.7.0)
shakapacker (10.0.0.rc.0)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -486,7 +486,7 @@ DEPENDENCIES
rails-html-sanitizer
rails_best_practices
rainbow
react_on_rails (= 16.4.0)
react_on_rails (= 16.6.0.rc.0)
redcarpet
redis (~> 5.0)
rspec-rails (~> 6.0.0)
Expand All @@ -498,7 +498,7 @@ DEPENDENCIES
scss_lint
sdoc
selenium-webdriver (~> 4)
shakapacker (= 9.7.0)
shakapacker (= 10.0.0.rc.0)
spring
spring-commands-rspec
stimulus-rails (~> 1.3)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-intl": "^6.4.4",
"react-on-rails": "16.4.0",
"react-on-rails": "16.6.0-rc.0",
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rescript-react-on-rails package (line ~92) is still pinned to 1.1.0. Please verify it is compatible with react-on-rails@16.6.0-rc.0 — a major or minor version gap here can cause runtime issues with ReScript bindings.

"react-redux": "^8.1.0",
"react-router": "^6.13.0",
"react-router-dom": "^6.13.0",
Expand All @@ -95,7 +95,7 @@
"sass": "^1.58.3",
"sass-loader": "^13.3.2",
"sass-resources-loader": "^2.2.5",
"shakapacker": "9.7.0",
"shakapacker": "10.0.0-rc.0",
"stimulus": "^3.0.1",
"style-loader": "^3.3.1",
"swc-loader": "^0.2.6",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8403,10 +8403,10 @@ react-is@^18.0.0, react-is@^18.3.1:
resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==

react-on-rails@16.4.0:
version "16.4.0"
resolved "https://registry.npmjs.org/react-on-rails/-/react-on-rails-16.4.0.tgz#37624e1fd4d7c38664f14b6b7a913a0b48705ee3"
integrity sha512-d71HGdyig5nPDGdI5Isv7TmSlFzfcFPK+KtSgrvu3u8M3+5XApgdH8zvEin4LbPShFnxwyyADEbNv42y3Ga1Qg==
react-on-rails@16.6.0-rc.0:
version "16.6.0-rc.0"
resolved "https://registry.npmjs.org/react-on-rails/-/react-on-rails-16.6.0-rc.0.tgz#ed0ed7085133905ad1e243cc97233e97d10a1c99"
integrity sha512-fSEomzwojgWob6uTWSfkbpP+XE++8kQBjNFpTT7V419QOON1daIHypQwA9gc8L8uX1If5r8hmAs57iWyGWmJuQ==

react-proxy@^1.1.7:
version "1.1.8"
Expand Down Expand Up @@ -9059,10 +9059,10 @@ setprototypeof@1.2.0, setprototypeof@~1.2.0:
resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

shakapacker@9.7.0:
version "9.7.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.7.0.tgz#e8e1b2cb58e54678942698d9071b14aff58b517e"
integrity sha512-/6Y/hioWAchUYDcH8pbIQdSLS63QI+Tb26mDGDR6wLO+QFFcxiv906/hqJTTUcW9Xrp5sFV5LwfdctQSSII5ig==
shakapacker@10.0.0-rc.0:
version "10.0.0-rc.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-10.0.0-rc.0.tgz#472258e85c7aef3f705d36b6e06f303e680df8fa"
integrity sha512-Sv58iSE+z1N73o0ksAHPE2BrMjynTySttsc9EmiAdsqeW5U5KYC/N0CdCEXQxQoT5ybAYA2t0j+NJHdWIM/PCg==
dependencies:
js-yaml "^4.1.0"
path-complete-extname "^1.0.0"
Expand Down
Loading