react_on_rails 17.2.0.rc.0 → 17.2.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c84e036c05a85bb64d0cdd85522f712816cdd5e7b1042f7635920fa0db020b30
-  data.tar.gz: 0a45d5bf692c9260f9a1c7e1c7c0d19908aef14b874e8a61056d78ad454d4916
+  metadata.gz: 9e693369dbaeba45ae43c510dfffae96a539f54ef55187d0fe3e3a29aee2a864
+  data.tar.gz: 6f73358fad45c5826b671ff7efcb3e1dbdd5a916b1659bd964df9db8a680a719
 SHA512:
-  metadata.gz: '04318a00cc5eba9189a576110532ce85a9221331715c0bd71c10274bc40a02954d6679ed18aacda545b49a12238476d81016052196503a382c75f5c99f7118c9'
-  data.tar.gz: 1b666939069f951819cf62d035db80d3f3382ee797269a26cc19d445512d45927965f7383509f541e219e3fb4dd1590adec455e1ef453ea1232b425099731b5e
+  metadata.gz: 8efb2839f33b03bea64098bdee605ccb70e6432511f07dda175ee8d9586121411af470c0c0f197238b2be850975521739edc58c35dd211c981f32e929a8a224d
+  data.tar.gz: e38c214f95d69aebecdab18058c6c3e3ae2fd04cba40daa262e098a59e3caee84558c204e684a99b36abedca27e140f702b9d7bdfa830d485b2c926ca300b351

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (17.2.0.rc.0)
+    react_on_rails (17.2.0.rc.2)
       addressable
       connection_pool
       execjs (~> 2.5)

data/lib/generators/react_on_rails/js_dependency_manager.rb

@@ -145,23 +145,25 @@ module ReactOnRails
       ].freeze
 
       # React Server Components dependencies (only installed when --rsc flag is used)
-      # Requires React 19.2.x with patch >= 19.2.7 - see https://react.dev/reference/rsc/server-components
+      # Requires the React line that matches the pinned package - see https://react.dev/reference/rsc/server-components
       RSC_DEPENDENCIES = %w[
         react-on-rails-rsc
       ].freeze
 
       # React peer-dependency range for generated RSC apps. This governs the `react` / `react-dom`
-      # installs (see add_react_dependencies) and intentionally stays on the React 19.2.x line
-      # with a 19.2.7 minimum. Do not widen this to later minors just because those releases are
-      # current on npm; React's RSC runtime and bundler integration can change between minors.
+      # installs (see add_react_dependencies) and stays on the single React minor that the pinned
+      # `react-on-rails-rsc` package bundles Flight for: 19.3.1 peers on React ^19.3.0. Do not widen
+      # this to later minors just because those releases are current on npm; React's RSC runtime and
+      # bundler integration can change between minors. Move it together with RSC_PACKAGE_VERSION_PIN.
       #
       # This is intentionally distinct from RSC_PACKAGE_VERSION_PIN below, which pins
       # `react-on-rails-rsc`. Coordination note for #3609: Pro package metadata and generated apps
-      # use the tested React 19.2.x range with the exact stable RSC package pin.
-      RSC_REACT_VERSION_RANGE = "~19.2.7"
-      # Pinned to the stable 19.2.1 package, which carries the coordinated React 19.2.7 RSC peer floor
-      # required by the React on Rails Pro 17 runtime check.
-      RSC_PACKAGE_VERSION_PIN = "19.2.1"
+      # use the tested React range with the exact stable RSC package pin.
+      RSC_REACT_VERSION_RANGE = "~19.3.0"
+      # Pinned to the stable 19.3.1 package, the current React 19.3 line. Apps generated by earlier
+      # versions keep their own pins (19.2.x with React 19.2.7+, or 19.3.0 with React 19.2.8+), which
+      # the React on Rails Pro 17 runtime check still supports.
+      RSC_PACKAGE_VERSION_PIN = "19.3.1"
 
       private
 
