Merge origin/main and finish the dependency consolidation

Author: justin808

CONTRIBUTING.md

@@ -117,6 +117,7 @@ It outputs an ironically webpacked couple of files into `lib/assets/react-source
   - Update the [changelog](CHANGELOG.md) (find recent changes on GitHub by listing commits or showing closed PRs)
   - Regular versions: `bundle exec rake create_release\[2.7.0\]`
   - RC versions: `bundle exec rake create_release\[2.7.0.rc.2\]`
+  - Dry run: `bundle exec rake create_release\[2.7.0,true\]`
   - Note, `rake create_release` runs `rake react:update` and `rake ujs:update`
 
 ## Styleguides

Gemfile

@@ -3,3 +3,7 @@
 source "http://rubygems.org"
 
 gemspec
+
+# Keep development bundle compatible with both Ruby 2.7 CI and newer local Rubies.
+# Nokogiri 1.19+ requires Ruby 3.2+, which breaks the repo's Ruby 2.7 matrix.
+gem "nokogiri", "~> 1.15.7"

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react-rails (3.2.1)
+    react-rails (3.3.0)
       babel-transpiler (>= 0.7.0)
       connection_pool
       execjs
@@ -87,7 +87,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     builder (3.2.4)
-    byebug (11.0.1)
+    byebug (11.1.3)
     capybara (3.37.1)
       addressable
       matrix
@@ -157,7 +157,7 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.9)
     minitest (5.17.0)
     minitest-retry (0.2.2)
       minitest (>= 5.0)
@@ -172,12 +172,14 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.7-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -190,8 +192,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.6)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.8.1)
+    rack (2.2.22)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (7.0.8.1)
@@ -256,6 +258,7 @@ GEM
     zeitwerk (2.6.6)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
   x86_64-darwin-20
   x86_64-linux
@@ -273,6 +276,7 @@ DEPENDENCIES
   jbuilder
   listen (~> 3.0.0)
   minitest-retry
+  nokogiri (~> 1.15.7)
   package_json
   pry-byebug (~> 3.8.0)
   rails (~> 7.0.7, >= 7.0.7.2)

README.md

@@ -22,6 +22,8 @@ Why? React on Rails code receives much more active development and testing. For
 
 You can find [migration to React on Rails steps here](https://github.com/reactjs/react-rails/blob/main/docs/migrating-from-react-rails-to-react_on_rails.md).
 
+For the fastest path, try the [LLM-assisted migration prompt](https://github.com/reactjs/react-rails/blob/main/docs/migrating-from-react-rails-to-react_on_rails.md#llm-assisted-migration-prompt).
+
 ---
 ## ShakaCode Support
 

docs/migrating-from-react-rails-to-react_on_rails.md

@@ -5,6 +5,7 @@
 
 - [Why migrate?](#why-migrate)
 - [Steps to migrate](#steps-to-migrate)
+- [LLM-assisted migration prompt](#llm-assisted-migration-prompt)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -61,3 +62,43 @@ In this guide, it is assumed that you have upgraded the `react-rails` project to
 
 You can also check [react-rails-to-react-on-rails](https://github.com/shakacode/react-rails-example-app/tree/react-rails-to-react-on-rails) branch on [react-rails example app](https://github.com/shakacode/react-rails-example-app) for an example of migration from `react-rails` v3 to `react_on_rails` v13.4.
 
+## LLM-assisted migration prompt
+
+You can usually do a safe first-pass migration quickly with a coding assistant. Give it this prompt:
+
+If your assistant cannot browse URLs, paste this migration guide content directly into the prompt context before running the template.
+
+```text
+You are a senior Rails + React engineer. Migrate this app from react-rails to react_on_rails.
+
+Before starting, ask me for the relevant files (at minimum: Gemfile, package.json, JS entrypoints, config/initializers, and representative react_component usages).
+
+Use this guide as the source of truth:
+https://github.com/reactjs/react-rails/blob/main/docs/migrating-from-react-rails-to-react_on_rails.md
+
+Requirements:
+1. Keep changes minimal and production-safe.
+2. Work in clear phases:
+   - dependencies
+   - installer changes
+   - bundle entry points
+   - view helper updates
+   - cleanup
+3. At each phase:
+   - explain what changed and why
+   - show commands run
+   - show exact files changed
+4. Do not remove behavior unless you explain the replacement.
+5. After each phase, tell me the exact test/lint commands to run and wait for my output before continuing.
+6. End with:
+   - a migration checklist
+   - rollback steps
+   - a PR summary with risk level
+7. Add safety checks:
+   - if `rails g react_on_rails:install` fails to install JS deps, run the install commands shown by the generator
+   - remove leftover `react_ujs` / `ReactRailsUJS` references
+   - remove or replace stale `server_rendering.js` entries if present
+   - if using Shakapacker, run `bundle exec rails shakapacker:compile` and fix compile errors before finalizing
+```
+
+Review all generated diffs before merging.