react_on_rails 16.2.0.beta.4 → 16.2.0.beta.8

data/react_on_rails_pro/lib/react_on_rails_pro/concerns/stream.rb

@@ -38,12 +38,66 @@ module ReactOnRailsPro
       # So we strip extra newlines from the template string and add a single newline
       response.stream.write(template_string)
 
-      @rorp_rendering_fibers.each do |fiber|
-        while (chunk = fiber.resume)
-          response.stream.write(chunk)
+      begin
+        drain_streams_concurrently
+      ensure
+        response.stream.close if close_stream_at_end
+      end
+    end
+
+    private
+
+    def drain_streams_concurrently
+      require "async"
+      require "async/limited_queue"
+
+      return if @rorp_rendering_fibers.empty?
+
+      Sync do |parent|
+        # To avoid memory bloat, we use a limited queue to buffer chunks in memory.
+        buffer_size = ReactOnRailsPro.configuration.concurrent_component_streaming_buffer_size
+        queue = Async::LimitedQueue.new(buffer_size)
+
+        writer = build_writer_task(parent: parent, queue: queue)
+        tasks = build_producer_tasks(parent: parent, queue: queue)
+
+        # This structure ensures that even if a producer task fails, we always
+        # signal the writer to stop and then wait for it to finish draining
+        # any remaining items from the queue before propagating the error.
+        begin
+          tasks.each(&:wait)
+        ensure
+          # `close` signals end-of-stream; when writer tries to dequeue, it will get nil, so it will exit.
+          queue.close
+          writer.wait
+        end
+      end
+    end
+
+    def build_producer_tasks(parent:, queue:)
+      @rorp_rendering_fibers.each_with_index.map do |fiber, idx|
+        parent.async do
+          loop do
+            chunk = fiber.resume
+            break unless chunk
+
+            # Will be blocked if the queue is full until a chunk is dequeued
+            queue.enqueue([idx, chunk])
+          end
+        end
+      end
+    end
+
+    def build_writer_task(parent:, queue:)
+      parent.async do
+        loop do
+          pair = queue.dequeue
+          break if pair.nil?
+
+          _idx_from_queue, item = pair
+          response.stream.write(item)
         end
       end
-      response.stream.close if close_stream_at_end
     end
   end
 end

data/react_on_rails_pro/lib/react_on_rails_pro/configuration.rb

@@ -32,7 +32,8 @@ module ReactOnRailsPro
       rsc_payload_generation_url_path: Configuration::DEFAULT_RSC_PAYLOAD_GENERATION_URL_PATH,
       rsc_bundle_js_file: Configuration::DEFAULT_RSC_BUNDLE_JS_FILE,
       react_client_manifest_file: Configuration::DEFAULT_REACT_CLIENT_MANIFEST_FILE,
-      react_server_client_manifest_file: Configuration::DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE
+      react_server_client_manifest_file: Configuration::DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE,
+      concurrent_component_streaming_buffer_size: Configuration::DEFAULT_CONCURRENT_COMPONENT_STREAMING_BUFFER_SIZE
     )
   end
 
@@ -59,6 +60,7 @@ module ReactOnRailsPro
     DEFAULT_RSC_BUNDLE_JS_FILE = "rsc-bundle.js"
     DEFAULT_REACT_CLIENT_MANIFEST_FILE = "react-client-manifest.json"
     DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE = "react-server-client-manifest.json"
+    DEFAULT_CONCURRENT_COMPONENT_STREAMING_BUFFER_SIZE = 64
 
     attr_accessor :renderer_url, :renderer_password, :tracing,
                   :server_renderer, :renderer_use_fallback_exec_js, :prerender_caching,
@@ -68,7 +70,7 @@ module ReactOnRailsPro
                   :renderer_request_retry_limit, :throw_js_errors, :ssr_timeout,
                   :profile_server_rendering_js_code, :raise_non_shell_server_rendering_errors, :enable_rsc_support,
                   :rsc_payload_generation_url_path, :rsc_bundle_js_file, :react_client_manifest_file,
