shakapacker 9.0.0 → 9.1.0

data/lib/shakapacker/bundler_switcher.rb

@@ -0,0 +1,322 @@
+# frozen_string_literal: true
+
+require "yaml"
+require "fileutils"
+
+module Shakapacker
+  # Provides functionality to switch between webpack and rspack bundlers
+  class BundlerSwitcher
+    SHAKAPACKER_CONFIG = "config/shakapacker.yml"
+    CUSTOM_DEPS_CONFIG = ".shakapacker-switch-bundler-dependencies.yml"
+
+    # Default dependencies for each bundler (package names only, no versions)
+    DEFAULT_RSPACK_DEPS = {
+      dev: %w[@rspack/cli @rspack/plugin-react-refresh],
+      prod: %w[@rspack/core rspack-manifest-plugin]
+    }.freeze
+
+    DEFAULT_WEBPACK_DEPS = {
+      dev: %w[webpack webpack-cli webpack-dev-server @pmmmwh/react-refresh-webpack-plugin @swc/core swc-loader],
+      prod: %w[webpack-assets-manifest webpack-merge]
+    }.freeze
+
+    attr_reader :root_path
+
+    def initialize(root_path = nil)
+      @root_path = root_path || (defined?(Rails) ? Rails.root : Pathname.new(Dir.pwd))
+    end
+
+    def current_bundler
+      config = load_yaml_config(config_path)
+      config.dig("default", "assets_bundler") || "webpack"
+    end
+
+    def switch_to(bundler, install_deps: false, no_uninstall: false)
+      unless %w[webpack rspack].include?(bundler)
+        raise ArgumentError, "Invalid bundler: #{bundler}. Must be 'webpack' or 'rspack'"
+      end
+
+      current = current_bundler
+      if current == bundler && !install_deps
+        puts "✅ Already using #{bundler}"
+        return
+      end
+
+      if current == bundler && install_deps
+        puts "✅ Already using #{bundler} - reinstalling dependencies as requested"
+        manage_dependencies(bundler, install_deps, switching: false, no_uninstall: no_uninstall)
+        return
+      end
+
+      update_config(bundler)
+
+      puts "✅ Switched from #{current} to #{bundler}"
+      puts ""
+      puts "📝 Configuration updated in #{SHAKAPACKER_CONFIG}"
+
+      manage_dependencies(bundler, install_deps, no_uninstall: no_uninstall)
+
+      puts ""
+      puts "🎯 Next steps:"
+      puts "   1. Restart your dev server: bin/dev"
+      puts "   2. Verify build works: bin/shakapacker"
+      puts ""
+      puts "💡 Tip: Both webpack and rspack can coexist in package.json during migration"
+      puts "        Use --install-deps to automatically manage dependencies, or manage manually"
+      puts "        Use --no-uninstall to skip removing old bundler packages (faster switching)"
+    end
+
+    def init_config
+      if File.exist?(custom_config_path)
+        puts "⚠️  #{CUSTOM_DEPS_CONFIG} already exists"
+        return
+      end
+
+      config = {
+        "rspack" => {
+          "devDependencies" => DEFAULT_RSPACK_DEPS[:dev],
+          "dependencies" => DEFAULT_RSPACK_DEPS[:prod]
+        },
+        "webpack" => {
+          "devDependencies" => DEFAULT_WEBPACK_DEPS[:dev],
+          "dependencies" => DEFAULT_WEBPACK_DEPS[:prod]
+        }
+      }
+
+      File.write(custom_config_path, YAML.dump(config))
+      puts "✅ Created #{CUSTOM_DEPS_CONFIG}"
+      puts ""
+      puts "You can now customize the dependencies for each bundler in this file."
+      puts "The script will automatically use these custom dependencies when switching bundlers."
+    end
+
+    def show_usage
+      current = current_bundler
+      puts "Current bundler: #{current}"
+      puts ""
+      puts "Usage:"
+      puts "  rails shakapacker:switch_bundler [webpack|rspack] [OPTIONS]"
+      puts "  rake shakapacker:switch_bundler [webpack|rspack] -- [OPTIONS]"
+      puts ""
+      puts "Options:"
+      puts "  --install-deps    Automatically install/uninstall dependencies"
+      puts "  --no-uninstall    Skip uninstalling old bundler packages (faster, keeps both bundlers)"
+      puts "  --init-config     Create #{CUSTOM_DEPS_CONFIG} with default dependencies"
+      puts "  --help, -h        Show this help message"
+      puts ""
+      puts "Examples:"
+      puts "  # Using rails command"
+      puts "  rails shakapacker:switch_bundler rspack --install-deps"
+      puts "  rails shakapacker:switch_bundler webpack --install-deps --no-uninstall"
+      puts "  rails shakapacker:switch_bundler --init-config"
+      puts ""
+      puts "  # Using rake command (note the -- separator)"
+      puts "  rake shakapacker:switch_bundler rspack -- --install-deps"
+      puts "  rake shakapacker:switch_bundler webpack -- --install-deps --no-uninstall"
+      puts "  rake shakapacker:switch_bundler -- --init-config"
+    end
+
+    private
+
+      def config_path
+        root_path.join(SHAKAPACKER_CONFIG)
+      end
+
+      def custom_config_path
+        root_path.join(CUSTOM_DEPS_CONFIG)
+      end
+
+      def load_dependencies
+        if File.exist?(custom_config_path)
+          puts "📝 Using custom dependencies from #{CUSTOM_DEPS_CONFIG}"
+          begin
+            custom = load_yaml_config(custom_config_path)
+          rescue Psych::SyntaxError => e
+            puts "❌ Error parsing #{CUSTOM_DEPS_CONFIG}: #{e.message}"
+            puts "   Please fix the YAML syntax or delete the file to use defaults"
+            raise
+          end
+          rspack_deps = {
+            dev: custom.dig("rspack", "devDependencies") || DEFAULT_RSPACK_DEPS[:dev],
+            prod: custom.dig("rspack", "dependencies") || DEFAULT_RSPACK_DEPS[:prod]
+          }
+          webpack_deps = {
+            dev: custom.dig("webpack", "devDependencies") || DEFAULT_WEBPACK_DEPS[:dev],
+            prod: custom.dig("webpack", "dependencies") || DEFAULT_WEBPACK_DEPS[:prod]
+          }
+          [rspack_deps, webpack_deps]
+        else
+          [DEFAULT_RSPACK_DEPS, DEFAULT_WEBPACK_DEPS]
+        end
+      end
+
+      def update_config(bundler)
+        content = File.read(config_path)
+
+        # Replace assets_bundler value (handles spaces, tabs, and various quote styles)
+        # Only matches uncommented lines
+        content.gsub!(/^([ \t]*assets_bundler:[ \t]*['"]?)(webpack|rspack)(['"]?)/, "\\1#{bundler}\\3")
+
+        # Update javascript_transpiler recommendation for rspack
+        # Only update if not already set to swc and only on uncommented lines
+        if bundler == "rspack" && content !~ /^[ \t]*javascript_transpiler:[ \t]*['"]?swc['"]?/
+          content.gsub!(/^([ \t]*javascript_transpiler:[ \t]*['"]?)\w+(['"]?)/, "\\1swc\\2")
+        end
+
+        File.write(config_path, content)
+      end
+
+      def manage_dependencies(bundler, install_deps, switching: true, no_uninstall: false)
+        rspack_deps, webpack_deps = load_dependencies
+        deps_to_install = bundler == "rspack" ? rspack_deps : webpack_deps
+        deps_to_remove = bundler == "rspack" ? webpack_deps : rspack_deps
+
+        if install_deps
+          puts ""
+          puts "📦 Managing dependencies..."
+          puts ""
+
+          # Show what will be removed (only when switching and not no_uninstall)
+          if switching && !no_uninstall && (!deps_to_remove[:dev].empty? || !deps_to_remove[:prod].empty?)
+            puts "   🗑️  Removing:"
+            deps_to_remove[:dev].each { |dep| puts "      - #{dep} (dev)" }
+            deps_to_remove[:prod].each { |dep| puts "      - #{dep} (prod)" }
+            puts ""
+          elsif switching && no_uninstall
+            puts "   ⏭️  Skipping uninstall (--no-uninstall)"
+            puts ""
+          end
+
+          # Show what will be installed
+          if !deps_to_install[:dev].empty? || !deps_to_install[:prod].empty?
+            puts "   📦 Installing:"
+            deps_to_install[:dev].each { |dep| puts "      - #{dep} (dev)" }
+            deps_to_install[:prod].each { |dep| puts "      - #{dep} (prod)" }
+            puts ""
+          end
+
+          # Remove old bundler dependencies (only when switching and not no_uninstall)
+          if switching && !no_uninstall
+            remove_dependencies(deps_to_remove)
+          end
+
+          # Install new bundler dependencies
+          install_dependencies(deps_to_install)
+
+          puts "   ✅ Dependencies updated"
+        else
+          print_manual_dependency_instructions(bundler, deps_to_install, deps_to_remove)
+        end
+      end
+
+      def remove_dependencies(deps)
+        package_json = get_package_json
+
+        unless deps[:dev].empty?
+          unless package_json.manager.remove(deps[:dev])
+            puts "   ⚠️  Warning: Failed to uninstall some dev dependencies"
+          end
+        end
+
+        unless deps[:prod].empty?
+          unless package_json.manager.remove(deps[:prod])
+            puts "   ⚠️  Warning: Failed to uninstall some prod dependencies"
+          end
+        end
+      end
+
+      def install_dependencies(deps)
+        package_json = get_package_json
+
+        unless deps[:dev].empty?
+          unless package_json.manager.add(deps[:dev], type: :dev)
+            puts "❌ Failed to install dev dependencies"
+            raise "Failed to install dev dependencies"
+          end
+        end
+
+        unless deps[:prod].empty?
+          unless package_json.manager.add(deps[:prod], type: :production)
+            puts "❌ Failed to install prod dependencies"
+            raise "Failed to install prod dependencies"
+          end
+        end
+      end
+
+      def get_package_json
+        require "package_json"
+        PackageJson.read(root_path)
+      end
+
+      def print_manual_dependency_instructions(bundler, deps_to_install, deps_to_remove)
+        puts ""
+        puts "⚠️  Dependencies not automatically installed (use --install-deps to auto-install)"
+        puts ""
+
+        package_manager = detect_package_manager
+        target_name = bundler == "rspack" ? "rspack" : "webpack"
+        old_name = bundler == "rspack" ? "webpack" : "rspack"
+
+        puts "📦 To install #{target_name} dependencies, run:"
+        print_install_commands(package_manager, deps_to_install)
+        puts ""
+        puts "🗑️  To remove #{old_name} dependencies, run:"
+        print_uninstall_commands(package_manager, deps_to_remove)
+      end
+
+      def detect_package_manager
+        get_package_json.manager.binary
+      rescue StandardError
+        "npm" # Fallback to npm if detection fails
+      end
+
+      def print_install_commands(package_manager, deps)
+        case package_manager
+        when "yarn"
+          puts "   yarn add --dev #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   yarn add #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        when "pnpm"
+          puts "   pnpm add -D #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   pnpm add #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        when "bun"
+          puts "   bun add --dev #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   bun add #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        else # npm
+          puts "   npm install --save-dev #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   npm install --save #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        end
+      end
+
+      def print_uninstall_commands(package_manager, deps)
+        case package_manager
+        when "yarn"
+          puts "   yarn remove #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   yarn remove #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        when "pnpm"
+          puts "   pnpm remove #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   pnpm remove #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        when "bun"
+          puts "   bun remove #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   bun remove #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        else # npm
+          puts "   npm uninstall #{deps[:dev].join(' ')}" unless deps[:dev].empty?
+          puts "   npm uninstall #{deps[:prod].join(' ')}" unless deps[:prod].empty?
+        end
+      end
+
+      # Load YAML config file with Ruby version compatibility
+      # Ruby 3.1+ supports aliases: keyword, older versions need YAML.safe_load
+      def load_yaml_config(path)
+        if YAML.respond_to?(:unsafe_load_file)
+          # Ruby 3.1+: Use unsafe_load_file to support aliases/anchors
+          YAML.unsafe_load_file(path)
+        else
+          # Ruby 2.7-3.0: Use safe_load with aliases enabled
+          YAML.safe_load(File.read(path), permitted_classes: [], permitted_symbols: [], aliases: true)
+        end
+      rescue ArgumentError
+        # Ruby 2.7 doesn't support aliases keyword - fall back to YAML.load
+        YAML.load(File.read(path)) # rubocop:disable Security/YAMLLoad
+      end
+  end
+end

data/lib/shakapacker/doctor.rb

@@ -65,12 +65,12 @@ module Shakapacker
 
       def check_entry_points
         # Check for invalid configuration first
-        if config.data[:source_entry_path] == "/" && config.nested_entries?
+        if config.fetch(:source_entry_path) == "/" && config.nested_entries?
           @issues << "Invalid configuration: cannot use '/' as source_entry_path with nested_entries: true"
           return  # Don't try to check files when config is invalid
         end
 
-        source_entry_path = config.source_path.join(config.data[:source_entry_path] || "packs")
+        source_entry_path = config.source_path.join(config.fetch(:source_entry_path) || "packs")
 
         unless source_entry_path.exist?
           @issues << "Source entry path #{source_entry_path} does not exist"
@@ -173,7 +173,8 @@ module Shakapacker
       end
 
       def check_sri_dependencies
-        return unless config.data.dig(:integrity, :enabled)
+        integrity_config = config.integrity
+        return unless integrity_config&.dig(:enabled)
 
         bundler = config.assets_bundler
         if bundler == "webpack"
@@ -183,7 +184,7 @@ module Shakapacker
         end
 
         # Validate hash functions
-        hash_functions = config.data.dig(:integrity, :hash_functions) || ["sha384"]
+        hash_functions = integrity_config.dig(:hash_functions) || ["sha384"]
         invalid_functions = hash_functions - ["sha256", "sha384", "sha512"]
         unless invalid_functions.empty?
           @issues << "Invalid SRI hash functions: #{invalid_functions.join(', ')}"
@@ -453,9 +454,53 @@ module Shakapacker
 
         if swc_config_path.exist?
           @info << "SWC configuration: Using config/swc.config.js (recommended). This config is merged with Shakapacker's defaults."
+          check_swc_config_settings(swc_config_path)
         end
       end
 
+      def check_swc_config_settings(config_path)
+        config_content = File.read(config_path, encoding: "UTF-8")
+
+        # Check for loose: true (deprecated default)
+        if config_content.match?(/loose\s*:\s*true/)
+          @warnings << "SWC configuration: 'loose: true' detected in config/swc.config.js. " \
+                      "This can cause silent failures with Stimulus controllers and incorrect spread operator behavior. " \
+                      "Consider removing this setting to use Shakapacker's default 'loose: false' (spec-compliant). " \
+                      "See: https://github.com/shakacode/shakapacker/blob/main/docs/using_swc_loader.md#using-swc-with-stimulus"
+        end
+
+        # Check for missing keepClassNames with Stimulus
+        if stimulus_likely_used? && !config_content.match?(/keepClassNames\s*:\s*true/)
+          @warnings << "SWC configuration: Stimulus appears to be in use, but 'keepClassNames: true' is not set in config/swc.config.js. " \
+                      "Without this setting, Stimulus controllers will fail silently. " \
+                      "Add 'keepClassNames: true' to jsc config. " \
+                      "See: https://github.com/shakacode/shakapacker/blob/main/docs/using_swc_loader.md#using-swc-with-stimulus"
+        elsif config_content.match?(/keepClassNames\s*:\s*true/)
+          @info << "SWC configuration: 'keepClassNames: true' is set (good for Stimulus compatibility)"
+        end
+
+        # Check for jsc.target and env conflict
+        # Use word boundary to avoid false positives with transform.target or other nested properties
+        if config_content.match?(/jsc\s*:\s*\{[^}]*\btarget\s*:/) && config_content.match?(/env\s*:\s*\{/)
+          @issues << "SWC configuration: Both 'jsc.target' and 'env' are configured. These cannot be used together. " \
+                     "Remove 'jsc.target' and use only 'env' (Shakapacker sets this automatically). " \
+                     "See: https://github.com/shakacode/shakapacker/blob/main/docs/using_swc_loader.md#using-swc-with-stimulus"
+        end
+      rescue => e
+        # Don't fail doctor if SWC config check has issues
+        @warnings << "Unable to validate SWC configuration: #{e.message}"
+      end
+
+      def stimulus_likely_used?
+        return false unless package_json_exists?
+
+        package_json = read_package_json
+        dependencies = (package_json["dependencies"] || {}).merge(package_json["devDependencies"] || {})
+
+        # Check for @hotwired/stimulus or stimulus package
+        dependencies.key?("@hotwired/stimulus") || dependencies.key?("stimulus")
+      end
+
       def check_css_dependencies
         check_dependency("css-loader", @issues, "CSS")
         check_dependency("style-loader", @issues, "CSS (style-loader)")

data/lib/shakapacker/swc_migrator.rb

@@ -51,11 +51,19 @@ module Shakapacker
       // This file is merged with Shakapacker's default SWC configuration
       // See: https://swc.rs/docs/configuration/compilation
 
+      const { env } = require('shakapacker');
+
       module.exports = {
-        jsc: {
-          transform: {
-            react: {
-              runtime: "automatic"
+        options: {
+          jsc: {
+            // CRITICAL for Stimulus compatibility: Prevents SWC from mangling class names
+            // which breaks Stimulus's class-based controller discovery mechanism
+            keepClassNames: true,
+            transform: {
+              react: {
+                runtime: "automatic",
+                refresh: env.isDevelopment && env.runningWebpackDevServer
+              }
             }
           }
         }
@@ -222,8 +230,8 @@ module Shakapacker
             settings.delete("babel")
           end
 
-          settings["swc"] = true
-          logger.info "  - Enabled SWC for #{env} environment"
+          settings["javascript_transpiler"] = "swc"
+          logger.info "  - Set javascript_transpiler to 'swc' for #{env} environment"
         end
 
         File.write(config_path, config.to_yaml)

data/lib/shakapacker/version.rb

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

data/lib/tasks/shakapacker/switch_bundler.rake

@@ -0,0 +1,82 @@
+require "shakapacker/bundler_switcher"
+
+namespace :shakapacker do
+  desc <<~DESC
+    Switch between webpack and rspack bundlers
+
+    Easily switch your Shakapacker configuration between webpack and rspack bundlers.
+    This task updates config/shakapacker.yml and optionally manages npm dependencies.
+
+    Usage:
+      rails shakapacker:switch_bundler [webpack|rspack] [OPTIONS]
+      rake shakapacker:switch_bundler [webpack|rspack] -- [OPTIONS]
+
+    Options:
+      --install-deps    Automatically install/uninstall bundler dependencies
+      --no-uninstall    Skip uninstalling old bundler packages (faster, keeps both bundlers)
+      --init-config     Create custom dependencies configuration file
+      --help, -h        Show detailed help message
+
+    Examples:
+      # Switch to rspack with automatic dependency management
+      rails shakapacker:switch_bundler rspack --install-deps
+      rake shakapacker:switch_bundler rspack -- --install-deps
+
+      # Fast switching without uninstalling (keeps both bundlers)
+      rails shakapacker:switch_bundler webpack --install-deps --no-uninstall
+      rake shakapacker:switch_bundler rspack -- --install-deps --no-uninstall
+
+      # Switch to rspack (manual dependency management)
+      rails shakapacker:switch_bundler rspack
+      rake shakapacker:switch_bundler rspack
+
+      # Switch back to webpack with dependency management
+      rails shakapacker:switch_bundler webpack --install-deps
+      rake shakapacker:switch_bundler webpack -- --install-deps
+
+      # Create custom dependencies config file
+      rails shakapacker:switch_bundler --init-config
+      rake shakapacker:switch_bundler -- --init-config
+
+      # Show current bundler and usage help
+      rails shakapacker:switch_bundler --help
+      rake shakapacker:switch_bundler -- --help
+
+    Note: When using 'rake', you must use '--' to separate rake options from task arguments.
+
+    What it does:
+      - Updates 'assets_bundler' in config/shakapacker.yml
+      - Preserves YAML comments and structure
+      - Updates 'javascript_transpiler' to 'swc' when switching to rspack
+      - With --install-deps: installs/uninstalls npm dependencies automatically
+      - Without --install-deps: shows manual installation commands
+
+    Custom Dependencies:
+      Create .shakapacker-switch-bundler-dependencies.yml to customize which
+      npm packages are installed/uninstalled during bundler switching.
+
+    See docs/rspack_migration_guide.md for more information.
+  DESC
+  task :switch_bundler do
+    switcher = Shakapacker::BundlerSwitcher.new
+
+    if ARGV.empty? || ARGV.include?("--help") || ARGV.include?("-h")
+      switcher.show_usage
+    elsif ARGV.include?("--init-config")
+      switcher.init_config
+    else
+      bundler = ARGV[1]
+      install_deps = ARGV.include?("--install-deps")
+      no_uninstall = ARGV.include?("--no-uninstall")
+
+      if bundler.nil? || bundler.start_with?("-")
+        switcher.show_usage
+      else
+        switcher.switch_to(bundler, install_deps: install_deps, no_uninstall: no_uninstall)
+      end
+    end
+
+    # Prevent rake from trying to execute arguments as tasks
+    ARGV.each { |arg| task arg.to_sym {} }
+  end
+end

data/lib/tasks/shakapacker.rake

@@ -9,7 +9,8 @@ tasks = {
   "shakapacker:check_binstubs"          => "Verifies that bin/shakapacker is present",
   "shakapacker:binstubs"                => "Installs Shakapacker binstubs in this application",
   "shakapacker:verify_install"          => "Verifies if Shakapacker is installed",
-  "shakapacker:doctor"                  => "Checks for configuration issues and missing dependencies"
+  "shakapacker:doctor"                  => "Checks for configuration issues and missing dependencies",
+  "shakapacker:switch_bundler"          => "Switch between webpack and rspack bundlers"
 }.freeze
 
 desc "Lists all available tasks in Shakapacker"

data/package/environments/__type-tests__/rspack-plugin-compatibility.ts

@@ -0,0 +1,30 @@
+/**
+ * Compile-time type tests for RspackPlugin backward compatibility
+ * This file ensures that RspackPlugin is correctly aliased to RspackPluginInstance
+ * and maintains backward compatibility for existing consumers.
+ *
+ * These tests will fail at compile time if the types are not compatible.
+ */
+
+import type { RspackPlugin, RspackPluginInstance } from '../types'
+
+// Test 1: RspackPlugin should be assignable to RspackPluginInstance
+const testPluginToInstance = (plugin: RspackPlugin): RspackPluginInstance => plugin
+
+// Test 2: RspackPluginInstance should be assignable to RspackPlugin
+const testInstanceToPlugin = (instance: RspackPluginInstance): RspackPlugin => instance
+
+// Test 3: Array compatibility
+const testArrayCompatibility = (plugins: RspackPlugin[]): RspackPluginInstance[] => plugins
+const testArrayCompatibilityReverse = (
+  instances: RspackPluginInstance[]
+): RspackPlugin[] => instances
+
+// Test 4: Optional parameter compatibility
+const testOptionalParam = (plugin?: RspackPlugin): RspackPluginInstance | undefined => plugin
+const testOptionalParamReverse = (
+  instance?: RspackPluginInstance
+): RspackPlugin | undefined => instance
+
+// Export a dummy value to make this a module
+export const __typeTestsComplete = true

data/package/environments/types.ts

@@ -3,8 +3,12 @@
  * These types are exported for consumer use
  */
 
-import type { Configuration as WebpackConfiguration, WebpackPluginInstance } from "webpack"
+import type {
+  Configuration as WebpackConfiguration,
+  WebpackPluginInstance
+} from "webpack"
 import type { Configuration as DevServerConfiguration } from "webpack-dev-server"
+import type { RspackPluginInstance as ImportedRspackPluginInstance } from "@rspack/core"
 
 /**
  * Webpack configuration extended with dev server support
@@ -15,15 +19,17 @@ export interface WebpackConfigWithDevServer extends WebpackConfiguration {
 }
 
 /**
- * Rspack plugin interface
- * Rspack plugins follow a similar pattern to webpack but may have different internals
+ * Rspack plugin instance interface
+ * Uses the RspackPluginInstance type from @rspack/core
  */
-export interface RspackPlugin {
-  new(...args: any[]): {
-    apply(compiler: any): void
-    [key: string]: any
-  }
-}
+export type RspackPluginInstance = ImportedRspackPluginInstance
+
+/**
+ * Rspack plugin type alias
+ * @deprecated Use RspackPluginInstance instead
+ * Retained for backward compatibility with existing code
+ */
+export type RspackPlugin = RspackPluginInstance
 
 /**
  * Rspack dev server configuration
@@ -52,7 +58,7 @@ export interface RspackConfigWithDevServer {
   mode?: "development" | "production" | "none"
   devtool?: string | false
   devServer?: RspackDevServerConfig
-  plugins?: RspackPlugin[]
+  plugins?: RspackPluginInstance[]
   module?: WebpackConfiguration["module"]
   resolve?: WebpackConfiguration["resolve"]
   entry?: WebpackConfiguration["entry"]
@@ -76,15 +82,17 @@ export interface CompressionPluginOptions {
 /**
  * Compression plugin constructor type
  */
-export type CompressionPluginConstructor = new (options: CompressionPluginOptions) => WebpackPluginInstance
+export type CompressionPluginConstructor = new (
+  options: CompressionPluginOptions
+) => WebpackPluginInstance
 
 /**
  * React Refresh plugin types
  */
 export interface ReactRefreshWebpackPlugin {
-  new(options?: Record<string, unknown>): WebpackPluginInstance
+  new (options?: Record<string, unknown>): WebpackPluginInstance
 }
 
 export interface ReactRefreshRspackPlugin {
-  new(options?: Record<string, unknown>): RspackPlugin
-}
+  new (options?: Record<string, unknown>): RspackPluginInstance
+}

data/package/index.ts

@@ -16,18 +16,21 @@ const inliningCss = require("./utils/inliningCss")
 const rulesPath = resolve(__dirname, "rules", `${config.assets_bundler}.js`)
 const rules = require(rulesPath)
 
-const generateWebpackConfig = (extraConfig: Configuration = {}, ...extraArgs: any[]): Configuration => {
+const generateWebpackConfig = (
+  extraConfig: Configuration = {},
+  ...extraArgs: unknown[]
+): Configuration => {
   if (extraArgs.length > 0) {
     throw new Error(
       `Invalid usage: generateWebpackConfig() accepts only one configuration object.\n\n` +
-      `You passed ${extraArgs.length + 1} arguments. Only one extra config may be passed here - use webpack-merge to merge configs before passing them to Shakapacker.\n\n` +
-      `Example:\n` +
-      `  const { merge } = require('webpack-merge')\n` +
-      `  const mergedConfig = merge(config1, config2, config3)\n` +
-      `  const finalConfig = generateWebpackConfig(mergedConfig)\n\n` +
-      `Or if using ES6:\n` +
-      `  import { merge } from 'webpack-merge'\n` +
-      `  const finalConfig = generateWebpackConfig(merge(config1, config2))`
+        `You passed ${extraArgs.length + 1} arguments. Only one extra config may be passed here - use webpack-merge to merge configs before passing them to Shakapacker.\n\n` +
+        `Example:\n` +
+        `  const { merge } = require('webpack-merge')\n` +
+        `  const mergedConfig = merge(config1, config2, config3)\n` +
+        `  const finalConfig = generateWebpackConfig(mergedConfig)\n\n` +
+        `Or if using ES6:\n` +
+        `  import { merge } from 'webpack-merge'\n` +
+        `  const finalConfig = generateWebpackConfig(merge(config1, config2))`
     )
   }