react_on_rails 17.1.0.rc.0 → 17.1.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c57ce4cf00568f0e471fb56202eda0a3483c1abdbcdd2ac75af3f7b0980fdcb
-  data.tar.gz: a5a7c6b5279f3274ece7bba232ad8d8367fab307532df3769fe222f4ad557b6b
+  metadata.gz: 7026d13c6ff6a7d80dcb8c566a11e8446036d052ec2418e47f2bcdaec6a2eed3
+  data.tar.gz: 0a1354cabb04d73d50281387151ab91c440b06955d038dd0c564cc08cc20e51e
 SHA512:
-  metadata.gz: 7f42ff98daf96f7f8e5a32a7d790790b1a61e3f5fdcbe18d32962b43ea77863a2061b4b14b58a59f4a6b8e9b5ee555ce18353dcccdf591776ba9480827237e14
-  data.tar.gz: 79891caa83aea2acaa89f37a5351b22a6ac8ac30c80f458d9ad4c4bc1bb2df461e2fa212297d03ad7f06beef37b29cd7ec3dd723c477c5cbb2192eeb08a4985d
+  metadata.gz: a40e5cc18caeef6e4879a46314aa86ea6c5b48128fbf60b2e4793b1d32748b334767b4f432c8ef6e1779fa21a07d53edf00253235ced9d641b5e3b43f74db4b8
+  data.tar.gz: e3af833f783b8096f457d1ecbd4e268a7e07b61f8b39f00f48de30c0c976ad5f75f3285bf534afc71d179c73af75b55c6d640a0bf82b0ff656cadfd08ab24775

data/Gemfile.development_dependencies

@@ -2,7 +2,7 @@
 
 eval_gemfile File.expand_path("../Gemfile.shared_dev_dependencies", __dir__)
 
-gem "shakapacker", "10.3.0"
+gem "shakapacker", "10.3.2"
 gem "bootsnap", require: false
 gem "rails", "~> 7.1.0"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (17.1.0.rc.0)
+    react_on_rails (17.1.0.rc.1)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -117,7 +117,7 @@ GEM
     cgi (0.5.2)
     childprocess (5.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.7)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
     crass (1.0.7)
     csv (3.3.5)
@@ -132,7 +132,7 @@ GEM
     drb (2.2.3)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erb (6.0.4)
+    erb (6.0.7)
     erubi (1.13.1)
     execjs (2.9.1)
     ffi (1.16.3)
@@ -146,7 +146,7 @@ GEM
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     interception (0.5)
-    io-console (0.8.2)
+    io-console (0.9.2)
     irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
@@ -169,7 +169,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.25.1)
+    loofah (2.25.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -228,16 +228,16 @@ GEM
     pry-rescue (1.6.0)
       interception (>= 0.5)
       pry (>= 0.12.0)
-    psych (5.4.0)
+    psych (5.5.0)
       date
       stringio
     public_suffix (6.0.2)
     puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.6)
-    rack-proxy (0.8.3)
-      rack
+    rack (3.2.7)
+    rack-proxy (1.0.1)
+      rack (>= 2.0, < 4)
     rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -263,8 +263,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (7.1.6)
       actionpack (= 7.1.6)
@@ -288,7 +288,7 @@ GEM
       psych (>= 4.0.0)
       tsort
     regexp_parser (2.11.3)
-    reline (0.6.3)
+    reline (0.7.0)
       io-console (~> 0.5)
     rexml (3.4.4)
     rspec-core (3.13.0)
@@ -331,7 +331,7 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.1.1)
-    shakapacker (10.3.0)
+    shakapacker (10.3.2)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
@@ -402,7 +402,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.8.2)
+    zeitwerk (2.8.3)
 
 PLATFORMS
   arm64-darwin
@@ -443,7 +443,7 @@ DEPENDENCIES
   sass-rails (~> 6.0)
   sdoc
   selenium-webdriver (= 4.9.0)
