react_on_rails 16.4.0.rc.8 → 16.4.0.rc.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8836b6e37dab21e6ee52f045e1f1dbb0ddce044107ce4ff6b48724ac57003bb9
-  data.tar.gz: 3deef582db0eccf9d692813848f8dc0e1f7c610f819497bb563fb6de0b5b2091
+  metadata.gz: bdb10a9ed4626714e8eb70c05076bed77f57d4a7470a6a4e506505ee7e408c7b
+  data.tar.gz: 1e7050122dc2c9feb0a2da0bc4152fd450a31cbc51a6229486345eed3dd08dae
 SHA512:
-  metadata.gz: 38982dfff467e79045d3c6017a991f8dedac9c17abee867cb55197e2514cbe238317ec99ef89e5ad0c258a7d306bf8325ea1266926ae85a98111af1f759023fb
-  data.tar.gz: 124b251b8a0ca66b4f38a8d2990012690be96408c768a4f1081ad43f87c6d73b525a5bfd2de56d023a138288a28f5dbf6a6f988bdcbab8dd8bf7f1e2ea585be7
+  metadata.gz: fa093cb5e5ac6ac0c6b69fae0de4e998e0e90b56b71c8290e421cc553bdd6a4748afafffd4cdbe8aa56f95f3fa14956eab1cf4f08b7c38cd5d29d5e3798ab0d0
+  data.tar.gz: 4b00fb4d7606b6276f1cc23b3e7766c74b3cc4ba58b3f4e9162918714dbc9a400f3f470c7d1ed1c100678179abc11aa3fa6f94a75a6861e4e926fd796c989976

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.4.0.rc.8)
+    react_on_rails (16.4.0.rc.9)
       addressable
       connection_pool
       execjs (~> 2.5)

data/lib/generators/react_on_rails/base_generator.rb

@@ -104,7 +104,7 @@ module ReactOnRails
       end
 
       def copy_webpack_config
