react_on_rails 16.2.0.beta.3 → 16.2.0.beta.8

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/sig/react_on_rails_pro/cache.rbs

@@ -0,0 +1,13 @@
+module ReactOnRailsPro
+  class Cache
+    def self.fetch_react_component: (String component_name, Hash[Symbol, untyped] options) { () -> untyped } -> untyped
+
+    def self.use_cache?: (Hash[Symbol, untyped] options) -> bool
+
+    def self.base_cache_key: (String type, ?prerender: bool?) -> Array[String]
+
+    def self.dependencies_cache_key: () -> String?
+
+    def self.react_component_cache_key: (String component_name, Hash[Symbol, untyped] options) -> Array[untyped]
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro/configuration.rbs

@@ -0,0 +1,100 @@
+module ReactOnRailsPro
+  class Configuration
+    DEFAULT_RENDERER_URL: String
+    DEFAULT_RENDERER_METHOD: String
+    DEFAULT_RENDERER_FALLBACK_EXEC_JS: bool
+    DEFAULT_RENDERER_HTTP_POOL_SIZE: Integer
+    DEFAULT_RENDERER_HTTP_POOL_TIMEOUT: Integer
+    DEFAULT_RENDERER_HTTP_POOL_WARN_TIMEOUT: Float
+    DEFAULT_SSR_TIMEOUT: Integer
+    DEFAULT_PRERENDER_CACHING: bool
+    DEFAULT_TRACING: bool
+    DEFAULT_DEPENDENCY_GLOBS: Array[String]
+    DEFAULT_EXCLUDED_DEPENDENCY_GLOBS: Array[String]
+    DEFAULT_REMOTE_BUNDLE_CACHE_ADAPTER: nil
+    DEFAULT_RENDERER_REQUEST_RETRY_LIMIT: Integer
+    DEFAULT_THROW_JS_ERRORS: bool
+    DEFAULT_RENDERING_RETURNS_PROMISES: bool
+    DEFAULT_PROFILE_SERVER_RENDERING_JS_CODE: bool
+    DEFAULT_RAISE_NON_SHELL_SERVER_RENDERING_ERRORS: bool
+    DEFAULT_ENABLE_RSC_SUPPORT: bool
+    DEFAULT_RSC_PAYLOAD_GENERATION_URL_PATH: String
+    DEFAULT_RSC_BUNDLE_JS_FILE: String
+    DEFAULT_REACT_CLIENT_MANIFEST_FILE: String
+    DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE: String
+
+    attr_accessor renderer_url: String?
+    attr_accessor renderer_password: String?
+    attr_accessor tracing: bool?
+    attr_accessor server_renderer: String?
+    attr_accessor renderer_use_fallback_exec_js: bool?
+    attr_accessor prerender_caching: bool?
+    attr_accessor renderer_http_pool_size: Integer?
+    attr_accessor renderer_http_pool_timeout: Integer?
+    attr_accessor renderer_http_pool_warn_timeout: Float?
+    attr_accessor dependency_globs: Array[String]?
+    attr_accessor excluded_dependency_globs: Array[String]?
+    attr_accessor rendering_returns_promises: bool?
+    attr_accessor remote_bundle_cache_adapter: Module?
+    attr_accessor ssr_pre_hook_js: String?
+    attr_accessor assets_to_copy: Array[String]?
+    attr_accessor renderer_request_retry_limit: Integer?
+    attr_accessor throw_js_errors: bool?
+    attr_accessor ssr_timeout: Integer?
+    attr_accessor profile_server_rendering_js_code: bool?
+    attr_accessor raise_non_shell_server_rendering_errors: bool?
+    attr_accessor enable_rsc_support: bool?
+    attr_accessor rsc_payload_generation_url_path: String?
+    attr_accessor rsc_bundle_js_file: String?
+    attr_accessor react_client_manifest_file: String?
+    attr_accessor react_server_client_manifest_file: String?
+
+    def initialize: (
+      ?renderer_url: String?,
+      ?renderer_password: String?,
+      ?server_renderer: String?,
+      ?renderer_use_fallback_exec_js: bool?,
+      ?prerender_caching: bool?,
+      ?renderer_http_pool_size: Integer?,
+      ?renderer_http_pool_timeout: Integer?,
+      ?renderer_http_pool_warn_timeout: Float?,
+      ?tracing: bool?,
+      ?dependency_globs: Array[String]?,
+      ?excluded_dependency_globs: Array[String]?,
+      ?rendering_returns_promises: bool?,
+      ?remote_bundle_cache_adapter: Module?,
+      ?ssr_pre_hook_js: String?,
+      ?assets_to_copy: Array[String]?,
+      ?renderer_request_retry_limit: Integer?,
+      ?throw_js_errors: bool?,
+      ?ssr_timeout: Integer?,
+      ?profile_server_rendering_js_code: bool?,
+      ?raise_non_shell_server_rendering_errors: bool?,
+      ?enable_rsc_support: bool?,
+      ?rsc_payload_generation_url_path: String?,
+      ?rsc_bundle_js_file: String?,
+      ?react_client_manifest_file: String?,
+      ?react_server_client_manifest_file: String?
+    ) -> void
+
+    def setup_config_values: () -> void
+
+    def check_react_on_rails_support_for_rsc: () -> void
+
+    def setup_execjs_profiler_if_needed: () -> void
+
+    def node_renderer?: () -> bool
+
+    private
+
+    def setup_assets_to_copy: () -> void
+
+    def configure_default_url_if_not_provided: () -> void
+
+    def validate_url: () -> void
+
+    def validate_remote_bundle_cache_adapter: () -> void
+
+    def setup_renderer_password: () -> void
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro/error.rbs

