shakapacker 9.3.0 → 9.3.2

data/lib/shakapacker/runner.rb

@@ -302,7 +302,7 @@ module Shakapacker
       def print_config_not_found_error(bundler_type, config_path, config_dir)
         $stderr.puts "[Shakapacker] ERROR: #{bundler_type} config #{config_path} not found."
         $stderr.puts ""
-        $stderr.puts "Please run 'bundle exec rails shakapacker:install' to install Shakapacker with default configs,"
+        $stderr.puts "Please run 'bundle exec rake shakapacker:install' to install Shakapacker with default configs,"
         $stderr.puts "or create the missing config file."
         $stderr.puts ""
         $stderr.puts "If your config file is in a different location, you can configure it in config/shakapacker.yml:"

data/lib/shakapacker/swc_migrator.rb

@@ -101,11 +101,11 @@ module Shakapacker
           logger.info "   - #{package}"
         end
         logger.info "\n   To remove them, run:"
-        logger.info "   rails shakapacker:clean_babel_packages"
+        logger.info "   bundle exec rake shakapacker:clean_babel_packages"
       end
 
       # Suggest running doctor to verify configuration
-      logger.info "\n🩺 Run 'rails shakapacker:doctor' to verify your configuration"
+      logger.info "\n🩺 Run 'bundle exec rake shakapacker:doctor' to verify your configuration"
 
       # Run package manager install if packages were added
       if run_installer && results[:packages_installed].any?

data/lib/shakapacker/version.rb

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

data/lib/tasks/shakapacker/binstubs.rake

@@ -7,9 +7,11 @@ namespace :shakapacker do
     prefix = task.name.split(/#|shakapacker:binstubs/).first
 
     if Rails::VERSION::MAJOR >= 5
-      exec "#{RbConfig.ruby} '#{bin_path}/rails' #{prefix}app:template LOCATION='#{binstubs_template_path}'"
+      system "#{RbConfig.ruby} '#{bin_path}/rails' #{prefix}app:template LOCATION='#{binstubs_template_path}'" or
+        raise "Binstubs installation failed"
     else
-      exec "#{RbConfig.ruby} '#{bin_path}/rake' #{prefix}rails:template LOCATION='#{binstubs_template_path}'"
+      system "#{RbConfig.ruby} '#{bin_path}/rake' #{prefix}rails:template LOCATION='#{binstubs_template_path}'" or
+        raise "Binstubs installation failed"
     end
   end
 end

data/lib/tasks/shakapacker/check_binstubs.rake

@@ -11,8 +11,8 @@ def verify_file_existence(binstub_file)
     puts <<~MSG
       Couldn't find shakapacker binstubs!
       Possible solutions:
-      - Ensure you have run `rails shakapacker:install`.
-      - Run `rails shakapacker:binstubs` if you have already installed shakapacker.
+      - Ensure you have run `bundle exec rake shakapacker:install`.
+      - Run `bundle exec rake shakapacker:binstubs` if you have already installed shakapacker.
       - Ensure the `bin` directory, `bin/shakapacker`, and `bin/shakapacker-dev-server` are not included in .gitignore.
     MSG
     exit!

data/lib/tasks/shakapacker/doctor.rake

@@ -20,9 +20,9 @@ namespace :shakapacker do
       --verbose    Display additional diagnostic details (paths, versions, environment)
 
     Examples:
-      bin/rails shakapacker:doctor
-      bin/rails shakapacker:doctor -- --verbose
-      bin/rails shakapacker:doctor -- --help
+      bundle exec rake shakapacker:doctor
+      bundle exec rake shakapacker:doctor -- --verbose
+      bundle exec rake shakapacker:doctor -- --help
 
     Exit codes:
       0 - No issues found

data/lib/tasks/shakapacker/export_bundler_config.rake

@@ -7,7 +7,6 @@ namespace :shakapacker do
     client vs server bundle differences.
 
     Usage:
-      rails shakapacker:export_bundler_config [OPTIONS]
       rake shakapacker:export_bundler_config -- [OPTIONS]
 
     Quick Start (Recommended):
@@ -28,22 +27,19 @@ namespace :shakapacker do
 
     Examples:
       # Export all configs for troubleshooting
-      rails shakapacker:export_bundler_config --doctor
+      bundle exec rake shakapacker:export_bundler_config -- --doctor
 
       # Save production client config
-      rails shakapacker:export_bundler_config --save --env=production --client-only
+      bundle exec rake shakapacker:export_bundler_config -- --save --env=production --client-only
 
       # View development config in terminal
-      rails shakapacker:export_bundler_config
+      bundle exec rake shakapacker:export_bundler_config
 
       # Show detailed help
-      rails shakapacker:export_bundler_config --help
-
-    Note: When using 'rake', you must use '--' to separate rake options from task arguments.
-          Example: rake shakapacker:export_bundler_config -- --doctor
+      bundle exec rake shakapacker:export_bundler_config -- --help
 
     The task automatically falls back to the gem version if bin/shakapacker-config
-    binstub is not installed. To install all binstubs, run: rails shakapacker:binstubs
+    binstub is not installed. To install all binstubs, run: bundle exec rake shakapacker:binstubs
   DESC
   task :export_bundler_config do
     # Try to use the binstub if it exists, otherwise use the gem's version

data/lib/tasks/shakapacker/install.rake

@@ -19,9 +19,11 @@ namespace :shakapacker do
     prefix = task.name.split(/#|shakapacker:install/).first
 
     if Rails::VERSION::MAJOR >= 5
-      exec "#{RbConfig.ruby} '#{bin_path}/rails' #{prefix}app:template LOCATION='#{install_template_path}'"
+      system "#{RbConfig.ruby} '#{bin_path}/rails' #{prefix}app:template LOCATION='#{install_template_path}'" or
+        raise "Installation failed"
     else
-      exec "#{RbConfig.ruby} '#{bin_path}/rake' #{prefix}rails:template LOCATION='#{install_template_path}'"
+      system "#{RbConfig.ruby} '#{bin_path}/rake' #{prefix}rails:template LOCATION='#{install_template_path}'" or
+        raise "Installation failed"
     end
   end
 end

data/lib/tasks/shakapacker/switch_bundler.rake

@@ -8,48 +8,26 @@ namespace :shakapacker do
     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]
+      bin/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)
+      --no-uninstall    Skip uninstalling old bundler packages
       --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.