@@ -254,8 +256,8 @@ module ReactOnRails
       def add_react_dependencies
         say "Installing React dependencies..."
 
-        # RSC requires the coordinated React 19.2.x patch line.
-        # Pin React to ~19.2.7 while using the matching stable RSC package.
+        # RSC requires the React line that matches the pinned RSC package.
+        # Pin React to RSC_REACT_VERSION_RANGE while using the matching stable RSC package.
         react_deps = if respond_to?(:use_rsc?) && use_rsc?
                        ["react@#{RSC_REACT_VERSION_RANGE}", "react-dom@#{RSC_REACT_VERSION_RANGE}",
                         "prop-types@^15.0.0"]

data/lib/generators/react_on_rails/rsc_setup/client_references.rb

@@ -43,8 +43,10 @@ module ReactOnRails
             // (which re-runs the hook). Running bin/shakapacker directly after changing server
             // components is covered by the best-effort staleness warning below.
             //
-            // The resolution cascade below is mirrored, branch for branch, by the Pro dummy's
-            // hand-written rscManifestClientReferences.js and pinned on both sides by contract tests.
+            // The resolution cascade below — including the react-on-rails-pro client-component
+            // registrations appended to every branch's result (issue #5079) — is mirrored, branch
+            // for branch, by the Pro dummy's hand-written rscManifestClientReferences.js and pinned
+            // on both sides by contract tests.
             const rscClientReferences = (() => {
               // Required inside the IIFE rather than at the top of the file because the module-scope
               // bindings 'resolve' (from 'path') and 'config' (from 'shakapacker') are already
@@ -168,40 +170,73 @@ module ReactOnRails
                 );
               };
 