@@ -0,0 +1,4 @@
+module ReactOnRailsPro
+  class Error < StandardError
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro/utils.rbs

@@ -0,0 +1,7 @@
+module ReactOnRailsPro
+  module Utils
+    def self.bundle_js_file_path: (String bundle_name) -> String
+
+    def self.running_on_windows?: () -> bool
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro.rbs

@@ -0,0 +1,5 @@
+module ReactOnRailsPro
+  def self.configure: () { (Configuration) -> void } -> void
+
+  def self.configuration: () -> Configuration
+end

data/react_on_rails_pro/spec/dummy/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ../../..
   specs:
-    react_on_rails (16.2.0.beta.3)
+    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.3)
+    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.3)
+      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)
@@ -327,6 +343,8 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
+    rbs (3.9.5)
+      logger
     rdoc (6.12.0)
       psych (>= 4.0.0)
     redis (5.4.0)
@@ -445,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)
@@ -524,6 +543,7 @@ DEPENDENCIES
   pry-theme
   puma (~> 6)
   rails (~> 7.1)
+  rbs
   react_on_rails!
   react_on_rails_pro!
   redis

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,11 +25,11 @@ 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
-  bundlePath: path.resolve(__dirname, '../.node-renderer-bundles'),
+  serverBundleCachePath: path.resolve(__dirname, '../.node-renderer-bundles'),
   port: env.RENDERER_PORT || 3800, // Listen at RENDERER_PORT env value or default port 3800
   logLevel: env.RENDERER_LOG_LEVEL || 'info',
 

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'

data/react_on_rails_pro/spec/dummy/config/initializers/react_on_rails.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-# For documentation of parameters see: docs/basics/configuration.md
+# ⚠️ TEST CONFIGURATION - Do not copy directly for production apps
+# This is the Pro dummy app configuration used for testing React on Rails Pro features.
+# See docs/api-reference/configuration.md for production configuration guidance.
+
+# Advanced: Custom rendering extension to add values to railsContext
 module RenderingExtension
-  # Return a Hash that contains custom values from the view context that will get passed to
-  # all calls to react_component and redux_store for rendering
   def self.custom_context(view_context)
     if view_context.controller.is_a?(ActionMailer::Base)
       {}
@@ -15,6 +17,7 @@ module RenderingExtension
   end
 end
 
+# Advanced: Custom props extension for client-side hydration
 module RenderingPropsExtension
   def self.adjust_props_for_client_side_hydration(_component_name, props)
     if props.instance_of?(Hash)
@@ -26,19 +29,32 @@ module RenderingPropsExtension
 end
 
 ReactOnRails.configure do |config|
+  ################################################################################
+  # Essential Configuration
+  ################################################################################
   config.server_bundle_js_file = "server-bundle.js"
+  config.components_subdirectory = "ror-auto-load-components"
+  config.auto_load_bundle = true
+
+  ################################################################################
+  # Pro Feature Testing: Server Bundle Security
+  ################################################################################
+  # Testing private server bundle enforcement (recommended for production)
+  config.enforce_private_server_bundles = true
+  config.server_bundle_output_path = "ssr-generated"
+
+  ################################################################################
+  # Test-specific Advanced Configuration
+  ################################################################################
+  # Testing with fixed DOM IDs for easier test assertions
   config.random_dom_id = false # default is true
 
