Harden legacy Redux warning emission

Author: justin808

react_on_rails/lib/generators/react_on_rails/install_generator.rb

@@ -221,6 +221,7 @@ def run_generators
         # print_generator_messages raises an exception. This prevents ENV pollution
         # that could affect subsequent processes.
         ENV.delete("REACT_ON_RAILS_SKIP_VALIDATION")
+        # Keep primary failure details first; the legacy Redux advisory is best-effort.
         add_legacy_redux_install_warning_once_safely
         print_generator_messages
       end
@@ -816,15 +817,14 @@ def add_legacy_redux_install_warning
       def add_legacy_redux_install_warning_once
         return if @legacy_redux_install_warning_added
 
-        # Set the flag after enqueueing so a failed warning add can be retried.
         add_legacy_redux_install_warning
         @legacy_redux_install_warning_added = true
       end
 
       def add_legacy_redux_install_warning_once_safely
         add_legacy_redux_install_warning_once
-      rescue StandardError
-        # Preserve the primary generator output; this legacy advisory is best-effort.
+      rescue StandardError => e
+        warn "[react_on_rails] Skipped legacy Redux warning: #{e.message}"
         nil
       end
 
@@ -1111,7 +1111,7 @@ def handle_shakapacker_gemfile_error
           Then re-run: #{recovery_install_command}
         MSG
         GeneratorMessages.add_error(error)
-        add_legacy_redux_install_warning_once
+        add_legacy_redux_install_warning_once_safely
         raise Thor::Error, error unless options.ignore_warnings?
       end
 
@@ -1136,7 +1136,7 @@ def handle_shakapacker_install_error
           Need help? Visit: https://github.com/shakacode/shakapacker/blob/main/docs/installation.md
         MSG
         GeneratorMessages.add_error(error)
-        add_legacy_redux_install_warning_once
+        add_legacy_redux_install_warning_once_safely
         raise Thor::Error, error unless options.ignore_warnings?
       end
 

react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb

@@ -13,7 +13,8 @@ class ReactWithReduxGenerator < Rails::Generators::Base
 
       Rails::Generators.hide_namespace(namespace)
       source_root(File.expand_path("templates", __dir__))
-      # Keep this standalone warning aligned with InstallGenerator#add_legacy_redux_install_warning.
+      # Keep the runtime API compatibility sentence aligned with InstallGenerator#add_legacy_redux_install_warning.
+      # The install path adds recovery docs and command guidance that this standalone warning intentionally omits.
       LEGACY_REDUX_GENERATOR_WARNING = <<~MSG.strip.freeze
         The react_on_rails:react_with_redux generator is a hidden legacy Redux generator path and is not
         recommended for new React on Rails apps.
@@ -28,6 +29,7 @@ class ReactWithReduxGenerator < Rails::Generators::Base
       class_option :rsc, type: :boolean, default: false, hide: true
       class_option :tailwind, type: :boolean, default: false, hide: true
 
+      # Only this public method is dispatched by Rails; helpers below stay private.
       def run_generator
         add_legacy_redux_generator_warning
         validate_standalone_tailwind

react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb

@@ -4575,11 +4575,36 @@ class ActiveSupport::TestCase
       allow(install_generator).to receive(:add_legacy_redux_install_warning)
         .and_raise(StandardError, "warning failed")
       allow(install_generator).to receive(:print_generator_messages)
+      allow(install_generator).to receive(:warn)
 
       expect { install_generator.run_generators }.to raise_error(Thor::Error, "generator failed")
       expect(install_generator).to have_received(:print_generator_messages)
     end
 
+    specify "warning failures do not mask shakapacker gemfile errors" do
+      install_generator = install_generator_fixture(redux: true)
+
+      allow(install_generator).to receive(:add_legacy_redux_install_warning)
+        .and_raise(StandardError, "warning failed")
+      allow(install_generator).to receive(:warn)
+
+      expect do
+        install_generator.send(:handle_shakapacker_gemfile_error)
+      end.to raise_error(Thor::Error, /Failed to add Shakapacker/)
+    end
+
+    specify "warning failures do not mask shakapacker install errors" do
+      install_generator = install_generator_fixture(redux: true)
+
+      allow(install_generator).to receive(:add_legacy_redux_install_warning)
+        .and_raise(StandardError, "warning failed")
+      allow(install_generator).to receive(:warn)
+
+      expect do
+        install_generator.send(:handle_shakapacker_install_error)
+      end.to raise_error(Thor::Error, /Failed to install Shakapacker/)
+    end
+
     specify "hidden install --redux --tailwind warning stays on the install path" do
       install_generator = install_generator_fixture(redux: true, tailwind: true)