react_on_rails 16.2.0.beta.10 → 16.2.0.beta.12

data/lib/react_on_rails/helper.rb

@@ -226,7 +226,7 @@ module ReactOnRails
           }
         }
 
-        consoleReplayScript = ReactOnRails.buildConsoleReplay();
+        consoleReplayScript = ReactOnRails.getConsoleReplayScript();
 
         return JSON.stringify({
             html: htmlResult,
@@ -242,8 +242,9 @@ module ReactOnRails
                .server_render_js_with_console_logging(js_code, render_options)
 
       html = result["html"]
-      console_log_script = result["consoleLogScript"]
-      raw("#{html}#{console_log_script if render_options.replay_console}")
+      console_script = result["consoleReplayScript"]
+      console_script_tag = wrap_console_script_with_nonce(console_script) if render_options.replay_console
+      raw("#{html}#{console_script_tag}")
     rescue ExecJS::ProgramError => err
       raise ReactOnRails::PrerenderError.new(component_name: "N/A (server_render_js called)",
                                              err: err,
@@ -394,7 +395,7 @@ module ReactOnRails
                                     server_rendered_html.html_safe,
                                     content_tag_options)
 
-      result_console_script = render_options.replay_console ? console_script : ""
+      result_console_script = render_options.replay_console ? wrap_console_script_with_nonce(console_script) : ""
       result = compose_react_component_html_with_spec_and_console(
         component_specification_tag, rendered_output, result_console_script
       )
@@ -419,7 +420,7 @@ module ReactOnRails
                                     server_rendered_html[COMPONENT_HTML_KEY].html_safe,
                                     content_tag_options)
 
-      result_console_script = render_options.replay_console ? console_script : ""
+      result_console_script = render_options.replay_console ? wrap_console_script_with_nonce(console_script) : ""
       result = compose_react_component_html_with_spec_and_console(
         component_specification_tag, rendered_output, result_console_script
       )
@@ -436,6 +437,32 @@ module ReactOnRails
       )
     end
 
+    # Wraps console replay JavaScript code in a script tag with CSP nonce if available.
+    # The console_script_code is already sanitized by scriptSanitizedVal() in the JavaScript layer,
+    # so using html_safe here is secure.
+    def wrap_console_script_with_nonce(console_script_code)
+      return "" if console_script_code.blank?
+
+      # Get the CSP nonce if available (Rails 5.2+)
+      # Rails 5.2-6.0 use content_security_policy_nonce with no arguments
+      # Rails 6.1+ accept an optional directive argument
+      nonce = if respond_to?(:content_security_policy_nonce)
+                begin
+                  content_security_policy_nonce(:script)
+                rescue ArgumentError
+                  # Fallback for Rails versions that don't accept arguments
+                  content_security_policy_nonce
+                end
+              end
+
+      # Build the script tag with nonce if available
+      script_options = { id: "consoleReplayLog" }
+      script_options[:nonce] = nonce if nonce.present?
+
+      # Safe to use html_safe because content is pre-sanitized via scriptSanitizedVal()
+      content_tag(:script, console_script_code.html_safe, script_options)
+    end
+
     def compose_react_component_html_with_spec_and_console(component_specification_tag, rendered_output,
                                                            console_script)
       # IMPORTANT: Ensure that we mark string as html_safe to avoid escaping.

data/lib/react_on_rails/packs_generator.rb

@@ -25,40 +25,42 @@ module ReactOnRails
     def generate_packs_if_stale
       return unless ReactOnRails.configuration.auto_load_bundle
 
+      verbose = ENV["REACT_ON_RAILS_VERBOSE"] == "true"
+
       add_generated_pack_to_server_bundle
 
       # Clean any non-generated files from directories