-              if (configuredRefsJson) {
-                const resolvedRefsJson = resolve(configuredRefsJson);
-                if (!existsSync(resolvedRefsJson)) {
-                  throw new Error(
-                    `RSC_MANIFEST_CLIENT_REFERENCES_JSON is set but the file does not exist: ${resolvedRefsJson}`,
-                  );
+              const resolveDiscoveredClientReferences = () => {
+                if (configuredRefsJson) {
+                  const resolvedRefsJson = resolve(configuredRefsJson);
+                  if (!existsSync(resolvedRefsJson)) {
+                    throw new Error(
+                      `RSC_MANIFEST_CLIENT_REFERENCES_JSON is set but the file does not exist: ${resolvedRefsJson}`,
+                    );
+                  }
+                  warnIfManifestStale(resolvedRefsJson);
+                  return readManifestReferences(resolvedRefsJson);
                 }
-                warnIfManifestStale(resolvedRefsJson);
-                return readManifestReferences(resolvedRefsJson);
-              }
 
-              if (process.env.RSC_REFERENCE_DISCOVERY_BUILD === 'true' || process.env.RSC_BUNDLE_ONLY === 'true') {
-                return [fallbackRscClientReferences];
-              }
-
-              if (existsSync(defaultRefsJson)) {
-                warnIfManifestStale(defaultRefsJson);
-                return readManifestReferences(defaultRefsJson);
-              }
-
-              if (existsSync(serverComponentRegistrationEntry)) {
-                if (!rscConfigSupportsDiscovery()) {
-                  console.warn(
-                    `[react_on_rails] Missing ${defaultRefsJson}, but this app's RSC webpack config ` +
-                      'or precompile hook does not support manifest discovery yet; falling back to broad client ' +
-                      'reference scan. Re-run rails g react_on_rails:rsc to update generated configs.',
-                  );
+                if (process.env.RSC_REFERENCE_DISCOVERY_BUILD === 'true' || process.env.RSC_BUNDLE_ONLY === 'true') {
                   return [fallbackRscClientReferences];
                 }
 
-                throw new Error(`Missing ${defaultRefsJson}. Run bin/shakapacker-precompile-hook before bin/shakapacker.`);
-              }
+                if (existsSync(defaultRefsJson)) {
+                  warnIfManifestStale(defaultRefsJson);
+                  return readManifestReferences(defaultRefsJson);
+                }
+
+                if (existsSync(serverComponentRegistrationEntry)) {
+                  if (!rscConfigSupportsDiscovery()) {
+                    console.warn(
+                      `[react_on_rails] Missing ${defaultRefsJson}, but this app's RSC webpack config ` +
+                        'or precompile hook does not support manifest discovery yet; falling back to broad client ' +
+                        'reference scan. Re-run rails g react_on_rails:rsc to update generated configs.',
+                    );
+                    return [fallbackRscClientReferences];
+                  }
+
+                  throw new Error(`Missing ${defaultRefsJson}. Run bin/shakapacker-precompile-hook before bin/shakapacker.`);
+                }
+
+                return [fallbackRscClientReferences];
+              };
 
-              return [fallbackRscClientReferences];
+              // react-on-rails-pro ships its own 'use client' components (RSCRoute, RSCProvider, and
+              // the default RSC provider registration). Both the discovery build and the fallback
+              // directory scan only cover app source — node_modules is never scanned — so these can
+              // never be discovered and, without explicit registration, never reach
+              // react-client-manifest.json. Server components rendering them (e.g. a nested
+              // <RSCRoute> for section-level refetching) then fail the render-time manifest lookup
+              // even when the RSC bundle compiles (issue #5079). require.resolve returns the
+              // absolute realpath, which matches the module resource webpack records
+              // (resolve.symlinks defaults to true), so the manifest keys line up with the file URLs
+              // the RSC bundle's client references carry even when react-on-rails-pro is installed
+              // through a symlink (pnpm, workspaces). A function (invoked in the return below, after
+              // the discovered references resolve) so both this resolver and its Pro dummy mirror
+              // surface the same first error when both steps fail.
+              const reactOnRailsProClientReferences = () =>
+                [
+                  'react-on-rails-pro/RSCRoute',
+                  'react-on-rails-pro/RSCProvider',
+                  'react-on-rails-pro/registerDefaultRSCProvider/client',
+                ].map((subpath) => {
+                  try {
+                    return require.resolve(subpath);
+                  } catch (err) {
+                    throw new Error(
+                      `Failed to resolve the react-on-rails-pro client component "${subpath}" for RSC ` +
+                        `client-reference registration: ${err.message}`,
+                    );
+                  }
+                });
+
+              return [...new Set([...resolveDiscoveredClientReferences(), ...reactOnRailsProClientReferences()])];
             })();
           JS
         end
@@ -277,6 +312,10 @@ module ReactOnRails
 
             content = read_current_rsc_config(config_path, fallback: content)
           end
+          # A previously generated IIFE (no react-on-rails-pro registrations — issue #5079) also
+          # counts as generated below; warn so the user registers the components manually.
+          warn_outdated_rsc_client_references_helper(config_path) if
+            outdated_generated_rsc_client_references_defined?(content)
           return :scoped if generated_rsc_client_references_defined?(content)
 
           warn_unscoped_rsc_client_references_helper(config_path)
@@ -312,6 +351,12 @@ module ReactOnRails
             content = normalized_content
           end
 
+          # A resolver emitted by a previous generator version (no react-on-rails-pro
+          # client-component registrations — issue #5079) is deliberately not rewritten; warn
+          # before the scoped-references short-circuit below treats it as already current.
+          warn_outdated_rsc_client_references_helper(config_path) if
+            outdated_generated_rsc_client_references_defined?(content)
+
           return unless rsc_plugin_sections_safe_to_rewrite?(config_path, content, is_server:)
 
           return if rsc_plugin_uses_scoped_client_references?(content, is_server:)
