shakapacker 9.3.0.beta.1 → 9.3.0.beta.4

data/lib/shakapacker/runner.rb

@@ -2,6 +2,7 @@ require_relative "utils/misc"
 require_relative "utils/manager"
 require_relative "configuration"
 require_relative "version"
+require_relative "build_config_loader"
 
 require "package_json"
 require "pathname"
@@ -34,15 +35,109 @@ module Shakapacker
       elsif argv.include?("--version") || argv.include?("-v")
         print_version
         exit(0)
+      elsif argv.include?("--init")
+        init_config_file
+        exit(0)
+      elsif argv.include?("--list-builds")
+        list_builds
+        exit(0)
+      end
+
+      # Check for --bundler flag
+      bundler_override = nil
+      bundler_index = argv.index("--bundler")
+      if bundler_index
+        bundler_value = argv[bundler_index + 1]
+        unless bundler_value && %w[webpack rspack].include?(bundler_value)
+          $stderr.puts "[Shakapacker] Error: --bundler requires 'webpack' or 'rspack'"
+          $stderr.puts "Usage: bin/shakapacker --bundler <webpack|rspack>"
+          exit(1)
+        end
+        bundler_override = bundler_value
+      end
+
+      # Check for --build flag
+      build_index = argv.index("--build")
+      if build_index
+        build_name = argv[build_index + 1]
+
+        unless build_name
+          $stderr.puts "[Shakapacker] Error: --build requires a build name"
+          $stderr.puts "Usage: bin/shakapacker --build <name>"
+          exit(1)
+        end
+
+        loader = BuildConfigLoader.new
+
+        unless loader.exists?
+          $stderr.puts "[Shakapacker] Config file not found: #{loader.config_file_path}"
+          $stderr.puts "Run 'bin/shakapacker --init' to create one"
+          exit(1)
+        end
+
+        begin
+          # Pass bundler override to resolve_build_config
+          resolve_opts = {}
+          resolve_opts[:default_bundler] = bundler_override if bundler_override
+          build_config = loader.resolve_build_config(build_name, **resolve_opts)
+
+          # Remove --build and build name from argv
+          remaining_argv = argv.dup
+          remaining_argv.delete_at(build_index + 1)
+          remaining_argv.delete_at(build_index)
+
+          # Remove --bundler and bundler value from argv if present
+          if bundler_index
+            bundler_idx_in_remaining = remaining_argv.index("--bundler")
+            if bundler_idx_in_remaining
+              remaining_argv.delete_at(bundler_idx_in_remaining + 1)
+              remaining_argv.delete_at(bundler_idx_in_remaining)
+            end
+          end
+
+          # If this build uses dev server, delegate to DevServerRunner
+          if loader.uses_dev_server?(build_config)
+            $stdout.puts "[Shakapacker] Build '#{build_name}' requires dev server"
+            $stdout.puts "[Shakapacker] Running: bin/shakapacker-dev-server --build #{build_name}"
+            $stdout.puts ""
+            require_relative "dev_server_runner"
+            DevServerRunner.run_with_build_config(remaining_argv, build_config)
+            return
+          end
+
+          # Otherwise run with this build config
+          run_with_build_config(remaining_argv, build_config)
+          return
+        rescue ArgumentError => e
+          $stderr.puts "[Shakapacker] #{e.message}"
+          exit(1)
+        end
       end
 
       Shakapacker.ensure_node_env!
 
+      # Remove --bundler flag from argv if present (not using --build)
+      remaining_argv = argv.dup
+      if bundler_index
+        bundler_idx = remaining_argv.index("--bundler")
+        if bundler_idx
+          remaining_argv.delete_at(bundler_idx + 1)
+          remaining_argv.delete_at(bundler_idx)
+        end
+      end
+
+      # Set SHAKAPACKER_ASSETS_BUNDLER if bundler override is specified
+      # This ensures JS/TS config files use the correct bundler
+      ENV["SHAKAPACKER_ASSETS_BUNDLER"] = bundler_override if bundler_override
+
       # Create a single runner instance to avoid loading configuration twice.
       # We extend it with the appropriate build command based on the bundler type.
-      runner = new(argv)
+      runner = new(remaining_argv, nil, bundler_override)
+
+      # Determine which bundler to use (override takes precedence)
+      use_rspack = bundler_override ? (bundler_override == "rspack") : runner.config.rspack?
 
-      if runner.config.rspack?
+      if use_rspack
         require_relative "rspack_runner"
         # Extend the runner instance with rspack-specific methods
         # This avoids creating a new RspackRunner which would reload the configuration
@@ -69,17 +164,71 @@ module Shakapacker
       end
     end
 
