shakacode
diff --git a/‎react_on_rails/lib/react_on_rails/dev/server_manager.rb‎
Lines changed: 16 additions & 117 deletions b/‎react_on_rails/lib/react_on_rails/dev/server_manager.rb‎
Lines changed: 16 additions & 117 deletions
diff --git a/‎react_on_rails/lib/react_on_rails/doctor.rb‎
Lines changed: 12 additions & 103 deletions b/‎react_on_rails/lib/react_on_rails/doctor.rb‎
Lines changed: 12 additions & 103 deletions
@@ -13,6 +13,7 @@
 require "uri"
 require "yaml"
 require_relative "../packer_utils"
+require_relative "../shakapacker_config_helpers"
 require_relative "../system_checker"
 require_relative "database_checker"
 require_relative "server_mode"
@@ -21,6 +22,10 @@
 module ReactOnRails
   module Dev
     class ServerManager
+      # Commands live on `class << self`, so extend (rather than include) the
+      # shared shakapacker-config helpers to expose them as singleton methods.
+      extend ReactOnRails::ShakapackerConfigHelpers
+
       HELP_FLAGS = ["-h", "--help"].freeze
       TEST_WATCH_MODES = %w[auto full client-only].freeze
       OPEN_BROWSER_WAIT_TIMEOUT = 60
@@ -472,53 +477,6 @@ def shared_private_output_paths?
           development_private == test_private
         end
 
-        def parsed_shakapacker_config
-          config_path = shakapacker_config_path
-          return nil unless File.exist?(config_path)
-
-          YAML.safe_load(ERB.new(File.read(config_path)).result, aliases: true, permitted_classes: [Symbol])
-        rescue StandardError, ScriptError
-          nil
-        end
-
-        def configured_assets_bundler
-          config = parsed_shakapacker_config
-          return nil unless config.is_a?(Hash)
-
-          rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
-          bundler_from_shakapacker_section(config, rails_env) || bundler_from_shakapacker_section(config, "default")
-        rescue StandardError, ScriptError
-          nil
-        end
-
-        def active_assets_bundler
-          configured_assets_bundler || "webpack"
-        end
-
-        def assets_bundler_label
-          active_assets_bundler.capitalize
-        end
-
-        def dev_server_label
-          active_assets_bundler == "webpack" ? "webpack-dev-server" : "#{assets_bundler_label} dev server"
-        end
-
-        def development_reload_mode_label
-          development_hmr_enabled? ? "HMR" : "Live reload"
-        end
-
-        def development_reload_feature_label
-          development_hmr_enabled? ? "Hot Module Replacement (HMR)" : "Live reload"
-        end
-
-        def development_mode_title
-          development_hmr_enabled? ? "HMR Development mode (default)" : "Live reload development mode (default)"
-        end
-
-        def hmr_procfile_description
-          "#{development_reload_mode_label} development with #{dev_server_label}"
-        end
-
         def default_procfile_description(default_mode)
           bundler_aware_dev_server_text(ServerMode.text(default_mode, :procfile_description))
         end
@@ -572,74 +530,6 @@ def compilation_failed_label
           end
         end
 
-        def bundler_from_shakapacker_section(config, section_name)
-          section = config[section_name] || config[section_name.to_sym]
-          return nil unless section.is_a?(Hash)
-
-          normalize_assets_bundler(section["assets_bundler"] || section[:assets_bundler])
-        end
-
-        def normalize_assets_bundler(value)
-          normalized = value.to_s.strip.downcase
-          ReactOnRails::SystemChecker::SUPPORTED_ASSETS_BUNDLERS.include?(normalized) ? normalized : nil
-        end
-
-        def development_hmr_enabled?
-          dev_server = development_dev_server_config
-          return hmr_config_value?(dev_server["hmr"]) if dev_server.key?("hmr")
-
-          return false if truthy_config_value?(dev_server["live_reload"])
-
-          # Default to HMR when neither hmr nor live_reload is configured, preserving historical behavior.
-          true
-        end
-
-        def hmr_config_value?(value)
-          value.to_s.strip.casecmp?("only") || truthy_config_value?(value)
-        end
-
-        def development_dev_server_config
-          config = parsed_shakapacker_config
-          return {} unless config.is_a?(Hash)
-
-          development_config = shakapacker_section(config, "default").merge(shakapacker_section(config, "development"))
-          dev_server_config_for(development_config)
-        end
-
-        def shakapacker_section(config, section_name)
-          section = config[section_name] || config[section_name.to_sym]
-          section.is_a?(Hash) ? section : {}
-        end
-
-        def dev_server_config_for(section)
-          dev_server = section["dev_server"] || section[:dev_server]
-          return {} unless dev_server.is_a?(Hash)
-
-          dev_server.transform_keys(&:to_s)
-        end
-
-        def truthy_config_value?(value)
-          value == true || value.to_s == "true"
-        end
-
-        # Resolves SHAKAPACKER_CONFIG the same way ReactOnRails::Engine does, so this CLI
-        # sees the same config file as Rails boot even when invoked from a directory other
-        # than the Rails root. Falls back to Dir.pwd when Rails isn't loaded (bin/dev does
-        # not require Rails directly).
-        def shakapacker_config_path
-          env_config_path = ENV.fetch("SHAKAPACKER_CONFIG", nil)
-          base = shakapacker_config_base_dir
-          return File.expand_path("config/shakapacker.yml", base) if env_config_path.to_s.empty?
-
-          File.expand_path(env_config_path, base)
-        end
-
-        def shakapacker_config_base_dir
-          return Rails.root.to_s if defined?(Rails) && Rails.respond_to?(:root) && Rails.root
-
-          Dir.pwd
-        end
-
         # rubocop:disable Metrics/AbcSize
         def handle_precompile_hook_failure(hook_value, stdout, stderr)
           puts ""