@@ -1405,6 +1450,31 @@ module ReactOnRails
           write_existing_rsc_config(config_path, updated_content, action: :rewrite)
         end
 
+        # True when the file carries a manifest-backed generated resolver IIFE that does not
+        # register the react-on-rails-pro client components (issue #5079) — either the resolver a
+        # previous generator version emitted, or a user customization of one. The generator never
+        # rewrites such a resolver; it warns with manual registration instructions instead.
+        def outdated_generated_rsc_client_references_defined?(content)
+          return false unless generated_rsc_client_references_defined?(content)
+
+          iife_body = generated_rsc_client_references_iife_body(content)
+          return false unless iife_body
+
+          !js_code_matches?(iife_body, /\breactOnRailsProClientReferences\b/)
+        end
+
+        def warn_outdated_rsc_client_references_helper(config_path)
+          GeneratorMessages.add_warning(
+            "#{config_path} contains a rscClientReferences resolver from a previous generator " \
+            "version: it does not register the react-on-rails-pro package's own client components " \
+            "(RSCRoute, RSCProvider, registerDefaultRSCProvider/client — issue #5079). The file was " \
+            "left unchanged. Add require.resolve entries for those components to your " \
+            "clientReferences (see the RSC setup docs at " \
+            "https://reactonrails.com/docs/pro/react-server-components/create-without-ssr), or " \
+            "remove the generated resolver block and re-run this generator to emit the current one."
+          )
+        end
+
         def read_current_rsc_config(config_path, fallback:)
           return fallback if options[:pretend] || options[:skip]
 

data/lib/generators/react_on_rails/rsc_setup.rb

@@ -35,6 +35,7 @@ module ReactOnRails
       RSC_FALLBACK_LAYOUT_NAME = "react_on_rails_rsc"
       RSC_GENERATED_LAYOUT_NAME_PATTERN = /\Areact_on_rails_rsc(?:_(?:[2-9]|[1-9]\d+))?\z/
       RSC_REACT_VERSION_RANGE = ReactOnRails::Generators::JsDependencyManager::RSC_REACT_VERSION_RANGE
+      RSC_PACKAGE_VERSION_PIN = ReactOnRails::Generators::JsDependencyManager::RSC_PACKAGE_VERSION_PIN
       RSC_MINIMUM_REACT_VERSION = RSC_REACT_VERSION_RANGE.sub(/\A[~^]/, "")
       RSC_MINIMUM_REACT_VERSION_TUPLE = RSC_MINIMUM_REACT_VERSION.split(".").map(&:to_i).freeze
       RSC_SUPPORTED_REACT_MAJOR = RSC_MINIMUM_REACT_VERSION_TUPLE.fetch(0)
@@ -88,12 +89,14 @@ module ReactOnRails
           GeneratorMessages.add_warning(<<~MSG.strip)
             ⚠️  RSC requires React #{RSC_SUPPORTED_REACT_LINE} (detected: #{react_version})
 
-            React Server Components in React on Rails Pro currently only supports
-            React #{RSC_SUPPORTED_REACT_LINE} with patch >= #{RSC_MINIMUM_REACT_VERSION}. Other React minor versions are
-            not yet supported.
+            This generator installs react-on-rails-rsc@#{RSC_PACKAGE_VERSION_PIN}, which requires
+            React #{RSC_SUPPORTED_REACT_LINE} with patch >= #{RSC_MINIMUM_REACT_VERSION}. The React on Rails Pro node renderer refuses
+            to start when React and react-on-rails-rsc are on different lines.
 
             To install a compatible React version:
               #{manual_add_packages_command(["react@#{RSC_REACT_VERSION_RANGE}", "react-dom@#{RSC_REACT_VERSION_RANGE}"])}
+
+            Run `bundle exec rake react_on_rails:doctor` afterwards to confirm the pairing.
           MSG
         elsif patch < RSC_MINIMUM_REACT_PATCH
           GeneratorMessages.add_warning(<<~MSG.strip)