+      bin/rake shakapacker:switch_bundler rspack -- --install-deps
+      bin/rake shakapacker:switch_bundler webpack -- --install-deps --no-uninstall
+      bin/rake shakapacker:switch_bundler -- --init-config
+      bin/rake shakapacker:switch_bundler -- --help
 
     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
+      - Without: shows manual installation commands
 
     Custom Dependencies:
       Create .shakapacker-switch-bundler-dependencies.yml to customize which
@@ -58,22 +36,34 @@ namespace :shakapacker do
     See docs/rspack_migration_guide.md for more information.
   DESC
   task :switch_bundler do
+    # This task must be run with rake, not rails
+    # Check the actual command name, not just if the path contains "rails"
+    command_name = File.basename($0)
+    if command_name == "rails" || $0.end_with?("/rails")
+      puts "\nError: This task must be run with 'bin/rake', not 'bin/rails'"
+      puts "Usage: bin/rake shakapacker:switch_bundler [bundler] -- [options]"
+      puts "Run 'bin/rake shakapacker:switch_bundler -- --help' for more information"
+      exit 1
+    end
+
     switcher = Shakapacker::BundlerSwitcher.new
 
-    if ARGV.empty? || ARGV.include?("--help") || ARGV.include?("-h")
+    # Parse command line arguments
+    # ARGV[0] is the task name, ARGV[1] would be the bundler name if provided
+    bundler = ARGV.length > 1 ? ARGV[1] : nil
+    install_deps = ARGV.include?("--install-deps")
+    no_uninstall = ARGV.include?("--no-uninstall")
+    init_config = ARGV.include?("--init-config")
+    show_help = ARGV.include?("--help") || ARGV.include?("-h")
+
+    if ARGV.empty? || show_help || (bundler.nil? && !init_config)
       switcher.show_usage