-      clean_non_generated_files_with_feedback
+      clean_non_generated_files_with_feedback(verbose: verbose)
 
       are_generated_files_present_and_up_to_date = Dir.exist?(generated_packs_directory_path) &&
                                                    File.exist?(generated_server_bundle_file_path) &&
                                                    !stale_or_missing_packs?
 
       if are_generated_files_present_and_up_to_date
-        puts Rainbow("✅ Generated packs are up to date, no regeneration needed").green
+        puts Rainbow("✅ Generated packs are up to date, no regeneration needed").green if verbose
         return
       end
 
-      clean_generated_directories_with_feedback
-      generate_packs
+      clean_generated_directories_with_feedback(verbose: verbose)
+      generate_packs(verbose: verbose)
     end
 
     private
 
-    def generate_packs
-      common_component_to_path.each_value { |component_path| create_pack(component_path) }
-      client_component_to_path.each_value { |component_path| create_pack(component_path) }
+    def generate_packs(verbose: false)
+      common_component_to_path.each_value { |component_path| create_pack(component_path, verbose: verbose) }
+      client_component_to_path.each_value { |component_path| create_pack(component_path, verbose: verbose) }
 
-      create_server_pack if ReactOnRails.configuration.server_bundle_js_file.present?
+      create_server_pack(verbose: verbose) if ReactOnRails.configuration.server_bundle_js_file.present?
     end
 
-    def create_pack(file_path)
+    def create_pack(file_path, verbose: false)
       output_path = generated_pack_path(file_path)
       content = pack_file_contents(file_path)
 
       File.write(output_path, content)
 
-      puts(Rainbow("Generated Packs: #{output_path}").yellow)
+      puts(Rainbow("Generated Packs: #{output_path}").yellow) if verbose
     end
 
     def first_js_statement_in_code(content) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
@@ -126,11 +128,11 @@ module ReactOnRails
       FILE_CONTENT
     end
 
-    def create_server_pack
+    def create_server_pack(verbose: false)
       File.write(generated_server_bundle_file_path, generated_server_pack_file_content)
 
       add_generated_pack_to_server_bundle
-      puts(Rainbow("Generated Server Bundle: #{generated_server_bundle_file_path}").orange)
+      puts(Rainbow("Generated Server Bundle: #{generated_server_bundle_file_path}").orange) if verbose
     end
 
     def build_server_pack_content(component_on_server_imports, server_components, client_components)
@@ -200,17 +202,17 @@ module ReactOnRails
       "#{generated_nonentrypoints_path}/#{generated_server_bundle_file_name}.js"
     end
 
-    def clean_non_generated_files_with_feedback
+    def clean_non_generated_files_with_feedback(verbose: false)
       directories_to_clean = [generated_packs_directory_path, generated_server_bundle_directory_path].compact.uniq
       expected_files = build_expected_files_set
 
-      puts Rainbow("🧹 Cleaning non-generated files...").yellow
+      puts Rainbow("🧹 Cleaning non-generated files...").yellow if verbose
 
       total_deleted = directories_to_clean.sum do |dir_path|
-        clean_unexpected_files_from_directory(dir_path, expected_files)
+        clean_unexpected_files_from_directory(dir_path, expected_files, verbose: verbose)
       end
 
-      display_cleanup_summary(total_deleted)
+      display_cleanup_summary(total_deleted, verbose: verbose) if verbose
     end
 
     def build_expected_files_set
@@ -225,17 +227,17 @@ module ReactOnRails
       { pack_files: expected_pack_files, server_bundle: expected_server_bundle }
     end
 
-    def clean_unexpected_files_from_directory(dir_path, expected_files)
+    def clean_unexpected_files_from_directory(dir_path, expected_files, verbose: false)
       return 0 unless Dir.exist?(dir_path)
 
       existing_files = Dir.glob("#{dir_path}/**/*").select { |f| File.file?(f) }
       unexpected_files = find_unexpected_files(existing_files, dir_path, expected_files)
 
       if unexpected_files.any?
