@modern-js/app-tools 2.5.0-alpha.1 → 2.5.1-alpha.0

package/dist/js/node/builder/index.js

@@ -1,9 +1,26 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -43,26 +60,118 @@ var __async = (__this, __arguments, generator) => {
 };
 var builder_exports = {};
 __export(builder_exports, {
-  createBuilderGenerator: () => createBuilderGenerator
+  createBuilderForModern: () => createBuilderForModern,
+  createBuilderOptions: () => createBuilderOptions,
+  createBuilderProviderConfig: () => createBuilderProviderConfig
 });
 module.exports = __toCommonJS(builder_exports);
-function createBuilderGenerator(bundler) {
+var import_builder = require("@modern-js/builder");
+var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
+var import_utils = require("@modern-js/utils");
+var import_compatModern = require("./builderPlugins/compatModern");
+var import_share = require("./share");
+function getBuilderTargets(normalizedConfig) {
+  const targets = ["web"];
+  const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
+  if (useNodeTarget) {
+    targets.push("node");
+  }
+  return targets;
+}
+function createBuilderForModern(_0) {
+  return __async(this, arguments, function* ({
+    normalizedConfig,
+    appContext,
+    compatPluginConfig
+  }) {
+    const builderConfig = createBuilderProviderConfig(
+      normalizedConfig,
+      appContext
+    );
+    const webpackProvider = (0, import_builder_webpack_provider.builderWebpackProvider)({
+      builderConfig
+    });
+    const target = getBuilderTargets(normalizedConfig);
+    const builderOptions = createBuilderOptions(target, appContext);
+    const builder = yield (0, import_builder.createBuilder)(webpackProvider, builderOptions);
+    yield applyBuilderPlugins(
+      builder,
+      normalizedConfig,
+      appContext,
+      compatPluginConfig
+    );
+    return builder;
+  });
+}
+function createBuilderProviderConfig(normalizedConfig, appContext) {
+  const output = createOutputConfig(normalizedConfig, appContext);
+  const htmlConfig = __spreadValues({}, normalizedConfig.html);
+  if (!htmlConfig.template) {
+    htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
+  }
+  return __spreadProps(__spreadValues({}, normalizedConfig), {
+    output,
+    dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
+      port: appContext.port
+    }),
+    html: htmlConfig
+  });
+  function createOutputConfig(config, appContext2) {
+    const defaultCopyPattern = (0, import_share.createCopyPattern)(appContext2, config, "upload");
+    const { copy } = config.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
+    const builderCopy = [...copyOptions || [], defaultCopyPattern];
+    return __spreadProps(__spreadValues({}, config.output), {
+      copy: builderCopy,
+      cleanDistPath: false
+    });
+  }
+}
+function createBuilderOptions(target, appContext) {
+  const entries = {};
+  const { entrypoints = [], checkedEntries } = appContext;
+  for (const { entryName, entry } of entrypoints) {
+    if (checkedEntries && !checkedEntries.includes(entryName)) {
+      continue;
+    }
+    if (entryName in entries) {
+      entries[entryName].push(entry);
+    } else {
+      entries[entryName] = [entry];
+    }
+  }
+  return {
+    cwd: appContext.appDirectory,
+    target,
+    configPath: appContext.configFile || void 0,
+    entry: entries,
+    framework: appContext.metaName
+  };
+}
+function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
   return __async(this, null, function* () {
-    if (bundler === "rspack") {
-      try {
-        const { createRspackBuilderForModern } = yield Promise.resolve().then(() => __toESM(require("./builder-rspack")));
-        return createRspackBuilderForModern;
-      } catch (_) {
-        throw new Error(
-          "Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
-        );
-      }
+    if (!normalizedConfig.output.disableNodePolyfill) {
+      const { builderPluginNodePolyfill } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-node-polyfill")));
+      builder.addPlugins([builderPluginNodePolyfill()]);
+    }
+    if (normalizedConfig.tools.esbuild) {
+      const { esbuild: esbuildOptions } = normalizedConfig.tools;
+      const { builderPluginEsbuild } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-esbuild")));
+      builder.addPlugins([
+        builderPluginEsbuild({
+          loader: false,
+          minimize: (0, import_utils.applyOptionsChain)({}, esbuildOptions)
+        })
+      ]);
     }
-    const { createWebpackBuilderForModern } = yield Promise.resolve().then(() => __toESM(require("./builder-webpack")));
-    return createWebpackBuilderForModern;
+    builder.addPlugins([
+      (0, import_compatModern.PluginCompatModern)(appContext, normalizedConfig, compatPluginConfig)
+    ]);
   });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createBuilderGenerator
+  createBuilderForModern,
+  createBuilderOptions,
+  createBuilderProviderConfig
 });

