react_on_rails 16.4.0.rc.8 → 16.4.0.rc.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8836b6e37dab21e6ee52f045e1f1dbb0ddce044107ce4ff6b48724ac57003bb9
-  data.tar.gz: 3deef582db0eccf9d692813848f8dc0e1f7c610f819497bb563fb6de0b5b2091
+  metadata.gz: cdd0253666ff913084d12f9f5b3f24b41f0f33ed418165f54a5d038cb567012d
+  data.tar.gz: 510bcdc628f66dd6c9ddfae7be24582fef28ea35c263440e86a640b419bff379
 SHA512:
-  metadata.gz: 38982dfff467e79045d3c6017a991f8dedac9c17abee867cb55197e2514cbe238317ec99ef89e5ad0c258a7d306bf8325ea1266926ae85a98111af1f759023fb
-  data.tar.gz: 124b251b8a0ca66b4f38a8d2990012690be96408c768a4f1081ad43f87c6d73b525a5bfd2de56d023a138288a28f5dbf6a6f988bdcbab8dd8bf7f1e2ea585be7
+  metadata.gz: fa0ec02748d25524f70fa7fe73803fc25c8c73249a17b953517ab3b226fa2101efc0443b3bab201737711f91d4a4f4d9d280e29005c28b505ae3d2d6d4bda153
+  data.tar.gz: 365c80cbf379d64e9c74958e96334fe494d2f9770f8fa0f1b01eae03f89e11fd08590459bbe3a021f6a4e3ff697a7ad78bcfa9fd93ac0646ada6007f6d471b8a

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.10)
       addressable
       connection_pool
       execjs (~> 2.5)

data/lib/generators/react_on_rails/base_generator.rb

@@ -2,6 +2,7 @@
 
 require "rails/generators"
 require "fileutils"
+require "erb"
 require_relative "generator_messages"
 require_relative "generator_helper"
 require_relative "js_dependency_manager"
@@ -47,6 +48,56 @@ module ReactOnRails
                    default: false,
                    hide: true
 
+      # Keep this map in sync with templates under:
+      # lib/generators/react_on_rails/templates/**/config/webpack/*.tt
+      MANAGED_WEBPACK_FILE_TEMPLATES = {
+        "clientWebpackConfig.js" => "base/base/config/webpack/clientWebpackConfig.js.tt",
+        "commonWebpackConfig.js" => "base/base/config/webpack/commonWebpackConfig.js.tt",
+        "test.js" => "base/base/config/webpack/test.js.tt",
+        "development.js" => "base/base/config/webpack/development.js.tt",
+        "production.js" => "base/base/config/webpack/production.js.tt",
+        "serverWebpackConfig.js" => "base/base/config/webpack/serverWebpackConfig.js.tt",
+        "rscWebpackConfig.js" => "rsc/base/config/webpack/rscWebpackConfig.js.tt",
+        "ServerClientOrBoth.js" => "base/base/config/webpack/ServerClientOrBoth.js.tt",
+        # Legacy filename generated by older React on Rails versions.
+        # We compare against the current options (including --pro/--rsc); if those
+        # don't match the original generation, cleanup intentionally preserves files.
+        "generateWebpackConfigs.js" => "base/base/config/webpack/ServerClientOrBoth.js.tt"
+      }.freeze
+
+      # Keep these helper delegates in sync with ERB calls in managed webpack
+      # templates. This is the intended template-facing API; missing delegates
+      # intentionally fail rendering and keep cleanup conservative by treating
+      # files as non-removable.
+      TemplateRenderContext = Struct.new(:generator, :config) do
+        def erb_binding
+          binding
+        end
+
+        def add_documentation_reference(*args)
+          generator.__send__(:add_documentation_reference, *args)
+        end
+
+        def use_pro?
+          generator.__send__(:use_pro?)
+        end
+
+        def use_rsc?
+          generator.__send__(:use_rsc?)
+        end
+
+        def shakapacker_version_9_or_higher?
+          generator.__send__(:shakapacker_version_9_or_higher?)
+        end
+      end
+
+      REMOVABLE_WEBPACK_FILES = (MANAGED_WEBPACK_FILE_TEMPLATES.keys +
+        %w[webpack.config.js]).freeze
+      DOCS_REFERENCE_MESSAGE = "// The source code including full typescript support is available at:"
+      TEMPLATE_RENDER_FAILED = Object.new.freeze # unique sentinel compared by identity via .equal?
+      private_constant :MANAGED_WEBPACK_FILE_TEMPLATES, :REMOVABLE_WEBPACK_FILES, :TemplateRenderContext,
+                       :DOCS_REFERENCE_MESSAGE, :TEMPLATE_RENDER_FAILED
+
       def add_hello_world_route
         # RSC uses HelloServer instead of HelloWorld, but Redux still needs hello_world route
         return if use_rsc? && !options.redux?
