react_on_rails 17.0.0.rc.7 → 17.0.0.rc.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce16b1a51d89bfe5fbfff93568259f0b49bdde7bed2e8df54a6fead70682112
-  data.tar.gz: b4f8f6b423781b9916807dc0153fa469eda85b9ca3764ebcefb4e168a28945a2
+  metadata.gz: 47532eab3f7e0341d454e53ac835f3b9034d0af9a0550107e62561701ac6d4f0
+  data.tar.gz: a4103c943cd5fc7854b65b1815bd51003c176d9578201a4ca7cfc93bde1ee883
 SHA512:
-  metadata.gz: 305cf7a49dffa50dd56c3c67f03ee375ed2900e35ec8538bfb02251faa66a13c41323e3f7915722431cd117f6cafff9860abc46609bcc354a68628a0ecbe8adb
-  data.tar.gz: 60f230a7ae4acee7fbe18623e276f48e3e8369179629262c7219a4e066aca0bb87458e92fee061aff74a032c399810ce818816036827f42031e0dfff0be71a1b
+  metadata.gz: 0b045aba9d3e83811a02f1fe26f8f7d47d4ab686cb9d224f0feb07cb91c052b3c7ef30065522bea5a84793549a0812cf926ba7653ed56cb41e793a1c61aa3242
+  data.tar.gz: 6145020e4b0102198e0f3561c1beedfbc135d45da5d6f9af02d6d7a6fc6fe579203c636f133a5b1223c183045a1f18966d1a42a2fae682d12e2b255dda5f8a36

data/Gemfile.lock

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

data/lib/react_on_rails/doctor.rb

@@ -3644,18 +3644,18 @@ module ReactOnRails
     end
 
     def detected_rspack_version_for_rsc
-      package_root = resolved_package_root
+      package_root = resolved_rsc_package_root
       installed_version = nil
       unless package_root_missing?(package_root)
         installed_version = installed_package_version(package_root, RSC_RSPACK_PACKAGE)
       end
-      installed_version || declared_rspack_version_for_rsc
+      installed_version || declared_rspack_version_for_rsc(package_root)
     rescue StandardError
       nil
     end
 
-    def declared_rspack_version_for_rsc
-      package_json_path = package_json_path_for("declared Rspack version")
+    def declared_rspack_version_for_rsc(package_root = resolved_rsc_package_root)
+      package_json_path = package_json_path_for("declared Rspack version", package_root)
       return nil unless package_json_path
 
       rsc_declared_package_version(package_json_path, RSC_RSPACK_PACKAGE)
@@ -3665,10 +3665,14 @@ module ReactOnRails
       rsc_rspack_version_requirement_error(
         rspack_version,
         error_prefix: "🚫",
-        package_json_path: package_json_path_for("RSC Rspack version")
+        package_json_path: package_json_path_for("RSC Rspack version", resolved_rsc_package_root)
       )
     end
 
+    def resolved_rsc_package_root
+      rsc_configured_package_root(resolved_package_root)
+    end
+
     def check_rsc_rspack_lazy_compilation
       return unless active_assets_bundler == "rspack"
 

data/lib/react_on_rails/rsc_rspack_support.rb

@@ -5,7 +5,7 @@ require "open3"
 require_relative "utils"
 
 module ReactOnRails
-  module RscRspackSupport
+  module RscRspackSupport # rubocop:disable Metrics/ModuleLength
     RSC_RSPACK_PACKAGE = "@rspack/core"
     RSC_RSPACK_V2_PACKAGES = %w[
       @rspack/core
@@ -37,6 +37,11 @@ module ReactOnRails
       [a-z0-9][a-z0-9._-]*
       \z
     }x
+    NODE_PACKAGE_RESOLUTION_SCRIPT = <<~JS
+      const packageName = process.argv[1];
+      const nodeModulesPath = process.argv[2];
+      console.log(require.resolve(packageName + '/package.json', { paths: [nodeModulesPath] }));
+    JS
 
     private
 
@@ -83,25 +88,32 @@ module ReactOnRails
       MSG
     end
 
-    def rsc_installed_package_version(package_root, package_name, &)
-      version = rsc_installed_package_json(package_root, package_name, &)&.fetch("version", nil)
+    def rsc_installed_package_version(package_root, package_name, node_modules_path: nil, &)
+      version = rsc_installed_package_json(package_root, package_name, node_modules_path:, &)&.fetch("version", nil)
       version if version&.match?(/\A\d+\.\d+\.\d+/)
     end
 
-    def rsc_flat_installed_package_version(package_root, package_name)
-      version = rsc_flat_installed_package_json(package_root, package_name)&.fetch("version", nil)
+    def rsc_flat_installed_package_version(package_root, package_name, node_modules_path: nil)
+      version = rsc_flat_installed_package_json(package_root, package_name, node_modules_path:)&.fetch("version", nil)
       version if version&.match?(/\A\d+\.\d+\.\d+/)
     end
 