@@ -102,7 +105,7 @@ module ReactOnRails
             Please upgrade to at least React #{RSC_MINIMUM_REACT_VERSION}:
               #{manual_add_packages_command(["react@#{RSC_MINIMUM_REACT_VERSION}", "react-dom@#{RSC_MINIMUM_REACT_VERSION}"])}
 
-            react-on-rails-rsc 19.2.x with patch >= 19.2.1 is coordinated with
+            react-on-rails-rsc@#{RSC_PACKAGE_VERSION_PIN} is coordinated with
             React/React DOM #{RSC_MINIMUM_REACT_VERSION}+ for the React on Rails Pro 17 RSC runtime.
           MSG
         end

data/lib/react_on_rails/doctor.rb

@@ -5070,7 +5070,7 @@ module ReactOnRails
     # Each row covers react-on-rails-rsc patches rsc_min_patch..rsc_max_patch (nil = open-ended)
     # on rsc_minor. React must match the Flight line the RSC package bundles:
     # 19.2.x ships Flight 19.2, published 19.3.0 ships Flight 19.2.8 (React on Rails 17.1.0),
-    # and 19.3.1+ (starting with 19.3.1-rc.0) ships Flight 19.3.0.
+    # and 19.3.1+ ships Flight 19.3.0. Only stable react-on-rails-rsc releases are supported.
     RSC_REACT_SUPPORT_RANGES = [
       { rsc_minor: 2, rsc_min_patch: 1, rsc_max_patch: nil, minor: 2, min_patch: 7 },
       { rsc_minor: 3, rsc_min_patch: 0, rsc_max_patch: 0, minor: 2, min_patch: 8 },
@@ -5084,9 +5084,10 @@ module ReactOnRails
       min_patch.positive? ? "#{line} starting at #{RSC_SUPPORTED_PACKAGE_MAJOR}.#{minor}.#{min_patch}" : line
     end.join(" or ")
     RSC_PACKAGE_INSTALL_VERSION = ReactOnRails::Generators::JsDependencyManager::RSC_PACKAGE_VERSION_PIN
-    # Admits the 19.3.1-rc.x soak. The generator pin stays on stable 19.2.1.
-    # Remove once react-on-rails-rsc 19.3.1 ships stable.
-    RSC_MINIMUM_PACKAGE_PRERELEASE_VERSION = "19.3.1-rc.0"
+    # Rejected prerelease lines with a known published stable successor: the 19.3.0-rc.4 pin that
+    # React on Rails 17.1.0 generated, and the 19.3.1-rc.x soak that 17.2.0.rc.0 and rc.1 admitted.
+    # Mirrors prereleaseLinesWithStableSuccessor in rscPeerSupport.ts.
+    RSC_PRERELEASE_LINES_WITH_STABLE_SUCCESSOR = [[19, 3, 0], [19, 3, 1]].freeze
     RSC_MINIMUM_REACT_VERSION = "19.2.7"
     RSC_MINIMUM_REACT_VERSION_TUPLE = RSC_MINIMUM_REACT_VERSION.split(".").map(&:to_i).freeze
     RSC_SUPPORTED_REACT_MAJOR = RSC_MINIMUM_REACT_VERSION_TUPLE.fetch(0)
@@ -5407,18 +5408,14 @@ module ReactOnRails
       rsc_version = rsc_package["version"].to_s
       return true if rsc_package_version_at_or_above_minimum?(rsc_version)
 
-      prerelease_requirement = if RSC_MINIMUM_PACKAGE_PRERELEASE_VERSION.present?
-                                 "\n(or #{RSC_MINIMUM_PACKAGE_PRERELEASE_VERSION} during the RC soak)"
-                               else
-                                 ""
-                               end
-
       rsc_install, react_install = rsc_package_floor_install_versions(rsc_version)
+      # A prerelease can satisfy the numeric floor and still be rejected, so say why.
+      stable_only_note = npm_prerelease(rsc_version).present? ? " (stable releases only)" : ""
 
       checker.add_error(<<~MSG.strip)
         🚫 #{RSC_PACKAGE_NAME} #{rsc_version.presence || 'unknown'} is not supported by React on Rails Pro 17 RSC.
 
-        React on Rails Pro 17 requires #{RSC_PACKAGE_NAME} >= #{RSC_MINIMUM_PACKAGE_VERSION}#{prerelease_requirement}
+        React on Rails Pro 17 requires #{RSC_PACKAGE_NAME} >= #{RSC_MINIMUM_PACKAGE_VERSION}#{stable_only_note}
         on the supported #{RSC_SUPPORTED_PACKAGE_LINE} package line
         with React/React DOM #{react_install}+.
 
@@ -5427,27 +5424,26 @@ module ReactOnRails
       false
     end
 
-    # Only the 19.3.0 transition has a known published stable successor. Compatibility does not establish
-    # publication for other rejected prereleases; use the generator pin for those versions.
+    # Only the lines in RSC_PRERELEASE_LINES_WITH_STABLE_SUCCESSOR have a known published stable
+    # successor. Compatibility does not establish publication for other rejected prereleases; use the
+    # generator pin for those versions.
     # Returns [rsc_version_to_install, react_version_to_install].
     def rsc_package_floor_install_versions(rsc_version)
-      if npm_prerelease(rsc_version).present? && npm_version_tuple(rsc_version) == [19, 3, 0]
+      if npm_prerelease(rsc_version).present? &&
+         RSC_PRERELEASE_LINES_WITH_STABLE_SUCCESSOR.include?(npm_version_tuple(rsc_version))
         stable_version = npm_version_tuple(rsc_version).join(".")
         if rsc_stable_package_version_supported?(stable_version)
           return [stable_version, recommended_react_install_version_for_rsc_package(stable_version)]
         end
       end
 
-      [RSC_PACKAGE_INSTALL_VERSION, RSC_MINIMUM_REACT_VERSION]
+      [RSC_PACKAGE_INSTALL_VERSION, recommended_react_install_version_for_rsc_package(RSC_PACKAGE_INSTALL_VERSION)]
     end
 
     def rsc_package_version_at_or_above_minimum?(rsc_version)
       return false if rsc_version.blank?
-      return true if rsc_stable_package_version_supported?(rsc_version)
-      return false if RSC_MINIMUM_PACKAGE_PRERELEASE_VERSION.blank?
-      return false unless npm_version_tuple(rsc_version) == npm_version_tuple(RSC_MINIMUM_PACKAGE_PRERELEASE_VERSION)
 
-      npm_version_compare(rsc_version, RSC_MINIMUM_PACKAGE_PRERELEASE_VERSION) >= 0
+      rsc_stable_package_version_supported?(rsc_version)
     end
 
     def rsc_stable_package_version_supported?(rsc_version)
@@ -5650,8 +5646,13 @@ module ReactOnRails
       installed_version = rsc_package["version"].to_s
       return if installed_version.blank?
 
-      rsc_dist_tags(package_root).each do |tag, tag_version|
+      dist_tags = rsc_dist_tags(package_root)
+      latest_version = dist_tags["latest"].to_s
+      dist_tags.each do |tag, tag_version|
         next unless RSC_DIST_TAGS_TO_CHECK.include?(tag)
+        # A prerelease tag that the stable `latest` release has caught up with or passed (for example
+        # next 19.3.1-rc.1 once latest is 19.3.1) is not an upgrade target, and this version rejects it.
+        next if latest_version.present? && !npm_version_greater?(tag_version, latest_version)
         next unless npm_version_greater?(tag_version, installed_version)
 
         checker.add_warning(<<~MSG.strip)

data/lib/react_on_rails/version.rb

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

metadata

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