-  # Next 2 lines are commented out because we've set test.compile to true
-  # config.build_test_command = "yarn run build:test"
-  # config.webpack_generated_files = %w[server-bundle.js manifest.json]
+  # Testing advanced rendering customization
   config.rendering_extension = RenderingExtension
-
   config.rendering_props_extension = RenderingPropsExtension
 
-  config.auto_load_bundle = true
-  config.components_subdirectory = "ror-auto-load-components"
-
-  config.enforce_private_server_bundles = true
-  config.server_bundle_output_path = "ssr-generated"
+  # NOTE: build_test_command and webpack_generated_files are commented out
+  # because we've set test.compile to true in shakapacker.yml
+  # config.build_test_command = "yarn run build:test"
+  # config.webpack_generated_files = %w[server-bundle.js manifest.json]
 end

data/react_on_rails_pro/spec/dummy/config.ru

@@ -2,6 +2,6 @@
 
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path("config/environment", __dir__)
+require File.expand_path("config/environment", __dir__)
 
 run Rails.application

data/react_on_rails_pro/spec/dummy/package.json

@@ -17,7 +17,7 @@
     "@loadable/server": "^5.16.2",
     "@loadable/webpack-plugin": "^5.15.2",
     "@sentry/node": "^7.120.0",
-    "@shakacode-tools/react-on-rails-pro-node-renderer": "link:.yalc/@shakacode-tools/react-on-rails-pro-node-renderer",
+    "react-on-rails-pro-node-renderer": "link:.yalc/react-on-rails-pro-node-renderer",
     "@shakacode/use-ssr-computation.macro": "^1.2.4",
     "@shakacode/use-ssr-computation.runtime": "^2.0.0",
     "@webpack-cli/serve": "^1.6.0",
@@ -98,7 +98,7 @@
     "test": "yarn run build:test && yarn run lint && rspec",
     "lint": "cd ../.. && nps lint",
     "e2e-test": "playwright test",
-    "preinstall": "yarn run link-source && yalc add --link react-on-rails-pro && cd .yalc/react-on-rails-pro && yalc add --link react-on-rails && cd ../.. && yalc add --link @shakacode-tools/react-on-rails-pro-node-renderer",
+    "preinstall": "yarn run link-source && yalc add --link react-on-rails-pro && cd .yalc/react-on-rails-pro && yalc add --link react-on-rails && cd ../.. && yalc add --link react-on-rails-pro-node-renderer",
     "link-source": "cd ../../.. && yarn && yarn run yalc:publish && cd react_on_rails_pro && yarn && yalc publish",
     "postinstall": "test -f post-yarn-install.local && ./post-yarn-install.local || true",
     "build:test": "rm -rf public/webpack/test && rm -rf ssr-generated && RAILS_ENV=test NODE_ENV=test bin/shakapacker",

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "async"
+require "async/queue"
 require "rails_helper"
 require "support/script_tag_utils"
 
@@ -327,10 +329,10 @@ describe ReactOnRailsProHelper do
       HTML
     end
 
+    # mock_chunks can be an Async::Queue or an Array
     def mock_request_and_response(mock_chunks = chunks, count: 1)
       # Reset connection instance variables to ensure clean state for tests
       ReactOnRailsPro::Request.instance_variable_set(:@connection, nil)
-      ReactOnRailsPro::Request.instance_variable_set(:@connection_without_retries, nil)
       original_httpx_plugin = HTTPX.method(:plugin)
       allow(HTTPX).to receive(:plugin) do |*args|
         original_httpx_plugin.call(:mock_stream).plugin(*args)