-    def rsc_installed_package_json(package_root, package_name, &)
+    def rsc_installed_package_json(package_root, package_name, node_modules_path: nil, &)
       return nil unless valid_rsc_package_name?(package_name)
 
-      script = "console.log(require.resolve(process.argv[1] + '/package.json'))"
-      resolved_path = rsc_resolved_node_package_json_path(package_root, package_name, script, &)
+      resolved_path = rsc_resolved_node_package_json_path(
+        package_root,
+        package_name,
+        NODE_PACKAGE_RESOLUTION_SCRIPT,
+        node_modules_path:,
+        &
+      )
       # package_name has passed PACKAGE_NAME_PATTERN, so this fallback cannot escape node_modules.
       # It covers classic flat node_modules layouts; pnpm virtual-store layouts rely on Node resolution above.
       # Limitation: a stale orphaned directory can still be read if Node resolution fails.
-      resolved_path = rsc_flat_installed_package_json_path(package_root, package_name) if resolved_path.empty?
+      if resolved_path.empty?
+        resolved_path = rsc_flat_installed_package_json_path(package_root, package_name, node_modules_path:)
+      end
       return nil unless File.exist?(resolved_path)
 
       JSON.parse(File.read(resolved_path))
@@ -109,10 +121,10 @@ module ReactOnRails
       nil
     end
 
-    def rsc_flat_installed_package_json(package_root, package_name)
+    def rsc_flat_installed_package_json(package_root, package_name, node_modules_path: nil)
       return nil unless valid_rsc_package_name?(package_name)
 
-      package_json_path = rsc_flat_installed_package_json_path(package_root, package_name)
+      package_json_path = rsc_flat_installed_package_json_path(package_root, package_name, node_modules_path:)
       return nil unless File.exist?(package_json_path)
 
       JSON.parse(File.read(package_json_path))
@@ -120,8 +132,8 @@ module ReactOnRails
       nil
     end
 
-    def rsc_flat_installed_package_json_path(package_root, package_name)
-      File.join(package_root, "node_modules", package_name, "package.json")
+    def rsc_flat_installed_package_json_path(package_root, package_name, node_modules_path: nil)
+      File.join(rsc_node_modules_path(package_root, node_modules_path), package_name, "package.json")
     end
 
     def rsc_support_enabled_config_value
@@ -164,9 +176,16 @@ module ReactOnRails
       major.to_i
     end
 
-    def rsc_resolved_node_package_json_path(package_root, package_name, script, &)
+    def rsc_resolved_node_package_json_path(package_root, package_name, script, node_modules_path: nil, &)
       # Boot/doctor validation only. This is intentionally outside the request path.
-      stdout, _stderr, status = Open3.capture3("node", "-e", script, package_name, chdir: package_root)
+      stdout, _stderr, status = Open3.capture3(
+        "node",
+        "-e",
+        script,
+        package_name,
+        rsc_node_modules_path(package_root, node_modules_path),
+        chdir: package_root
+      )
       unless status.success?
         yield(package_name) if block_given?
         return ""
@@ -178,6 +197,26 @@ module ReactOnRails
       ""
     end
 
+    def rsc_configured_package_root(default_package_root)
+      configured_path = ReactOnRails.configuration.node_modules_location.to_s
+      return default_package_root if configured_path.empty?
+
+      rails_root = defined?(Rails) && Rails.respond_to?(:root) ? Rails.root.to_s : Dir.pwd
+      File.expand_path(configured_path, rails_root)
+    rescue StandardError
+      default_package_root
+    end
+
+    def rsc_node_modules_path(package_root, node_modules_path = nil)
+      resolved_node_modules_path = node_modules_path.to_s
+      return resolved_node_modules_path unless resolved_node_modules_path.empty?
+
+      package_root_string = package_root.to_s
+      return package_root_string if File.basename(package_root_string) == "node_modules"
+
+      File.join(package_root_string, "node_modules")
+    end
+
     def rsc_detected_package_manager
       ReactOnRails::Utils.detect_package_manager
     rescue StandardError

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "17.0.0.rc.7"
+  VERSION = "17.0.0.rc.8"
 end

data/lib/react_on_rails/version_checker.rb

@@ -262,7 +262,7 @@ module ReactOnRails
     end
 
     def detected_rspack_version_for_rsc
-      package_root = File.dirname(node_package_version.package_json)
+      package_root = rsc_configured_package_root(File.dirname(node_package_version.package_json))
       declared_spec = package_dependency_spec(RSC_RSPACK_PACKAGE)
       declared_version = rsc_normalized_declared_package_version(declared_spec) || declared_spec
       declared_major_version = rsc_package_major_version(declared_spec)

metadata

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