Address RSC generator review follow-ups

Author: justin808

react_on_rails/lib/generators/react_on_rails/js_dependency_manager.rb

@@ -413,14 +413,13 @@ def add_rsc_dependencies
         GeneratorMessages.add_info(rsc_dependency_pin_info) if used_version_pins
         return if add_packages(rsc_packages)
 
-        manual_install_packages = rsc_packages
         GeneratorMessages.add_warning(rsc_dependency_pin_failed_warning) if used_version_pins
 
         GeneratorMessages.add_warning(<<~MSG.strip)
           ⚠️  Failed to add React Server Components dependencies.
 
           You can install them manually by running:
-            #{manual_add_packages_command(manual_install_packages)}
+            #{manual_add_packages_command(rsc_packages)}
         MSG
       rescue StandardError => e
         manual_install_packages = rsc_packages_with_pin
@@ -613,18 +612,15 @@ def fallback_package_manager
       end
 
       def build_install_args(package_manager, dev, packages)
-        base_commands = {
-          "npm" => %w[npm install --save-exact],
-          "yarn" => %w[yarn add --exact],
-          "pnpm" => %w[pnpm add --save-exact],
-          "bun" => %w[bun add --exact]
-        }
-
-        base_args = base_commands.fetch(package_manager).dup
+        base_args = package_manager_commands(package_manager).fetch(:install).dup
         base_args << dev_flag_for(package_manager) if dev
         base_args + packages
       end
 
+      def build_remove_args(package_manager, packages)
+        package_manager_commands(package_manager).fetch(:remove) + packages
+      end
+
       def manual_add_packages_command(packages, dev: false)
         build_install_args(fallback_package_manager, dev, packages).join(" ")
       end
@@ -634,14 +630,28 @@ def manual_install_dependencies_command
       end
 
       def manual_remove_packages_command(packages)
-        base_commands = {
-          "npm" => %w[npm uninstall],
-          "yarn" => %w[yarn remove],
-          "pnpm" => %w[pnpm remove],
-          "bun" => %w[bun remove]
-        }
-
-        (base_commands.fetch(fallback_package_manager).dup + packages).join(" ")
+        build_remove_args(fallback_package_manager, packages).join(" ")
+      end
+
+      def package_manager_commands(package_manager)
+        {
+          "npm" => {
+            install: %w[npm install --save-exact],
+            remove: %w[npm uninstall]
+          },
+          "yarn" => {
+            install: %w[yarn add --exact],
+            remove: %w[yarn remove]
+          },
+          "pnpm" => {
+            install: %w[pnpm add --save-exact],
+            remove: %w[pnpm remove]
+          },
+          "bun" => {
+            install: %w[bun add --exact],
+            remove: %w[bun remove]
+          }
+        }.fetch(package_manager)
       end
 
       def dev_flag_for(package_manager)

react_on_rails/spec/react_on_rails/generators/js_dependency_manager_spec.rb

@@ -680,33 +680,17 @@ def errors
 
       expect(instance).to have_received(:add_packages).with([rsc_package])
       expect(instance).not_to have_received(:add_packages).with(["react-on-rails-rsc"])
-      expect(warnings.join("\n")).to include("left the version pin in package.json")
-    end
-
-    it "skips the unversioned fallback for rspack and keeps the pin when the pinned install fails" do
-      instance.using_rspack = true
-      allow(instance)
-        .to receive(:rsc_packages_with_version)
-        .and_return([["react-on-rails-rsc@19.0.5-rc.6"], true])
-
-      allow(instance).to receive(:add_packages).with(["react-on-rails-rsc@19.0.5-rc.6"]).and_return(false)
-      allow(instance).to receive(:add_packages).with(["react-on-rails-rsc"]).and_return(true)
-
-      instance.send(:add_rsc_dependencies)
-
-      # rspack must NOT retry the unversioned `latest` (it lacks RspackPlugin)
-      expect(instance).not_to have_received(:add_packages).with(["react-on-rails-rsc"])
 
       warning_text = warnings.join("\n")
       expect(warning_text).to include("Could not install the pinned react-on-rails-rsc@19.0.5-rc.6")
+      expect(warning_text).to include("left the version pin in package.json")
       expect(warning_text).to include("react-on-rails-rsc/RspackPlugin")
-      # the manual instruction points at the pinned version, not the unversioned package
-      expect(warning_text).to include("npm install --save-exact react-on-rails-rsc@19.0.5-rc.6")
-      expect(warning_text.scan("npm install --save-exact react-on-rails-rsc@19.0.5-rc.6").size).to eq(1)
+      manual_command = "npm install --save-exact react-on-rails-rsc@19.0.5-rc.6"
+      expect(warning_text).to include(manual_command)
+      expect(warning_text.scan(manual_command).size).to eq(1)
     end
 
-    it "keeps the rspack pin in the manual install instruction when the pinned install raises" do
-      instance.using_rspack = true
+    it "keeps the pinned manual install instruction when the pinned install raises" do
       allow(instance)
         .to receive(:rsc_packages_with_version)
         .and_return([["react-on-rails-rsc@19.0.5-rc.6"], true])