@@ -340,9 +342,19 @@ describe ReactOnRailsProHelper do
       chunks_read.clear
       mock_streaming_response(%r{http://localhost:3800/bundles/[a-f0-9]{32}-test/render/[a-f0-9]{32}}, 200,
                               count: count) do |yielder|
-        mock_chunks.each do |chunk|
-          chunks_read << chunk
-          yielder.call("#{chunk.to_json}\n")
+        if mock_chunks.is_a?(Async::Queue)
+          loop do
+            chunk = mock_chunks.dequeue
+            break if chunk.nil?
+
+            chunks_read << chunk
+            yielder.call("#{chunk.to_json}\n")
+          end
+        else
+          mock_chunks.each do |chunk|
+            chunks_read << chunk
+            yielder.call("#{chunk.to_json}\n")
+          end
         end
       end
     end
@@ -429,18 +441,35 @@ describe ReactOnRailsProHelper do
 
         allow(mocked_stream).to receive(:write) do |chunk|
           written_chunks << chunk
-          # Ensures that any chunk received is written immediately to the stream
-          expect(written_chunks.count).to eq(chunks_read.count) # rubocop:disable RSpec/ExpectInHook
         end
         allow(mocked_stream).to receive(:close)
         mocked_response = instance_double(ActionDispatch::Response)
         allow(mocked_response).to receive(:stream).and_return(mocked_stream)
         allow(self).to receive(:response).and_return(mocked_response)
-        mock_request_and_response
+      end
+
+      def execute_stream_view_containing_react_components
+        queue = Async::Queue.new
+        mock_request_and_response(queue)
+
+        Sync do |parent|
+          parent.async { stream_view_containing_react_components(template: template_path) }
+
+          chunks_to_write = chunks.dup
+          while (chunk = chunks_to_write.shift)
+            queue.enqueue(chunk)
+            sleep 0.05
+
+            # Ensures that any chunk received is written immediately to the stream
+            expect(written_chunks.count).to eq(chunks_read.count)
+          end
+          queue.close
+          sleep 0.05
+        end
       end
 
       it "writes the chunk to stream as soon as it is received" do
-        stream_view_containing_react_components(template: template_path)
+        execute_stream_view_containing_react_components
         expect(self).to have_received(:render_to_string).once.with(template: template_path)
         expect(chunks_read.count).to eq(chunks.count)
         expect(written_chunks.count).to eq(chunks.count)
@@ -449,7 +478,7 @@ describe ReactOnRailsProHelper do
       end
 
       it "prepends the rails context to the first chunk only" do
-        stream_view_containing_react_components(template: template_path)
+        execute_stream_view_containing_react_components
         initial_result = written_chunks.first
         expect(initial_result).to script_tag_be_included(rails_context_tag)
 
@@ -465,7 +494,7 @@ describe ReactOnRailsProHelper do
       end
 
       it "prepends the component specification tag to the first chunk only" do
-        stream_view_containing_react_components(template: template_path)
+        execute_stream_view_containing_react_components
         initial_result = written_chunks.first
         expect(initial_result).to script_tag_be_included(react_component_specification_tag)
 
@@ -476,7 +505,7 @@ describe ReactOnRailsProHelper do
       end
 
       it "renders the rails view content in the first chunk" do
-        stream_view_containing_react_components(template: template_path)
+        execute_stream_view_containing_react_components
         initial_result = written_chunks.first
         expect(initial_result).to include("<h1>Header Rendered In View</h1>")
         written_chunks[1..].each do |chunk|

data/react_on_rails_pro/spec/dummy/spec/rails_helper.rb

@@ -53,7 +53,7 @@ RSpec.configure do |config|
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   # For React on Rails Pro, using loadable-stats.json
-  config.fixture_paths = ["#{::Rails.root}/spec/fixtures"]
+  config.fixture_paths = ["#{Rails.root}/spec/fixtures"]
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

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

@@ -15,11 +15,11 @@ describe "Console logging from server" do
       html_nodes = Nokogiri::HTML(response.body)
       expected = <<~JS
         console.log.apply(console, ["[SERVER] RENDERED ReduxSharedStoreApp to dom node with id: ReduxSharedStoreApp-react-component-0"]);
-        console.log.apply(console, ["[SERVER] This is a script:\\\"</div>\\\"(/script> <script>alert('WTF1')(/script>"]);
-        console.log.apply(console, ["[SERVER] Script2:\\\"</div>\\\"(/script xx> <script>alert('WTF2')(/script xx>"]);
-        console.log.apply(console, ["[SERVER] Script3:\\\"</div>\\\"(/script xx> <script>alert('WTF3')(/script xx>"]);
-        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] This is a script:\\"</div>\\"(/script> <script>alert('WTF1')(/script>"]);
+        console.log.apply(console, ["[SERVER] Script2:\\"</div>\\"(/script xx> <script>alert('WTF2')(/script xx>"]);
+        console.log.apply(console, ["[SERVER] Script3:\\"</div>\\"(/script xx> <script>alert('WTF3')(/script xx>"]);
+        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"]);
       JS
 

data/react_on_rails_pro/spec/dummy/spec/system/integration_spec.rb

@@ -110,7 +110,7 @@ describe "Turbolinks across pages", :js do
   it "changes name in message according to input" do
     visit "/client_side_hello_world"
     change_text_expect_dom_selector("#HelloWorld-react-component-0")
-    click_link "Hello World Component Server Rendered, with extra options" # rubocop:disable Capybara/ClickLinkOrButtonStyle
+    click_on "Hello World Component Server Rendered, with extra options"
     change_text_expect_dom_selector("#my-hello-world-id")
   end
 end
@@ -174,19 +174,19 @@ describe "React Router", :js do
 
   before do
     visit "/"
-    click_link "React Router" # rubocop:disable Capybara/ClickLinkOrButtonStyle
+    click_on "React Router"
   end
 
   context "when rendering /react_router" do
     it { is_expected.to have_text("Woohoo, we can use react-router here!") }
 
     it "clicking links correctly renders other pages" do
-      click_link "Router First Page" # rubocop:disable Capybara/ClickLinkOrButtonStyle
+      click_on "Router First Page"
       expect(page).to have_current_path("/react_router/first_page")
       first_page_header_text = page.find(:css, "h2#first-page").text
       expect(first_page_header_text).to eq("React Router First Page")
 
-      click_link "Router Second Page" # rubocop:disable Capybara/ClickLinkOrButtonStyle
+      click_on "Router Second Page"
       expect(page).to have_current_path("/react_router/second_page")
       second_page_header_text = page.find(:css, "h2#second-page").text
       expect(second_page_header_text).to eq("React Router Second Page")
@@ -244,7 +244,7 @@ describe "Manual client hydration", :js do
 
   it "HelloWorldRehydratable onChange should trigger" do
     within("form") do
-      click_button "refresh" # rubocop:disable Capybara/ClickLinkOrButtonStyle
+      click_on "refresh"
     end
     within("#HelloWorldRehydratable-react-component-1") do
       find("input").set "Should update"
@@ -396,14 +396,14 @@ shared_examples "streamed component tests" do |path, selector|
 
   it "hydrates the component" do
     visit path
-    expect(page.html).to include("client-bundle.js")
+    expect(page.html).to match(/client-bundle[^"]*.js/)
     change_text_expect_dom_selector(selector)
   end
 
   it "renders the page completely on server and displays content on client even without JavaScript" do
     # Don't add client-bundle.js to the page to ensure that the app is not hydrated
     visit "#{path}?skip_js_packs=true"
-    expect(page.html).not_to include("client-bundle.js")
+    expect(page.html).not_to match(/client-bundle[^"]*.js/)
     # Ensure that the component state is not updated
     change_text_expect_dom_selector(selector, expect_no_change: true)
 
@@ -422,13 +422,18 @@ shared_examples "streamed component tests" do |path, selector|
   end
 end
 
-describe "Pages/stream_async_components_for_testing", :js,
-         skip: "Flaky test replaced by Playwright E2E tests in e2e-tests/streaming.spec.ts" do
+describe "Pages/stream_async_components_for_testing", :js do
   it_behaves_like "streamed component tests", "/stream_async_components_for_testing",
                   "#AsyncComponentsTreeForTesting-react-component-0"
 end
 
-describe "React Router Sixth Page", :js, skip: "Work in progress in another branch: justin808/fix-body-dup-retry" do
+describe "React Router Sixth Page", :js do
   it_behaves_like "streamed component tests", "/server_router/streaming-server-component",
                   "#ServerComponentRouter-react-component-0"
+
+  # Skip the test that fails without JavaScript - being addressed in another PR
+  it "renders the page completely on server and displays content on client even without JavaScript", # rubocop:disable RSpec/NoExpectationExample
+     skip: "Being addressed in another PR" do
+    # This test is overridden to skip it
+  end
 end

data/react_on_rails_pro/spec/dummy/spec/system/renderer_integration_spec.rb

@@ -9,14 +9,14 @@ describe "Shared Redux store example", :server_rendering do
 
   context "with enabled JS", :js do
     it "Has correct heading and text inside the text input" do
-      expect(page).to have_selector("h3", text: /\ARedux Hello, Mr. Server Side Rendering!\z/)
-      expect(page).to have_selector("input[type='text'][value='Mr. Server Side Rendering']")
+      expect(page).to have_css("h3", text: /\ARedux Hello, Mr. Server Side Rendering!\z/)
+      expect(page).to have_css("input[type='text'][value='Mr. Server Side Rendering']")
     end
 
     it "updates header in reaction to text input changes" do
       new_value = "new value"
       all("input[type='text']")[0].set(new_value)
-      expect(page).to have_selector("h3", text: /\ARedux Hello, #{new_value}!\z/)
+      expect(page).to have_css("h3", text: /\ARedux Hello, #{new_value}!\z/)
     end
   end
 end