@@ -70,9 +121,9 @@ module ReactOnRails
                         .env.example
                         bin/shakapacker-precompile-hook]
 
-        # HelloServer uses the hello_world layout so React on Rails can inject generated
-        # packs without requiring a hardcoded application.js pack entry.
-        base_files << "app/views/layouts/hello_world.html.erb"
+        # react_on_rails_default layout provides empty pack tags so React on Rails can
+        # inject generated packs without requiring a hardcoded application.js pack entry.
+        base_files << "app/views/layouts/react_on_rails_default.html.erb"
 
         # HelloWorld controller only when not using RSC (RSC uses HelloServer)
         # Exception: Redux still needs the HelloWorld controller even with RSC
@@ -104,7 +155,11 @@ module ReactOnRails
       end
 
       def copy_webpack_config
-        puts "Adding #{using_rspack? ? 'Rspack' : 'Webpack'} config"
+        # Cleanup must run before writing new webpack/rspack configs so we only
+        # evaluate pre-existing stale entries, never files generated in this run.
+        cleanup_stale_webpack_config_dir_for_rspack
+
+        say "Adding #{using_rspack? ? 'Rspack' : 'Webpack'} config"
         base_path = "base/base"
         base_files = %w[babel.config.js
                         config/webpack/clientWebpackConfig.js
@@ -114,9 +169,7 @@ module ReactOnRails
                         config/webpack/production.js
                         config/webpack/serverWebpackConfig.js
                         config/webpack/ServerClientOrBoth.js]
-        config = {
-          message: "// The source code including full typescript support is available at:"
-        }
+        config = { message: DOCS_REFERENCE_MESSAGE }
         base_files.each do |file|
           template("#{base_path}/#{file}.tt", destination_config_path(file), config)
         end
@@ -130,12 +183,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 +229,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
+      CONFIGURE_RSPEC_TO_COMPILE_ASSETS = <<~STR
         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
+        # 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
 
@@ -202,16 +272,16 @@ module ReactOnRails
           existing_content = File.read(webpack_config_path)
 
           # Check if it's the standard Shakapacker config that we can safely replace
-          if standard_shakapacker_config?(existing_content)
+          if standard_shakapacker_config?(existing_content, strip_comments: true)
             # 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 +296,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
 
@@ -254,25 +326,265 @@ module ReactOnRails
         end
       end
 