package/dist/js/node/builder/{generator/getBuilderTargets.js → loaders/routerLoader.js}

@@ -15,21 +15,24 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var getBuilderTargets_exports = {};
-__export(getBuilderTargets_exports, {
-  getBuilderTargets: () => getBuilderTargets
+var routerLoader_exports = {};
+__export(routerLoader_exports, {
+  default: () => routerLoader_default
 });
-module.exports = __toCommonJS(getBuilderTargets_exports);
+module.exports = __toCommonJS(routerLoader_exports);
 var import_utils = require("@modern-js/utils");
-function getBuilderTargets(normalizedConfig) {
-  const targets = ["web"];
-  const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
-  if (useNodeTarget) {
-    targets.push("node");
+function loader(source) {
+  this.cacheable();
+  const { target } = this._compiler.options;
+  if (target === "node" || Array.isArray(target) && target.includes("node")) {
+    return source;
   }
-  return targets;
+  const { resourcePath } = this;
+  const code = `
+    export { default } from "${(0, import_utils.slash)(resourcePath)}";
+  `;
+  return code;
 }
+var routerLoader_default = loader;
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getBuilderTargets
-});
+0 && (module.exports = {});

package/dist/js/node/builder/{shared/createCopyPattern.js → share.js}

@@ -21,11 +21,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createCopyPattern_exports = {};
-__export(createCopyPattern_exports, {
+var share_exports = {};
+__export(share_exports, {
   createCopyPattern: () => createCopyPattern
 });
-module.exports = __toCommonJS(createCopyPattern_exports);
+module.exports = __toCommonJS(share_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 function createCopyPattern(appContext, config, patternsType, chain) {

package/dist/js/node/builder/{shared/bundlerPlugins/HtmlAsyncChunkPlugin.js → webpackPlugins/htmlAsyncChunkPlugin.js}

@@ -15,33 +15,36 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var HtmlAsyncChunkPlugin_exports = {};
-__export(HtmlAsyncChunkPlugin_exports, {
+var htmlAsyncChunkPlugin_exports = {};
+__export(htmlAsyncChunkPlugin_exports, {
   HtmlAsyncChunkPlugin: () => HtmlAsyncChunkPlugin
 });
-module.exports = __toCommonJS(HtmlAsyncChunkPlugin_exports);
+module.exports = __toCommonJS(htmlAsyncChunkPlugin_exports);
 class HtmlAsyncChunkPlugin {
   constructor(htmlWebpackPlugin) {
     this.name = "HtmlAsyncChunkPlugin";
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }
   apply(compiler) {
-    compiler.hooks.compilation.tap(this.name, (compilation) => {
-      const hooks = this.htmlWebpackPlugin.getHooks(compilation);
-      hooks.alterAssetTagGroups.tap(this.name, (assets) => {
-        const tags = [...assets.headTags, ...assets.bodyTags];
-        for (const tag of tags) {
-          if (tag.tagName === "script") {
-            const { attributes } = tag;
-            if (attributes && attributes.defer === true) {
-              attributes.async = true;
-              delete attributes.defer;
+    compiler.hooks.compilation.tap(
+      this.name,
+      (compilation) => {
+        const hooks = this.htmlWebpackPlugin.getHooks(compilation);
+        hooks.alterAssetTagGroups.tap(this.name, (assets) => {
+          const tags = [...assets.headTags, ...assets.bodyTags];
+          for (const tag of tags) {
+            if (tag.tagName === "script") {
+              const { attributes } = tag;
+              if (attributes && attributes.defer === true) {
+                attributes.async = true;
+                delete attributes.defer;
+              }
             }
           }
-        }
-        return assets;
-      });
-    });
+          return assets;
+        });
+      }
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/node/builder/{shared/bundlerPlugins/HtmlBottomTemplate.js → webpackPlugins/htmlBottomTemplate.js}

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var HtmlBottomTemplate_exports = {};
-__export(HtmlBottomTemplate_exports, {
+var htmlBottomTemplate_exports = {};
+__export(htmlBottomTemplate_exports, {
   BottomTemplatePlugin: () => BottomTemplatePlugin
 });
-module.exports = __toCommonJS(HtmlBottomTemplate_exports);
+module.exports = __toCommonJS(htmlBottomTemplate_exports);
 class BottomTemplatePlugin {
   constructor(htmlWebpackPlugin) {
     this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
@@ -28,27 +28,30 @@ class BottomTemplatePlugin {
     this.name = "bottom-template";
   }
   apply(compiler) {
-    compiler.hooks.compilation.tap(this.name, (compilation) => {
-      this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, (data) => {
-        var _a;
-        if (!((_a = data.plugin.options) == null ? void 0 : _a.__internal__)) {
-          return data;
-        }
-        if (this.bottomTemplateReg.test(data.html)) {
-          data.html = data.html.replace(this.bottomTemplateReg, "");
-          const { bottomTemplate } = data.plugin.options;
-          if (bottomTemplate) {
-            data.html = data.html.replace(
-              this.bodyRegExp,
-              (match) => `
+    compiler.hooks.compilation.tap(
+      this.name,
+      (compilation) => {
+        this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, (data) => {
+          var _a;
+          if (!((_a = data.plugin.options) == null ? void 0 : _a.__internal__)) {
+            return data;
+          }
+          if (this.bottomTemplateReg.test(data.html)) {
+            data.html = data.html.replace(this.bottomTemplateReg, "");
+            const { bottomTemplate } = data.plugin.options;
+            if (bottomTemplate) {
+              data.html = data.html.replace(
+                this.bodyRegExp,
+                (match) => `
 ${bottomTemplate}
 ${match}`
-            );
+              );
+            }
           }
-        }
-        return data;
-      });
-    });
+          return data;
+        });
+      }
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/node/builder/{builder-webpack/webpackPlugins/RouterPlugin.js → webpackPlugins/routerPlugin.js}

@@ -41,11 +41,11 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var RouterPlugin_exports = {};
-__export(RouterPlugin_exports, {
-  RouterPlugin: () => RouterPlugin
+var routerPlugin_exports = {};
+__export(routerPlugin_exports, {
+  default: () => RouterPlugin
 });
-module.exports = __toCommonJS(RouterPlugin_exports);
+module.exports = __toCommonJS(routerPlugin_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 const PLUGIN_NAME = "ModernjsRoutePlugin";
@@ -132,6 +132,4 @@ class RouterPlugin {
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  RouterPlugin
-});
+0 && (module.exports = {});

package/dist/js/node/config/default.js

@@ -39,11 +39,12 @@ __export(default_exports, {
 });
 module.exports = __toCommonJS(default_exports);
 var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
-function createDefaultConfig(appContext, bundler) {
+function createDefaultConfig(appContext) {
   const defaultBuilderConfig = (0, import_builder_webpack_provider.createDefaultConfig)();
   const dev = __spreadProps(__spreadValues({}, defaultBuilderConfig.dev), {
     port: void 0
   });
+  const tools = __spreadValues({}, defaultBuilderConfig.tools);
   const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
     disableNodePolyfill: true
   });
@@ -81,7 +82,6 @@ function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
-  const tools = bundler === "webpack" ? __spreadValues({}, defaultBuilderConfig.tools) : void 0;
   return {
     source,
     output,

package/dist/js/node/config/index.js

@@ -2,6 +2,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -10,10 +14,21 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var config_exports = {};
+__export(config_exports, {
+  checkIsLegacyConfig: () => import_initial.checkIsLegacyConfig,
+  createDefaultConfig: () => import_default.createDefaultConfig,
+  createLegacyDefaultConfig: () => import_default.createLegacyDefaultConfig,
+  initialNormalizedConfig: () => import_initial.initialNormalizedConfig
+});
 module.exports = __toCommonJS(config_exports);
-__reExport(config_exports, require("./legacy"), module.exports);
-__reExport(config_exports, require("./initialize"), module.exports);
-__reExport(config_exports, require("./default"), module.exports);
+var import_default = require("./default");
+var import_initial = require("./initial");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  checkIsLegacyConfig,
+  createDefaultConfig,
+  createLegacyDefaultConfig,
+  initialNormalizedConfig
+});

package/dist/js/node/config/{initialize → initial}/index.js

@@ -15,21 +15,27 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var initialize_exports = {};
-__export(initialize_exports, {
-  initialNormalizedConfig: () => initialNormalizedConfig
+var initial_exports = {};
+__export(initial_exports, {
+  checkIsLegacyConfig: () => checkIsLegacyConfig,
+  initialNormalizedConfig: () => initialNormalizedConfig,
+  transformNormalizedConfig: () => import_transformNormalizedConfig.transformNormalizedConfig
 });
-module.exports = __toCommonJS(initialize_exports);
+module.exports = __toCommonJS(initial_exports);
 var import_inits = require("./inits");
-function initialNormalizedConfig(config, appContext, bundler) {
+var import_transformNormalizedConfig = require("./transformNormalizedConfig");
+function checkIsLegacyConfig(config) {
+  return Boolean(config.legacy);
+}
+function initialNormalizedConfig(config, appContext) {
   (0, import_inits.initHtmlConfig)(config, appContext);
-  (0, import_inits.initSourceConfig)(config, appContext, bundler);
-  if (bundler === "webpack") {
-    (0, import_inits.initToolsConfig)(config);
-  }
+  (0, import_inits.initSourceConfig)(config, appContext);
+  (0, import_inits.initToolsConfig)(config);
   return config;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  initialNormalizedConfig
+  checkIsLegacyConfig,
+  initialNormalizedConfig,
+  transformNormalizedConfig
 });

package/dist/js/node/config/{initialize → initial}/inits.js

@@ -81,12 +81,10 @@ function initHtmlConfig(config, appContext) {
     return favicon || defaultFavicon || void 0;
   }
 }
-function initSourceConfig(config, appContext, bundler) {
+function initSourceConfig(config, appContext) {
   config.source.include = createBuilderInclude(config, appContext);
+  config.source.moduleScopes = createBuilderModuleScope(config);
   config.source.globalVars = createBuilderGlobalVars(config, appContext);
-  if (bundler === "webpack") {
-    config.source.moduleScopes = createBuilderModuleScope(config);
-  }
   function createBuilderGlobalVars(config2, appContext2) {
     const { globalVars = {} } = config2.source;
     const publicEnv = (0, import_env.getAutoInjectEnv)(appContext2);

package/dist/js/node/config/{legacy/index.js → initial/transformNormalizedConfig.js}

@@ -15,12 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var legacy_exports = {};
-__export(legacy_exports, {
-  checkIsLegacyConfig: () => checkIsLegacyConfig,
+var transformNormalizedConfig_exports = {};
+__export(transformNormalizedConfig_exports, {
   transformNormalizedConfig: () => transformNormalizedConfig
 });
-module.exports = __toCommonJS(legacy_exports);
+module.exports = __toCommonJS(transformNormalizedConfig_exports);
 var import_createToolsConfig = require("./createToolsConfig");
 var import_createSourceConfig = require("./createSourceConfig");
 var import_createOutputConfig = require("./createOutputConfig");
@@ -65,11 +64,7 @@ function transformNormalizedConfig(config) {
     }
   };
 }
-function checkIsLegacyConfig(config) {
-  return Boolean(config.legacy);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  checkIsLegacyConfig,
   transformNormalizedConfig
 });

package/dist/js/node/index.js

@@ -127,9 +127,7 @@ const buildCommand = (program, api) => __async(void 0, null, function* () {
     }
   }
 });
-var src_default = (options = {
-  bundler: "webpack"
-}) => ({
+var src_default = () => ({
   name: "@modern-js/app-tools",
   post: [
     "@modern-js/plugin-initialize",
@@ -142,15 +140,7 @@ var src_default = (options = {
     "@modern-js/plugin-polyfill"
   ],
   registerHook: import_hooks.hooks,
-  usePlugins: [
-    (0, import_initialize.default)({
-      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
-    }),
-    (0, import_analyze.default)({
-      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
-    }),
-    (0, import_plugin_lint.default)()
-  ],
+  usePlugins: [(0, import_initialize.default)(), (0, import_analyze.default)(), (0, import_plugin_lint.default)()],
   setup: (api) => {
     const locale = (0, import_language.getLocaleLanguage)();
     import_locale.i18n.changeLanguage({ locale });
@@ -169,19 +159,19 @@ var src_default = (options = {
           program.command("deploy").usage("[options]").option(
             "-c --config <config>",
             import_locale.i18n.t(import_locale.localeKeys.command.shared.config)
-          ).description(import_locale.i18n.t(import_locale.localeKeys.command.deploy.describe)).action((options2) => __async(this, null, function* () {
+          ).description(import_locale.i18n.t(import_locale.localeKeys.command.deploy.describe)).action((options) => __async(this, null, function* () {
             const { build } = yield Promise.resolve().then(() => __toESM(require("./commands/build")));
             yield build(api);
             const { deploy } = yield Promise.resolve().then(() => __toESM(require("./commands/deploy")));
-            yield deploy(api, options2);
+            yield deploy(api, options);
             process.exit(0);
           }));
           program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("--lang <lang>", import_locale.i18n.t(import_locale.localeKeys.command.new.lang)).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option(
             "-c, --config <config>",
             import_locale.i18n.t(import_locale.localeKeys.command.new.config)
-          ).option("--dist-tag <tag>", import_locale.i18n.t(import_locale.localeKeys.command.new.distTag)).option("--registry", import_locale.i18n.t(import_locale.localeKeys.command.new.registry)).action((options2) => __async(this, null, function* () {
+          ).option("--dist-tag <tag>", import_locale.i18n.t(import_locale.localeKeys.command.new.distTag)).option("--registry", import_locale.i18n.t(import_locale.localeKeys.command.new.registry)).action((options) => __async(this, null, function* () {
             const { MWANewAction } = yield Promise.resolve().then(() => __toESM(require("@modern-js/new-action")));
-            yield MWANewAction(__spreadProps(__spreadValues({}, options2), { locale: options2.lang || locale }));
+            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale: options.lang || locale }));
           }));
           program.command("inspect").description("inspect internal webpack config").option(
             `--env <env>`,
@@ -194,9 +184,9 @@ var src_default = (options = {
           ).option("--verbose", import_locale.i18n.t(import_locale.localeKeys.command.inspect.verbose)).option(
             "-c --config <config>",
             import_locale.i18n.t(import_locale.localeKeys.command.shared.config)
-          ).action((options2) => __async(this, null, function* () {
+          ).action((options) => __async(this, null, function* () {
             const { inspect } = yield Promise.resolve().then(() => __toESM(require("./commands/inspect")));
-            inspect(api, options2);
+            inspect(api, options);
           }));
           upgradeModel.defineCommand(program.command("upgrade"));
         });