react_on_rails 16.2.0.beta.3 → 16.2.0.beta.4

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

@@ -11,7 +11,7 @@ def change_text_expect_dom_selector(dom_selector, expect_no_change: false)
     find("input").set new_text
     within("h3") do
       if expect_no_change
-        expect(subject).to have_no_content new_text
+        expect(subject).not_to have_content new_text
       else
         expect(subject).to have_content new_text
       end
@@ -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_link "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_link "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_link "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_link "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")
@@ -239,12 +239,12 @@ describe "async render function returns component", :js do
   end
 end
 
-describe "Manual client hydration", :js do
+describe "Manual client hydration", :js, type: :system do
   before { visit "/xhr_refresh" }
 
   it "HelloWorldRehydratable onChange should trigger" do
     within("form") do
-      click_button "refresh" # rubocop:disable Capybara/ClickLinkOrButtonStyle
+      click_button "refresh"
     end
     within("#HelloWorldRehydratable-react-component-1") do
       find("input").set "Should update"
@@ -396,20 +396,20 @@ 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)
 
-    expect(page).to have_no_text "Loading branch1"
-    expect(page).to have_no_text "Loading branch2"
-    expect(page).to have_no_text(/Loading branch1 at level \d+/)
+    expect(page).not_to have_text "Loading branch1"
+    expect(page).not_to have_text "Loading branch2"
+    expect(page).not_to have_text(/Loading branch1 at level \d+/)
     expect(page).to have_text(/branch1 \(level \d+\)/, count: 5)
   end
 
@@ -417,18 +417,17 @@ shared_examples "streamed component tests" do |path, selector|
     # visit waits for the page to load, so we ensure that the page is loaded before checking the hydration status
     visit "#{path}?skip_js_packs=true"
     expect(page).to have_text "HydrationStatus: Streaming server render"
-    expect(page).to have_no_text "HydrationStatus: Hydrated"
-    expect(page).to have_no_text "HydrationStatus: Page loaded"
+    expect(page).not_to have_text "HydrationStatus: Hydrated"
+    expect(page).not_to have_text "HydrationStatus: Page loaded"
   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"
 end

data/sig/react_on_rails/controller.rbs

@@ -5,7 +5,7 @@ module ReactOnRails
 
     def redux_store: (
       String store_name,
-      ?props: untyped,
+      ?props: Hash[Symbol, untyped] | String,
       ?immediate_hydration: bool
     ) -> void
 

data/sig/react_on_rails/error.rbs

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

data/sig/react_on_rails/helper.rbs

@@ -21,7 +21,7 @@ module ReactOnRails
     # Returns html_safe string (ActiveSupport::SafeBuffer)
     def redux_store: (
       String store_name,
-      ?Hash[Symbol, untyped] props
+      ?Hash[Symbol, untyped] | String props
     ) -> safe_buffer
 
     # Returns html_safe string (ActiveSupport::SafeBuffer)
@@ -33,7 +33,7 @@ module ReactOnRails
       ?Hash[Symbol, untyped] options
     ) -> safe_buffer
 