-    def initialize(argv)
+    def self.run_with_build_config(argv, build_config)
+      $stdout.sync = true
+      Shakapacker.ensure_node_env!
+
+      # Apply build config environment variables
+      build_config[:environment].each do |key, value|
+        ENV[key] = value.to_s
+      end
+
+      # Set SHAKAPACKER_ASSETS_BUNDLER so JS/TS config files use the correct bundler
+      # This ensures the bundler override (from --bundler or build config) is respected
+      ENV["SHAKAPACKER_ASSETS_BUNDLER"] = build_config[:bundler]
+
+      puts "[Shakapacker] Running build: #{build_config[:name]}"
+      puts "[Shakapacker] Description: #{build_config[:description]}" if build_config[:description]
+      puts "[Shakapacker] Bundler: #{build_config[:bundler]}"
+      puts "[Shakapacker] Config file: #{build_config[:config_file]}" if build_config[:config_file]
+
+      # Create runner with modified argv and bundler from build_config
+      # The build_config[:bundler] already has any CLI --bundler override applied
+      runner = new(argv, build_config, build_config[:bundler])
+
+      # Use bundler from build_config (which includes CLI override)
+      if build_config[:bundler] == "rspack"
+        require_relative "rspack_runner"
+        runner.extend(Module.new do
+          def build_cmd
+            package_json.manager.native_exec_command("rspack")
+          end
+
+          def assets_bundler_commands
+            BASE_COMMANDS + %w[build watch]
+          end
+        end)
+        runner.run
+      else
+        require_relative "webpack_runner"
+        runner.extend(Module.new do
+          def build_cmd
+            package_json.manager.native_exec_command("webpack")
+          end
+        end)
+        runner.run
+      end
+    end
+
+    def initialize(argv, build_config = nil, bundler_override = nil)
       @argv = argv
+      @build_config = build_config
+      @bundler_override = bundler_override
+
+      @app_path           = File.expand_path(".", Dir.pwd)
+      @shakapacker_config = ENV["SHAKAPACKER_CONFIG"] || File.join(@app_path, "config/shakapacker.yml")
 
-      @app_path              = File.expand_path(".", Dir.pwd)
-      @shakapacker_config    = ENV["SHAKAPACKER_CONFIG"] || File.join(@app_path, "config/shakapacker.yml")
-      @config                = Configuration.new(
+      # Create config with bundler override if provided
+      config_opts = {
         root_path: Pathname.new(@app_path),
         config_path: Pathname.new(@shakapacker_config),
         env: ENV["RAILS_ENV"] || ENV["NODE_ENV"] || "development"
-      )
-      @webpack_config        = find_assets_bundler_config
+      }
+      config_opts[:bundler_override] = bundler_override if bundler_override
+
+      @config = Configuration.new(**config_opts)
+
+      @webpack_config = find_webpack_config_from_build_or_default
 
       Shakapacker::Utils::Manager.error_unless_package_manager_is_obvious!
     end
@@ -175,13 +324,26 @@ module Shakapacker
           --debug-shakapacker       Enable Node.js debugging (--inspect-brk)
           --trace-deprecation       Show stack traces for deprecations
           --no-deprecation          Silence deprecation warnings
+          --bundler <webpack|rspack>
+                                    Override bundler (defaults to shakapacker.yml)
 
-        Examples:
-          bin/shakapacker                              # Build for production
-          bin/shakapacker --mode development           # Build for development
-          bin/shakapacker --watch                      # Watch mode
-          bin/shakapacker --mode development --analyze # Development build with analysis
-          bin/shakapacker --debug-shakapacker          # Debug with Node inspector
+        Build configurations (config/shakapacker-builds.yml):
+          --init                    Create config/shakapacker-builds.yml
+          --list-builds             List available builds
+          --build <name>            Run a specific build configuration
+
+        Examples (build configs):
+          bin/shakapacker --init                       # Create config file
+          bin/shakapacker --list-builds                # Show available builds
+          bin/shakapacker --build dev-hmr              # Run the 'dev-hmr' build
+          bin/shakapacker --build prod                 # Run the 'prod' build
+          bin/shakapacker --build prod --bundler rspack # Override to use rspack
+
+          Note: If a build has dev_server: true in its config, it will
+          automatically use bin/shakapacker-dev-server instead.
+
+          Advanced: Use bin/shakapacker-config for more config management options
+          (validate builds, export configs, etc.)
 
         HELP
 
@@ -189,6 +351,14 @@ module Shakapacker
 
         puts <<~HELP
 
+        Examples (passing options to webpack/rspack):
+          bin/shakapacker                              # Build for production
+          bin/shakapacker --bundler rspack             # Build with rspack instead of webpack
+          bin/shakapacker --mode development           # Build for development
+          bin/shakapacker --watch                      # Watch mode
+          bin/shakapacker --mode development --analyze # Development build with analysis
+          bin/shakapacker --debug-shakapacker          # Debug with Node inspector
+
         Options managed by Shakapacker (configured via config files):
           --config                  Set automatically based on assets_bundler_config_path
                                     (defaults to config/webpack or config/rspack)