-  shakapacker (= 10.3.0)
+  shakapacker (= 10.3.2)
   simplecov (~> 0.16.1)
   spring (~> 4.0)
   sprockets (~> 4.0)

data/docs/agent/install-and-upgrade.md

@@ -11,7 +11,8 @@ Use this guide for an existing Rails app. Keep app-specific choices and custom c
 
 ## Install
 
-Add Shakapacker and React on Rails through Bundler.
+Add React on Rails first so Bundler resolves a compatible Shakapacker version, then pin that resolved version when
+promoting Shakapacker to a direct dependency.
 Choose exactly one stack flag before running the install generator.
 Use `--standard-only` for OSS, `--pro` for Pro, or `--rsc` for Pro with RSC.
 Do not rely on an interactive TTY prompt; replace `<STACK_FLAG>` explicitly in every command.
@@ -19,8 +20,9 @@ Choose the language explicitly too: replace `<LANGUAGE_CHOICE>` with `--typescri
 or remove that placeholder for JavaScript. TypeScript is optional; omitting its flag preserves JavaScript.
 
 ```bash
-bundle add shakapacker --strict
 bundle add react_on_rails --strict
+SHAKAPACKER_VERSION="$(bundle exec ruby -rreact_on_rails -e 'print ReactOnRails::PackerUtils.shakapacker_version')"
+bundle add shakapacker --version="${SHAKAPACKER_VERSION}" --strict
 ```
 
 For `--pro` or `--rsc`, React on Rails Pro is free for evaluation and non-production use;

data/lib/generators/react_on_rails/install_generator.rb

@@ -1033,7 +1033,13 @@ module ReactOnRails
         say "📝 Adding Shakapacker to Gemfile...", :yellow
         # Use with_unbundled_env to prevent inheriting BUNDLE_GEMFILE from parent process
         # See: https://github.com/shakacode/react_on_rails/issues/2287
-        success = Bundler.with_unbundled_env { system("bundle add shakapacker --strict") }
+        # Pin the version already resolved through react_on_rails. Without an explicit
+        # version, `bundle add --strict` can prefer an older globally installed gem and
+        # downgrade the target app's lockfile.
+        shakapacker_version = ReactOnRails::PackerUtils.shakapacker_version
+        success = Bundler.with_unbundled_env do
+          system("bundle", "add", "shakapacker", "--version", shakapacker_version, "--strict")
+        end
         return true if success
 
         handle_shakapacker_gemfile_error
@@ -1163,6 +1169,7 @@ module ReactOnRails
       end
 
       def handle_shakapacker_gemfile_error
+        shakapacker_version = ReactOnRails::PackerUtils.shakapacker_version
         error = <<~MSG.strip
           🚫 Failed to add Shakapacker to your Gemfile.
 
@@ -1172,7 +1179,7 @@ module ReactOnRails
           • Gemfile permissions
 
           Please try manually:
-              bundle add shakapacker --strict
+              bundle add shakapacker --version #{shakapacker_version} --strict
 
           #{recovery_working_tree_note}
           Then re-run: #{recovery_install_command}

data/lib/react_on_rails/system_checker.rb

@@ -163,13 +163,14 @@ module ReactOnRails
       if shakapacker_in_gemfile?
         add_success("✅ Shakapacker is declared in Gemfile")
       else
+        shakapacker_version = ReactOnRails::PackerUtils.shakapacker_version
         add_warning(<<~MSG.strip)
           ⚠️  Shakapacker not found in Gemfile.
 
           While Shakapacker might be available as a dependency,
           it's recommended to add it explicitly to your Gemfile:
 
-          bundle add shakapacker --strict
+          bundle add shakapacker --version #{shakapacker_version} --strict
         MSG
       end
     end

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "17.1.0.rc.0"
+  VERSION = "17.1.0.rc.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 17.1.0.rc.0
+  version: 17.1.0.rc.1
 platform: ruby
 authors:
 - Justin Gordon