react_on_rails 16.2.0.test.6 → 16.2.0.test.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96c65c2ad30fb286eb0f181994d7201f57a386c0370363f6d3356c7d2e9a1317
-  data.tar.gz: 83f9308811c6f328296ad9a68232a7b7fd104ff46857ea239c621cedc7e285f8
+  metadata.gz: 3f7e9fd77765f52ade236e021ec85676e820ec0a3579698d97dffc9351fc9f9d
+  data.tar.gz: 818fca7c6a6ea3571972b7a80af2c39c8551a0ee96c9f26a156585bdfcfda61d
 SHA512:
-  metadata.gz: 796d8a27960b07fe2234e19be037ccca56dd85d5aebe9153d59fd26a4a560c5f504d55e8f3984eee545fc5deb159154abe019eced470da28c037352d45c19af9
-  data.tar.gz: 9ed658b9e921a68ab1dad98d01a9197b3c15b96bd634f4973f781682243f2b7da641c0efb8372bcae52a1976676f209b9d41e37ee70daadb40b9bd691b3cfe0f
+  metadata.gz: b74d821039717f5396a474b0b580536321fbe3c8f1d63ca6bdb209a31232ce2e2b8dc104a57a18937ba11ddd4738e3e538c55e97549257c7f1535449cc244329
+  data.tar.gz: ab07b316a31ca4ba7e20ffa9b4c8d15b0614217ee2685b047f2e88756c98c15486d46bee0c4560821d46c6579a1d2f2cd736e8e73be414f5742e8db41d5fae3f

data/.rubocop.yml

@@ -1,36 +1,16 @@
-# This is the configuration used to check the rubocop source code.
-# Check out: https://github.com/bbatsov/rubocop
-require:
-  - rubocop-performance
-  - rubocop-rspec
+# Inherits from root config
+inherit_from: ../.rubocop.yml
+
+# Merge Exclude arrays with parent instead of replacing them
+inherit_mode:
+  merge:
+    - Exclude
 
 AllCops:
-  NewCops: enable
-  DisplayCopNames: true
-  TargetRubyVersion: 3.0.0
   SuggestExtensions: false
 
-  Include:
-    - '**/Rakefile'
-    - '**/config.ru'
-    - 'Gemfile'
-    - '**/*.rb'
-    - '**/*.rake'
-
   Exclude:
-    - '**/*.js'
-    - '**/node_modules/**/*'
-    - '**/public/**/*'
-    - '**/tmp/**/*'
-    - 'coverage/**/*'
-    - 'gen-examples/examples/**/*'
-    - 'node_modules/**/*'
-    - '../react_on_rails_pro/**/*'  # Exclude pro package (has its own linting)
     - 'spec/dummy/bin/*'
-    - 'spec/fixtures/**/*'
-    - 'spec/react_on_rails/dummy-for-generators/**/*'
-    - 'tmp/**/*'
-    - 'vendor/**/*'
 
 Naming/FileName:
   Exclude:
@@ -38,24 +18,6 @@ Naming/FileName:
     - '**/Rakefile'
     - '**/Steepfile'
 
-Layout/LineLength:
-  Max: 120
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/Documentation:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
 Lint/AssignmentInCondition:
   Exclude:
     - 'spec/dummy/bin/spring'
@@ -66,33 +28,19 @@ Lint/SuppressedException:
     - 'spec/dummy/bin/rake'
 
 Metrics/AbcSize:
-  Max: 28
   Exclude:
     - 'lib/generators/react_on_rails/install_generator.rb'  # Generator setup methods require comprehensive error handling
 
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-Metrics/PerceivedComplexity:
-  Max: 10
-
 Metrics/ClassLength:
-  Max: 150
   Exclude:
     - 'lib/generators/react_on_rails/base_generator.rb'  # Generator complexity justified
     - 'lib/react_on_rails/dev/server_manager.rb'  # Dev tool with comprehensive help system
 
-Metrics/ParameterLists:
-  Max: 5
-  CountKeywordArgs: false
-
 Metrics/MethodLength:
-  Max: 41
   Exclude:
     - 'lib/generators/react_on_rails/install_generator.rb'  # Generator setup methods require comprehensive error handling
 
 Metrics/ModuleLength:
-  Max: 180
   Exclude:
     - 'spec/react_on_rails/engine_spec.rb'  # Comprehensive engine tests require many examples
 