@@ -893,13 +783,18 @@ def default_dev_server_detail_lines(mode)
         def help_react_refresh_troubleshooting(default_mode)
           return help_hmr_react_refresh_troubleshooting if default_mode == :hmr
 
-          <<~REFRESH
+          troubleshooting = <<~REFRESH
             #{Rainbow('⚛️  React Refresh:').yellow.bold}
             #{Rainbow('React Refresh requires HMR; current default mode is not HMR.').white}
             #{Rainbow('•').yellow} #{Rainbow(ServerMode.text(default_mode, :refresh_guidance)).white}
             #{Rainbow('•').yellow} #{Rainbow(ServerMode.text(default_mode, :refresh_note)).white}
-            #{rspack_react_refresh_config_hint}
           REFRESH
+
+          # Append the rspack/other-bundler config-hint bullet only when present so it
+          # lines up with the bullets above; webpack returns "" and we skip it rather
+          # than emitting a trailing blank line.
+          hint = rspack_react_refresh_config_hint
+          hint.empty? ? troubleshooting : "#{troubleshooting}#{hint}\n"
         end
 
         def rspack_react_refresh_config_hint
@@ -913,6 +808,10 @@ def rspack_react_refresh_config_hint
         def help_hmr_react_refresh_troubleshooting
           plugin_check = "Check that both babel plugin and #{react_refresh_bundler_plugin_description} are configured:"
 
+          # The babel `react-refresh/babel` plugin is gated on WEBPACK_SERVE in the
+          # generated babel.config.js for both webpack and rspack apps, so that
+          # qualifier intentionally stays bundler-agnostic. Only the bundler plugin
+          # line below (react_refresh_bundler_config_hint) is bundler-specific.
           <<~REFRESH
             #{Rainbow('⚛️  React Refresh Issues:').yellow.bold}
             #{Rainbow('If you see "$RefreshSig$ is not defined" errors:').white}
 
@@ -7,6 +7,7 @@
 require "yaml"
 require_relative "utils"
 require_relative "config_path_resolver"
+require_relative "shakapacker_config_helpers"
 require_relative "dev/server_mode"
 require_relative "version_syntax_converter"
 require_relative "version_synchronizer"
@@ -47,6 +48,7 @@ module ReactOnRails
   # rubocop:disable Metrics/ClassLength, Metrics/AbcSize
   class Doctor
     include ConfigPathResolver