-    elsif ARGV.include?("--init-config")
+    elsif init_config
       switcher.init_config
+    elsif bundler.nil? || bundler.start_with?("-")
+      switcher.show_usage
     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
+      switcher.switch_to(bundler, install_deps: install_deps, no_uninstall: no_uninstall)
     end
 
     # Prevent rake from trying to execute arguments as tasks

data/package/config.ts

@@ -6,12 +6,11 @@ const { ensureTrailingSlash } = require("./utils/helpers")
 const { railsEnv } = require("./env")
 const configPath = require("./utils/configPath")
 const defaultConfigPath = require("./utils/defaultConfigPath")
-import { Config, YamlConfig, LegacyConfig } from "./types"
+import { Config, YamlConfig } from "./types"
 const {
   isValidYamlConfig,
   createConfigValidationError,
-  isPartialConfig,
-  isValidConfig
+  isPartialConfig
 } = require("./utils/typeGuards")
 const {
   isFileNotFoundError,

data/package/configExporter/cli.ts

@@ -309,58 +309,61 @@ QUICK START (for troubleshooting):
       description:
         "Generate only server config (fallback when no config file exists)"
     })
-    .check((argv) => {
-      if (argv.webpack && argv.rspack) {
+    .check((parsedArgs) => {
+      if (parsedArgs.webpack && parsedArgs.rspack) {
         throw new Error(
           "--webpack and --rspack are mutually exclusive. Please specify only one."
         )
       }
-      if (argv["client-only"] && argv["server-only"]) {
+      if (parsedArgs["client-only"] && parsedArgs["server-only"]) {
         throw new Error(
           "--client-only and --server-only are mutually exclusive. Please specify only one."
         )
       }
-      if (argv.output && argv["save-dir"]) {
+      if (parsedArgs.output && parsedArgs["save-dir"]) {
         throw new Error(
           "--output and --save-dir are mutually exclusive. Use one or the other."
         )
       }
-      if (argv.stdout && argv["save-dir"]) {
+      if (parsedArgs.stdout && parsedArgs["save-dir"]) {
         throw new Error(
           "--stdout and --save-dir are mutually exclusive. Use one or the other."
         )
       }
-      if (argv.build && argv["all-builds"]) {
+      if (parsedArgs.build && parsedArgs["all-builds"]) {
         throw new Error(
           "--build and --all-builds are mutually exclusive. Use one or the other."
         )
       }
-      if (argv.validate && argv["validate-build"]) {
+      if (parsedArgs.validate && parsedArgs["validate-build"]) {
         throw new Error(
           "--validate and --validate-build are mutually exclusive. Use one or the other."
         )
       }
-      if (argv.validate && (argv.build || argv["all-builds"])) {
+      if (
+        parsedArgs.validate &&
+        (parsedArgs.build || parsedArgs["all-builds"])
+      ) {
         throw new Error(
           "--validate cannot be used with --build or --all-builds."
         )
       }
-      if (argv["all-builds"] && argv.output) {
+      if (parsedArgs["all-builds"] && parsedArgs.output) {
         throw new Error(
           "--all-builds and --output are mutually exclusive. Use --save-dir instead."
         )
       }
-      if (argv["all-builds"] && argv.stdout) {
+      if (parsedArgs["all-builds"] && parsedArgs.stdout) {
         throw new Error(
           "--all-builds and --stdout are mutually exclusive. Use --save-dir instead."
         )
       }
-      if (argv.stdout && argv.output) {
+      if (parsedArgs.stdout && parsedArgs.output) {
         throw new Error(
           "--stdout and --output are mutually exclusive. Use one or the other."
         )
       }
-      if (argv.ssr && !argv.init) {
+      if (parsedArgs.ssr && !parsedArgs.init) {
         throw new Error(
           "--ssr can only be used with --init. Use: bin/shakapacker-config --init --ssr"
         )
@@ -539,7 +542,7 @@ end
   // Make executable
   try {
     chmodSync(binStubPath, 0o755)
-  } catch (e) {
+  } catch (_e) {
     // chmod might fail on some systems, but mode in writeFileSync should handle it
   }
 }
@@ -646,6 +649,7 @@ async function runValidateCommand(options: ExportOptions): Promise<number> {
         "development"
 
       // Auto-detect bundler using the build's environment
+      // eslint-disable-next-line no-await-in-loop -- Sequential execution required: each build modifies shared global state (env vars, config cache) that must be cleared/restored between iterations
       const defaultBundler = await autoDetectBundler(
         buildEnv,
         appRoot,
@@ -660,6 +664,7 @@ async function runValidateCommand(options: ExportOptions): Promise<number> {
       )
 
       // Validate the build
+      // eslint-disable-next-line no-await-in-loop -- Sequential execution required: each build modifies shared global state (env vars, config cache) that must be cleared/restored between iterations
       const result = await validator.validateBuild(resolvedBuild, appRoot)
       results.push(result)
 
@@ -738,6 +743,7 @@ async function runAllBuildsCommand(options: ExportOptions): Promise<number> {
 
       // Create a modified options object for this build
       const buildOptions = { ...resolvedOptions, build: buildName }
+      // eslint-disable-next-line no-await-in-loop -- Sequential execution required: each build modifies shared global state (env vars, config cache) that must be cleared/restored between iterations
       const configs = await loadConfigsForEnv(undefined, buildOptions, appRoot)
 
       for (const { config: cfg, metadata } of configs) {
@@ -817,6 +823,7 @@ async function runDoctorMode(
           // Clear shakapacker config cache between builds
           shakapackerConfigCache = null
 
+          // eslint-disable-next-line no-await-in-loop -- Sequential execution required: each build modifies shared global state (env vars, config cache) that must be cleared/restored between iterations
           const configs = await loadConfigsForEnv(
             undefined,
             { ...options, build: buildName },
@@ -884,6 +891,7 @@ async function runDoctorMode(
         process.env.WEBPACK_SERVE = "true"
       }
 
+      // eslint-disable-next-line no-await-in-loop -- Sequential execution required: each config modifies shared global state (env vars, config cache) that must be cleared/restored between iterations
       const configs = await loadConfigsForEnv(env, options, appRoot)
 
       for (const { config, metadata } of configs) {
@@ -922,7 +930,6 @@ async function runDoctorMode(
         }
 
         const fullPath = resolve(targetDir, filename)
-        const fileOutput: FileOutput = { filename, content: output, metadata }
         FileWriter.writeSingleFile(fullPath, output)
         createdFiles.push(fullPath)
       }
@@ -1099,19 +1106,17 @@ async function loadConfigsForEnv(
         console.warn(
           `[Config Exporter] Warning: Skipping dangerous environment variable: ${key}`
         )
-        continue
-      }
-      if (!isBuildEnvVar(key)) {
+      } else if (!isBuildEnvVar(key)) {
         console.warn(
           `[Config Exporter] Warning: Skipping non-whitelisted environment variable: ${key}. ` +
             `Allowed variables are: ${BUILD_ENV_VARS.join(", ")}`
         )
-        continue
-      }
-      if (options.verbose) {
-        console.log(`[Config Exporter]   ${key}=${value}`)
+      } else {
+        if (options.verbose) {
+          console.log(`[Config Exporter]   ${key}=${value}`)
+        }
+        process.env[key] = value
       }
-      process.env[key] = value
     }
 
     // Determine final env: CLI flag > build config NODE_ENV > default
@@ -1193,7 +1198,7 @@ async function loadConfigsForEnv(
   if (configFile.endsWith(".ts")) {
     try {
       require("ts-node/register/transpile-only")
-    } catch (error) {
+    } catch (_error) {
       throw new Error(
         "TypeScript config detected but ts-node is not available. " +
           "Install ts-node as a dev dependency: npm install --save-dev ts-node"
@@ -1630,7 +1635,7 @@ function loadShakapackerConfig(
 
       return result
     }
-  } catch (error: unknown) {
+  } catch (_error: unknown) {
     console.warn(
       `[Config Exporter] Error loading shakapacker config, defaulting to webpack`
     )

data/package/dev_server.ts

@@ -1,8 +1,8 @@
 // These are the raw shakapacker dev server config settings from the YML file with ENV overrides applied.
-import { DevServerConfig } from "./types"
+import type { DevServerConfig, Config } from "./types"
 
 const { isBoolean } = require("./utils/helpers")
-const config = require("./config")
+const config = require("./config") as Config
 
 const envFetch = (key: string): string | boolean | undefined => {
   const value = process.env[key]

data/package/env.ts

@@ -51,7 +51,7 @@ try {
     // File not found, use default configuration
     try {
       config = load(readFileSync(defaultConfigPath, "utf8")) as ConfigFile
-    } catch (defaultError) {
+    } catch (_defaultError) {
       throw new Error(
         `Failed to load Shakapacker configuration.\n` +
           `Neither user config (${configPath}) nor default config (${defaultConfigPath}) could be loaded.\n\n` +

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

@@ -9,26 +9,26 @@
 import type { RspackPlugin, RspackPluginInstance } from "../types"
 
 // Test 1: RspackPlugin should be assignable to RspackPluginInstance
-const testPluginToInstance = (plugin: RspackPlugin): RspackPluginInstance =>
+const _testPluginToInstance = (plugin: RspackPlugin): RspackPluginInstance =>
   plugin
 
 // Test 2: RspackPluginInstance should be assignable to RspackPlugin
-const testInstanceToPlugin = (instance: RspackPluginInstance): RspackPlugin =>
+const _testInstanceToPlugin = (instance: RspackPluginInstance): RspackPlugin =>
   instance
 
 // Test 3: Array compatibility
-const testArrayCompatibility = (
+const _testArrayCompatibility = (
   plugins: RspackPlugin[]
 ): RspackPluginInstance[] => plugins
-const testArrayCompatibilityReverse = (
+const _testArrayCompatibilityReverse = (
   instances: RspackPluginInstance[]
 ): RspackPlugin[] => instances
 
 // Test 4: Optional parameter compatibility
-const testOptionalParam = (
+const _testOptionalParam = (
   plugin?: RspackPlugin
 ): RspackPluginInstance | undefined => plugin
-const testOptionalParamReverse = (
+const _testOptionalParamReverse = (
   instance?: RspackPluginInstance
 ): RspackPlugin | undefined => instance
 

data/package/environments/base.ts

@@ -1,13 +1,13 @@
-/* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
 import { Dirent } from "fs"
 import type { Configuration, Entry } from "webpack"
+import type { Config } from "../types"
 
 const { basename, dirname, join, relative, resolve } = require("path")
 const { existsSync, readdirSync } = require("fs")
 const extname = require("path-complete-extname")
-const config = require("../config")
+const config = require("../config") as Config
 const { isProduction } = require("../env")
 
 const pluginsPath = resolve(

data/package/environments/development.ts

@@ -5,13 +5,12 @@
 
 import type {
   WebpackConfigWithDevServer,
-  RspackConfigWithDevServer,
-  ReactRefreshWebpackPlugin,
-  ReactRefreshRspackPlugin
+  RspackConfigWithDevServer
 } from "./types"
+import type { Config } from "../types"
 
 const { merge } = require("webpack-merge")
-const config = require("../config")
+const config = require("../config") as Config
 const baseConfig = require("./base")
 const webpackDevServerConfig = require("../webpackDevServerConfig")
 const { runningWebpackDevServer } = require("../env")
@@ -41,7 +40,6 @@ const webpackDevConfig = (): WebpackConfigWithDevServer => {
     devServerConfig.hot &&
     moduleExists("@pmmmwh/react-refresh-webpack-plugin")
   ) {
-    // eslint-disable-next-line global-require
     const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin")
     webpackConfig.plugins = [
       ...(webpackConfig.plugins || []),
@@ -74,7 +72,6 @@ const rspackDevConfig = (): RspackConfigWithDevServer => {
     devServerConfig.hot &&
     moduleExists("@rspack/plugin-react-refresh")
   ) {
-    // eslint-disable-next-line global-require
     const ReactRefreshPlugin = require("@rspack/plugin-react-refresh")
     rspackConfig.plugins = [
       ...(rspackConfig.plugins || []),

data/package/environments/production.ts

@@ -3,7 +3,6 @@
  * @module environments/production
  */
 
-/* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
 import type {
@@ -11,12 +10,13 @@ import type {
   WebpackPluginInstance
 } from "webpack"
 import type { CompressionPluginConstructor } from "./types"
+import type { Config } from "../types"
 
 const { resolve } = require("path")
 const { merge } = require("webpack-merge")
 const baseConfig = require("./base")
 const { moduleExists } = require("../utils/helpers")
-const config = require("../config")
+const config = require("../config") as Config
 
 const optimizationPath = resolve(
   __dirname,

data/package/environments/test.ts

@@ -4,9 +4,10 @@
  */
 
 import type { Configuration as WebpackConfiguration } from "webpack"
+import type { Config } from "../types"
 
 const { merge } = require("webpack-merge")
-const config = require("../config")
+const config = require("../config") as Config
 const baseConfig = require("./base")
 
 interface TestConfig {

data/package/esbuild/index.ts

@@ -1,4 +1,3 @@
-/* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
 import { resolve } from "path"
@@ -21,7 +20,6 @@ const getLoaderExtension = (filename: string): string => {
 const getCustomConfig = (): Partial<RuleSetRule> => {
   const path = resolve("config", "esbuild.config.js")
   if (existsSync(path)) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     return require(path)
   }
   return {}

data/package/index.d.ts

@@ -7,6 +7,7 @@
  * When adding/modifying exports in index.ts, update this file accordingly.
  */
 
+// @ts-ignore: webpack is an optional peer dependency (using type-only import)
 import type { Configuration, RuleSetRule } from "webpack"
 import type { Config, DevServerConfig, Env } from "./types"
 

data/package/index.d.ts.template

@@ -7,6 +7,7 @@
  * When adding/modifying exports in index.ts, update this file accordingly.
  */
 
+// @ts-ignore: webpack is an optional peer dependency (using type-only import)
 import type { Configuration, RuleSetRule } from "webpack"
 import type { Config, DevServerConfig, Env } from "./types"
 

data/package/index.ts

@@ -1,4 +1,3 @@
-/* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
 import * as webpackMerge from "webpack-merge"

data/package/loaders.d.ts

@@ -1,4 +1,4 @@
-// @ts-expect-error: webpack is an optional peer dependency (using type-only import)
+// @ts-ignore: webpack is an optional peer dependency (using type-only import)
 import type { LoaderDefinitionFunction } from "webpack"
 
 export interface ShakapackerLoaderOptions {

data/package/plugins/rspack.ts

@@ -1,8 +1,10 @@
+import type { Config } from "../types"
+
 const { requireOrError } = require("../utils/requireOrError")
 
 const { RspackManifestPlugin } = requireOrError("rspack-manifest-plugin")
 const rspack = requireOrError("@rspack/core")
-const config = require("../config")
+const config = require("../config") as Config
 const { isProduction } = require("../env")
 const { moduleExists } = require("../utils/helpers")
 

data/package/plugins/webpack.ts

@@ -1,9 +1,11 @@
+import type { Config } from "../types"
+
 const { requireOrError } = require("../utils/requireOrError")
 // TODO: Change to `const { WebpackAssetsManifest }` when dropping 'webpack-assets-manifest < 6.0.0' (Node >=20.10.0) support
 const WebpackAssetsManifest = requireOrError("webpack-assets-manifest")
 const webpack = requireOrError("webpack")
-const config = require("../config")
-const { isProduction, isDevelopment } = require("../env")
+const config = require("../config") as Config
+const { isProduction } = require("../env")
 const { moduleExists } = require("../utils/helpers")
 
 const getPlugins = (): unknown[] => {
@@ -15,7 +17,7 @@ const getPlugins = (): unknown[] => {
   const plugins = [
     new webpack.EnvironmentPlugin(process.env),
     new WebpackAssetsManifestConstructor({
-      merge: isDevelopment,
+      merge: true,
       entrypoints: true,
       writeToDisk: true,
       output: config.manifestPath,