-        delete_unexpected_files(unexpected_files, dir_path)
+        delete_unexpected_files(unexpected_files, dir_path, verbose: verbose)
         unexpected_files.length
       else
-        puts Rainbow("   No unexpected files found in #{dir_path}").cyan
+        puts Rainbow("   No unexpected files found in #{dir_path}").cyan if verbose
         0
       end
     end
@@ -250,15 +252,21 @@ module ReactOnRails
       end
     end
 
-    def delete_unexpected_files(unexpected_files, dir_path)
-      puts Rainbow("   Deleting #{unexpected_files.length} unexpected files from #{dir_path}:").cyan
-      unexpected_files.each do |file|
-        puts Rainbow("     - #{File.basename(file)}").blue
-        File.delete(file)
+    def delete_unexpected_files(unexpected_files, dir_path, verbose: false)
+      if verbose
+        puts Rainbow("   Deleting #{unexpected_files.length} unexpected files from #{dir_path}:").cyan
+        unexpected_files.each do |file|
+          puts Rainbow("     - #{File.basename(file)}").blue
+          File.delete(file)
+        end
+      else
+        unexpected_files.each { |file| File.delete(file) }
       end
     end
 
-    def display_cleanup_summary(total_deleted)
+    def display_cleanup_summary(total_deleted, verbose: false)
+      return unless verbose
+
       if total_deleted.positive?
         puts Rainbow("🗑️  Deleted #{total_deleted} unexpected files total").red
       else
@@ -266,15 +274,17 @@ module ReactOnRails
       end
     end
 
-    def clean_generated_directories_with_feedback
+    def clean_generated_directories_with_feedback(verbose: false)
       directories_to_clean = [
         generated_packs_directory_path,
         generated_server_bundle_directory_path
       ].compact.uniq
 
-      puts Rainbow("🧹 Cleaning generated directories...").yellow
+      puts Rainbow("🧹 Cleaning generated directories...").yellow if verbose
+
+      total_deleted = directories_to_clean.sum { |dir_path| clean_directory_with_feedback(dir_path, verbose: verbose) }
 
-      total_deleted = directories_to_clean.sum { |dir_path| clean_directory_with_feedback(dir_path) }
+      return unless verbose
 
       if total_deleted.positive?
         puts Rainbow("🗑️  Deleted #{total_deleted} generated files total").red
@@ -283,27 +293,29 @@ module ReactOnRails
       end
     end
 
-    def clean_directory_with_feedback(dir_path)
-      return create_directory_with_feedback(dir_path) unless Dir.exist?(dir_path)
+    def clean_directory_with_feedback(dir_path, verbose: false)
+      return create_directory_with_feedback(dir_path, verbose: verbose) unless Dir.exist?(dir_path)
 
       files = Dir.glob("#{dir_path}/**/*").select { |f| File.file?(f) }
 
       if files.any?
-        puts Rainbow("   Deleting #{files.length} files from #{dir_path}:").cyan
-        files.each { |file| puts Rainbow("     - #{File.basename(file)}").blue }
+        if verbose
+          puts Rainbow("   Deleting #{files.length} files from #{dir_path}:").cyan
+          files.each { |file| puts Rainbow("     - #{File.basename(file)}").blue }
+        end
         FileUtils.rm_rf(dir_path)
         FileUtils.mkdir_p(dir_path)
         files.length
       else
-        puts Rainbow("   Directory #{dir_path} is already empty").cyan
+        puts Rainbow("   Directory #{dir_path} is already empty").cyan if verbose
         FileUtils.rm_rf(dir_path)
         FileUtils.mkdir_p(dir_path)
         0
       end
     end
 
-    def create_directory_with_feedback(dir_path)
-      puts Rainbow("   Directory #{dir_path} does not exist, creating...").cyan
+    def create_directory_with_feedback(dir_path, verbose: false)
+      puts Rainbow("   Directory #{dir_path} does not exist, creating...").cyan if verbose
       FileUtils.mkdir_p(dir_path)
       0
     end

data/lib/react_on_rails/system_checker.rb

@@ -213,17 +213,20 @@ module ReactOnRails
 
         return unless npm_version && defined?(ReactOnRails::VERSION)
 
-        # Clean version strings for comparison (remove ^, ~, =, etc.)
-        clean_npm_version = npm_version.gsub(/[^0-9.]/, "")
+        # Normalize NPM version format to Ruby gem format for comparison
+        # Uses existing VersionSyntaxConverter to handle dash/dot differences
+        # (e.g., "16.2.0-beta.10" → "16.2.0.beta.10")
+        converter = ReactOnRails::VersionSyntaxConverter.new
+        normalized_npm_version = converter.npm_to_rubygem(npm_version)
         gem_version = ReactOnRails::VERSION
 
-        if clean_npm_version == gem_version
+        if normalized_npm_version == gem_version
           add_success("✅ React on Rails gem and NPM package versions match (#{gem_version})")
           check_version_patterns(npm_version, gem_version)
         else
           # Check for major version differences
           gem_major = gem_version.split(".")[0].to_i
-          npm_major = clean_npm_version.split(".")[0].to_i
+          npm_major = normalized_npm_version.split(".")[0].to_i
 
           if gem_major != npm_major # rubocop:disable Style/NegatedIfElseCondition
             add_error(<<~MSG.strip)

data/lib/react_on_rails/utils.rb

@@ -443,6 +443,60 @@ module ReactOnRails
       end
     end
 
