Merge remote-tracking branch 'origin/master' into justin808/ci-docs-guard

* origin/master:
  Fix Knip configuration after monorepo restructure (#2041)
  Fix Pro package RuboCop violations (#2038)
  Fix CI to always run full test suite on master branch (#2035)

# Conflicts:
#	.github/workflows/examples.yml
#	.github/workflows/gem-tests.yml
#	.github/workflows/integration-tests.yml
#	.github/workflows/lint-js-and-ruby.yml
#	.github/workflows/package-js-tests.yml
#	.github/workflows/playwright.yml
#	.github/workflows/pro-integration-tests.yml
#	.github/workflows/pro-lint.yml
#	.github/workflows/pro-test-package-and-gem.yml

Author: justin808

.github/workflows/pro-lint.yml

@@ -65,7 +65,7 @@ jobs:
           docs-only: ${{ steps.detect.outputs.docs_only }}
           previous-sha: ${{ github.event.before }}
 
-  lint-js-and-ruby:
+  pro-lint-js-and-ruby:
     needs: detect-changes
     if: |
       !(
@@ -160,7 +160,7 @@ jobs:
         run: cd spec/dummy && bundle exec rake react_on_rails:generate_packs
 
       - name: Lint Ruby
-        run: bundle exec rubocop
+        run: bundle exec rubocop --ignore-parent-exclusion
 
       - name: Validate RBS type signatures
         run: bundle exec rake rbs:validate

.gitignore

@@ -20,16 +20,7 @@ tmp/
 
 node_modules
 
-/packages/*/lib
-
-# TypeScript build artifacts in src (shouldn't be there, but just in case)
-/packages/*/src/**/*.js
-/packages/*/src/**/*.d.ts
-/packages/*/src/**/*.d.cts
-/packages/*/src/**/*.cjs
-/packages/*/src/**/*.map
-!/packages/*/src/**/*.test.js
-!/packages/*/src/**/*.spec.js
+/node_package/lib
 
 yarn-debug.*
 yarn-error.*
@@ -75,8 +66,4 @@ ssr-generated
 
 # Claude Code local settings
 .claude/settings.local.json
-.claude/.fuse_hidden*
-
-# Playwright test artifacts (from cypress-on-rails gem)
-/spec/dummy/e2e/playwright-report/
-/spec/dummy/test-results/
+packages/

knip.ts

@@ -5,13 +5,11 @@ const config: KnipConfig = {
   workspaces: {
     // Root workspace - manages the monorepo and global tooling
     '.': {
-      entry: ['eslint.config.ts'],
+      entry: ['eslint.config.ts', 'jest.config.base.js'],
       project: ['*.{js,mjs,ts}'],
       ignoreBinaries: [
         // Has to be installed globally
         'yalc',
-        // Used in package.json scripts (devDependency, so unlisted in production mode)
-        'nps',
         // Pro package binaries used in Pro workflows
         'playwright',
         'e2e-test',
@@ -41,6 +39,17 @@ const config: KnipConfig = {
         // SWC transpiler dependencies used in dummy apps
         '@swc/core',
         'swc-loader',
+        // Test dependencies used by child workspaces (packages/react-on-rails, packages/react-on-rails-pro)
+        '@testing-library/dom',
+        '@testing-library/jest-dom',
+        '@testing-library/react',
+        '@types/react-dom',
+        'create-react-class',
+        'jest-fetch-mock',
+        'prop-types',
+        'react',
+        'react-dom',
+        'redux',
       ],
     },
 
@@ -89,6 +98,11 @@ const config: KnipConfig = {
         'src/RSCRoute.tsx:RSCRouteProps',
         'src/streamServerRenderedReactComponent.ts:StreamingTrackers',
       ],
+      ignoreDependencies: [
+        // Test dependencies used only in tests
+        '@types/mock-fs',
+        'mock-fs',
+      ],
     },
     'spec/dummy': {
       entry: [
@@ -124,9 +138,6 @@ const config: KnipConfig = {
         'bin/.*',
       ],
       ignoreDependencies: [
-        // Build-time dependencies not detected by Knip in any mode
-        '@babel/runtime',
-        'mini-css-extract-plugin',
         // There's no ReScript plugin for Knip
         '@rescript/react',
         // The Babel plugin fails to detect it
@@ -136,13 +147,10 @@ const config: KnipConfig = {
         'node-libs-browser',
         // The below dependencies are not detected by the Webpack plugin
         // due to the config issue.
-        'css-loader',
         'expose-loader',
         'file-loader',
         'imports-loader',
         'null-loader',
-        'sass',
-        'sass-loader',
         'sass-resources-loader',
         'style-loader',
         'url-loader',

react_on_rails_pro/lib/react_on_rails_pro/license_public_key.rb

@@ -16,15 +16,15 @@ module LicensePublicKey
     # 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

react_on_rails_pro/lib/react_on_rails_pro/request.rb

@@ -217,7 +217,7 @@ def common_form_data
         ReactOnRailsPro::Utils.common_form_data
       end
 
-      def create_connection
+      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}"
@@ -229,28 +229,37 @@ def create_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 teh 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: ->(request, response) do
-              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.\n" \
-                                              "Original error:\n#{e}\n#{e.backtrace}"
-              end
-
-              Rails.logger.info do
-                "[ReactOnRailsPro] An error happneding 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
+                      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

react_on_rails_pro/lib/react_on_rails_pro/stream_request.rb

@@ -51,23 +51,23 @@ def handle_chunk(chunk, position)
       end
     end
 
-    def each_chunk(&block)
+    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)
-        block.call(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)
-      block.call(last_chunk) unless last_chunk.empty?
-    rescue StandardError => err
-      current_error = err
+      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

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:

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 @@ def redis_receiver
     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
 

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

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

@@ -69,7 +69,7 @@
   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'