@@ -107,18 +55,6 @@ RSpec/AnyInstance:
     - 'spec/react_on_rails/binstubs/dev_static_spec.rb'
     - 'spec/react_on_rails/dev/**/*_spec.rb'  # Dev module tests require system mocking
 
-RSpec/DescribeClass:
-  Enabled: false
-
-RSpec/ExampleLength:
-  Enabled: false
-
-RSpec/MessageSpies:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Max: 4
-
 RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/react_on_rails/generators/dev_tests_generator_spec.rb'
@@ -127,19 +63,10 @@ RSpec/BeforeAfterAll:
     - 'spec/react_on_rails/binstubs/dev_static_spec.rb'
     - 'spec/react_on_rails/dev/**/*_spec.rb'  # Dev module tests require global setup
 
-RSpec/MessageChain:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
 RSpec/MultipleDescribes:
   Exclude:
     - 'spec/dummy/spec/system/integration_spec.rb'
 
-RSpec/MultipleMemoizedHelpers:
-  Max: 12
-
 Style/GlobalVars:
   Exclude:
     - 'spec/dummy/config/environments/development.rb'
@@ -156,4 +83,3 @@ RSpec/InstanceVariable:
 RSpec/StubbedMock:
   Exclude:
     - 'spec/react_on_rails/dev/**/*_spec.rb'  # Dev module tests use mixed stub/mock patterns
-

data/Gemfile.development_dependencies

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+eval_gemfile File.expand_path("../Gemfile.shared_dev_dependencies", __dir__)
+
 gem "shakapacker", "9.4.0"
 gem "bootsnap", require: false
 gem "rails", "~> 7.1"
@@ -35,9 +37,6 @@ group :development, :test do
   gem "pry-rescue"
   gem "rbs", require: false
   gem "steep", require: false
-  gem "rubocop", "1.61.0", require: false
-  gem "rubocop-performance", "~>1.20.0", require: false
-  gem "rubocop-rspec", "~>2.26", require: false
   gem "spring", "~> 4.0"
   gem "lefthook", require: false
   # Added for Ruby 3.5+ compatibility to silence warnings

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.2.0.test.6)
+    react_on_rails (16.2.0.test.7)
       addressable
       connection_pool
       execjs (~> 2.5)

data/lib/generators/react_on_rails/dev_tests_generator.rb

@@ -31,7 +31,8 @@ module ReactOnRails
 
       def add_test_related_gems_to_gemfile
         gem("rspec-rails", group: :test)
-        gem("chromedriver-helper", group: :test)
+        # NOTE: chromedriver-helper was deprecated in 2019. Modern selenium-webdriver (4.x)
+        # and GitHub Actions have built-in driver management, so no driver helper is needed.
         gem("coveralls", require: false)
       end
 

data/lib/generators/react_on_rails/generator_helper.rb

@@ -124,4 +124,75 @@ module GeneratorHelper
       true
     end
   end