-    def sanitized_props_string: (untyped props) -> String
+    def sanitized_props_string: (Hash[Symbol, untyped] | String props) -> String
 
     def rails_context: (
       ?server_side: bool

data/sig/react_on_rails/json_parse_error.rbs

@@ -0,0 +1,10 @@
+module ReactOnRails
+  class JsonParseError < ::ReactOnRails::Error
+    attr_reader json: String
+
+    def initialize: (parse_error: StandardError, json: String) -> void
+    def to_honeybadger_context: () -> Hash[Symbol, untyped]
+    def raven_context: () -> Hash[Symbol, untyped]
+    def to_error_context: () -> Hash[Symbol, untyped]
+  end
+end

data/sig/react_on_rails/prerender_error.rbs

@@ -0,0 +1,21 @@
+module ReactOnRails
+  class PrerenderError < ::ReactOnRails::Error
+    MAX_ERROR_SNIPPET_TO_LOG: Integer
+
+    attr_reader component_name: String?
+    attr_reader err: StandardError?
+    attr_reader props: String?
+    attr_reader js_code: String?
+    attr_reader console_messages: String?
+
+    def initialize: (?component_name: String?, ?err: StandardError?, ?props: String?, ?js_code: String?, ?console_messages: String?) -> void
+    def to_honeybadger_context: () -> Hash[Symbol, untyped]
+    def raven_context: () -> Hash[Symbol, untyped]
+    def to_error_context: () -> Hash[Symbol, untyped]
+
+    private
+
+    def calc_message: (String? component_name, String? console_messages, StandardError? err, String? js_code, String? props) -> [String?, String]
+    def build_troubleshooting_suggestions: (String? component_name, StandardError? err, String? console_messages) -> String
+  end
+end

data/sig/react_on_rails/smart_error.rbs

@@ -0,0 +1,28 @@
+module ReactOnRails
+  class SmartError < Error
+    attr_reader error_type: Symbol
+    attr_reader component_name: String?
+    attr_reader props: String?
+    attr_reader js_code: String?
+    attr_reader additional_context: Hash[Symbol, untyped]
+
+    def initialize: (error_type: Symbol, ?component_name: String?, ?props: String?, ?js_code: String?, **untyped additional_context) -> void
+    def solution: () -> String
+
+    private
+
+    def build_error_message: () -> String
+    def error_type_title: () -> String
+    def error_description: () -> String
+    def component_not_registered_solution: () -> String
+    def missing_auto_loaded_bundle_solution: () -> String
+    def hydration_mismatch_solution: () -> String
+    def server_rendering_error_solution: () -> String
+    def redux_store_not_found_solution: () -> String
+    def configuration_error_solution: () -> String
+    def default_solution: () -> String
+    def additional_info: () -> String
+    def troubleshooting_section: () -> String
+    def find_similar_components: (String name) -> Array[String]
+  end
+end

data/sig/react_on_rails.rbs

@@ -9,30 +9,9 @@ module ReactOnRails
   def self.configure: () { (Configuration) -> void } -> void
   def self.configuration: () -> Configuration
 
+  # Error classes are defined in separate RBS files:
+  # - sig/react_on_rails/prerender_error.rbs
+  # - sig/react_on_rails/json_parse_error.rbs
   class Error < StandardError
   end
-
-  class PrerenderError < Error
-    attr_reader component_name: String?
-    attr_reader js_code: String?
-    attr_reader err: Hash[Symbol, untyped]?
-    attr_reader props: (Hash[Symbol, untyped] | String)?
-    attr_reader console_messages: Array[String]?
-
-    def initialize: (
-      ?component_name: String?,
-      ?js_code: String?,
-      ?err: Hash[Symbol, untyped]?,
-      ?props: (Hash[Symbol, untyped] | String)?,
-      ?console_messages: Array[String]?
-    ) -> void
-
-    def to_honeybadger_context: () -> Hash[Symbol, untyped]
-    def raven_context: () -> Hash[Symbol, untyped]
-    def to_error_context: () -> Hash[Symbol, untyped]
-  end
-
-  class JsonParseError < Error
-    def initialize: (Hash[Symbol, untyped] err) -> void
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 16.2.0.beta.3
+  version: 16.2.0.beta.4
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-11 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -137,6 +137,7 @@ files:
 - Rakefile
 - SUMMARY.md
 - SWITCHING_CI_CONFIGS.md
+- Steepfile
 - TODO.md
 - WARP.md
 - app/helpers/react_on_rails_helper.rb
@@ -243,7 +244,6 @@ files:
 - lib/react_on_rails/packs_generator.rb
 - lib/react_on_rails/prerender_error.rb
 - lib/react_on_rails/pro_helper.rb
-- lib/react_on_rails/pro_utils.rb
 - lib/react_on_rails/react_component/render_options.rb
 - lib/react_on_rails/server_rendering_js_code.rb
 - lib/react_on_rails/server_rendering_pool.rb
@@ -378,6 +378,7 @@ files:
 - react_on_rails_pro/packages/node-renderer/src/worker.ts
 - react_on_rails_pro/packages/node-renderer/src/worker/authHandler.ts
 - react_on_rails_pro/packages/node-renderer/src/worker/checkProtocolVersionHandler.ts
+- react_on_rails_pro/packages/node-renderer/src/worker/handleGracefulShutdown.ts
 - react_on_rails_pro/packages/node-renderer/src/worker/handleRenderRequest.ts
 - react_on_rails_pro/packages/node-renderer/src/worker/types.ts
 - react_on_rails_pro/packages/node-renderer/src/worker/vm.ts
@@ -430,6 +431,7 @@ files:
 - react_on_rails_pro/rakelib/dummy_apps.rake
 - react_on_rails_pro/rakelib/lint.rake
 - react_on_rails_pro/rakelib/public_key_management.rake
+- react_on_rails_pro/rakelib/rbs.rake
 - react_on_rails_pro/rakelib/run_rspec.rake
 - react_on_rails_pro/rakelib/task_helpers.rb
 - react_on_rails_pro/rakelib/yard.rake
@@ -439,6 +441,11 @@ files:
 - react_on_rails_pro/script/preinstall.js
 - react_on_rails_pro/script/setup
 - react_on_rails_pro/script/test
+- react_on_rails_pro/sig/react_on_rails_pro.rbs
+- react_on_rails_pro/sig/react_on_rails_pro/cache.rbs
+- react_on_rails_pro/sig/react_on_rails_pro/configuration.rbs
+- react_on_rails_pro/sig/react_on_rails_pro/error.rbs
+- react_on_rails_pro/sig/react_on_rails_pro/utils.rbs
 - react_on_rails_pro/spec/.rubocop.yml
 - react_on_rails_pro/spec/dummy/.browserslistrc
 - react_on_rails_pro/spec/dummy/.gitignore
@@ -966,10 +973,14 @@ files:
 - sig/react_on_rails.rbs
 - sig/react_on_rails/configuration.rbs
 - sig/react_on_rails/controller.rbs
+- sig/react_on_rails/error.rbs
 - sig/react_on_rails/git_utils.rbs
 - sig/react_on_rails/helper.rbs
+- sig/react_on_rails/json_parse_error.rbs
 - sig/react_on_rails/packer_utils.rbs
+- sig/react_on_rails/prerender_error.rbs
 - sig/react_on_rails/server_rendering_pool.rbs
+- sig/react_on_rails/smart_error.rbs
 - sig/react_on_rails/test_helper.rbs
 - sig/react_on_rails/utils.rbs
 - sig/react_on_rails/version_checker.rbs

data/lib/react_on_rails/pro_utils.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module ReactOnRails
-  module ProUtils
-    PRO_ONLY_OPTIONS = %i[immediate_hydration].freeze
-
-    # Checks if React on Rails Pro features are available
-    # @return [Boolean] true if Pro is installed and licensed, false otherwise
-    def self.support_pro_features?
-      ReactOnRails::Utils.react_on_rails_pro?
-    end
-
-    def self.disable_pro_render_options_if_not_licensed(raw_options)
-      if support_pro_features?
-        return {
-          raw_options: raw_options,
-          explicitly_disabled_pro_options: []
-        }
-      end
-
-      raw_options_after_disable = raw_options.dup
-
-      explicitly_disabled_pro_options = PRO_ONLY_OPTIONS.select do |option|
-        # Use global configuration if it's not overridden in the options
-        next ReactOnRails.configuration.send(option) if raw_options[option].nil?
-
-        raw_options[option]
-      end
-      explicitly_disabled_pro_options.each { |option| raw_options_after_disable[option] = false }
-
-      {
-        raw_options: raw_options_after_disable,
-        explicitly_disabled_pro_options: explicitly_disabled_pro_options
-      }
-    end
-  end
-end