-      def standard_shakapacker_config?(content)
+      def cleanup_stale_webpack_config_dir_for_rspack
+        return unless cleanup_stale_webpack_config_dir?
+
+        webpack_config_relative_dir = "config/webpack"
+        all_entries = stale_webpack_config_entries
+        unless all_entries
+          say_status :warning,
+                     "Keeping #{webpack_config_relative_dir}; could not read directory entries " \
+                     "(permission denied or path changed)",
+                     :yellow
+          return
+        end
+        if all_entries.empty?
+          say_status :skip, "#{webpack_config_relative_dir} (empty directory, leaving as-is)", :yellow
+          return
+        end
+
+        return warn_dotfiles_only_webpack_dir(webpack_config_relative_dir, all_entries) if all_dotfiles?(all_entries)
+
+        # We only clean up known top-level files. Any directory or unknown entry is
+        # treated as non-removable so we don't recurse into user-managed content.
+        non_removable_entries = non_removable_webpack_entries(all_entries)
+        removable_entries = removable_webpack_entries(all_entries)
+        if non_removable_entries.empty?
+          remove_stale_webpack_dir(webpack_config_relative_dir)
+          return
+        end
+
+        if all_dotfiles?(non_removable_entries)
+          handle_dotfile_only_non_removable_entries(
+            webpack_config_relative_dir,
+            removable_entries,
+            non_removable_entries
+          )
+          return
+        end
+
+        removed_entries = remove_stale_webpack_files(webpack_config_relative_dir, removable_entries)
+        warn_non_removable_webpack_entries(webpack_config_relative_dir, non_removable_entries, removed_entries)
+      end
+
+      def remove_stale_webpack_dir(webpack_config_relative_dir)
+        # Thor's remove_dir uses paths relative to destination_root.
+        # TOCTOU: a file created between the removability check and remove_dir
+        # would be deleted. Acceptable for this generator cleanup path.
+        remove_dir(webpack_config_relative_dir, verbose: false)
+        say_status :remove,
+                   "#{webpack_config_relative_dir} (stale webpack configs after switching to --rspack)",
+                   :green
+      end
+
+      def handle_dotfile_only_non_removable_entries(
+        webpack_config_relative_dir,
+        removable_entries,
+        non_removable_entries
+      )
+        removed_entries = remove_stale_webpack_files(webpack_config_relative_dir, removable_entries)
+        warn_dotfiles_in_webpack_dir(webpack_config_relative_dir, non_removable_entries, removed_entries)
+      end
+
+      def cleanup_stale_webpack_config_dir?
+        using_rspack? && Dir.exist?(stale_webpack_config_dir)
+      end
+
+      def all_dotfiles?(entries)
+        entries.any? && entries.all? { |entry| entry.start_with?(".") }
+      end
+
+      def warn_dotfiles_only_webpack_dir(webpack_config_relative_dir, all_entries)
+        say_status :warning,
+                   "Keeping #{webpack_config_relative_dir}; only dotfiles found: " \
+                   "#{all_entries.join(', ')}",
+                   :yellow
+      end
+
+      def warn_non_removable_webpack_entries(webpack_config_relative_dir, non_removable_entries, removed_entries = [])
+        non_dotfile_entries = non_removable_entries.reject { |entry| entry.start_with?(".") }
+        dotfiles = non_removable_entries.select { |entry| entry.start_with?(".") }
+        non_removable_directories, non_removable_files = non_dotfile_entries.partition do |entry|
+          directory_entry?(entry)
+        end
+
+        non_removable_sections = []
+        non_removable_sections << "files: #{non_removable_files.join(', ')}" if non_removable_files.any?
+        if non_removable_directories.any?
+          non_removable_sections << "directories: #{non_removable_directories.join(', ')}"
+        end
+        non_removable_sections << "dotfiles: #{dotfiles.join(', ')}" if dotfiles.any?
+
+        non_removable_sections_message = non_removable_sections.join("; ")
+        removed_entries_message = if removed_entries.any?
+                                    " Removed stale managed files: #{removed_entries.join(', ')}."
+                                  else
+                                    ""
+                                  end
+        say_status :warning,
+                   "Keeping #{webpack_config_relative_dir}; " \
+                   "custom/non-removable entries detected: #{non_removable_sections_message}." \
+                   "#{removed_entries_message}",
+                   :yellow
+      end
+
+      def directory_entry?(entry)
+        File.directory?(File.join(stale_webpack_config_dir, entry))
+      rescue Errno::EACCES, Errno::ELOOP, Errno::ENOENT
+        false
+      end
+
+      def warn_dotfiles_in_webpack_dir(webpack_config_relative_dir, dotfiles, removed_entries)
+        removed_entries_message = if removed_entries.any?
+                                    " Removed stale managed files: #{removed_entries.join(', ')}."
+                                  else
+                                    ""
+                                  end
+        say_status :warning,
+                   "Keeping #{webpack_config_relative_dir}; dotfiles present: #{dotfiles.join(', ')}. " \
+                   "Remove them manually if you want the directory cleaned up." \
+                   "#{removed_entries_message}",
+                   :yellow
+      end
+
+      def non_removable_webpack_entries(all_entries)
+        all_entries.select do |entry|
+          entry.start_with?(".") || !removable_webpack_entry?(entry)
+        end
+      end
+
+      def removable_webpack_entries(all_entries)
+        all_entries.select { |entry| removable_webpack_entry?(entry) }
+      end
+
+      def remove_stale_webpack_files(webpack_config_relative_dir, entries)
+        entries.each_with_object([]) do |entry, removed_entries|
+          relative_path = File.join(webpack_config_relative_dir, entry)
+          full_path = File.join(destination_root, relative_path)
+          remove_file(relative_path, verbose: false)
+          removed_entries << entry unless File.exist?(full_path)
+        rescue Errno::EACCES, Errno::ELOOP, Errno::ENOENT, Errno::ENOTDIR
+          # If we cannot stat after removal attempt, conservatively report as not removed.
+          nil
+        end
+      end
+
+      def removable_webpack_entry?(entry)
+        return false unless REMOVABLE_WEBPACK_FILES.include?(entry)
+
+        full_path = File.join(stale_webpack_config_dir, entry)
+        return false if File.symlink?(full_path)
+        return false unless File.file?(full_path)
+
+        content = safe_read_cleanup_file(full_path)
+        return false unless content
+
+        return removable_webpack_main_config?(content) if entry == "webpack.config.js"
+
+        removable_managed_webpack_entry?(entry, content)
+      rescue Errno::EACCES, Errno::ELOOP, Errno::ENOENT, Errno::ENOTDIR
+        false
+      end
+
+      def removable_webpack_main_config?(content)
+        webpack_template = rendered_template_for_cleanup("base/base/config/webpack/webpack.config.js.tt")
+        return standard_shakapacker_config?(content) if webpack_template.equal?(TEMPLATE_RENDER_FAILED)
+
+        # Cleanup is deliberately comment-sensitive (unlike copy_webpack_main_config)
+        # so comment-only edits keep the file as a potential customization.
+        standard_shakapacker_config?(content) || content_matches_template?(content, webpack_template)
+      end
+
+      def removable_managed_webpack_entry?(entry, content)
+        template_path = MANAGED_WEBPACK_FILE_TEMPLATES[entry]
+        return false unless template_path
+
+        rendered_template = rendered_template_for_cleanup(template_path)
+        return false if rendered_template.equal?(TEMPLATE_RENDER_FAILED)
+
+        content_matches_template?(content, rendered_template)
+      end
+
+      def rendered_template_for_cleanup(template_path)
+        @rendered_template_cache ||= {}
+        @rendered_template_cache[template_path] ||= begin
+          # Cleanup comparisons only need the injected documentation comment.
+          template_doc_config = { message: DOCS_REFERENCE_MESSAGE }
+          template_content = File.read(File.join(self.class.source_root, template_path))
+          # Render against current generator options. Any mismatch is treated as non-removable,
+          # which is intentional because cleanup should be conservative.
+          # Note: files originally generated with --pro or --rsc will not match when the
+          # current run omits those options; in that case, we preserve the directory.
+          # Templates rely on config[:message] plus a small helper subset exposed by
+          # TemplateRenderContext (add_documentation_reference, use_pro?, use_rsc?,
+          # shakapacker_version_9_or_higher?). Missing method delegates raise
+          # NoMethodError and are caught below, treating the file as non-removable.
+          # Missing config hash keys return nil silently, so any new config key
+          # required by templates must be added to template_doc_config above.
+          # Use TemplateRenderContext#erb_binding to avoid leaking method-local
+          # variables from rendered_template_for_cleanup into the ERB scope.
+          template_render_context = TemplateRenderContext.new(self, template_doc_config)
+          ERB.new(template_content, trim_mode: "-").result(template_render_context.erb_binding)
+        rescue StandardError => e
+          say_status :warning,
+                     "Could not render template #{template_path} for cleanup check (#{e.class}: #{e.message}); " \
+                     "treating as non-removable",
+                     :yellow
+          # Rendering failures should never abort installation. Returning a sentinel
+          # guarantees a non-match so the file is treated as non-removable.
+          # We cache the sentinel intentionally (same options within one generator run)
+          # so repeated checks stay consistent and avoid noisy duplicate warnings.
+          TEMPLATE_RENDER_FAILED
+        end
+      end
+
+      def stale_webpack_config_dir
+        File.join(destination_root, "config/webpack")
+      end
+
+      def stale_webpack_config_entries
+        Dir.children(stale_webpack_config_dir).sort
+      rescue Errno::EACCES, Errno::ENOENT, Errno::ENOTDIR
+        # TOCTOU: directory may disappear between exist? check and read
+        nil
+      end
+
+      def safe_read_cleanup_file(path)
+        File.read(path)
+      rescue Errno::EACCES, Errno::ELOOP, Errno::ENOENT, Errno::EISDIR, Errno::ENOTDIR
+        nil
+      end
+
+      def standard_shakapacker_config?(content, strip_comments: false)
+        # Keep strip_comments false by default so comment-only edits are treated as
+        # potential customizations during cleanup. Callers can pass true when they
+        # need historical comment-insensitive replacement matching.
         # Get the expected default config based on Shakapacker version
         expected_configs = shakapacker_default_configs
 
         # Check if the content matches any of the known default configurations