-                  :react_server_client_manifest_file
+                  :react_server_client_manifest_file, :concurrent_component_streaming_buffer_size
 
     def initialize(renderer_url: nil, renderer_password: nil, server_renderer: nil, # rubocop:disable Metrics/AbcSize
                    renderer_use_fallback_exec_js: nil, prerender_caching: nil,
@@ -79,7 +81,9 @@ module ReactOnRailsPro
                    renderer_request_retry_limit: nil, throw_js_errors: nil, ssr_timeout: nil,
                    profile_server_rendering_js_code: nil, raise_non_shell_server_rendering_errors: nil,
                    enable_rsc_support: nil, rsc_payload_generation_url_path: nil,
-                   rsc_bundle_js_file: nil, react_client_manifest_file: nil, react_server_client_manifest_file: nil)
+                   rsc_bundle_js_file: nil, react_client_manifest_file: nil,
+                   react_server_client_manifest_file: nil,
+                   concurrent_component_streaming_buffer_size: DEFAULT_CONCURRENT_COMPONENT_STREAMING_BUFFER_SIZE)
       self.renderer_url = renderer_url
       self.renderer_password = renderer_password
       self.server_renderer = server_renderer
@@ -105,6 +109,7 @@ module ReactOnRailsPro
       self.rsc_bundle_js_file = rsc_bundle_js_file
       self.react_client_manifest_file = react_client_manifest_file
       self.react_server_client_manifest_file = react_server_client_manifest_file
+      self.concurrent_component_streaming_buffer_size = concurrent_component_streaming_buffer_size
     end
 
     def setup_config_values
@@ -113,6 +118,7 @@ module ReactOnRailsPro
       validate_remote_bundle_cache_adapter
       setup_renderer_password
       setup_assets_to_copy
+      validate_concurrent_component_streaming_buffer_size
       setup_execjs_profiler_if_needed
       check_react_on_rails_support_for_rsc
     end
@@ -204,6 +210,14 @@ module ReactOnRailsPro
       end
     end
 
+    def validate_concurrent_component_streaming_buffer_size
+      return if concurrent_component_streaming_buffer_size.is_a?(Integer) &&
+                concurrent_component_streaming_buffer_size.positive?
+
+      raise ReactOnRailsPro::Error,
+            "config.concurrent_component_streaming_buffer_size must be a positive integer"
+    end
+
     def setup_renderer_password
       return if renderer_password.present?
 

data/react_on_rails_pro/lib/react_on_rails_pro/license_public_key.rb

@@ -16,15 +16,15 @@ module ReactOnRailsPro
     # TODO: Add a prepublish check to ensure this key matches the latest public key from the API.
     #       This should be implemented after publishing the API endpoint on the ShakaCode website.
     KEY = OpenSSL::PKey::RSA.new(<<~PEM.strip.strip_heredoc)
-      -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzcS/fpHz5CbnTQxb4Zot
-khjzXu7xNS+Y9VKfapMaHOMzNoCMfy1++hxHJatRedr+YQfZRCjfiN168Cpe+dhe
-yfNtOoLU9/+/5jTsxH+WQJWNRswyKms5HNajlIMN1GEYdZmZbvOPaZvh6ENsT+EV
-HnhjJtsHl7qltBoL0ul7rONxaNHCzJcKk4lf3B2/1j1wpA91MKz4bbQVh4/6Th0E
-/39f0PWvvBXzQS+yt1qaa1DIX5YL6Aug5uEpb1+6QWcN3hCzqSPBv1HahrG50rsD
-gf8KORV3X2N9t6j6iqPmRqfRcTBKtmPhM9bORtKiSwBK8LsIUzp2/UUmkdHnkyzu
-NQIDAQAB
------END PUBLIC KEY-----
+            -----BEGIN PUBLIC KEY-----
+      MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzcS/fpHz5CbnTQxb4Zot
+      khjzXu7xNS+Y9VKfapMaHOMzNoCMfy1++hxHJatRedr+YQfZRCjfiN168Cpe+dhe
+      yfNtOoLU9/+/5jTsxH+WQJWNRswyKms5HNajlIMN1GEYdZmZbvOPaZvh6ENsT+EV
+      HnhjJtsHl7qltBoL0ul7rONxaNHCzJcKk4lf3B2/1j1wpA91MKz4bbQVh4/6Th0E
+      /39f0PWvvBXzQS+yt1qaa1DIX5YL6Aug5uEpb1+6QWcN3hCzqSPBv1HahrG50rsD
+      gf8KORV3X2N9t6j6iqPmRqfRcTBKtmPhM9bORtKiSwBK8LsIUzp2/UUmkdHnkyzu
+      NQIDAQAB
+      -----END PUBLIC KEY-----
     PEM
   end
 end

data/react_on_rails_pro/lib/react_on_rails_pro/request.rb

@@ -9,9 +9,7 @@ module ReactOnRailsPro
     class << self
       def reset_connection
         @connection&.close