+    include ShakapackerConfigHelpers
 
     MESSAGE_COLORS = {
       error: :red,
@@ -58,7 +60,6 @@ class Doctor
     RSPEC_HELPER_FILES = ["spec/rails_helper.rb", "spec/spec_helper.rb"].freeze
     MINITEST_HELPER_FILE = "test/test_helper.rb"
     DEFAULT_BUILD_TEST_COMMAND = 'config.build_test_command = "RAILS_ENV=test bin/shakapacker"'
-    DEFAULT_SHAKAPACKER_CONFIG_PATH = "config/shakapacker.yml"
     SERVER_BUNDLE_SOURCE_EXTENSIONS = %w[.js .jsx .ts .tsx .mjs .cjs].freeze
     CUSTOM_LAUNCHER_INDICATOR_FILES = %w[dev].freeze
     RAILS_SERVER_COMMAND_REGEX = %r{\b(?:(?:bin/)?rails\s+(?:server|s)|puma|unicorn|rackup|passenger\s+start)\b}
@@ -341,7 +342,7 @@ def check_individual_procfile(filename, config)
 
     def procfile_descriptions
       {
-        hmr: "#{development_reload_mode_label} development with #{dev_server_procfile_label}",
+        hmr: "#{development_reload_mode_label} development with #{dev_server_label}",
         static: "Static development with #{static_watch_label}"
       }
     end
@@ -353,7 +354,7 @@ def default_procfile_description(default_mode)
     def bundler_aware_dev_server_text(text)
       return text if active_assets_bundler == "webpack"
 
-      text.gsub("webpack-dev-server", dev_server_procfile_label)
+      text.gsub("webpack-dev-server", dev_server_label)
     end
 
     def check_bin_dev_script
@@ -549,100 +550,22 @@ def print_next_steps
       puts
     end
 
-    def dev_server_label
-      active_assets_bundler == "webpack" ? "webpack-dev-server" : "#{assets_bundler_label} dev server"
-    end
-
-    def active_assets_bundler
-      configured_assets_bundler || "webpack"
-    end
-
-    def assets_bundler_label
-      active_assets_bundler.capitalize
-    end
-
-    def dev_server_procfile_label
-      dev_server_label
-    end
-
     def static_watch_label
       active_assets_bundler == "webpack" ? "webpack --watch" : "#{active_assets_bundler} watch"
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-    def development_reload_mode_label
-      development_hmr_enabled? ? "HMR" : "Live reload"
-    end
-
-    def configured_assets_bundler
-      config = parsed_shakapacker_config
-      return nil unless config.is_a?(Hash)
-
-      rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
-      bundler_from_shakapacker_section(config, rails_env) || bundler_from_shakapacker_section(config, "default")
-    rescue StandardError, ScriptError
-      nil
-    end
-
+    # Memoized per Doctor instance (a fresh Doctor runs per `doctor` invocation),
+    # so a single diagnosis reads and parses config/shakapacker.yml at most once
+    # even though several checks consult it. The base implementation lives in
+    # ShakapackerConfigHelpers. ServerManager intentionally does not memoize its
+    # copy because its helpers live on `class << self` and would leak across specs.
     def parsed_shakapacker_config
-      config_path = shakapacker_config_path
-      return nil unless File.exist?(config_path)
-
-      parse_shakapacker_config(File.read(config_path))
-    rescue StandardError, ScriptError
-      nil
-    end
-
-    def bundler_from_shakapacker_section(config, section_name)
-      section = config[section_name] || config[section_name.to_sym]
-      return nil unless section.is_a?(Hash)
+      return @parsed_shakapacker_config if defined?(@parsed_shakapacker_config)
 
-      normalize_assets_bundler(section["assets_bundler"] || section[:assets_bundler])
+      @parsed_shakapacker_config = super
     end
 
-    def normalize_assets_bundler(value)
-      normalized = value.to_s.strip.downcase
-      ReactOnRails::SystemChecker::SUPPORTED_ASSETS_BUNDLERS.include?(normalized) ? normalized : nil
-    end
-
-    def development_hmr_enabled?
-      dev_server = development_dev_server_config
-      return hmr_config_value?(dev_server["hmr"]) if dev_server.key?("hmr")
-
-      return false if truthy_config_value?(dev_server["live_reload"])
-
-      # Default to HMR when neither hmr nor live_reload is configured, preserving historical behavior.
-      true
-    end
-
-    def hmr_config_value?(value)
-      value.to_s.strip.casecmp?("only") || truthy_config_value?(value)
-    end
-
-    def development_dev_server_config
-      config = parsed_shakapacker_config
-      return {} unless config.is_a?(Hash)
-
-      development_config = shakapacker_section(config, "default").merge(shakapacker_section(config, "development"))
-      dev_server_config_for(development_config)
-    end
-
-    def shakapacker_section(config, section_name)
-      section = config[section_name] || config[section_name.to_sym]
-      section.is_a?(Hash) ? section : {}
-    end
-
-    def dev_server_config_for(section)
-      dev_server = section["dev_server"] || section[:dev_server]
-      return {} unless dev_server.is_a?(Hash)
-
-      dev_server.transform_keys(&:to_s)
-    end
-
-    def truthy_config_value?(value)
-      value == true || value.to_s == "true"
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
     def print_test_workflow_next_steps
       case @test_output_path_strategy
       when :shared
@@ -2069,20 +1992,6 @@ def uses_react_on_rails_test_helper?
     # than the Rails root. Without this, a relative SHAKAPACKER_CONFIG would fail to resolve and
     # dev-server mode detection would silently fall back to HMR labels. Falls back to Dir.pwd when
     # Rails isn't booted (e.g. in unit specs).
-    def shakapacker_config_path
-      env_config_path = ENV.fetch("SHAKAPACKER_CONFIG", nil)
-      base = shakapacker_config_base_dir
-      return File.expand_path(DEFAULT_SHAKAPACKER_CONFIG_PATH, base) if env_config_path.to_s.empty?
-
-      File.expand_path(env_config_path, base)
-    end
-
-    def shakapacker_config_base_dir
-      return Rails.root.to_s if defined?(Rails) && Rails.respond_to?(:root) && Rails.root
-
-      Dir.pwd
-    end
-
     def default_dev_server_mode
       @default_dev_server_mode ||= Dev::ServerMode.detect(shakapacker_config_path)
     end