-        expected_configs.any? { |config| content_matches_template?(content, config) }
+        expected_configs.any? { |config| content_matches_template?(content, config, strip_comments: strip_comments) }
       end
 
-      def content_matches_template?(content, template)
+      def content_matches_template?(content, template, strip_comments: false)
         # Normalize whitespace and compare
-        normalize_config_content(content) == normalize_config_content(template)
+        normalize_config_content(content, strip_comments: strip_comments) ==
+          normalize_config_content(template, strip_comments: strip_comments)
       end
 
-      def normalize_config_content(content)
-        # Remove comments, normalize whitespace, and clean up for comparison
-        content.gsub(%r{//.*$}, "")                    # Remove single-line comments
-               .gsub(%r{/\*.*?\*/}m, "")               # Remove multi-line comments
-               .gsub(/\s+/, " ")                       # Normalize whitespace
-               .strip
+      def normalize_config_content(content, strip_comments: false)
+        normalized_content = content
+        if strip_comments
+          # Replacement detection historically removed inline // comments too.
+          # Note: this also strips `//` in string literals (for example URLs),
+          # which can yield false-negatives and prompt for replacement.
+          normalized_content = normalized_content.gsub(%r{//.*$}, "")
+                                                 .gsub(%r{/\*.*?\*/}m, "")
+        end
+
+        # Normalize whitespace while preserving comments by default so added comments
+        # count as potential customizations and keep cleanup conservative.
+        normalized_content.gsub(/\s+/, " ").strip
       end
 
       def shakapacker_default_configs
@@ -359,15 +671,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 +709,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 +730,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 +770,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