react_on_rails 16.4.0 → 16.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8711eddc91f2c2afd343c203a466e320e3c98231a6cea82f950f91de9c234c
-  data.tar.gz: 3e833073ef81b6051e2484075288e7aca18026eafb9d7e1727a84a7ae53e22fc
+  metadata.gz: 14bbaccde12f9bb4f998ade94c02d95d27e1df386a9dfaf887fefb0f073070e0
+  data.tar.gz: 952bf7eb1d5694d86b74dd654ab2cb10fd7490207d6be3c66ac6ea4866802eee
 SHA512:
-  metadata.gz: fb4f879f38e2a7fce93204c22efaf2c360dc5031ad52384d7abe3cfcf0f712365dbfed53ae3385f93106d4d9549bb36a714caacb820d633d7c21a4864dce3c00
-  data.tar.gz: df85baa5aecb849d6b28636975540a2102ab0f70c1efdc3b00e26923dd4524f4bda758a6153eb541c8db86dfc8e6860830c6336785e50c1d5416d12486b2d5e7
+  metadata.gz: 3bdbf4f3343cf568ea879a13d0902d650379016004832c44affd1498ac8c0be881de9e7d4bb42ecd883f095f5697518dfcc773d7d79b61c4250026457100d9cd
+  data.tar.gz: 920530b24dbe7d23af418d53ad564e9f75bbf0f21fcc03851b89de03994d6a1e910fdaeb962da9eb4f66eed0cc37f28a9048fd2dcf3d208c9422843a7208fe4c

data/Gemfile.lock

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

data/lib/generators/react_on_rails/generator_messages.rb

@@ -3,6 +3,9 @@
 require "rainbow"
 
 module GeneratorMessages
+  PRO_UPGRADE_HINT = "\n\n    💎 For RSC, streaming SSR, and 10-100x faster SSR, try React on Rails Pro:" \
+                     "\n       #{Rainbow('https://reactonrails.com/docs/pro/upgrading-to-pro/').cyan.underline}".freeze
+
   class << self
     def output
       @output ||= []
@@ -40,14 +43,16 @@ module GeneratorMessages
       @output = []
     end
 
-    def helpful_message_after_installation(component_name: "HelloWorld", route: "hello_world", rsc: false,
-                                           shakapacker_just_installed: false)
+    def helpful_message_after_installation(component_name: "HelloWorld", route: "hello_world", pro: false,
+                                           rsc: false, shakapacker_just_installed: false)
       process_manager_section = build_process_manager_section
       testing_section = build_testing_section
       package_manager = detect_package_manager
       shakapacker_status = build_shakapacker_status_section(shakapacker_just_installed: shakapacker_just_installed)
       render_example = build_render_example(component_name: component_name, route: route, rsc: rsc)
       render_label = build_render_label(route: route, rsc: rsc)
+      # rsc guard is defensive; callers via install_generator already pass pro: true when rsc is set
+      pro_hint = pro || rsc ? "" : PRO_UPGRADE_HINT
 
       <<~MSG
 
@@ -61,13 +66,16 @@ module GeneratorMessages
         1. Install dependencies:
            #{Rainbow("bundle && #{package_manager} install").cyan}
 
-        2. Start the app:
+        2. Prepare database:
+           #{Rainbow('bin/rails db:prepare').cyan}
+
+        3. Start the app:
            ./bin/dev              # HMR (Hot Module Replacement) mode
            ./bin/dev static       # Static bundles (no HMR, faster initial load)
            ./bin/dev prod         # Production-like mode for testing
            ./bin/dev help         # See all available options
 
-        3. Visit: #{Rainbow(route ? "http://localhost:3000/#{route}" : 'http://localhost:3000').cyan.underline}
+        4. Visit: #{Rainbow(route ? "http://localhost:3000/#{route}" : 'http://localhost:3000').cyan.underline}
         ✨ KEY FEATURES:
         ─────────────────────────────────────────────────────────────────────────
         • Auto-registration enabled - Your layout only needs:
@@ -79,16 +87,19 @@ module GeneratorMessages
 
         📚 LEARN MORE:
         ─────────────────────────────────────────────────────────────────────────
-        • Documentation: #{Rainbow('https://www.shakacode.com/react-on-rails/docs/').cyan.underline}
+        • Documentation: #{Rainbow('https://reactonrails.com/docs/').cyan.underline}
         • Webpack customization: #{Rainbow('https://github.com/shakacode/shakapacker#webpack-configuration').cyan.underline}
 
-        💡 TIP: Run 'bin/dev help' for development server options and troubleshooting#{testing_section}
+        💡 TIP: Run 'bin/dev help' for development server options and troubleshooting#{testing_section}#{pro_hint}
       MSG
     end
 
     # Uses relative lockfile paths resolved against Dir.pwd, so callers must invoke
     # this while the current working directory is the target Rails app root.
     def detect_package_manager
+      env_package_manager = ENV.fetch("REACT_ON_RAILS_PACKAGE_MANAGER", nil)&.strip&.downcase
+      return env_package_manager if %w[npm pnpm yarn bun].include?(env_package_manager)
+
       # Check for lock files to determine package manager
       return "yarn" if File.exist?("yarn.lock")
       return "pnpm" if File.exist?("pnpm-lock.yaml")
@@ -133,10 +144,7 @@ module GeneratorMessages
     end
 
     def build_testing_section
-      # Check if we have any spec files to determine if testing setup is needed
-      has_spec_files = File.exist?("spec/rails_helper.rb") || File.exist?("spec/spec_helper.rb")
-
-      return "" if has_spec_files
+      return "" if File.exist?("spec/rails_helper.rb") || File.exist?("spec/spec_helper.rb")
 
       <<~TESTING
 
@@ -160,7 +168,6 @@ module GeneratorMessages
 
     def build_shakapacker_status_section(shakapacker_just_installed: false)
       version_warning = check_shakapacker_version_warning
-
       if shakapacker_just_installed
         base = <<~SHAKAPACKER
 
@@ -179,18 +186,13 @@ module GeneratorMessages
     end
 
     def check_shakapacker_version_warning
-      # Try to detect Shakapacker version from Gemfile.lock
       return "" unless File.exist?("Gemfile.lock")
 
-      gemfile_lock_content = File.read("Gemfile.lock")
-      shakapacker_match = gemfile_lock_content.match(/shakapacker \((\d+\.\d+\.\d+)\)/)
-
+      shakapacker_match = File.read("Gemfile.lock").match(/shakapacker \((\d+\.\d+\.\d+)\)/)
       return "" unless shakapacker_match
 
       version = shakapacker_match[1]
-      major_version = version.split(".").first.to_i
-
-      if major_version < 8
+      if version.split(".").first.to_i < 8
         <<~WARNING
 
           ⚠️  #{Rainbow('IMPORTANT: Upgrade Recommended').yellow.bold}

data/lib/generators/react_on_rails/install_generator.rb

@@ -79,6 +79,49 @@ module ReactOnRails
       # Removed: --skip-shakapacker-install (Shakapacker is now a required dependency)
 
       SHAKAPACKER_YML_PATH = "config/shakapacker.yml"
