shakapacker 9.1.0 → 9.3.0.beta.0

data/lib/shakapacker/configuration.rb

@@ -117,6 +117,17 @@ class Shakapacker::Configuration
     assets_bundler == "webpack"
   end
 
+  def precompile_hook
+    hook = fetch(:precompile_hook)
+    return nil if hook.nil? || (hook.is_a?(String) && hook.strip.empty?)
+
+    unless hook.is_a?(String)
+      raise "Shakapacker configuration error: precompile_hook must be a string, got #{hook.class}"
+    end
+
+    hook.strip
+  end
+
   def javascript_transpiler
     # Show deprecation warning if using old 'webpack_loader' key
     if data.has_key?(:webpack_loader) && !data.has_key?(:javascript_transpiler)
@@ -137,6 +148,14 @@ class Shakapacker::Configuration
     javascript_transpiler
   end
 
+  def assets_bundler_config_path
+    custom_path = fetch(:assets_bundler_config_path)
+    return custom_path if custom_path
+
+    # Default paths based on bundler type
+    rspack? ? "config/rspack" : "config/webpack"
+  end
+
   private
 
     def default_javascript_transpiler
@@ -255,7 +274,21 @@ class Shakapacker::Configuration
       rescue ArgumentError
         YAML.load_file(config_path.to_s)
       end
-      symbolized_config = config[env].deep_symbolize_keys
+
+      # Try to find environment-specific configuration with fallback
+      # Fallback order: requested env → production
+      if config[env]
+        env_config = config[env]
+      elsif config["production"]
+        log_fallback(env, "production")
+        env_config = config["production"]
+      else
+        # No suitable configuration found - rely on bundled defaults
+        log_fallback(env, "none (will use bundled defaults)")
+        env_config = nil
+      end
+
+      symbolized_config = env_config&.deep_symbolize_keys || {}
 
       return symbolized_config
     rescue Errno::ENOENT => e
@@ -280,7 +313,10 @@ class Shakapacker::Configuration
         rescue ArgumentError
           YAML.load_file(path)
         end
-        HashWithIndifferentAccess.new(config[env] || config[Shakapacker::DEFAULT_ENV])
+        # Load defaults from bundled shakapacker.yml (always has all environments)
+        # Note: This differs from load() which reads user's config and may be missing environments
+        # Fallback to production ensures staging and other custom envs get production-like defaults
+        HashWithIndifferentAccess.new(config[env] || config["production"])
       end
     end
 
@@ -289,4 +325,22 @@ class Shakapacker::Configuration
 
       path
     end
+
+    def log_fallback(requested_env, fallback_env)
+      message = "Shakapacker environment '#{requested_env}' not found in #{config_path}, " \
+                "falling back to '#{fallback_env}'"
+
+      # Try to use the logger if available, otherwise fall back to stdout
+      begin
+        if Shakapacker.respond_to?(:logger) && Shakapacker.logger
+          Shakapacker.logger.info(message)
+        else
+          puts message
+        end
+      rescue NameError, NoMethodError
+        # If logger access fails (e.g., circular dependency in standalone runner context),
+        # fall back to stdout so the message still gets displayed
+        puts message
+      end
+    end
 end

data/lib/shakapacker/dev_server_runner.rb

@@ -4,13 +4,150 @@ require "socket"
 require_relative "configuration"
 require_relative "dev_server"
 require_relative "runner"
+require_relative "version"
 
 module Shakapacker
   class DevServerRunner < Shakapacker::Runner
     def self.run(argv)
+      # Show Shakapacker help and exit (don't call bundler)
+      if argv.include?("--help") || argv.include?("-h")
+        print_help
+        exit(0)
+      elsif argv.include?("--version") || argv.include?("-v")
+        print_version
+        exit(0)
+      end
+
       new(argv).run
     end
 