+
+  # Check if SWC is configured as the JavaScript transpiler in shakapacker.yml
+  #
+  # @return [Boolean] true if SWC is configured or should be used by default
+  #
+  # Detection logic:
+  # 1. If shakapacker.yml exists and specifies javascript_transpiler: parse it
+  # 2. For Shakapacker 9.3.0+, SWC is the default if not specified
+  # 3. Returns true for fresh installations (SWC is recommended default)
+  #
+  # @note This method is used to determine whether to install SWC dependencies
+  #   (@swc/core, swc-loader) instead of Babel dependencies during generation.
+  #
+  # @note Caching: The result is memoized for the lifetime of the generator instance.
+  #   If shakapacker.yml changes during generator execution (unlikely), the cached
+  #   value will not update. This is acceptable since generators run quickly.
+  def using_swc?
+    return @using_swc if defined?(@using_swc)
+
+    @using_swc = detect_swc_configuration
+  end
+
+  private
+
+  def detect_swc_configuration
+    shakapacker_yml_path = File.join(destination_root, "config/shakapacker.yml")
+
+    if File.exist?(shakapacker_yml_path)
+      config = parse_shakapacker_yml(shakapacker_yml_path)
+      transpiler = config.dig("default", "javascript_transpiler")
+
+      # Explicit configuration takes precedence
+      return transpiler == "swc" if transpiler
+
+      # For Shakapacker 9.3.0+, SWC is the default
+      return shakapacker_version_9_3_or_higher?
+    end
+
+    # Fresh install: SWC is recommended default for Shakapacker 9.3.0+
+    shakapacker_version_9_3_or_higher?
+  end
+
+  def parse_shakapacker_yml(path)
+    require "yaml"
+    # Use safe_load_file for security (defense-in-depth, even though this is user's own config)
+    # permitted_classes: [Symbol] allows symbol keys which shakapacker.yml may use
+    # aliases: true allows YAML anchors (&default, *default) commonly used in Rails configs
+    YAML.safe_load_file(path, permitted_classes: [Symbol], aliases: true)
+  rescue ArgumentError
+    # Older Psych versions don't support all parameters - try without aliases
+    begin
+      YAML.safe_load_file(path, permitted_classes: [Symbol])
+    rescue ArgumentError
+      # Very old Psych - fall back to safe_load with File.read
+      YAML.safe_load(File.read(path), permitted_classes: [Symbol]) # rubocop:disable Style/YAMLFileRead
+    end
+  rescue StandardError
+    # If we can't parse the file, return empty config
+    {}
+  end
+
+  # Check if Shakapacker 9.3.0 or higher is available
+  # This version made SWC the default JavaScript transpiler
+  def shakapacker_version_9_3_or_higher?
+    return true unless defined?(ReactOnRails::PackerUtils)
+
+    ReactOnRails::PackerUtils.shakapacker_version_requirement_met?("9.3.0")
+  rescue StandardError
+    # If we can't determine version, assume latest (which uses SWC)
+    true
+  end
 end

data/lib/generators/react_on_rails/js_dependency_manager.rb

@@ -99,6 +99,13 @@ module ReactOnRails
         @types/react-dom
       ].freeze
 
+      # SWC transpiler dependencies (for Shakapacker 9.3.0+ default transpiler)
+      # SWC is ~20x faster than Babel and is the default for new Shakapacker installations
+      SWC_DEPENDENCIES = %w[
+        @swc/core
+        swc-loader
+      ].freeze
+
       private
 
       def setup_js_dependencies
@@ -118,6 +125,8 @@ module ReactOnRails
         add_css_dependencies
         # Rspack dependencies are only added when --rspack flag is used
         add_rspack_dependencies if respond_to?(:options) && options&.rspack?
+        # SWC dependencies are only added when SWC is the configured transpiler
+        add_swc_dependencies if using_swc?
         # Dev dependencies vary based on bundler choice
         add_dev_dependencies
       end
@@ -232,6 +241,26 @@ module ReactOnRails
         MSG
       end
 
+      def add_swc_dependencies
+        puts "Installing SWC transpiler dependencies (20x faster than Babel)..."
+        return if add_packages(SWC_DEPENDENCIES, dev: true)
+
+        GeneratorMessages.add_warning(<<~MSG.strip)
+          ⚠️  Failed to add SWC dependencies.
+
+          SWC is the default JavaScript transpiler for Shakapacker 9.3.0+.
+          You can install them manually by running:
+            npm install --save-dev #{SWC_DEPENDENCIES.join(' ')}
+        MSG
+      rescue StandardError => e
+        GeneratorMessages.add_warning(<<~MSG.strip)
+          ⚠️  Error adding SWC dependencies: #{e.message}
+
+          You can install them manually by running:
+            npm install --save-dev #{SWC_DEPENDENCIES.join(' ')}
+        MSG
+      end
+
       def add_typescript_dependencies
         puts "Installing TypeScript dependencies..."
         return if add_packages(TYPESCRIPT_DEPENDENCIES, dev: true)

data/lib/generators/react_on_rails/templates/base/base/bin/switch-bundler

@@ -61,7 +61,6 @@ class BundlerSwitcher
     puts "✅ Updated assets_bundler to '#{@target_bundler}'"
   end
 
-  # rubocop:disable Metrics/CyclomaticComplexity
   def update_dependencies
     puts "📦 Updating package.json dependencies..."
 
@@ -86,9 +85,7 @@ class BundlerSwitcher
     puts "✅ Removed #{@target_bundler == 'rspack' ? 'webpack' : 'rspack'} dependencies"
     File.write(package_json_path, JSON.pretty_generate(package_json))
   end
-  # rubocop:enable Metrics/CyclomaticComplexity
 