+      # Matches the stock `bin/dev` written by Rails 8.x. Rails 7.1 commonly
+      # generated a foreman-based shell script instead, which stock_rails_bin_dev?
+      # also recognizes so the React on Rails template can replace either variant.
+      STOCK_RAILS_BIN_DEV = <<~RUBY
+        #!/usr/bin/env ruby
+        exec "./bin/rails", "server", *ARGV
+      RUBY
+      # Recognize only known legacy Rails foreman templates. Any other variant is
+      # treated as customized so install does not overwrite app-specific logic.
+      LEGACY_FOREMAN_BIN_DEV_TEMPLATES = [
+        <<~BASH,
+          #!/usr/bin/env bash
+          if ! gem list foreman -i --silent; then
+            gem install foreman
+          fi
+
+          exec foreman start -f Procfile.dev "$@"
+        BASH
+        <<~SH,
+          #!/usr/bin/env sh
+          if ! gem list foreman -i --silent; then
+            gem install foreman
+          fi
+
+          exec foreman start -f Procfile.dev "$@"
+        SH
+        <<~BASH,
+          #!/usr/bin/env bash
+          if ! gem list foreman -i --silent; then
+            gem install foreman
+          fi
+
+          exec foreman start -f Procfile.dev $@
+        BASH
+        <<~SH
+          #!/usr/bin/env sh
+          if ! gem list foreman -i --silent; then
+            gem install foreman
+          fi
+
+          exec foreman start -f Procfile.dev $@
+        SH
+      ].map { |template| template.gsub("\r\n", "\n").strip }.freeze
 
       # Main generator entry point
       #
@@ -188,10 +231,28 @@ module ReactOnRails
       # js(.coffee) are not checked by this method, but instead produce warning messages
       # and allow the build to continue
       def installation_prerequisites_met?
-        # Check uncommitted_changes? before missing_pro_gem? so that
-        # auto-install does not mutate the Gemfile on a dirty working tree.
-        !(missing_node? || missing_package_manager? ||
-          ReactOnRails::GitUtils.uncommitted_changes?(GeneratorMessages) || missing_pro_gem?)
+        # Non-blocking: warn about dirty worktree but don't prevent installation.
+        # A clean tree makes the generator diff easier to review, but blocking would
+        # be too strict for a generator that creates many new files.
+        has_worktree_issues = ReactOnRails::GitUtils.warn_if_uncommitted_changes(
+          GeneratorMessages, git_installed: cli_exists?("git")
+        )
+
+        # missing_pro_gem? may auto-install the gem (mutating Gemfile), so only run
+        # it on a clean worktree. On a dirty tree, use the read-only pro_gem_installed?
+        # check to catch a missing gem without triggering auto-install.
+        if has_worktree_issues && use_pro? && !pro_gem_installed?
+          GeneratorMessages.add_error(<<~MSG.strip)
+            🚫 react_on_rails_pro gem is required for #{options[:rsc] ? '--rsc' : '--pro'} but is not installed.
+            Auto-install was skipped because the worktree has uncommitted changes.
+            Please add it manually:
+              gem 'react_on_rails_pro', '~> #{recommended_pro_gem_version}'
+            Then run: bundle install
+          MSG
+          return false
+        end
+
+        !(missing_node? || missing_package_manager? || (!has_worktree_issues && missing_pro_gem?))
       end
 
       def missing_node?
@@ -277,13 +338,23 @@ module ReactOnRails
       end
 
       def add_bin_scripts
+        replace_stock_rails_bin_dev!
+
         # Copy bin scripts from templates
         template_bin_path = "#{__dir__}/templates/base/base/bin"
-        directory template_bin_path, "bin"
+        directory_options = {}
+        directory_options[:exclude_pattern] = %r{/dev(?:\.tt)?\z} if preserve_existing_bin_dev?
+        directory template_bin_path, "bin", directory_options
 
         # For --rsc without --redux, hello_world doesn't exist — update DEFAULT_ROUTE
         if use_rsc? && !options.redux?
-          gsub_file "bin/dev", 'DEFAULT_ROUTE = "hello_world"', 'DEFAULT_ROUTE = "hello_server"'
+          if preserve_existing_bin_dev?
+            say_status :warn,
+                       'Custom bin/dev detected: update DEFAULT_ROUTE to "hello_server" manually for --rsc',
+                       :yellow
+          else
+            gsub_file "bin/dev", 'DEFAULT_ROUTE = "hello_world"', 'DEFAULT_ROUTE = "hello_server"'
+          end
         end
 
         # `directory` and `gsub_file` above are Thor actions that already honor
@@ -294,13 +365,48 @@ module ReactOnRails
         end
 
         # Make these and only these files executable
-        files_to_copy = []
-        Dir.chdir(template_bin_path) do
-          files_to_copy.concat(Dir.glob("*"))
+        files_to_become_executable = bin_scripts_to_chmod(template_bin_path)
+        File.chmod(0o755, *files_to_become_executable)
+      end
+
+      def replace_stock_rails_bin_dev!
+        @preserve_existing_bin_dev = false
+
+        unless stock_rails_bin_dev?
+          if File.exist?("bin/dev")
+            say_status :skip, "bin/dev exists but does not match a stock Rails template; keeping existing file", :yellow
+            @preserve_existing_bin_dev = true
+          end
+          return
         end
-        files_to_become_executable = files_to_copy.map { |filename| "bin/#{filename}" }
 
-        File.chmod(0o755, *files_to_become_executable)
+        if options[:pretend] || options[:skip]
+          say_status :skip, "Detected stock Rails bin/dev; leaving existing file in place for --pretend/--skip", :yellow
+          @preserve_existing_bin_dev = true
+          return
+        end
+
+        say_status :replace, "Detected stock Rails bin/dev; installing React on Rails bin/dev", :yellow
+        remove_file "bin/dev", verbose: false
+      end
+
+      def preserve_existing_bin_dev?
+        # Set by replace_stock_rails_bin_dev! which always runs first via add_bin_scripts.
+        # Explicitly coerce to boolean so nil (before initialization) is treated as false.
+        !!@preserve_existing_bin_dev
+      end
+
+      def bin_scripts_to_chmod(template_bin_path)
+        files = Dir.children(template_bin_path)
+        files.reject! { |f| f == "dev" } if preserve_existing_bin_dev?
+        files.map { |filename| "bin/#{filename}" }
+      end
+
+      def stock_rails_bin_dev?
+        return false unless File.exist?("bin/dev")
+
+        content = normalize_bin_dev_content(File.read("bin/dev"))
+        content == normalize_bin_dev_content(STOCK_RAILS_BIN_DEV) || legacy_foreman_bin_dev?(content)
       end
 
       def add_post_install_message
@@ -322,6 +428,7 @@ module ReactOnRails
         GeneratorMessages.add_info(GeneratorMessages.helpful_message_after_installation(
                                      component_name: component_name,
                                      route: route,
+                                     pro: use_pro?,
                                      rsc: use_rsc?,
                                      shakapacker_just_installed: shakapacker_just_installed?
                                    ))
@@ -411,7 +518,16 @@ module ReactOnRails
       end
 
       def cli_exists?(command)
-        system("which #{command} > /dev/null 2>&1")
+        which_command = ReactOnRails::Utils.running_on_windows? ? "where" : "which"
+        system(which_command, command, out: File::NULL, err: File::NULL)
+      end
+
+      def normalize_bin_dev_content(content)
+        content.gsub("\r\n", "\n").strip
+      end
+
+      def legacy_foreman_bin_dev?(content)
+        LEGACY_FOREMAN_BIN_DEV_TEMPLATES.include?(content)
       end
 
       def shakapacker_binaries_exist?

data/lib/generators/react_on_rails/pro_generator.rb

@@ -89,7 +89,7 @@ module ReactOnRails
           3. Visit http://localhost:3000/#{route}
           4. The Node Renderer will start on port 3800
 
-          Documentation: https://www.shakacode.com/react-on-rails-pro/docs/
+          Documentation: https://reactonrails.com/docs/pro/
         MSG
       end
     end

data/lib/generators/react_on_rails/pro_setup.rb

@@ -78,8 +78,9 @@ module ReactOnRails
 
           Then run: bundle install
 
-          Try Pro free! Email justin@shakacode.com for an evaluation license.
-          For evaluation licenses or more info, see: https://www.shakacode.com/react-on-rails-pro/
+          No license needed for evaluation or non-production use.
+          Free or low-cost production licenses available for startups and small companies.
+          Get started: https://pro.reactonrails.com/
         MSG
         true
       end

data/lib/generators/react_on_rails/react_with_redux_generator.rb

@@ -99,7 +99,8 @@ module ReactOnRails
 
         # Append Redux-specific post-install instructions
         GeneratorMessages.add_info(
-          GeneratorMessages.helpful_message_after_installation(component_name: "HelloWorldApp", route: "hello_world")
+          GeneratorMessages.helpful_message_after_installation(component_name: "HelloWorldApp", route: "hello_world",
+                                                               pro: Gem.loaded_specs.key?("react_on_rails_pro"))
         )
       end
 

data/lib/generators/react_on_rails/rsc_generator.rb

@@ -92,7 +92,7 @@ module ReactOnRails
           2. Visit http://localhost:3000/hello_server to see RSC in action
           3. The RSC bundle watcher will compile server components
 
-          Documentation: https://www.shakacode.com/react-on-rails-pro/docs/rsc/
+          Documentation: https://reactonrails.com/docs/pro/react-server-components/
         MSG
       end
     end

data/lib/generators/react_on_rails/templates/base/base/bin/dev

@@ -35,7 +35,7 @@
 # 2. Remove precompile_hook from config/shakapacker.yml if present
 # 3. Uncomment the run_precompile_tasks call near the bottom of this file
 #
-# See documentation: https://www.shakacode.com/react-on-rails/docs/building-features/extensible-precompile-pattern
+# See documentation: https://reactonrails.com/docs/building-features/extensible-precompile-pattern
 #
 # def run_precompile_tasks
 #   require_relative "../config/environment"

data/lib/generators/react_on_rails/templates/pro/base/client/node-renderer.js

@@ -1,7 +1,9 @@
 const path = require('path');
-const { reactOnRailsProNodeRenderer } = require('react-on-rails-pro-node-renderer');
+const { reactOnRailsProNodeRenderer, parseWorkersCount } = require('react-on-rails-pro-node-renderer');
 
 const { env } = process;
+const configuredWorkersCount =
+  parseWorkersCount(env.RENDERER_WORKERS_COUNT) ?? parseWorkersCount(env.NODE_RENDERER_CONCURRENCY);
 
 const config = {
   serverBundleCachePath: path.resolve(__dirname, '../.node-renderer-bundles'),
@@ -12,8 +14,10 @@ const config = {
   password: env.RENDERER_PASSWORD || 'devPassword',
 
   // Number of Node.js worker threads for SSR rendering
-  // Set NODE_RENDERER_CONCURRENCY env var to override (e.g., for production tuning)
-  workersCount: env.NODE_RENDERER_CONCURRENCY != null ? Number(env.NODE_RENDERER_CONCURRENCY) : 3,
+  // Set RENDERER_WORKERS_COUNT env var to override (e.g., for production tuning)
+  // Set to 0 for single-process mode (useful for debugging).
+  // Legacy fallback: NODE_RENDERER_CONCURRENCY
+  workersCount: configuredWorkersCount ?? 3,
 
   // If set to true, `supportModules` enables the server-bundle code to call a default set of NodeJS modules
   // that get added to the VM context: { Buffer, process, setTimeout, setInterval, clearTimeout, clearInterval }.
@@ -34,7 +38,7 @@ const config = {
 // Renderer detects a total number of CPUs on virtual hostings like Heroku or CircleCI instead
 // of CPUs number allocated for current container. This results in spawning many workers while
 // only 1-2 of them really needed.
-if (env.CI) {
+if (env.CI && configuredWorkersCount == null) {
   config.workersCount = 2;
 }
 

data/lib/generators/react_on_rails/templates/pro/base/config/initializers/react_on_rails_pro.rb.tt

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# See https://www.shakacode.com/react-on-rails-pro/docs/configuration/
+# See https://reactonrails.com/docs/configuration/configuration-pro
 # License: Set REACT_ON_RAILS_PRO_LICENSE environment variable
 ReactOnRailsPro.configure do |config|
   config.server_renderer = "NodeRenderer"

data/lib/generators/react_on_rails/templates/rsc/base/app/controllers/hello_server_controller.rb.tt

@@ -10,7 +10,7 @@
 # - Automatic hydration on the client
 #
 # For more information, see:
-# https://www.shakacode.com/react-on-rails-pro/docs/react-server-components/
+# https://reactonrails.com/docs/pro/react-server-components/
 
 class HelloServerController < ApplicationController
   layout "<%= config[:layout_name] %>"

data/lib/generators/react_on_rails/templates/rsc/base/app/javascript/src/HelloServer/components/HelloServer.jsx

@@ -9,7 +9,7 @@
 // 4. Streaming — wrapped in <Suspense>, this component streams HTML as it resolves
 //
 // For more information, see:
-// https://www.shakacode.com/react-on-rails-pro/docs/react-server-components/
+// https://reactonrails.com/docs/pro/react-server-components/
 
 import React from 'react';
 import LikeButton from './LikeButton';

data/lib/generators/react_on_rails/templates/rsc/base/app/javascript/src/HelloServer/components/HelloServer.tsx

@@ -9,7 +9,7 @@
 // 4. Streaming — wrapped in <Suspense>, this component streams HTML as it resolves
 //
 // For more information, see:
-// https://www.shakacode.com/react-on-rails-pro/docs/react-server-components/
+// https://reactonrails.com/docs/pro/react-server-components/
 
 import React from 'react';
 import LikeButton from './LikeButton';

data/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb

@@ -30,7 +30,7 @@
 
 <p style="margin-top: 16px;">
   <strong>Learn more:</strong>
-  <a href="https://www.shakacode.com/react-on-rails-pro/docs/react-server-components/">
+  <a href="https://reactonrails.com/docs/pro/react-server-components/">
     React Server Components Documentation
   </a>
 </p>

data/lib/generators/react_on_rails/templates/rsc/base/config/webpack/rscWebpackConfig.js.tt

@@ -1,6 +1,6 @@
 // React Server Components webpack configuration
 // This creates the RSC bundle based on the server webpack config
-// See: https://www.shakacode.com/react-on-rails-pro/docs/react-server-components/
+// See: https://reactonrails.com/docs/pro/react-server-components/
 
 const serverWebpackModule = require('./serverWebpackConfig');
 

data/lib/react_on_rails/config_path_resolver.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module ReactOnRails
+  module ConfigPathResolver
+    private
+
+    def resolved_package_json_path
+      node_modules_location = ReactOnRails.configuration.node_modules_location.to_s
+      return "package.json" if node_modules_location.empty? || node_modules_location == Rails.root.to_s
+
+      Rails.root.join(node_modules_location, "package.json").to_s
+    end
+
+    def resolved_webpack_config_path
+      webpack_config_candidates.find { |path| File.exist?(path) }
+    end
+
+    def webpack_config_candidates
+      candidates = []
+
+      shakapacker_config_dir = shakapacker_webpack_config_directory
+      if shakapacker_config_dir
+        candidates.concat(%w[js ts cjs mjs].flat_map do |ext|
+          [
+            File.join(shakapacker_config_dir, "webpack.config.#{ext}"),
+            File.join(shakapacker_config_dir, "rspack.config.#{ext}")
+          ]
+        end)
+      end
+
+      candidates << "config/webpack/webpack.config.js"
+      candidates << "config/webpack/webpack.config.ts"
+      candidates << "config/rspack/rspack.config.js"
+      candidates << "config/rspack/rspack.config.ts"
+      candidates.uniq
+    end
+
+    def shakapacker_webpack_config_directory
+      require "shakapacker"
+      path = Shakapacker.config.assets_bundler_config_path.to_s
+      return nil if path.empty?
+
+      directory = File.dirname(path)
+      rails_root = Rails.root.to_s
+      directory.start_with?("#{rails_root}/") ? directory.sub("#{rails_root}/", "") : directory
+    rescue LoadError, StandardError
+      nil
+    end
+  end
+end

data/lib/react_on_rails/configuration.rb

@@ -463,7 +463,7 @@ module ReactOnRails
       msg = <<~MSG
         **ERROR** ReactOnRails: auto_load_bundle is set to true, yet components_subdirectory is not configured.\
         Please set components_subdirectory to the desired directory.  For more information, please see \
-        https://www.shakacode.com/react-on-rails/docs/guides/file-system-based-automated-bundle-generation.md
+        https://reactonrails.com/docs/guides/file-system-based-automated-bundle-generation.md
       MSG
 
       raise ReactOnRails::Error, msg

data/lib/react_on_rails/dev/process_manager.rb

@@ -8,6 +8,14 @@ module ReactOnRails
       # Timeout for version check operations to prevent hanging
       VERSION_CHECK_TIMEOUT = 5
 
+      # Env vars set after Bundler.setup that must survive with_unbundled_env.
+      # with_unbundled_env restores the pre-Bundler env snapshot, so any var
+      # set at runtime (e.g. PORT by PortSelector) is lost. We capture them
+      # before entering the block and pass them explicitly to system().
+      # This follows the same pattern used by Rails' bundle_command (railties),
+      # Spring's process spawning, and this codebase's own PackGenerator.
+      ENV_KEYS_TO_PRESERVE = %w[PORT SHAKAPACKER_DEV_SERVER_PORT].freeze
+
       class << self
         # Check if a process is available and usable in the current execution context
         # This accounts for bundler context where system commands might be intercepted
@@ -103,8 +111,9 @@ module ReactOnRails
         # This allows using system-installed processes even when they're not in the Gemfile
         def run_process_outside_bundle(process, args)
           if defined?(Bundler)
+            env_overrides = preserve_runtime_env_vars
             with_unbundled_context do
-              system(process, *args)
+              system(env_overrides, process, *args)
             end
           else
             # Fallback if Bundler is not available
@@ -168,6 +177,12 @@ module ReactOnRails
           MSG
         end
 
+        def preserve_runtime_env_vars
+          ENV_KEYS_TO_PRESERVE.each_with_object({}) do |key, hash|
+            hash[key] = ENV[key] if ENV[key]
+          end
+        end
+
         def valid_procfile_path?(procfile)
           # Reject paths with shell metacharacters
           return false if procfile.match?(/[;&|`$(){}\[\]<>]/)

data/lib/react_on_rails/dev/server_manager.rb

@@ -457,7 +457,7 @@ module ReactOnRails
           puts Rainbow("   1. Upgrade to Shakapacker 9.4.0 or later:").cyan
           puts Rainbow("      bundle update shakapacker").cyan.bold
           puts Rainbow("   2. Or switch to a script-based hook with a self-guard.").cyan
-          puts Rainbow("      See: https://www.shakacode.com/react-on-rails/docs/building-features/process-managers").cyan
+          puts Rainbow("      See: https://reactonrails.com/docs/building-features/process-managers").cyan
           puts ""
         end
         # rubocop:enable Metrics/AbcSize
@@ -889,7 +889,7 @@ module ReactOnRails
             #{Rainbow('📖 DOCUMENTATION:').cyan.bold}
             #{Rainbow('•').yellow} #{Rainbow('Testing & dev server guide:').white} #{Rainbow('docs/oss/building-features/dev-server-and-testing.md').green}
             #{Rainbow('•').yellow} #{Rainbow('Testing configuration:').white} #{Rainbow('docs/oss/building-features/testing-configuration.md').green}
-            #{Rainbow('•').yellow} #{Rainbow('Full docs:').white} #{Rainbow('https://www.shakacode.com/react-on-rails/docs/').cyan.underline}
+            #{Rainbow('•').yellow} #{Rainbow('Full docs:').white} #{Rainbow('https://reactonrails.com/docs/').cyan.underline}
           TROUBLESHOOTING
         end
         # rubocop:enable Metrics/AbcSize