+    def self.print_help
+      puts <<~HELP
+        ================================================================================
+        SHAKAPACKER DEV SERVER - Development Server with Hot Module Replacement
+        ================================================================================
+
+        Usage: bin/shakapacker-dev-server [options]
+
+        Shakapacker-specific options:
+          -h, --help              Show this help message
+          -v, --version           Show Shakapacker version
+          --debug-shakapacker     Enable Node.js debugging (--inspect-brk)
+
+        Examples:
+          bin/shakapacker-dev-server                    # Start dev server
+          bin/shakapacker-dev-server --no-hot           # Disable HMR
+          bin/shakapacker-dev-server --open             # Open browser automatically
+          bin/shakapacker-dev-server --debug-shakapacker # Debug with Node inspector
+
+      HELP
+
+      print_dev_server_help
+
+      puts <<~HELP
+
+        Options managed by Shakapacker (configured in config/shakapacker.yml):
+          --host                  Set from dev_server.host (default: localhost)
+          --port                  Set from dev_server.port (default: 3035)
+          --https                 Set from dev_server.server (http or https)
+          --config                Set automatically to config/webpack/webpack.config.js
+                                  or config/rspack/rspack.config.js
+
+        Note: CLI flags for --host, --port, and --https are NOT supported.
+        Configure these in config/shakapacker.yml instead.
+      HELP
+    end
+
+    def self.print_dev_server_help
+      bundler_type, bundler_help = get_dev_server_help
+
+      if bundler_help
+        bundler_name = bundler_type == :rspack ? "RSPACK" : "WEBPACK"
+        puts "=" * 80
+        puts "AVAILABLE #{bundler_name} DEV SERVER OPTIONS (Passed directly to #{bundler_name.downcase})"
+        puts "=" * 80
+        puts
+        puts filter_managed_options(bundler_help)
+        puts
+        puts "For complete documentation:"
+        if bundler_type == :rspack
+          puts "  https://rspack.dev/config/dev-server"
+        else
+          puts "  https://webpack.js.org/configuration/dev-server/"
+        end
+      else
+        puts "For complete documentation:"
+        puts "  Webpack: https://webpack.js.org/configuration/dev-server/"
+        puts "  Rspack:  https://rspack.dev/config/dev-server"
+      end
+    end
+
+    def self.get_dev_server_help
+      Runner.execute_bundler_command("serve", "--help") { |stdout| stdout }
+    end
+
+    # Filter dev server help output to remove Shakapacker-managed options
+    #
+    # This method processes the raw help output from webpack-dev-server/rspack serve
+    # and removes options that Shakapacker manages automatically:
+    # - --config (set from config/webpack or config/rspack)
+    # - --host, --port (set from config/shakapacker.yml dev_server settings)
+    # - --help, --version (shown separately in Shakapacker's help)
+    #
+    # The filtering uses skip_until_blank to track multi-line option descriptions
+    # and skip them entirely when the option header matches a managed option.
+    #
+    # Note: This relies on dev server help format conventions. If webpack-dev-server
+    # or rspack significantly changes their help output format, this may need adjustment.
+    def self.filter_managed_options(help_text)
+      lines = help_text.lines
+      filtered_lines = []
+      skip_until_blank = false
+
+      lines.each do |line|
+        # Skip options that Shakapacker manages and their descriptions
+        # These options are shown in the "Options managed by Shakapacker" section
+        if line.match?(/^\s*(-c,\s*)?--config\b/) ||
+           line.match?(/^\s*--configName\b/) ||
+           line.match?(/^\s*--configLoader\b/) ||
+           line.match?(/^\s*--nodeEnv\b/) ||
+           line.match?(/^\s*--host\b/) ||
+           line.match?(/^\s*--port\b/) ||
+           line.match?(/^\s*--https\b/) ||
+           line.match?(/^\s*(-h,\s*)?--help\b/) ||
+           line.match?(/^\s*(-v,\s*)?--version\b/)
+          skip_until_blank = true
+          next
+        end
+
+        # Continue skipping lines that are part of a filtered option's description
+        # Reset when we hit a blank line or the start of a new option (starts with -)
+        if skip_until_blank
+          if line.strip.empty? || line.match?(/^\s*-/)
+            skip_until_blank = false
+          else
+            next
+          end
+        end
+
+        filtered_lines << line
+      end
+
+      filtered_lines.join
+    end
+
+    def self.print_version
+      puts "Shakapacker #{Shakapacker::VERSION}"
+      puts "Framework: Rails #{Rails.version}" if defined?(Rails)
+
+      # Try to get bundler version
+      bundler_type, bundler_version = Runner.get_bundler_version
+      if bundler_version
+        bundler_name = bundler_type == :rspack ? "Rspack" : "Webpack"
+        puts "Bundler: #{bundler_name} #{bundler_version}"
+      end
+    end
+
     def run
       load_config
       detect_unsupported_switches!
@@ -96,8 +233,10 @@ module Shakapacker
         cmd += @argv
 
         Dir.chdir(@app_path) do
-          Kernel.exec env, *cmd
+          system(env, *cmd)
         end
+
+        exit($?.exitstatus || 1) unless $?.success?
       end
 
       def build_cmd