Avoid killing OSS renderer-derived port

justin808 · justin808 · commit 53c62ee026d0 · 2026-05-04T00:04:27.000-10:00
diff --git a/react_on_rails/lib/react_on_rails/dev/server_manager.rb b/react_on_rails/lib/react_on_rails/dev/server_manager.rb
@@ -63,15 +63,16 @@ def kill_processes
         # derived ports when REACT_ON_RAILS_BASE_PORT / CONDUCTOR_PORT is set,
         # so `bin/dev kill` in a worktree on ports 5000/5001/5002 targets the
         # right ports instead of the 3000/3001 default. Falls back to
-        # [3000, 3001] when no base port is configured, plus the default
-        # renderer port when Pro renderer support is active. Uses PortSelector's
-        # pure #base_port_hash so no "Base port detected" banner prints during
-        # a kill.
+        # [3000, 3001] when no base port is configured, plus the renderer port
+        # when Pro renderer support is active. Uses PortSelector's pure
+        # #base_port_hash so no "Base port detected" banner prints during a kill.
         def killable_ports
           base = PortSelector.base_port_hash
           return pro_renderer_active? ? [3000, 3001, 3800] : [3000, 3001] unless base
 
-          [base[:rails], base[:webpack], base[:renderer]]
+          ports = [base[:rails], base[:webpack]]
+          ports << base[:renderer] if pro_renderer_active?
+          ports
         end
 
         def development_processes
diff --git a/react_on_rails/spec/react_on_rails/dev/server_manager_spec.rb b/react_on_rails/spec/react_on_rails/dev/server_manager_spec.rb
@@ -1166,6 +1166,21 @@ def mock_port_selector_defaults
       described_class.kill_processes
     end
 
+    it "skips the base-port-derived renderer port when Pro renderer support is inactive" do
+      allow(ReactOnRails::Dev::PortSelector)
+        .to receive(:base_port_hash)
+        .and_return({ rails: 5000, webpack: 5001, renderer: 5002, base_port_mode: true })
+      allow(described_class).to receive(:pro_renderer_active?).and_return(false)
+      # No pattern-based processes so kill_port_processes runs.
+      allow(Open3).to receive(:capture2).with("pgrep", any_args).and_return(["", nil])
+
+      allow(Open3).to receive(:capture2).with("lsof", "-ti", ":5000", err: File::NULL).and_return(["", nil])
+      allow(Open3).to receive(:capture2).with("lsof", "-ti", ":5001", err: File::NULL).and_return(["", nil])
+      expect(Open3).not_to receive(:capture2).with("lsof", "-ti", ":5002", err: File::NULL)
+
+      described_class.kill_processes
+    end
+
     it "targets the default renderer port when Pro renderer support is active without a base port" do
       allow(ReactOnRails::Dev::PortSelector).to receive(:base_port_hash).and_return(nil)
       allow(described_class).to receive(:pro_renderer_active?).and_return(true)