-        @connection_without_retries&.close
         @connection = create_connection
-        @connection_without_retries = create_connection(enable_retries: false)
       end
 
       def render_code(path, js_code, send_bundle)
@@ -84,29 +82,17 @@ module ReactOnRailsPro
 
       private
 
-      # NOTE: We maintain two separate HTTP connection pools to handle streaming vs non-streaming requests.
-      # This doubles the memory footprint (e.g., if renderer_http_pool_size is 10, we use 20 total connections).
-      # This tradeoff is acceptable to prevent body duplication in streaming responses.
-
       def connection
         @connection ||= create_connection
       end
 
-      def connection_without_retries
-        @connection_without_retries ||= create_connection(enable_retries: false)
-      end
-
-      def perform_request(path, **post_options) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-        # For streaming requests, use connection without retries to prevent body duplication
-        # The StreamRequest class handles retries properly by starting fresh requests
-        conn = post_options[:stream] ? connection_without_retries : connection
-
+      def perform_request(path, **post_options) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
         available_retries = ReactOnRailsPro.configuration.renderer_request_retry_limit
         retry_request = true
         while retry_request
           begin
             start_time = Time.now
-            response = conn.post(path, **post_options)
+            response = connection.post(path, **post_options)
             raise response.error if response.is_a?(HTTPX::ErrorResponse)
 
             request_time = Time.now - start_time
@@ -231,20 +217,50 @@ module ReactOnRailsPro
         ReactOnRailsPro::Utils.common_form_data
       end
 
-      def create_connection(enable_retries: true)
+      def create_connection # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         url = ReactOnRailsPro.configuration.renderer_url
         Rails.logger.info do
           "[ReactOnRailsPro] Setting up Node Renderer connection to #{url}"
         end
 