-  # rubocop:disable Metrics/CyclomaticComplexity
   def install_dependencies
     puts "📥 Installing #{@target_bundler} dependencies..."
 
@@ -123,7 +120,6 @@ class BundlerSwitcher
 
     puts "✅ Installed #{@target_bundler} dependencies"
   end
-  # rubocop:enable Metrics/CyclomaticComplexity
 
   def detect_package_manager
     return "yarn" if File.exist?("yarn.lock")

data/lib/react_on_rails/doctor.rb

@@ -468,7 +468,6 @@ module ReactOnRails
       check_npm_wildcards
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def check_gem_wildcards
       gemfile_path = ENV["BUNDLE_GEMFILE"] || "Gemfile"
       return unless File.exist?(gemfile_path)
@@ -490,9 +489,7 @@ module ReactOnRails
         # Ignore errors reading Gemfile
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def check_npm_wildcards
       return unless File.exist?("package.json")
 
@@ -514,7 +511,6 @@ module ReactOnRails
         # Ignore other errors
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     def check_key_configuration_files
       files_to_check = {
@@ -538,7 +534,6 @@ module ReactOnRails
       check_server_rendering_engine
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def check_layout_files
       layout_files = Dir.glob("app/views/layouts/**/*.erb")
       return if layout_files.empty?
@@ -565,7 +560,6 @@ module ReactOnRails
         end
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     # rubocop:disable Metrics/CyclomaticComplexity
     def check_server_rendering_engine
@@ -603,7 +597,6 @@ module ReactOnRails
     end
     # rubocop:enable Metrics/CyclomaticComplexity
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def check_shakapacker_configuration_details
       return unless File.exist?("config/shakapacker.yml")
 
@@ -632,7 +625,6 @@ module ReactOnRails
         checker.add_warning("  ⚠️  Could not run 'rake shakapacker:info': #{e.message}")
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     def check_react_on_rails_configuration_details
       check_react_on_rails_initializer

data/lib/react_on_rails/git_utils.rb

@@ -5,7 +5,9 @@ require "English"
 module ReactOnRails
   module GitUtils
     def self.uncommitted_changes?(message_handler, git_installed: true)
-      return false if ENV["COVERAGE"] == "true"
+      # Skip check in CI environments - CI often makes temporary modifications
+      # (e.g., script/convert for minimum version testing) before running generators
+      return false if ENV["CI"] == "true" || ENV["COVERAGE"] == "true"
 
       status = `git status --porcelain`
       return false if git_installed && status&.empty?

data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -9,11 +9,10 @@ module ReactOnRails
     class RubyEmbeddedJavaScript
       class << self
         def reset_pool
-          options = {
+          @js_context_pool = ConnectionPool.new(
             size: ReactOnRails.configuration.server_renderer_pool_size,
             timeout: ReactOnRails.configuration.server_renderer_timeout
-          }
-          @js_context_pool = ConnectionPool.new(options) { create_js_context }
+          ) { create_js_context }
         end
 
         def reset_pool_if_server_bundle_was_modified
@@ -50,7 +49,6 @@ module ReactOnRails
         # Note, js_code does not have to be based on React.
         # js_code MUST RETURN json stringify Object
         # Calling code will probably call 'html_safe' on return value before rendering to the view.
-        # rubocop:disable Metrics/CyclomaticComplexity
         def exec_server_render_js(js_code, render_options, js_evaluator = nil)
           js_evaluator ||= self
           if render_options.trace
@@ -87,7 +85,6 @@ module ReactOnRails
           # We need to parse each chunk and replay the console messages.
           result.transform { |chunk| parse_result_and_replay_console_messages(chunk, render_options) }
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         def trace_js_code_used(msg, js_code, file_name = "tmp/server-generated.js", force: false)
           return unless ReactOnRails.configuration.trace || force

data/lib/react_on_rails/system_checker.rb

@@ -203,7 +203,7 @@ module ReactOnRails
       add_warning("⚠️  Could not parse package.json")
     end
 
-    def check_package_version_sync # rubocop:disable Metrics/CyclomaticComplexity
+    def check_package_version_sync
       return unless File.exist?("package.json")
 
       begin
@@ -540,7 +540,6 @@ module ReactOnRails
       MSG
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def check_gemfile_version_patterns
       gemfile_path = ENV["BUNDLE_GEMFILE"] || "Gemfile"
       return unless File.exist?(gemfile_path)
@@ -571,9 +570,7 @@ module ReactOnRails
         # Ignore errors reading Gemfile
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def report_dependency_versions(package_json)
       all_deps = package_json["dependencies"]&.merge(package_json["devDependencies"] || {}) || {}
 
@@ -590,7 +587,6 @@ module ReactOnRails
         add_success("✅ React DOM #{react_dom_version}")
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     def report_shakapacker_version
       return unless File.exist?("Gemfile.lock")

data/lib/react_on_rails/utils.rb

@@ -98,9 +98,12 @@ module ReactOnRails
           exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
         MSG
 
-        puts wrap_message(msg)
-        puts ""
-        puts default_troubleshooting_section
+        # Use warn to ensure output is visible in CI logs (goes to stderr)
+        # and flush immediately before calling exit!
+        warn wrap_message(msg)
+        warn ""
+        warn default_troubleshooting_section
+        $stderr.flush
 
         # Rspec catches exit without! in the exit callbacks
         exit!(1)
@@ -467,7 +470,6 @@ module ReactOnRails
     #
     # @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?
 
@@ -495,7 +497,6 @@ module ReactOnRails
         path_str
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     def self.default_troubleshooting_section
       <<~DEFAULT

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "16.2.0.test.6"
+  VERSION = "16.2.0.test.7"
 end

data/lib/react_on_rails/version_checker.rb

@@ -338,7 +338,6 @@ module ReactOnRails
       private
 
       # Resolve version from lockfiles if available, otherwise use package.json version
-      # rubocop:disable Metrics/CyclomaticComplexity
       def resolve_version(package_json_version, package_name)
         # If package.json specifies a local path or URL, don't try to resolve from lockfiles
         # Lockfiles may contain placeholder versions like "0.0.0" for local links
@@ -359,7 +358,6 @@ module ReactOnRails
         # Fall back to package.json version
         package_json_version
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
 
       # Check if a version string represents a local path or URL
       def local_path_or_url_version?(version)

data/rakelib/example_type.rb

@@ -14,12 +14,49 @@ module ReactOnRails
         @all ||= { shakapacker_examples: [] }
       end
 
-      attr_reader :packer_type, :name, :generator_options
+      # Supported React versions for compatibility testing
+      # Keys are major version strings, values are specific version to pin to (nil = latest)
+      REACT_VERSIONS = {
+        "16" => "16.14.0",
+        "17" => "17.0.2",
+        "18" => "18.0.0",
+        "19" => nil # nil means use latest (default)
+      }.freeze
+
+      # Supported React major versions (we test with latest patch of each)
+      MINIMUM_SUPPORTED_REACT_MAJOR_VERSION = "16"
+      LATEST_REACT_MAJOR_VERSION = "19"
+
+      # Minimum Shakapacker version for compatibility testing
+      MINIMUM_SHAKAPACKER_VERSION = "8.2.0"
+
+      attr_reader :packer_type, :name, :generator_options, :react_version
+
+      # Returns true if this example uses a pinned (non-latest) React version
+      def pinned_react_version?
+        !react_version.nil?
+      end
+
+      # Returns the actual React version string to use
+      def react_version_string
+        return nil unless react_version
+
+        REACT_VERSIONS[react_version.to_s] || react_version
+      end
 
-      def initialize(packer_type: nil, name: nil, generator_options: nil)
+      def initialize(packer_type: nil, name: nil, generator_options: nil, react_version: nil)
         @packer_type = packer_type
         @name = name
         @generator_options = generator_options
+        @react_version = react_version
+
+        # Validate react_version is a known version to catch configuration errors early
+        if @react_version && !REACT_VERSIONS.key?(@react_version.to_s)
+          valid_versions = REACT_VERSIONS.keys.join(", ")
+          raise ArgumentError, "Invalid react_version '#{@react_version}' for example '#{name}'. " \
+                               "Valid versions: #{valid_versions}"
+        end
+
         self.class.all[packer_type.to_sym] << self
       end
 

data/rakelib/examples_config.yml

@@ -1,4 +1,23 @@
+# Example Type Configuration for React on Rails Generator Tests
+#
+# CI Test Coverage:
+# -----------------
+# - Latest CI (all PRs): Runs shakapacker_examples_latest (React 19, Shakapacker 9.x)
+#                        Examples: basic, basic-server-rendering, redux, redux-server-rendering
+#
+# - Pinned CI (master):  Runs shakapacker_examples_pinned (React 16, 17, 18 with Shakapacker 8.2.0)
+#                        Examples: basic-react16, basic-server-rendering-react16,
+#                                  basic-react17, basic-server-rendering-react17,
+#                                  basic-react18, basic-server-rendering-react18
+#
+# Terminology:
+# - "Latest" = Current React version (19) with latest Shakapacker (9.x)
+# - "Pinned" = Specific older React versions (16, 17, 18) for backward compatibility testing
+#
+# Note: We support React 16+ but test with latest patch of each major version.
+
 example_type_data:
+  # Latest versions (React 19, Shakapacker 9.x)
   - name: basic
     generator_options: ''
   - name: basic-server-rendering
@@ -7,3 +26,27 @@ example_type_data:
     generator_options: --redux
   - name: redux-server-rendering
     generator_options: --redux --example-server-rendering
+
+  # React 18 compatibility tests (uses Root API introduced in React 18)
+  - name: basic-react18
+    generator_options: ''
+    react_version: '18'
+  - name: basic-server-rendering-react18
+    generator_options: --example-server-rendering
+    react_version: '18'
+
+  # React 17 compatibility tests (legacy render/hydrate API)
+  - name: basic-react17
+    generator_options: ''
+    react_version: '17'
+  - name: basic-server-rendering-react17
+    generator_options: --example-server-rendering
+    react_version: '17'
+
+  # React 16 compatibility tests (oldest supported legacy API)
+  - name: basic-react16
+    generator_options: ''
+    react_version: '16'
+  - name: basic-server-rendering-react16
+    generator_options: --example-server-rendering
+    react_version: '16'

data/rakelib/run_rspec.rake

@@ -82,7 +82,10 @@ namespace :run_rspec do
     puts "Creating #{example_type.rspec_task_name} task"
     desc "Runs RSpec for #{example_type.name_pretty} only"
     task example_type.rspec_task_name_short => example_type.gen_task_name do
-      run_tests_in(File.join(examples_dir, example_type.name)) # have to use relative path
+      # Use unbundled mode for pinned React version examples to ensure the example app's
+      # Gemfile and gem versions are used, not the parent workspace's bundle
+      run_tests_in(File.join(examples_dir, example_type.name),
+                   unbundled: example_type.pinned_react_version?)
     end
   end
 
@@ -91,6 +94,52 @@ namespace :run_rspec do
     ExampleType.all[:shakapacker_examples].each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
   end
 
+  # Helper methods for filtering examples by React version
+  def latest_examples
+    ExampleType.all[:shakapacker_examples].reject(&:pinned_react_version?)
+  end
+
+  def react18_examples
+    ExampleType.all[:shakapacker_examples].select { |e| e.react_version == "18" }
+  end
+
+  def react17_examples
+    ExampleType.all[:shakapacker_examples].select { |e| e.react_version == "17" }
+  end
+
+  def react16_examples
+    ExampleType.all[:shakapacker_examples].select { |e| e.react_version == "16" }
+  end
+
+  def pinned_version_examples
+    ExampleType.all[:shakapacker_examples].select(&:pinned_react_version?)
+  end
+
+  desc "Runs Rspec for latest version example apps only (React 19, Shakapacker 9.x)"
+  task shakapacker_examples_latest: latest_examples.map(&:gen_task_name) do
+    latest_examples.each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
+  end
+
+  desc "Runs Rspec for React 18 example apps only (Shakapacker 8.2.0)"
+  task shakapacker_examples_react18: react18_examples.map(&:gen_task_name) do
+    react18_examples.each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
+  end
+
+  desc "Runs Rspec for React 17 example apps only (legacy render API)"
+  task shakapacker_examples_react17: react17_examples.map(&:gen_task_name) do
+    react17_examples.each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
+  end
+
+  desc "Runs Rspec for React 16 example apps only (oldest supported legacy API)"
+  task shakapacker_examples_react16: react16_examples.map(&:gen_task_name) do
+    react16_examples.each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
+  end
+
+  desc "Runs Rspec for all pinned version example apps (React 16, 17, and 18)"
+  task shakapacker_examples_pinned: pinned_version_examples.map(&:gen_task_name) do
+    pinned_version_examples.each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
+  end
+
   Coveralls::RakeTask.new if ENV["USE_COVERALLS"] == "TRUE"
 
   desc "run all tests no examples"
@@ -139,11 +188,23 @@ end
 # If string is passed and it's not absolute, it's converted relative to root of the gem.
 # TEST_ENV_COMMAND_NAME is used to make SimpleCov.command_name unique in order to
 # prevent a name collision. Defaults to the given directory's name.
+# Options:
+#   :command_name - name for SimpleCov (default: dir basename)
+#   :rspec_args - additional rspec arguments (default: "")
+#   :env_vars - additional environment variables (default: "")
+#   :unbundled - run with unbundled_sh_in_dir for Bundler isolation (default: false)
+#                This is required for pinned version examples because they have different
+#                gem versions (e.g., Shakapacker 8.2.0) pinned in their Gemfile than the
+#                parent workspace (Shakapacker 9.x). Without bundle isolation, Bundler
+#                would inherit the parent's gem resolution and use the wrong versions.
+#                Latest version examples don't need this because they use the same versions
+#                as the parent workspace.
 def run_tests_in(dir, options = {})
   path = calc_path(dir)
 
   command_name = options.fetch(:command_name, path.basename)
   rspec_args = options.fetch(:rspec_args, "")
+  unbundled = options.fetch(:unbundled, false)
 
   # Build environment variables as an array for proper spacing
   env_tokens = []
@@ -152,5 +213,11 @@ def run_tests_in(dir, options = {})
   env_tokens << "COVERAGE=true" if ENV["USE_COVERALLS"]
 
   env_vars = env_tokens.join(" ")
-  sh_in_dir(path.realpath, "#{env_vars} bundle exec rspec #{rspec_args}")
+  command = "#{env_vars} bundle exec rspec #{rspec_args}"
+
+  if unbundled
+    unbundled_sh_in_dir(path.realpath, command)
+  else
+    sh_in_dir(path.realpath, command)
+  end
 end

data/rakelib/shakapacker_examples.rake

@@ -8,6 +8,7 @@
 require "yaml"
 require "rails/version"
 require "pathname"
+require "json"
 
 require_relative "example_type"
 require_relative "task_helpers"
@@ -15,8 +16,89 @@ require_relative "task_helpers"
 namespace :shakapacker_examples do # rubocop:disable Metrics/BlockLength
   include ReactOnRails::TaskHelpers
 
+  # Updates React-related dependencies to a specific version
+  def update_react_dependencies(deps, react_version)
+    return unless deps
+
+    deps["react"] = react_version
+    deps["react-dom"] = react_version
+  end
+
+  # Updates Shakapacker to minimum supported version in either dependencies or devDependencies
+  def update_shakapacker_dependency(deps, dev_deps)
+    if dev_deps&.key?("shakapacker")
+      dev_deps["shakapacker"] = ExampleType::MINIMUM_SHAKAPACKER_VERSION
+    elsif deps&.key?("shakapacker")
+      deps["shakapacker"] = ExampleType::MINIMUM_SHAKAPACKER_VERSION
+    end
+  end
+
+  # Updates dependencies in package.json to use specific React version
+  def update_package_json_for_react_version(package_json_path, react_version)
+    return unless File.exist?(package_json_path)
+
+    begin
+      package_json = JSON.parse(File.read(package_json_path))
+    rescue JSON::ParserError => e
+      puts "  ERROR: Failed to parse #{package_json_path}: #{e.message}"
+      raise
+    end
+
+    deps = package_json["dependencies"]
+    dev_deps = package_json["devDependencies"]
+
+    update_react_dependencies(deps, react_version)
+    # Shakapacker 8.2.0 requires webpack-assets-manifest ^5.x (v6.x uses ESM and breaks)
+    # Always add this explicitly since the transitive dependency from shakapacker may be v6.x
+    dev_deps["webpack-assets-manifest"] = "^5.0.6" if dev_deps
+    # Shakapacker 8.2.0 requires babel-loader to be explicitly installed as a devDependency
+    # (in 9.x this requirement was relaxed or the package structure changed)
+    dev_deps["babel-loader"] = "^9.1.3" if dev_deps
+    # @babel/plugin-transform-runtime is required by the default babel config but not
+    # automatically included as a dependency in older Shakapacker versions
+    dev_deps["@babel/plugin-transform-runtime"] = "^7.24.0" if dev_deps
+    update_shakapacker_dependency(deps, dev_deps)
+
+    # Add npm overrides to force specific React version, preventing yalc-linked
+    # react-on-rails from pulling in React 19 as a transitive dependency
+    package_json["overrides"] = {
+      "react" => react_version,
+      "react-dom" => react_version
+    }
+
+    File.write(package_json_path, "#{JSON.pretty_generate(package_json)}\n")
+  end
+
+  # Updates Gemfile to pin shakapacker to minimum version
+  # (must match the npm package version exactly)
+  def update_gemfile_versions(gemfile_path)
+    return unless File.exist?(gemfile_path)
+
+    gemfile_content = File.read(gemfile_path)
+    # Replace any shakapacker gem line with exact version pin
+    # Handle both single-line: gem 'shakapacker', '>= 8.2.0'
+    # And multi-line declarations:
+    #   gem 'shakapacker',
+    #       '>= 8.2.0'
+    gemfile_content = gemfile_content.gsub(
+      /gem ['"]shakapacker['"][^\n]*(?:\n\s+[^g\n][^\n]*)*$/m,
+      "gem 'shakapacker', '#{ExampleType::MINIMUM_SHAKAPACKER_VERSION}'"
+    )
+    File.write(gemfile_path, gemfile_content)
+  end
+
+  # Updates package.json and Gemfile to use specific React version for compatibility testing
+  def apply_react_version(dir, react_version)
+    update_package_json_for_react_version(File.join(dir, "package.json"), react_version)
+    update_gemfile_versions(File.join(dir, "Gemfile"))
+
+    puts "  Updated package.json for compatibility testing:"
+    puts "    React: #{react_version}"
+    puts "    Shakapacker: #{ExampleType::MINIMUM_SHAKAPACKER_VERSION}"
+  end
+
   # Define tasks for each example type
-  ExampleType.all[:shakapacker_examples].each do |example_type|
+  ExampleType.all[:shakapacker_examples].each do |example_type| # rubocop:disable Metrics/BlockLength
     relative_gem_root = Pathname(gem_root).relative_path_from(Pathname(example_type.dir))
     # CLOBBER
     desc "Clobbers (deletes) #{example_type.name_pretty}"
@@ -46,10 +128,31 @@ namespace :shakapacker_examples do # rubocop:disable Metrics/BlockLength
         "REACT_ON_RAILS_SKIP_VALIDATION=true #{cmd}"
       end
       sh_in_dir(example_type.dir, generator_commands)
-      sh_in_dir(example_type.dir, "npm install")
+      # Re-run bundle install since dev_tests generator adds rspec-rails and coveralls to Gemfile
+      bundle_install_in(example_type.dir)
+
+      # Apply specific React version for compatibility testing examples
+      if example_type.pinned_react_version?
+        apply_react_version(example_type.dir, example_type.react_version_string)
+        # Re-run bundle install since Gemfile was updated with pinned shakapacker version
+        bundle_install_in(example_type.dir)
+        # Run npm install BEFORE shakapacker:binstubs to ensure the npm shakapacker version
+        # matches the gem version. The binstubs task loads the Rails environment which
+        # validates version matching between gem and npm package.
+        # Use --legacy-peer-deps to avoid peer dependency conflicts when yalc-linked
+        # react-on-rails expects newer React versions
+        sh_in_dir(example_type.dir, "npm install --legacy-peer-deps")
+        # Regenerate Shakapacker binstubs after downgrading from 9.x to 8.2.x
+        # The binstub format may differ between major versions
+        unbundled_sh_in_dir(example_type.dir, "bundle exec rake shakapacker:binstubs")
+      else
+        sh_in_dir(example_type.dir, "npm install")
+      end
       # Generate the component packs after running the generator to ensure all
-      # auto-bundled components have corresponding pack files created
-      sh_in_dir(example_type.dir, "bundle exec rake react_on_rails:generate_packs")
+      # auto-bundled components have corresponding pack files created.
+      # Use unbundled_sh_in_dir to ensure we're using the generated app's Gemfile
+      # and gem versions, not the parent workspace's bundle context.
+      unbundled_sh_in_dir(example_type.dir, "bundle exec rake react_on_rails:generate_packs")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 16.2.0.test.6
+  version: 16.2.0.test.7
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-07 00:00:00.000000000 Z
+date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable