@modern-js/app-tools 2.3.1-alpha.2 → 2.4.0

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

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

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

@@ -2,10 +2,6 @@ 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))
@@ -14,21 +10,10 @@ 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);
-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
-});
+__reExport(config_exports, require("./legacy"), module.exports);
+__reExport(config_exports, require("./initialize"), module.exports);
+__reExport(config_exports, require("./default"), module.exports);

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

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

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

@@ -81,10 +81,12 @@ function initHtmlConfig(config, appContext) {
     return favicon || defaultFavicon || void 0;
   }
 }
-function initSourceConfig(config, appContext) {
+function initSourceConfig(config, appContext, bundler) {
   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/{initial/transformNormalizedConfig.js → legacy/index.js}

@@ -15,11 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var transformNormalizedConfig_exports = {};
-__export(transformNormalizedConfig_exports, {
+var legacy_exports = {};
+__export(legacy_exports, {
+  checkIsLegacyConfig: () => checkIsLegacyConfig,
   transformNormalizedConfig: () => transformNormalizedConfig
 });
-module.exports = __toCommonJS(transformNormalizedConfig_exports);
+module.exports = __toCommonJS(legacy_exports);
 var import_createToolsConfig = require("./createToolsConfig");
 var import_createSourceConfig = require("./createSourceConfig");
 var import_createOutputConfig = require("./createOutputConfig");
@@ -64,7 +65,11 @@ 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,7 +127,9 @@ const buildCommand = (program, api) => __async(void 0, null, function* () {
     }
   }
 });
-var src_default = () => ({
+var src_default = (options = {
+  bundler: "webpack"
+}) => ({
   name: "@modern-js/app-tools",
   post: [
     "@modern-js/plugin-initialize",
@@ -140,7 +142,15 @@ var src_default = () => ({
     "@modern-js/plugin-polyfill"
   ],
   registerHook: import_hooks.hooks,
-  usePlugins: [(0, import_initialize.default)(), (0, import_analyze.default)(), (0, import_plugin_lint.default)()],
+  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)()
+  ],
   setup: (api) => {
     const locale = (0, import_language.getLocaleLanguage)();
     import_locale.i18n.changeLanguage({ locale });
@@ -159,19 +169,19 @@ var src_default = () => ({
           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((options) => __async(this, null, function* () {
+          ).description(import_locale.i18n.t(import_locale.localeKeys.command.deploy.describe)).action((options2) => __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, options);
+            yield deploy(api, options2);
             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((options) => __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((options2) => __async(this, null, function* () {
             const { MWANewAction } = yield Promise.resolve().then(() => __toESM(require("@modern-js/new-action")));
-            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale: options.lang || locale }));
+            yield MWANewAction(__spreadProps(__spreadValues({}, options2), { locale: options2.lang || locale }));
           }));
           program.command("inspect").description("inspect internal webpack config").option(
             `--env <env>`,
@@ -184,9 +194,9 @@ var src_default = () => ({
           ).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((options) => __async(this, null, function* () {
+          ).action((options2) => __async(this, null, function* () {
             const { inspect } = yield Promise.resolve().then(() => __toESM(require("./commands/inspect")));
-            inspect(api, options);
+            inspect(api, options2);
           }));
           upgradeModel.defineCommand(program.command("upgrade"));
         });

package/dist/js/node/initialize/index.js

@@ -59,15 +59,16 @@ __export(initialize_exports, {
 module.exports = __toCommonJS(initialize_exports);
 var import_utils = require("@modern-js/utils");
 var import_schema = require("../schema");
-var import_transformNormalizedConfig = require("../config/initial/transformNormalizedConfig");
 var import_config = require("../config");
-var initialize_default = () => ({
+var initialize_default = ({
+  bundler
+}) => ({
   name: "@modern-js/plugin-initialize",
   setup(api) {
     const config = () => {
       const appContext = api.useAppContext();
       const userConfig = api.useConfigContext();
-      return (0, import_config.checkIsLegacyConfig)(userConfig) ? (0, import_config.createLegacyDefaultConfig)(appContext) : (0, import_config.createDefaultConfig)(appContext);
+      return (0, import_config.checkIsLegacyConfig)(userConfig) ? (0, import_config.createLegacyDefaultConfig)(appContext) : (0, import_config.createDefaultConfig)(appContext, bundler);
     };
     const validateSchema = () => {
       const userConfig = api.useConfigContext();
@@ -91,36 +92,42 @@ var initialize_default = () => ({
             )
           });
           api.setAppContext(appContext);
-          const normalizedConfig = (0, import_config.checkIsLegacyConfig)(resolved) ? (0, import_transformNormalizedConfig.transformNormalizedConfig)(resolved) : resolved;
-          return {
-            resolved: {
-              _raw: userConfig,
-              source: normalizedConfig.source || {},
-              server: __spreadProps(__spreadValues({}, normalizedConfig.server || {}), {
-                port
-              }),
-              bff: normalizedConfig.bff || {},
-              dev: normalizedConfig.dev || {},
-              html: normalizedConfig.html || {},
-              output: normalizedConfig.output || {},
-              security: normalizedConfig.security || {},
-              tools: normalizedConfig.tools || {},
-              testing: normalizedConfig.testing || {},
-              plugins: normalizedConfig.plugins || [],
-              builderPlugins: normalizedConfig.builderPlugins || [],
-              runtime: normalizedConfig.runtime || {},
-              runtimeByEntries: normalizedConfig.runtimeByEntries || {},
-              deploy: normalizedConfig.deploy || {},
-              performance: normalizedConfig.performance || {},
-              experiments: normalizedConfig.experiments || {},
-              autoLoadPlugins: normalizedConfig.autoLoadPlugins || false
-            }
-          };
+          const normalizedConfig = (0, import_config.checkIsLegacyConfig)(resolved) ? (0, import_config.transformNormalizedConfig)(resolved) : resolved;
+          resolved._raw = userConfig;
+          resolved.server = __spreadProps(__spreadValues({}, normalizedConfig.server || {}), {
+            port
+          });
+          resolved.autoLoadPlugins = normalizedConfig.autoLoadPlugins || false;
+          stabilizeConfig(resolved, normalizedConfig, [
+            "source",
+            "bff",
+            "dev",
+            "html",
+            "output",
+            "tools",
+            "testing",
+            "plugins",
+            "builderPlugins",
+            "runtime",
+            "runtimeByEntries",
+            "deploy",
+            "performance"
+          ]);
+          if (bundler === "webpack") {
+            resolved.security = normalizedConfig.security || {};
+            resolved.experiments = normalizedConfig.experiments;
+          }
+          return { resolved };
         });
       }
     };
   }
 });
+function stabilizeConfig(resolve, config, keys) {
+  keys.forEach((key) => {
+    resolve[key] = config[key] || {};
+  });
+}
 function getServerPort(config) {
   return __async(this, null, function* () {
     const prodPort = config.server.port || 8080;

package/dist/js/node/locale/zh.js

@@ -39,7 +39,7 @@ const ZH_LOCALE = {
     serve: { describe: "应用启动命令" },
     deploy: { describe: "部署应用命令" },
     new: {
-      describe: "MWA 项目中执行生成器",
+      describe: "Web App 项目中执行生成器",
       debug: "开启 Debug 模式，打印调试日志信息",
       config: "生成器运行默认配置(JSON 字符串)",
       distTag: "生成器使用特殊的 npm Tag 版本",

package/dist/js/node/types/utils.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+module.exports = __toCommonJS(utils_exports);