-        puts "Adding #{using_rspack? ? 'Rspack' : 'Webpack'} config"
+        say "Adding #{using_rspack? ? 'Rspack' : 'Webpack'} config"
         base_path = "base/base"
         base_files = %w[babel.config.js
                         config/webpack/clientWebpackConfig.js
@@ -130,12 +130,12 @@ module ReactOnRails
         config = "config/shakapacker.yml"
 
         if options.shakapacker_just_installed?
-          puts "Replacing Shakapacker default config with React on Rails version"
+          say "Replacing Shakapacker default config with React on Rails version"
           # Shakapacker's installer just created this file from scratch (no pre-existing config).
           # Safe to overwrite silently with RoR's version-aware template (e.g., private_output_path).
           template("#{base_path}#{config}.tt", config, force: true)
         else
-          puts "Adding Shakapacker #{ReactOnRails::PackerUtils.shakapacker_version} config"
+          say "Adding Shakapacker #{ReactOnRails::PackerUtils.shakapacker_version} config"
           # Thor handles the conflict: prompts user interactively, or respects --force/--skip flags.
           template("#{base_path}#{config}.tt", config)
         end
@@ -176,25 +176,42 @@ module ReactOnRails
       end
 
       def append_to_spec_rails_helper
-        rails_helper = File.join(destination_root, "spec/rails_helper.rb")
-        if File.exist?(rails_helper)
-          add_configure_rspec_to_compile_assets(rails_helper)
-        else
-          spec_helper = File.join(destination_root, "spec/spec_helper.rb")
-          add_configure_rspec_to_compile_assets(spec_helper) if File.exist?(spec_helper)
-        end
+        rspec_helper = preferred_rspec_helper_file
+        add_configure_rspec_to_compile_assets(rspec_helper) if rspec_helper
+
+        test_helper = File.join(destination_root, "test/test_helper.rb")
+        add_configure_minitest_to_compile_assets(test_helper) if File.exist?(test_helper)
       end
 
       CONFIGURE_RSPEC_TO_COMPILE_ASSETS = <<-STR.strip_heredoc
         RSpec.configure do |config|
           # Ensure that if we are running js tests, we are using latest webpack assets
           # This will use the defaults of :js and :server_rendering meta tags
+          # Requires config.build_test_command in config/initializers/react_on_rails.rb.
+          # This is the default setup for React on Rails generated apps.
           ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
         end
       STR
 
+      CONFIGURE_MINITEST_TO_COMPILE_ASSETS = <<-STR.strip_heredoc
+        # Ensure that tests run against fresh webpack assets.
+        ActiveSupport::TestCase.setup do
+          ReactOnRails::TestHelper.ensure_assets_compiled
+        end
+      STR
+
       private
 
+      def preferred_rspec_helper_file
+        rails_helper = File.join(destination_root, "spec/rails_helper.rb")
+        return rails_helper if File.exist?(rails_helper)
+
+        spec_helper = File.join(destination_root, "spec/spec_helper.rb")
+        return spec_helper if File.exist?(spec_helper)
+
+        nil
+      end
+
       def copy_webpack_main_config(base_path, config)
         webpack_config_path = bundler_main_config_path
 
@@ -206,12 +223,12 @@ module ReactOnRails
             # Remove the file first to avoid conflict prompt, then recreate it
             remove_file(webpack_config_path, verbose: false)
             # Show what we're doing
-            puts "   #{set_color('replace', :green)}  #{webpack_config_path} " \
-                 "(auto-upgrading from standard Shakapacker to React on Rails config)"
+            say_status :replace,
+                       "#{webpack_config_path} (auto-upgrading from standard Shakapacker to React on Rails config)",
+                       :green
             template("#{base_path}/config/webpack/webpack.config.js.tt", webpack_config_path, config)
           elsif react_on_rails_config?(existing_content)
-            puts "   #{set_color('identical', :blue)}  #{webpack_config_path} " \
-                 "(already React on Rails compatible)"
+            say_status :identical, "#{webpack_config_path} (already React on Rails compatible)", :blue
             # Skip - don't need to do anything
           else
             handle_custom_webpack_config(base_path, config, webpack_config_path)
@@ -226,23 +243,25 @@ module ReactOnRails
         # Custom config - ask user
         config_file_name = File.basename(webpack_config_path)
         bundler_name = using_rspack? ? "rspack" : "webpack"
-        puts "\n#{set_color('NOTICE:', :yellow)} Your #{config_file_name} appears to be customized."
-        puts "React on Rails needs to replace it with an environment-specific loader."
-        puts "Your current config will be backed up to #{config_file_name}.backup"
+        say ""
+        say_status :notice, "Your #{config_file_name} appears to be customized.", :yellow
+        say "React on Rails needs to replace it with an environment-specific loader."
+        say "Your current config will be backed up to #{config_file_name}.backup"
 
         if yes?("Replace #{config_file_name} with React on Rails version? (Y/n)")
           # Create backup
           backup_path = "#{webpack_config_path}.backup"
           if File.exist?(webpack_config_path)
             FileUtils.cp(webpack_config_path, backup_path)
-            puts "   #{set_color('create', :green)}  #{backup_path} (backup of your custom config)"
+            say_status :create, "#{backup_path} (backup of your custom config)", :green
           end
 
           template("#{base_path}/config/webpack/webpack.config.js.tt", webpack_config_path, config)
         else
-          puts "   #{set_color('skip', :yellow)}  #{webpack_config_path}"
-          puts "   #{set_color('WARNING:', :red)} React on Rails may not work correctly " \
-               "without the environment-specific #{bundler_name} config"
+          say_status :skip, webpack_config_path, :yellow
+          say_status :warning,
+                     "React on Rails may not work correctly without the environment-specific #{bundler_name} config",
+                     :red
         end
       end
 
@@ -359,15 +378,27 @@ module ReactOnRails
       end
 
       def add_configure_rspec_to_compile_assets(helper_file)
-        search_str = "RSpec.configure do |config|"
-        gsub_file(helper_file, search_str, CONFIGURE_RSPEC_TO_COMPILE_ASSETS)
+        content = File.read(helper_file)
+        return if content.match?(/^\s*[^#\s][^#]*ReactOnRails::TestHelper\.configure_rspec_to_compile_assets/)
+
+        updated_content = content.sub("RSpec.configure do |config|", CONFIGURE_RSPEC_TO_COMPILE_ASSETS)
+        return if updated_content == content
+
+        File.write(helper_file, updated_content)
+      end
+
+      def add_configure_minitest_to_compile_assets(helper_file)
+        content = File.read(helper_file)
+        return if content.match?(/^\s*[^#\s][^#]*ReactOnRails::TestHelper\.ensure_assets_compiled/)
+
+        append_to_file(helper_file, "\n\n#{CONFIGURE_MINITEST_TO_COMPILE_ASSETS}\n")
       end
 
       def configure_rspack_in_shakapacker
         shakapacker_config_path = "config/shakapacker.yml"
         return unless File.exist?(shakapacker_config_path)
 
-        puts Rainbow("🔧 Configuring Shakapacker for Rspack...").yellow
+        say "🔧 Configuring Shakapacker for Rspack...", :yellow
 
         # Use regex replacement to preserve file structure (comments, anchors, aliases)
         # This replaces ALL occurrences of assets_bundler, not just in default section
@@ -385,7 +416,7 @@ module ReactOnRails
           '\1swc\2'
         )
 
-        puts Rainbow("✅ Updated shakapacker.yml for Rspack").green
+        say "✅ Updated shakapacker.yml for Rspack", :green
       end
 
       def configure_precompile_hook_in_shakapacker
@@ -406,7 +437,7 @@ module ReactOnRails
                   /^(\s*)#\s*precompile_hook:\s*~\s*$/,
                   "\\1precompile_hook: 'bin/shakapacker-precompile-hook'"
 
-        puts Rainbow("✅ Configured precompile_hook in shakapacker.yml").green
+        say "✅ Configured precompile_hook in shakapacker.yml", :green
       end
 
       def configure_private_output_path_in_shakapacker
@@ -446,7 +477,7 @@ module ReactOnRails
 
         return unless File.read(shakapacker_config_path).match?(/^\s+private_output_path:\s*ssr-generated/)
 
-        puts Rainbow("✅ Configured private_output_path in shakapacker.yml").green
+        say "✅ Configured private_output_path in shakapacker.yml", :green
       end
     end
   end

data/lib/generators/react_on_rails/generator_helper.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "rainbow"
 require "json"
 
+# rubocop:disable Metrics/ModuleLength
 module GeneratorHelper
   def package_json
     # Lazy load package_json gem only when actually needed for dependency management
@@ -10,12 +10,13 @@ module GeneratorHelper
     require "package_json" unless defined?(PackageJson)
     @package_json ||= PackageJson.read
   rescue LoadError
-    puts "Warning: package_json gem not available. This is expected before Shakapacker installation."
-    puts "Dependencies will be installed using the default package manager after Shakapacker setup."
+    say_status :warning, "package_json gem not available. This is expected before Shakapacker installation.", :yellow
+    say_status :warning, "Dependencies will be installed using the default package manager after Shakapacker setup.",
+               :yellow
     nil
   rescue StandardError => e
-    puts "Warning: Could not read package.json: #{e.message}"
-    puts "This is normal before Shakapacker creates the package.json file."
+    say_status :warning, "Could not read package.json: #{e.message}", :yellow
+    say_status :warning, "This is normal before Shakapacker creates the package.json file.", :yellow
     nil
   end
 
@@ -32,8 +33,8 @@ module GeneratorHelper
       end
       true
     rescue StandardError => e
-      puts "Warning: Could not add packages via package_json gem: #{e.message}"
-      puts "Will fall back to direct npm commands."
+      say_status :warning, "Could not add packages via package_json gem: #{e.message}", :yellow
+      say_status :warning, "Will fall back to direct npm commands.", :yellow
       false
     end
   end
@@ -93,9 +94,11 @@ module GeneratorHelper
   end
 
   def print_generator_messages
+    # GeneratorMessages stores pre-colored strings, so we strip ANSI manually for --no-color output.
+    no_color = !shell.is_a?(Thor::Shell::Color)
     GeneratorMessages.messages.each do |message|
-      puts message
-      puts "" # Blank line after each message for readability
+      say(no_color ? message.to_s.gsub(/\e\[[0-9;]*m/, "") : message)
+      say "" # Blank line after each message for readability
     end
   end
 
@@ -129,6 +132,10 @@ module GeneratorHelper
     @pro_gem_installed = Gem.loaded_specs.key?("react_on_rails_pro") || gem_in_lockfile?("react_on_rails_pro")
   end
 
+  def mark_pro_gem_installed!
+    @pro_gem_installed = true
+  end
+
   # Check if Pro features should be enabled
   # Returns true if --pro flag is set OR --rsc flag is set (RSC implies Pro)
   #
@@ -347,3 +354,4 @@ module GeneratorHelper
     config.dig("default", "assets_bundler") == "rspack"
   end
 end
+# rubocop:enable Metrics/ModuleLength

data/lib/generators/react_on_rails/generator_messages.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rainbow"
+
 module GeneratorMessages
   class << self
     def output

data/lib/generators/react_on_rails/install_generator.rb

@@ -187,8 +187,10 @@ module ReactOnRails
       # js(.coffee) are not checked by this method, but instead produce warning messages
       # and allow the build to continue
       def installation_prerequisites_met?
-        !(missing_node? || missing_package_manager? || missing_pro_gem? ||
-          ReactOnRails::GitUtils.uncommitted_changes?(GeneratorMessages))
+        # Check uncommitted_changes? before missing_pro_gem? so that
+        # auto-install does not mutate the Gemfile on a dirty working tree.
+        !(missing_node? || missing_package_manager? ||
+          ReactOnRails::GitUtils.uncommitted_changes?(GeneratorMessages) || missing_pro_gem?)
       end
 
       def missing_node?
@@ -358,15 +360,15 @@ module ReactOnRails
       end
 
       def print_shakapacker_setup_banner
-        puts Rainbow("\n#{'=' * 80}").cyan
-        puts Rainbow("🔧 SHAKAPACKER SETUP").cyan.bold
-        puts Rainbow("=" * 80).cyan
+        say "\n#{set_color('=' * 80, :cyan)}"
+        say set_color("🔧 SHAKAPACKER SETUP", :cyan, :bold)
+        say set_color("=" * 80, :cyan)
       end
 
       def ensure_shakapacker_in_gemfile
         return if shakapacker_in_gemfile?
 
-        puts Rainbow("📝 Adding Shakapacker to Gemfile...").yellow
+        say "📝 Adding Shakapacker to Gemfile...", :yellow
         # Use with_unbundled_env to prevent inheriting BUNDLE_GEMFILE from parent process
         # See: https://github.com/shakacode/react_on_rails/issues/2287
         success = Bundler.with_unbundled_env { system("bundle add shakapacker --strict") }
@@ -376,11 +378,11 @@ module ReactOnRails
       end
 
       def install_shakapacker
-        puts Rainbow("⚙️  Installing Shakapacker (required for webpack integration)...").yellow
+        say "⚙️  Installing Shakapacker (required for webpack integration)...", :yellow
 
         # First run bundle install to make shakapacker available
         # Use with_unbundled_env to prevent inheriting BUNDLE_GEMFILE from parent process
-        puts Rainbow("📦 Running bundle install...").yellow
+        say "📦 Running bundle install...", :yellow
         bundle_success = Bundler.with_unbundled_env { system("bundle install") }
         unless bundle_success
           handle_shakapacker_install_error
@@ -404,10 +406,10 @@ module ReactOnRails
       end
 
       def finalize_shakapacker_setup(yml_content_before)
-        puts Rainbow("✅ Shakapacker installed successfully!").green
-        puts Rainbow("=" * 80).cyan
-        puts Rainbow("🚀 CONTINUING WITH REACT ON RAILS SETUP").cyan.bold
-        puts "#{Rainbow('=' * 80).cyan}\n"
+        say "✅ Shakapacker installed successfully!", :green
+        say "=" * 80, :cyan
+        say set_color("🚀 CONTINUING WITH REACT ON RAILS SETUP", :cyan, :bold)
+        say "#{'=' * 80}\n", :cyan
 
         yml_content_after = File.exist?(SHAKAPACKER_YML_PATH) ? File.read(SHAKAPACKER_YML_PATH) : nil
 
@@ -501,7 +503,7 @@ module ReactOnRails
           return
         end
 
-        puts Rainbow("📝 Installing TypeScript dependencies...").yellow
+        say "📝 Installing TypeScript dependencies...", :yellow
         # Delegate to shared module for consistent dependency management
         add_typescript_dependencies
       end
@@ -512,7 +514,7 @@ module ReactOnRails
           return
         end
 
-        puts Rainbow("📝 Creating CSS module type definitions...").yellow
+        say "📝 Creating CSS module type definitions...", :yellow
 
         # Ensure the types directory exists
         FileUtils.mkdir_p("app/javascript/types")
@@ -536,7 +538,7 @@ module ReactOnRails
         TS
 
         File.write("app/javascript/types/css-modules.d.ts", css_module_types_content)
-        puts Rainbow("✅ Created CSS module type definitions").green
+        say "✅ Created CSS module type definitions", :green
       end
 
       def create_typescript_config
@@ -546,7 +548,7 @@ module ReactOnRails
         end
 
         if File.exist?("tsconfig.json")
-          puts Rainbow("⚠️  tsconfig.json already exists, skipping creation").yellow
+          say "⚠️  tsconfig.json already exists, skipping creation", :yellow
           return
         end
 
@@ -572,7 +574,7 @@ module ReactOnRails
         }
 
         File.write("tsconfig.json", JSON.pretty_generate(tsconfig_content))
-        puts Rainbow("✅ Created tsconfig.json").green
+        say "✅ Created tsconfig.json", :green
       end
     end
     # rubocop:enable Metrics/ClassLength

data/lib/generators/react_on_rails/js_dependency_manager.rb

@@ -186,13 +186,15 @@ module ReactOnRails
 
                                "react-on-rails@#{npm_version}"
                              else
-                               puts "WARNING: Unrecognized version format #{ReactOnRails::VERSION}. " \
-                                    "Adding the latest react-on-rails NPM module. " \
-                                    "Double check this is correct in package.json"
+                               say_status :warning,
+                                          "Unrecognized version format #{ReactOnRails::VERSION}. " \
+                                          "Adding the latest react-on-rails NPM module. " \
+                                          "Double check this is correct in package.json",
+                                          :yellow
                                "react-on-rails"
                              end
 
-        puts "Installing React on Rails package..."
+        say "Installing React on Rails package..."
         return if add_package(react_on_rails_pkg)
 
         GeneratorMessages.add_warning(<<~MSG.strip)
@@ -211,7 +213,7 @@ module ReactOnRails
       end
 
       def add_react_dependencies
-        puts "Installing React dependencies..."
+        say "Installing React dependencies..."
 
         # RSC requires React 19.0.x specifically (not 19.1.x or later)
         # Pin to ~19.0.4 to allow patch updates while staying within 19.0.x
@@ -239,7 +241,7 @@ module ReactOnRails
       end
 
       def add_css_dependencies
-        puts "Installing CSS handling dependencies..."
+        say "Installing CSS handling dependencies..."
         return if add_packages(CSS_DEPENDENCIES)
 
         GeneratorMessages.add_warning(<<~MSG.strip)
@@ -258,7 +260,7 @@ module ReactOnRails
       end
 
       def add_rspack_dependencies
-        puts "Installing Rspack core dependencies..."
+        say "Installing Rspack core dependencies..."
         return if add_packages(RSPACK_DEPENDENCIES)
 
         GeneratorMessages.add_warning(<<~MSG.strip)
@@ -277,7 +279,7 @@ module ReactOnRails
       end
 
       def add_swc_dependencies
-        puts "Installing SWC transpiler dependencies (20x faster than Babel)..."
+        say "Installing SWC transpiler dependencies (20x faster than Babel)..."
         return if add_packages(SWC_DEPENDENCIES, dev: true)
 
         GeneratorMessages.add_warning(<<~MSG.strip)
@@ -297,7 +299,7 @@ module ReactOnRails
       end
 
       def add_babel_react_dependencies
-        puts "Installing Babel React preset dependency..."
+        say "Installing Babel React preset dependency..."
         return if add_packages(BABEL_REACT_DEPENDENCIES, dev: true)
 
         GeneratorMessages.add_warning(<<~MSG.strip)
@@ -316,7 +318,7 @@ module ReactOnRails
       end
 
       def add_typescript_dependencies
-        puts "Installing TypeScript dependencies..."
+        say "Installing TypeScript dependencies..."
         return if add_packages(TYPESCRIPT_DEPENDENCIES, dev: true)
 
         GeneratorMessages.add_warning(<<~MSG.strip)
@@ -335,7 +337,7 @@ module ReactOnRails
       end
 
       def add_pro_dependencies
-        puts "Installing React on Rails Pro dependencies..."
+        say "Installing React on Rails Pro dependencies..."
 
         # When upgrading from base React on Rails to Pro, remove the base package first
         # Pro package includes all base functionality, so having both causes validation errors
@@ -364,19 +366,21 @@ module ReactOnRails
 
       # Returns Pro package names with version suffix matching the gem version.
       # Uses VersionSyntaxConverter to handle Ruby->npm format conversion.
-      # Falls back to unversioned package names if version can't be determined.
+      # Falls back to ReactOnRails::VERSION since Pro and base gems share the same version.
       def pro_packages_with_version
-        return PRO_DEPENDENCIES unless defined?(ReactOnRailsPro::VERSION)
-
-        npm_version = ReactOnRails::VersionSyntaxConverter.new.rubygem_to_npm(ReactOnRailsPro::VERSION)
+        # Prefer Pro gem version if loaded; fall back to base gem version (same by policy).
+        # After auto-install via bundle add, the Pro gem isn't loaded in the current process,
+        # so ReactOnRailsPro::VERSION won't be defined. The base gem version is always available.
+        gem_version = defined?(ReactOnRailsPro::VERSION) ? ReactOnRailsPro::VERSION : ReactOnRails::VERSION
+        npm_version = ReactOnRails::VersionSyntaxConverter.new.rubygem_to_npm(gem_version)
         PRO_DEPENDENCIES.map { |pkg| "#{pkg}@#{npm_version}" }
       rescue StandardError
-        puts "WARNING: Could not determine Pro package version. Installing latest."
+        say_status :warning, "Could not determine Pro package version. Installing latest.", :yellow
         PRO_DEPENDENCIES
       end
 
       def add_rsc_dependencies
-        puts "Installing React Server Components dependencies..."
+        say "Installing React Server Components dependencies..."
         return if add_packages(RSC_DEPENDENCIES)
 
         GeneratorMessages.add_warning(<<~MSG.strip)
@@ -401,9 +405,9 @@ module ReactOnRails
         dependencies = pj.fetch("dependencies", {})
         return unless dependencies.key?("react-on-rails")
 
-        puts "Removing base 'react-on-rails' package (Pro package includes all base functionality)..."
+        say "Removing base 'react-on-rails' package (Pro package includes all base functionality)..."
         pj.manager.remove(["react-on-rails"])
-        puts "✅ Removed 'react-on-rails' package"
+        say "✅ Removed 'react-on-rails' package"
       rescue StandardError => e
         GeneratorMessages.add_warning(<<~MSG.strip)
           ⚠️  Could not remove base 'react-on-rails' package: #{e.message}
@@ -414,7 +418,7 @@ module ReactOnRails
       end
 
       def add_dev_dependencies
-        puts "Installing development dependencies..."
+        say "Installing development dependencies..."
 
         # Use Rspack-specific dev dependencies if rspack is configured
         dev_deps = using_rspack? ? RSPACK_DEV_DEPENDENCIES : DEV_DEPENDENCIES

data/lib/generators/react_on_rails/pro_generator.rb

@@ -70,9 +70,9 @@ module ReactOnRails
       end
 
       def add_pro_npm_dependencies
-        puts Rainbow("📝 Adding Pro npm dependencies...").yellow
+        say "📝 Adding Pro npm dependencies...", :yellow
         add_pro_dependencies
-        puts Rainbow("✅ Pro npm dependencies added").green
+        say "✅ Pro npm dependencies added", :green
       end
 
       def print_success_message