+    # Converts an absolute path (String or Pathname) to a path relative to Rails.root.
+    # If the path is already relative or doesn't contain Rails.root, returns it as-is.
+    #
+    # This method is used to normalize paths from Shakapacker's privateOutputPath (which is
+    # absolute) to relative paths suitable for React on Rails configuration.
+    #
+    # Note: Absolute paths that don't start with Rails.root are intentionally passed through
+    # unchanged. While there's no known use case for server bundles outside Rails.root,
+    # this behavior preserves the original path for debugging and error messages.
+    #
+    # @param path [String, Pathname] The path to normalize
+    # @return [String, nil] The relative path as a string, or nil if path is nil
+    #
+    # @example Converting absolute paths within Rails.root
+    #   # Assuming Rails.root is "/app"
+    #   normalize_to_relative_path("/app/ssr-generated") # => "ssr-generated"
+    #   normalize_to_relative_path("/app/foo/bar")       # => "foo/bar"
+    #
+    # @example Already relative paths pass through
+    #   normalize_to_relative_path("ssr-generated")      # => "ssr-generated"
+    #   normalize_to_relative_path("./ssr-generated")    # => "./ssr-generated"
+    #
+    # @example Absolute paths outside Rails.root (edge case)
+    #   normalize_to_relative_path("/other/path/bundles") # => "/other/path/bundles"
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def self.normalize_to_relative_path(path)
+      return nil if path.nil?
+
+      path_str = path.to_s
+      rails_root_str = Rails.root.to_s.chomp("/")
+
+      # Treat as "inside Rails.root" only for exact match or a subdirectory
+      inside_rails_root = rails_root_str.present? &&
+                          (path_str == rails_root_str || path_str.start_with?("#{rails_root_str}/"))
+
+      # If path is within Rails.root, remove that prefix
+      if inside_rails_root
+        # Remove Rails.root and any leading slash
+        path_str.sub(%r{^#{Regexp.escape(rails_root_str)}/?}, "")
+      else
+        # Path is already relative or outside Rails.root
+        # Warn if it's an absolute path outside Rails.root (edge case)
+        if path_str.start_with?("/") && !inside_rails_root
+          Rails.logger&.warn(
+            "ReactOnRails: Detected absolute path outside Rails.root: '#{path_str}'. " \
+            "Server bundles are typically stored within Rails.root. " \
+            "Verify this is intentional."
+          )
+        end
+        path_str
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
     def self.default_troubleshooting_section
       <<~DEFAULT
         📞 Get Help & Support:

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "16.2.0.beta.10"
+  VERSION = "16.2.0.beta.12"
 end

data/lib/tasks/generate_packs.rake

@@ -17,18 +17,24 @@ namespace :react_on_rails do
   DESC
 
   task generate_packs: :environment do
-    puts Rainbow("🚀 Starting React on Rails pack generation...").bold
-    puts Rainbow("📁 Auto-load bundle: #{ReactOnRails.configuration.auto_load_bundle}").cyan
-    puts Rainbow("📂 Components subdirectory: #{ReactOnRails.configuration.components_subdirectory}").cyan
-    puts ""
+    verbose = ENV["REACT_ON_RAILS_VERBOSE"] == "true"
+
+    if verbose
+      puts Rainbow("🚀 Starting React on Rails pack generation...").bold
+      puts Rainbow("📁 Auto-load bundle: #{ReactOnRails.configuration.auto_load_bundle}").cyan
+      puts Rainbow("📂 Components subdirectory: #{ReactOnRails.configuration.components_subdirectory}").cyan
+      puts ""
+    end
 
     begin
       start_time = Time.now
       ReactOnRails::PacksGenerator.instance.generate_packs_if_stale
       end_time = Time.now
 
-      puts ""
-      puts Rainbow("✨ Pack generation completed in #{((end_time - start_time) * 1000).round(1)}ms").green
+      if verbose
+        puts ""
+        puts Rainbow("✨ Pack generation completed in #{((end_time - start_time) * 1000).round(1)}ms").green
+      end
     rescue ReactOnRails::Error => e
       handle_react_on_rails_error(e)
       exit 1

data/react_on_rails_pro/CHANGELOG.md

@@ -20,13 +20,12 @@ You can find the **package** version numbers from this repo's tags and below in
 _Add changes in master not yet tagged._
 
 ### Improved
-- Significantly improved streaming performance by processing React components concurrently instead of sequentially. This reduces latency and improves responsiveness when using `stream_view_containing_react_components`.
 
-### Added
-- Added `config.concurrent_component_streaming_buffer_size` configuration option to control the memory buffer size for concurrent component streaming (defaults to 64). This allows fine-tuning of memory usage vs. performance for streaming applications.
+- **Concurrent Streaming Performance**: Implemented concurrent draining of streamed React components using the async gem. Instead of processing components sequentially, the system now uses a producer-consumer pattern with bounded buffering to allow multiple components to stream simultaneously while maintaining per-component chunk ordering. This significantly reduces latency and improves responsiveness when using `stream_view_containing_react_components`. [PR 2015](https://github.com/shakacode/react_on_rails/pull/2015) by [ihabadham](https://github.com/ihabadham).
 
 ### Added
 
+- Added `config.concurrent_component_streaming_buffer_size` configuration option to control the memory buffer size for concurrent component streaming (defaults to 64). This allows fine-tuning of memory usage vs. performance for streaming applications.
 - Added `cached_stream_react_component` helper method, similar to `cached_react_component` but for streamed components.
 - **License Validation System**: Implemented comprehensive JWT-based license validation with offline verification using RSA-256 signatures. License validation occurs at startup in both Ruby and Node.js environments. Supports required fields (`sub`, `iat`, `exp`) and optional fields (`plan`, `organization`, `iss`). FREE evaluation licenses are available for 3 months at [shakacode.com/react-on-rails-pro](https://shakacode.com/react-on-rails-pro). [PR #1857](https://github.com/shakacode/react_on_rails/pull/1857) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 - **Pro-Specific Configurations Moved from Open-Source**: The following React Server Components (RSC) configurations are now exclusively in the Pro gem and should be configured in `ReactOnRailsPro.configure`:
@@ -46,9 +45,17 @@ _Add changes in master not yet tagged._
 
 - **Node Renderer Gem Version Validation**: The node renderer now validates that the Ruby gem version (`react_on_rails_pro`) matches the node renderer package version (`@shakacode-tools/react-on-rails-pro-node-renderer`) on every render request. Environment-aware: strict enforcement in development (returns 412 Precondition Failed on mismatch), permissive in production (allows with warning). Includes version normalization to handle Ruby gem vs NPM format differences (e.g., `4.0.0.rc.1` vs `4.0.0-rc.1`). [PR #1881](https://github.com/shakacode/react_on_rails/pull/1881) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 
+### Fixed
+
+- **Node Renderer Worker Restart**: Fixed "descriptor closed" error that occurred when the node renderer restarts while handling an in-progress request (especially streaming requests). Workers now perform graceful shutdowns: they disconnect from the cluster to stop receiving new requests, wait for active requests to complete, then shut down cleanly. A configurable `gracefulWorkerRestartTimeout` ensures workers are forcibly killed if they don't shut down in time. [PR 1970](https://github.com/shakacode/react_on_rails/pull/1970) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
+
+- **Body Duplication Bug On Streaming**: Fixed a bug that happens while streaming if the node renderer connection closed after streaming some chunks to the client. [PR 1995](https://github.com/shakacode/react_on_rails/pull/1995) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
+
 ### Changed
 
-- Renamed Node Renderer configuration option `bundlePath` to `serverBundleCachePath` to better clarify its purpose as a cache directory for uploaded server bundles, distinct from Shakapacker's public asset directory. The old `bundlePath` property and `RENDERER_BUNDLE_PATH` environment variable continue to work with deprecation warnings. [PR 2008](https://github.com/shakacode/react_on_rails/pull/2008) by [justin808](https://github.com/justin808).
+### Deprecated
+
+- **Node Renderer Configuration**: Renamed `bundlePath` configuration option to `serverBundleCachePath` in the node renderer to better describe its purpose and avoid confusion with Shakapacker's public bundle path. The old `bundlePath` option continues to work with deprecation warnings. Both `RENDERER_SERVER_BUNDLE_CACHE_PATH` (new) and `RENDERER_BUNDLE_PATH` (deprecated) environment variables are supported. [PR 2008](https://github.com/shakacode/react_on_rails/pull/2008) by [justin808](https://github.com/justin808).
 
 ### Changed (Breaking)
 

data/react_on_rails_pro/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ..
   specs:
-    react_on_rails (16.2.0.beta.10)
+    react_on_rails (16.2.0.beta.12)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -20,7 +20,7 @@ PATH
 PATH
   remote: .
   specs:
-    react_on_rails_pro (16.2.0.beta.10)
+    react_on_rails_pro (16.2.0.beta.12)
       addressable
       async (>= 2.6)
       connection_pool
@@ -28,7 +28,7 @@ PATH
       httpx (~> 1.5)
       jwt (~> 2.7)
       rainbow
-      react_on_rails (= 16.2.0.beta.10)
+      react_on_rails (= 16.2.0.beta.12)
 
 GEM
   remote: https://rubygems.org/

data/react_on_rails_pro/app/helpers/react_on_rails_pro_helper.rb

@@ -347,7 +347,8 @@ module ReactOnRailsProHelper
           render_options: render_options
         )
       else
-        result_console_script = render_options.replay_console ? chunk_json_result["consoleReplayScript"] : ""
+        console_script = chunk_json_result["consoleReplayScript"]
+        result_console_script = render_options.replay_console ? wrap_console_script_with_nonce(console_script) : ""
         # No need to prepend component_specification_tag or add rails context again
         # as they're already included in the first chunk
         compose_react_component_html_with_spec_and_console(

data/react_on_rails_pro/lib/react_on_rails_pro/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module ReactOnRailsPro
-  VERSION = "16.2.0.beta.10"
+  VERSION = "16.2.0.beta.12"
   PROTOCOL_VERSION = "2.0.0"
 end

data/react_on_rails_pro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails-pro-node-renderer",
-  "version": "16.2.0-beta.10",
+  "version": "16.2.0-beta.12",
   "protocolVersion": "2.0.0",
   "description": "react-on-rails-pro JavaScript for react_on_rails_pro Ruby gem",
   "exports": {

data/react_on_rails_pro/spec/dummy/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ../../..
   specs:
-    react_on_rails (16.2.0.beta.10)
+    react_on_rails (16.2.0.beta.12)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -20,7 +20,7 @@ PATH
 PATH
   remote: ../..
   specs:
-    react_on_rails_pro (16.2.0.beta.10)
+    react_on_rails_pro (16.2.0.beta.12)
       addressable
       async (>= 2.6)
       connection_pool
@@ -28,7 +28,7 @@ PATH
       httpx (~> 1.5)
       jwt (~> 2.7)
       rainbow
-      react_on_rails (= 16.2.0.beta.10)
+      react_on_rails (= 16.2.0.beta.12)
 
 GEM
   remote: https://rubygems.org/

data/react_on_rails_pro/spec/dummy/spec/helpers/react_on_rails_pro_helper_spec.rb

@@ -295,13 +295,13 @@ describe ReactOnRailsProHelper do
     let(:chunks) do
       [
         { html: "<div>Chunk 1: Stream React Server Components</div>",
-          consoleReplayScript: "<script>console.log.apply(console, " \
-                               "['Chunk 1: Console Message'])</script>" },
+          consoleReplayScript: "console.log.apply(console, " \
+                               "['Chunk 1: Console Message'])" },
         { html: "<div>Chunk 2: More content</div>",
-          consoleReplayScript: "<script>console.log.apply(console, " \
+          consoleReplayScript: "console.log.apply(console, " \
                                "['Chunk 2: Console Message']);\n" \
                                "console.error.apply(console, " \
-                               "['Chunk 2: Console Error']);</script>" },
+                               "['Chunk 2: Console Error']);" },
         { html: "<div>Chunk 3: Final content</div>", consoleReplayScript: "" }
       ]
     end
@@ -373,7 +373,12 @@ describe ReactOnRailsProHelper do
         mock_request_and_response
         initial_result = stream_react_component(component_name, props: props, **component_options)
         expect(initial_result).to include(react_component_div_with_initial_chunk)
-        expect(initial_result).to include(chunks.first[:consoleReplayScript])
+        # consoleReplayScript is now wrapped in a script tag with id="consoleReplayLog"
+        if chunks.first[:consoleReplayScript].present?
+          script = chunks.first[:consoleReplayScript]
+          wrapped = "<script id=\"consoleReplayLog\">#{script}</script>"
+          expect(initial_result).to include(wrapped)
+        end
         expect(initial_result).not_to include("More content", "Final content")
         expect(chunks_read.count).to eq(1)
       end
@@ -386,9 +391,12 @@ describe ReactOnRailsProHelper do
         expect(fiber).to be_alive
 
         second_result = fiber.resume
-        # regex that matches the html and consoleReplayScript and allows for any amount of whitespace between them
+        # regex that matches the html and wrapped consoleReplayScript
+        # Note: consoleReplayScript is now wrapped in a script tag with id="consoleReplayLog"
+        script = chunks[1][:consoleReplayScript]
+        wrapped = script.present? ? "<script id=\"consoleReplayLog\">#{script}</script>" : ""
         expect(second_result).to match(
-          /#{Regexp.escape(chunks[1][:html])}\s+#{Regexp.escape(chunks[1][:consoleReplayScript])}/
+          /#{Regexp.escape(chunks[1][:html])}\s+#{Regexp.escape(wrapped)}/
         )
         expect(second_result).not_to include("Stream React Server Components", "Final content")
         expect(chunks_read.count).to eq(2)

data/react_on_rails_pro/spec/dummy/spec/requests/renderer_console_logging_spec.rb

@@ -21,15 +21,20 @@ describe "Console logging from server" do
         console.log.apply(console, ["[SERVER] Script4\\"</div>\\"(/script <script>alert('WTF4')(/script>"]);
         console.log.apply(console, ["[SERVER] Script5:\\"</div>\\"(/script> <script>alert('WTF5')(/script>"]);
         console.log.apply(console, ["[SERVER] railsContext.serverSide is ","true"]);
+        console.log.apply(console, ["[SERVER] RENDERED ReduxSharedStoreApp to dom node with id: ReduxSharedStoreApp-react-component-1"]);
       JS
 
       expected_lines = expected.split("\n")
 
-      script_node = html_nodes.css("script#consoleReplayLog")
-      script_lines = script_node.text.split("\n")
+      # When multiple components with replay_console are rendered, each creates its own script tag
+      # with id="consoleReplayLog". Nokogiri's .text concatenates them without separators, which
+      # breaks parsing. Instead, we explicitly join them with newlines.
+      script_nodes = html_nodes.css("script#consoleReplayLog")
+      script_text = script_nodes.map(&:text).join("\n")
+      script_lines = script_text.split("\n")
 
-      # First item is a blank line since expected script starts form "\n":
-      script_lines.shift
+      # Remove leading blank line if present (old format had it, new format doesn't)
+      script_lines.shift if script_lines.first && script_lines.first.empty?
 
       # Create external iterators for expected and found console replay script lines:
       expected_lines_iterator = expected_lines.to_enum

data/sig/react_on_rails/dev/file_manager.rbs

@@ -0,0 +1,15 @@
+module ReactOnRails
+  module Dev
+    class FileManager
+      def self.cleanup_stale_files: () -> bool
+
+      private
+
+      def self.cleanup_overmind_sockets: () -> bool
+      def self.cleanup_rails_pid_file: () -> bool
+      def self.overmind_running?: () -> bool
+      def self.process_running?: (Integer) -> bool
+      def self.remove_file_if_exists: (String, String) -> bool
+    end
+  end
+end

data/sig/react_on_rails/dev/pack_generator.rbs

@@ -0,0 +1,19 @@
+module ReactOnRails
+  module Dev
+    class PackGenerator
+      def self.generate: (?verbose: bool) -> void
+
+      private
+
+      def self.run_pack_generation: (?silent: bool, ?verbose: bool) -> bool
+      def self.should_run_directly?: () -> bool
+      def self.rails_available?: () -> bool
+      def self.run_rake_task_directly: (?silent: bool) -> bool
+      def self.load_rake_tasks: () -> void
+      def self.prepare_rake_task: () -> untyped
+      def self.capture_output: (bool) { () -> bool } -> bool
+      def self.handle_rake_error: (Exception, bool) -> void
+      def self.run_via_bundle_exec: (?silent: bool, ?verbose: bool) -> (bool | nil)
+    end
+  end
+end

data/sig/react_on_rails/dev/process_manager.rbs

@@ -0,0 +1,22 @@
+module ReactOnRails
+  module Dev
+    class ProcessManager
+      VERSION_CHECK_TIMEOUT: Integer
+
+      def self.installed?: (String) -> bool
+      def self.ensure_procfile: (String) -> void
+      def self.run_with_process_manager: (String) -> void
+
+      private
+
+      def self.installed_in_current_context?: (String) -> bool
+      def self.version_flags_for: (String) -> Array[String]
+      def self.run_process_if_available: (String, Array[String]) -> bool
+      def self.run_process_outside_bundle: (String, Array[String]) -> bool
+      def self.process_available_in_system?: (String) -> bool
+      def self.with_unbundled_context: () { () -> untyped } -> untyped
+      def self.show_process_manager_installation_help: () -> void
+      def self.valid_procfile_path?: (String) -> bool
+    end
+  end
+end