-        http_client = HTTPX
-        # For persistent connections we want retries,
-        # so the requests don't just fail if the other side closes the connection
-        # https://honeyryderchuck.gitlab.io/httpx/wiki/Persistent
-        # However, for streaming requests, retries cause body duplication
-        # See https://github.com/shakacode/react_on_rails/issues/1895
-        http_client = http_client.plugin(:retries, max_retries: 1, retry_change_requests: true) if enable_retries
-        http_client
+        HTTPX
+          # For persistent connections we want retries,
+          # so the requests don't just fail if the other side closes the connection
+          # https://honeyryderchuck.gitlab.io/httpx/wiki/Persistent
+          .plugin(
+            :retries, max_retries: 1,
+                      retry_change_requests: true,
+                      # Official HTTPx docs says that we should use the retry_on option to decide if the
+                      # request should be retried or not
+                      # However, HTTPx assumes that connection errors such as timeout error should be retried
+                      # by default and it doesn't consider retry_on block at all at that case
+                      # So, we have to do the following trick to avoid retries when a Timeout error happens
+                      # while streaming a component
+                      # If the streamed component returned any chunks, it shouldn't retry on errors, as it
+                      # would cause page duplication
+                      # The SSR-generated html will be written to the page two times in this case
+                      retry_after: lambda do |request, response|
+                                     if request.stream.instance_variable_get(:@react_on_rails_received_first_chunk)
+                                       e = response.error
+                                       raise(
+                                         ReactOnRailsPro::Error,
+                                         "An error happened during server side render streaming " \
+                                         "of a component.\nOriginal error:\n#{e}\n#{e.backtrace}"
+                                       )
+                                     end
+
+                                     Rails.logger.info do
+                                       "[ReactOnRailsPro] An error occurred while making " \
+                                         "a request to the Node Renderer.\n" \
+                                         "Error: #{response.error}.\n" \
+                                         "Retrying by HTTPX \"retries\" plugin..."
+                                     end
+                                     # The retry_after block expects to return a delay to wait before
+                                     # retrying the request
+                                     # nil means no waiting delay
+                                     nil
+                                   end
+          )
           .plugin(:stream)
           # See https://www.rubydoc.info/gems/httpx/1.3.3/HTTPX%2FOptions:initialize for the available options
           .with(

data/react_on_rails_pro/lib/react_on_rails_pro/stream_request.rb

@@ -10,6 +10,7 @@ module ReactOnRailsPro
       # @param position [Symbol] The position of the chunk in the stream (:first, :middle, or :last)
       # The position parameter is used by actions that add content to the beginning or end of the stream
       @actions = [] # List to store all actions
+      @rescue_blocks = []
     end
 
     # Add a prepend action
@@ -39,27 +40,45 @@ module ReactOnRailsPro
       self # Return self to allow chaining
     end
 
+    def rescue(&block)
+      @rescue_blocks << block
+      self # Return self to allow chaining
+    end
+
     def handle_chunk(chunk, position)
       @actions.reduce(chunk) do |acc, action|
         action.call(acc, position)
       end
     end
 
-    def each_chunk
-      return enum_for(:each_chunk) unless block_given?
+    def each_chunk(&block) # rubocop:disable Metrics/CyclomaticComplexity
+      return enum_for(:each_chunk) unless block
 
       first_chunk = true
       @component.each_chunk do |chunk|
         position = first_chunk ? :first : :middle
         modified_chunk = handle_chunk(chunk, position)
-        yield modified_chunk
+        yield(modified_chunk)
         first_chunk = false
       end
 
       # The last chunk contains the append content after the transformation
       # All transformations are applied to the append content
       last_chunk = handle_chunk("", :last)
-      yield last_chunk unless last_chunk.empty?
+      yield(last_chunk) unless last_chunk.empty?
+    rescue StandardError => e
+      current_error = e
+      rescue_block_index = 0
+      while current_error.present? && (rescue_block_index < @rescue_blocks.size)
+        begin
+          @rescue_blocks[rescue_block_index].call(current_error, &block)
+          current_error = nil
+        rescue StandardError => inner_error
+          current_error = inner_error
+        end
+        rescue_block_index += 1
+      end
+      raise current_error if current_error.present?
     end
   end
 
@@ -75,9 +94,6 @@ module ReactOnRailsPro
 
       send_bundle = false
       error_body = +""
-      # Retry logic for streaming requests is handled here by starting fresh requests.
-      # The HTTPx connection used for streaming has retries disabled (see Request#connection_without_retries)
-      # to prevent body duplication when partial chunks are already sent to the client.
       loop do
         stream_response = @request_executor.call(send_bundle)
 
@@ -89,6 +105,9 @@ module ReactOnRailsPro
         break
       rescue HTTPX::HTTPError => e
         send_bundle = handle_http_error(e, error_body, send_bundle)
+      rescue HTTPX::ReadTimeoutError => e
+        raise ReactOnRailsPro::Error, "Time out error while server side render streaming a component.\n" \
+                                      "Original error:\n#{e}\n#{e.backtrace}"
       end
     end
 
@@ -135,6 +154,7 @@ module ReactOnRailsPro
       line = "".b
 
       response.each do |chunk|
+        response.instance_variable_set(:@react_on_rails_received_first_chunk, true)
         line << chunk
 
         while (idx = line.index("\n"))

data/react_on_rails_pro/lib/react_on_rails_pro/utils.rb

@@ -108,7 +108,7 @@ module ReactOnRailsPro
       @rsc_bundle_hash = calc_bundle_hash(server_rsc_bundle_js_file_path)
     end
 
-    # Returns the hashed file name when using webpacker. Useful for creating cache keys.
+    # Returns the hashed file name when using Shakapacker. Useful for creating cache keys.
     def self.bundle_file_name(bundle_name)
       # bundle_js_uri_from_packer can return a file path or a HTTP URL (for files served from the dev server)
       # Pathname can handle both cases
@@ -117,8 +117,8 @@ module ReactOnRailsPro
       pathname.basename.to_s
     end
 
-    # Returns the hashed file name of the server bundle when using webpacker.
-    # Necessary fragment-caching keys.
+    # Returns the hashed file name of the server bundle when using Shakapacker.
+    # Necessary for fragment-caching keys.
     def self.server_bundle_file_name
       return @server_bundle_hash if @server_bundle_hash && !Rails.env.development?
 

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.4"
+  VERSION = "16.2.0.beta.8"
   PROTOCOL_VERSION = "2.0.0"
 end

data/react_on_rails_pro/package-scripts.yml

@@ -47,7 +47,7 @@ scripts:
         [ -f packages/node-renderer/dist/ReactOnRailsProNodeRenderer.js ] ||
           (nps build >/dev/null 2>&1 || true) &&
           [ -f packages/node-renderer/dist/ReactOnRailsProNodeRenderer.js ] ||
-          { echo 'Building @shakacode-tools/react-on-rails-pro-node-renderer seems to have failed!'; }
+          { echo 'Building react-on-rails-pro-node-renderer seems to have failed!'; }
 
   clean:
     description: Clean the project

data/react_on_rails_pro/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@shakacode-tools/react-on-rails-pro-node-renderer",
-  "version": "16.2.0-beta.4",
+  "name": "react-on-rails-pro-node-renderer",
+  "version": "16.2.0-beta.8",
   "protocolVersion": "2.0.0",
   "description": "react-on-rails-pro JavaScript for react_on_rails_pro Ruby gem",
   "exports": {
@@ -17,9 +17,6 @@
   "bin": {
     "react-on-rails-pro-node-renderer": "packages/node-renderer/dist/default-node-renderer.js"
   },
-  "publishConfig": {
-    "registry": "https://npm.pkg.github.com"
-  },
   "directories": {
     "doc": "docs"
   },
@@ -119,7 +116,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/shakacode-tools/react_on_rails_pro.git"
+    "url": "git+https://github.com/shakacode/react_on_rails.git"
   },
   "keywords": [
     "react",
@@ -132,9 +129,9 @@
   "author": "justin@shakacode.com",
   "license": "UNLICENSED",
   "bugs": {
-    "url": "https://github.com/shakacode/react_on_rails_pro/issues"
+    "url": "https://github.com/shakacode/react_on_rails/issues"
   },
-  "homepage": "https://github.com/shakacode/react_on_rails_pro#readme",
+  "homepage": "https://github.com/shakacode/react_on_rails/tree/master/react_on_rails_pro#readme",
   "jest": {
     "clearMocks": true,
     "collectCoverageFrom": [

data/react_on_rails_pro/packages/node-renderer/src/integrations/api.ts

@@ -4,7 +4,7 @@
  * @example
  * ```ts
  * import Bugsnag from '@bugsnag/js';
- * import { addNotifier, setupTracing } from '@shakacode-tools/react-on-rails-pro-node-renderer/integrations/api';
+ * import { addNotifier, setupTracing } from 'react-on-rails-pro-node-renderer/integrations/api';
  * Bugsnag.start({ ... });
  *
  * addNotifier((msg) => { Bugsnag.notify(msg); });

data/react_on_rails_pro/rakelib/public_key_management.rake

@@ -13,9 +13,9 @@ require "uri"
 #   rake react_on_rails_pro:verify_public_key              # Verify current configuration
 #   rake react_on_rails_pro:public_key_help                # Show help
 
-namespace :react_on_rails_pro do
+namespace :react_on_rails_pro do # rubocop:disable Metrics/BlockLength
   desc "Update the public key for React on Rails Pro license validation"
-  task :update_public_key, [:source] do |_task, args|
+  task :update_public_key, [:source] do |_task, args| # rubocop:disable Metrics/BlockLength
     source = args[:source] || "production"
 
     # Determine the API URL based on the source
@@ -68,7 +68,7 @@ namespace :react_on_rails_pro do
             # ShakaCode's public key for React on Rails Pro license verification
             # The private key corresponding to this public key is held by ShakaCode
             # and is never committed to the repository
-            # Last updated: #{Time.now.utc.strftime("%Y-%m-%d %H:%M:%S UTC")}
+            # Last updated: #{Time.now.utc.strftime('%Y-%m-%d %H:%M:%S UTC')}
             # Source: #{api_url}
             #
             # You can update this public key by running the rake task:
@@ -86,12 +86,13 @@ namespace :react_on_rails_pro do
       puts "✅ Updated Ruby public key: #{ruby_file_path}"
 
       # Update Node/TypeScript public key file
-      node_file_path = File.join(File.dirname(__FILE__), "..", "packages", "node-renderer", "src", "shared", "licensePublicKey.ts")
+      node_file_path = File.join(File.dirname(__FILE__), "..", "packages", "node-renderer", "src", "shared",
+                                 "licensePublicKey.ts")
       node_content = <<~TYPESCRIPT
         // ShakaCode's public key for React on Rails Pro license verification
         // The private key corresponding to this public key is held by ShakaCode
         // and is never committed to the repository
-        // Last updated: #{Time.now.utc.strftime("%Y-%m-%d %H:%M:%S UTC")}
+        // Last updated: #{Time.now.utc.strftime('%Y-%m-%d %H:%M:%S UTC')}
         // Source: #{api_url}
         //
         // You can update this public key by running the rake task:

data/react_on_rails_pro/react_on_rails_pro.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "execjs", "~> 2.9"
   s.add_runtime_dependency "httpx", "~> 1.5"
   s.add_runtime_dependency "jwt", "~> 2.7"
+  s.add_runtime_dependency "async", ">= 2.6"
   s.add_runtime_dependency "rainbow"
   s.add_runtime_dependency "react_on_rails", ReactOnRails::VERSION
   s.add_development_dependency "bundler"

data/react_on_rails_pro/spec/dummy/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ../../..
   specs:
-    react_on_rails (16.2.0.beta.4)
+    react_on_rails (16.2.0.beta.8)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -20,14 +20,15 @@ PATH
 PATH
   remote: ../..
   specs:
-    react_on_rails_pro (16.2.0.beta.4)
+    react_on_rails_pro (16.2.0.beta.8)
       addressable
+      async (>= 2.6)
       connection_pool
       execjs (~> 2.9)
       httpx (~> 1.5)
       jwt (~> 2.7)
       rainbow
-      react_on_rails (= 16.2.0.beta.4)
+      react_on_rails (= 16.2.0.beta.8)
 
 GEM
   remote: https://rubygems.org/
@@ -107,6 +108,12 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     amazing_print (1.6.0)
     ast (2.4.2)
+    async (2.34.0)
+      console (~> 1.29)
+      fiber-annotation
+      io-event (~> 1.11)
+      metrics (~> 0.12)
+      traces (~> 0.18)
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
@@ -131,6 +138,10 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
+    console (1.34.2)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -165,6 +176,9 @@ GEM
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     ffi (1.17.0-x86_64-linux-musl)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
     fiber-storage (1.0.0)
     generator_spec (0.10.0)
       activesupport (>= 3.0.0)
@@ -184,6 +198,7 @@ GEM
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     io-console (0.8.0)
+    io-event (1.14.2)
     irb (1.15.1)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -216,6 +231,7 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.1.0)
+    metrics (0.15.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.25.4)
@@ -447,6 +463,7 @@ GEM
     tins (1.33.0)
       bigdecimal
       sync
+    traces (0.18.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)

data/react_on_rails_pro/spec/dummy/app/controllers/pages_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class PagesController < ApplicationController
+class PagesController < ApplicationController # rubocop:disable Metrics/ClassLength
   include ReactOnRailsPro::RSCPayloadRenderer
   include RscPostsPageOverRedisHelper
 
@@ -85,8 +85,8 @@ class PagesController < ApplicationController
     ensure
       begin
         redis&.close
-      rescue StandardError => close_err
-        Rails.logger.warn "Failed to close Redis: #{close_err.message}"
+      rescue StandardError => e
+        Rails.logger.warn "Failed to close Redis: #{e.message}"
       end
     end
 

data/react_on_rails_pro/spec/dummy/bin/dev

@@ -1,9 +1,5 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-if ! command -v foreman &> /dev/null
-then
-  echo "Installing foreman..."
-  gem install foreman
-fi
-
-foreman start -f Procfile.dev
+# This script calls the base dev script with a fixed route for the dummy app
+exec File.join(__dir__, "../../../../lib/generators/react_on_rails/templates/base/base/bin/dev"), "--route=/", *ARGV

data/react_on_rails_pro/spec/dummy/client/node-renderer.js

@@ -5,14 +5,14 @@ const Sentry = require('@sentry/node');
 const { env } = process;
 
 // Use this for package installation test:
-const { reactOnRailsProNodeRenderer } = require('@shakacode-tools/react-on-rails-pro-node-renderer');
+const { reactOnRailsProNodeRenderer } = require('react-on-rails-pro-node-renderer');
 
 Honeybadger.configure({
   // This is a test account for React on Rails Pro. Substitute your own.
   apiKey: 'a602365c',
   environment: process.env.NODE_ENV ?? 'development',
 });
-require('@shakacode-tools/react-on-rails-pro-node-renderer/integrations/honeybadger').init();
+require('react-on-rails-pro-node-renderer/integrations/honeybadger').init();
 
 // This is a test account for React on Rails Pro.
 // Substitute your own DSN.
@@ -25,7 +25,7 @@ Sentry.init({
   // Sentry recommends adjusting this value in production, or using tracesSampler for finer control
   tracesSampleRate: 1.0,
 });
-require('@shakacode-tools/react-on-rails-pro-node-renderer/integrations/sentry').init({ tracing: true });
+require('react-on-rails-pro-node-renderer/integrations/sentry').init({ tracing: true });
 
 const config = {
   // This is the default but avoids searching for the Rails root

data/react_on_rails_pro/spec/dummy/config/environments/production.rb

@@ -69,7 +69,7 @@ Rails.application.configure do
   config.active_support.deprecation = :notify
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
+  config.log_formatter = Logger::Formatter.new
 
   # Use a different logger for distributed setups.
   # require 'syslog/logger'