@@ -301,6 +471,52 @@ module Shakapacker
         end
       end
 
+      def self.init_config_file
+        loader = BuildConfigLoader.new
+        config_path = loader.config_file_path
+
+        if loader.exists?
+          puts "[Shakapacker] Config file already exists: #{config_path}"
+          puts "Use --list-builds to see available builds"
+          return
+        end
+
+        # Delegate to bin/shakapacker-config
+        app_path = File.expand_path(".", Dir.pwd)
+        shakapacker_config_path = File.join(app_path, "bin", "shakapacker-config")
+
+        unless File.exist?(shakapacker_config_path)
+          $stderr.puts "[Shakapacker] Error: bin/shakapacker-config not found"
+          $stderr.puts "Please ensure Shakapacker is properly installed"
+          exit(1)
+        end
+
+        # Run the init command and check if it succeeded
+        unless system(shakapacker_config_path, "--init")
+          exit_code = $?.exitstatus || 1
+          $stderr.puts "[Shakapacker] Error: Failed to run: #{shakapacker_config_path} --init"
+          $stderr.puts "[Shakapacker] Command exited with status: #{exit_code}"
+          exit(exit_code)
+        end
+      end
+
+      def self.list_builds
+        loader = BuildConfigLoader.new
+
+        unless loader.exists?
+          puts "[Shakapacker] No config file found: #{loader.config_file_path}"
+          puts "Run 'bin/shakapacker --init' to create one"
+          return
+        end
+
+        begin
+          loader.list_builds
+        rescue ArgumentError => e
+          $stderr.puts "[Shakapacker] Error: #{e.message}"
+          exit(1)
+        end
+      end
+
       def self.get_bundler_version
         execute_bundler_command("--version") { |stdout| stdout.strip }
       end
@@ -356,6 +572,15 @@ module Shakapacker
       end
 
     private
+
+      def find_webpack_config_from_build_or_default
+        if @build_config && @build_config[:config_file]
+          File.join(@app_path, @build_config[:config_file])
+        else
+          find_assets_bundler_config
+        end
+      end
+
       def find_assets_bundler_config
         if @config.rspack?
           find_rspack_config_with_fallback
@@ -379,7 +604,7 @@ module Shakapacker
           return rspack_path
         end
 
-        # Fallback to webpack config with deprecation warning
+        # Fallback to webpack config in the configured directory
         webpack_paths = %w[ts js].map do |ext|
           File.join(@app_path, config_dir, "webpack.config.#{ext}")
         end
@@ -393,6 +618,29 @@ module Shakapacker
           return webpack_path
         end
 
+        # Backward compatibility: Check config/webpack/ if we were looking in config/rspack/
+        # This supports upgrades from versions where rspack used config/webpack/
+        if config_dir == "config/rspack"
+          webpack_dir_paths = %w[ts js].map do |ext|
+            File.join(@app_path, "config/webpack", "webpack.config.#{ext}")
+          end
+
+          puts "[Shakapacker] Checking config/webpack/ for backward compatibility..."
+          webpack_dir_path = webpack_dir_paths.find { |f| File.exist?(f) }
+          if webpack_dir_path
+            $stderr.puts "⚠️  DEPRECATION WARNING: Found webpack config in config/webpack/ but assets_bundler is set to 'rspack'."
+            $stderr.puts "   For rspack, configs should be in config/rspack/ directory."
+            $stderr.puts "   "
+            $stderr.puts "   To fix this, either:"
+            $stderr.puts "   1. Move your config: mv config/webpack config/rspack"
+            $stderr.puts "   2. Set assets_bundler_config_path in config/shakapacker.yml:"
+            $stderr.puts "      assets_bundler_config_path: config/webpack"
+            $stderr.puts "   "
+            $stderr.puts "   Using: #{webpack_dir_path}"
+            return webpack_dir_path
+          end
+        end
+
         # No config found
         print_config_not_found_error("rspack", rspack_paths.last, config_dir)
         exit(1)

data/lib/shakapacker/version.rb

@@ -1,4 +1,4 @@
 module Shakapacker
   # Change the version in package.json too, please!
-  VERSION = "9.3.0.beta.1".freeze
+  VERSION = "9.3.0.beta.4".freeze
 end

data/package/configExporter/buildValidator.ts

@@ -865,13 +865,13 @@ export class BuildValidator {
       const failedBuilds = results.filter((r) => !r.success)
       failedBuilds.forEach((result) => {
         lines.push(
-          `   bin/export-bundler-config --validate-build ${result.buildName} --verbose`
+          `   bin/shakapacker-config --validate-build ${result.buildName} --verbose`
         )
       })
 
       lines.push("")
       lines.push(
-        "   Or validate all builds with full output: bin/export-bundler-config --validate --verbose"
+        "   Or validate all builds with full output: bin/shakapacker-config --validate --verbose"
       )
       lines.push("=".repeat(80))
     }