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

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);

package/dist/js/treeshaking/analyze/constants.js

@@ -32,7 +32,9 @@ var NESTED_ROUTE = {
     PAGE_LOADER_FILE: "page.loader",
     LOADING_FILE: "loading",
     ERROR_FILE: "error",
-    LOADER_FILE: "loader"
+    LOADER_FILE: "loader",
+    SPLATE_FILE: "$",
+    SPLATE_LOADER_FILE: "$.loader"
 };
 var APP_CONFIG_NAME = "config";
 var APP_INIT_EXPORTED = "init";

package/dist/js/treeshaking/analyze/generateCode.js

@@ -161,7 +161,7 @@ var createImportSpecifier = function(specifiers) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = specifiers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _value = _step.value, local = _value.local, imported = _value.imported;
+            var _step_value = _step.value, local = _step_value.local, imported = _step_value.imported;
             if (local && imported) {
                 named.push("".concat(imported, " as ").concat(local));
             } else if (local) {
@@ -198,7 +198,7 @@ var createImportStatements = function(statements) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         var _loop = function() {
-            var _value = _step.value, value = _value.value, specifiers = _value.specifiers, initialize = _value.initialize;
+            var _step_value = _step.value, value = _step_value.value, specifiers = _step_value.specifiers, initialize = _step_value.initialize;
             if (!seen.has(value)) {
                 deDuplicated.push({
                     value: value,
@@ -207,14 +207,14 @@ var createImportStatements = function(statements) {
                 });
                 seen.set(value, specifiers);
             } else {
-                var _instance;
-                var ref;
-                (_instance = seen.get(value)).push.apply(_instance, _toConsumableArray(specifiers));
+                var _seen_get;
+                var _deDuplicated_modifyIndex;
+                (_seen_get = seen.get(value)).push.apply(_seen_get, _toConsumableArray(specifiers));
                 var modifyIndex = deDuplicated.findIndex(function(v) {
                     return v.value === value;
                 });
-                var ref1;
-                var originInitialize = (ref1 = (ref = deDuplicated[modifyIndex]) === null || ref === void 0 ? void 0 : ref.initialize) !== null && ref1 !== void 0 ? ref1 : "";
+                var _deDuplicated_modifyIndex_initialize;
+                var originInitialize = (_deDuplicated_modifyIndex_initialize = (_deDuplicated_modifyIndex = deDuplicated[modifyIndex]) === null || _deDuplicated_modifyIndex === void 0 ? void 0 : _deDuplicated_modifyIndex.initialize) !== null && _deDuplicated_modifyIndex_initialize !== void 0 ? _deDuplicated_modifyIndex_initialize : "";
                 deDuplicated[modifyIndex].initialize = originInitialize.concat("\n".concat(initialize || ""));
             }
         };
@@ -240,13 +240,13 @@ var createImportStatements = function(statements) {
 };
 var generateCode = function() {
     var _ref = _asyncToGenerator(function(appContext, config, entrypoints, api) {
-        var ref, ref1, ref2, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
+        var _config_runtime, _config_runtime1, _config_runtime_router, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
         function generateEntryCode(entrypoint) {
             return _generateEntryCode.apply(this, arguments);
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, ref, code2, _, _tmp, routesServerFile, code3, ref1, importStatements, plugins, ref2, renderFunction, exportStatement, code, entryFile, ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -346,7 +346,7 @@ var generateCode = function() {
                                 ])
                             ];
                         case 6:
-                            ref = _state.sent(), code2 = ref.code;
+                            _ref = _state.sent(), code2 = _ref.code;
                             if (!(entrypoint.nestedRoutesEntry && mode)) return [
                                 3,
                                 9
@@ -386,7 +386,7 @@ var generateCode = function() {
                                 })
                             ];
                         case 11:
-                            ref1 = _state.sent(), importStatements = ref1.imports;
+                            _ref1 = _state.sent(), importStatements = _ref1.imports;
                             return [
                                 4,
                                 hookRunners.modifyEntryRuntimePlugins({
@@ -408,7 +408,7 @@ var generateCode = function() {
                                 })
                             ];
                         case 13:
-                            ref2 = _state.sent(), renderFunction = ref2.code;
+                            _ref2 = _state.sent(), renderFunction = _ref2.code;
                             return [
                                 4,
                                 hookRunners.modifyEntryExport({
@@ -438,7 +438,7 @@ var generateCode = function() {
                                 })
                             ];
                         case 15:
-                            ref3 = _state.sent(), asyncEntryCode = ref3.code;
+                            _ref3 = _state.sent(), asyncEntryCode = _ref3.code;
                             fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
                             bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                             fs.outputFileSync(bootstrapFile, code, "utf8");
@@ -463,7 +463,7 @@ var generateCode = function() {
                 case 0:
                     internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
                     hookRunners = api.useHookRunners();
-                    isV5 = typeof ((ref = config.runtime) === null || ref === void 0 ? void 0 : ref.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (ref1 = config.runtime) === null || ref1 === void 0 ? void 0 : (ref2 = ref1.router) === null || ref2 === void 0 ? void 0 : ref2.mode) === "react-router-5";
+                    isV5 = typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
                     mountId = config.html.mountId;
                     getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
                     return [

package/dist/js/treeshaking/analyze/getBundleEntry.js

@@ -24,7 +24,7 @@ var ifAlreadyExists = function(entrypoints, checked) {
 };
 var getBundleEntry = function(appContext, config) {
     var appDirectory = appContext.appDirectory, packageName = appContext.packageName;
-    var _source = config.source, disableDefaultEntries = _source.disableDefaultEntries, entries = _source.entries, entriesDir = _source.entriesDir;
+    var _config_source = config.source, disableDefaultEntries = _config_source.disableDefaultEntries, entries = _config_source.entries, entriesDir = _config_source.entriesDir;
     var defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
     if (entries) {
         Object.keys(entries).forEach(function(name) {
@@ -52,7 +52,7 @@ var getBundleEntry = function(appContext, config) {
     if (!disableDefaultEntries) {
         var entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
         var found = defaults.find(function(param) {
-            var entryName = param.entryName, entry = param.entry, _nestedRoutesEntry = param.nestedRoutesEntry, nestedRoutesEntry = _nestedRoutesEntry === void 0 ? "" : _nestedRoutesEntry;
+            var entryName = param.entryName, entry = param.entry, _param_nestedRoutesEntry = param.nestedRoutesEntry, nestedRoutesEntry = _param_nestedRoutesEntry === void 0 ? "" : _param_nestedRoutesEntry;
             return entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs;
         });
         found && (found.entryName = MAIN_ENTRY_NAME);

package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js

@@ -67,7 +67,7 @@ var layoutNameAbbr = function(filePath) {
 };
 var parents = [];
 var recursiveReadDir = function(param) {
-    var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
+    var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
     var hasDynamicRoute = false;
     var resetParent = false;
     var parent = parents[parents.length - 1];

package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js

@@ -67,7 +67,7 @@ var layoutNameAbbr = function(filePath) {
 };
 var parents = [];
 var recursiveReadDirLegacy = function(param) {
-    var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
+    var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
     var hasDynamicRoute = false;
     var resetParent = false;
     var parent = parents[parents.length - 1];

package/dist/js/treeshaking/analyze/getFileSystemEntry.js

@@ -80,7 +80,7 @@ var scanDir = function(dirs) {
 };
 var getFileSystemEntry = function(appContext, config) {
     var appDirectory = appContext.appDirectory;
-    var _source = config.source, entriesDir = _source.entriesDir, disableEntryDirs = _source.disableEntryDirs;
+    var _config_source = config.source, entriesDir = _config_source.entriesDir, disableEntryDirs = _config_source.disableEntryDirs;
     var disabledDirs = [];
     if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
         disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map(function(dir) {

package/dist/js/treeshaking/analyze/getServerRoutes.js

@@ -104,7 +104,7 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import path from "path";
 import fs from "fs";
-import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash } from "@modern-js/utils";
+import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 var applyBaseUrl = function(baseUrl, routes) {
     if (baseUrl) {
@@ -130,8 +130,8 @@ var applyRouteOptions = function(original, routeOptions) {
     var routes;
     if (route) {
         if (Array.isArray(route)) {
-            var _tmp;
-            _tmp = route.map(function(url) {
+            var _route_map;
+            _route_map = route.map(function(url) {
                 if (isPlainObject(url)) {
                     var urlPath = url.path, other = _objectWithoutProperties(url, [
                         "path"
@@ -144,7 +144,7 @@ var applyRouteOptions = function(original, routeOptions) {
                         urlPath: url
                     });
                 }
-            }), routes = _tmp, _tmp;
+            }), routes = _route_map, _route_map;
         } else if (isPlainObject(route)) {
             var urlPath = route.path, other = _objectWithoutProperties(route, [
                 "path"
@@ -169,12 +169,13 @@ var applyRouteOptions = function(original, routeOptions) {
     return routes;
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
-    var disableHtmlFolder = config.html.disableHtmlFolder, _output = config.output, tmp = _output.distPath, ref = tmp === void 0 ? {} : tmp, htmlPath = ref.html, _server = config.server, baseUrl = _server.baseUrl, routes = _server.routes, ssr = _server.ssr, ssrByEntries = _server.ssrByEntries;
+    var disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, worker = _config_server.worker;
     var packageName = appContext.packageName;
     var htmlRoutes = entrypoints.reduce(function(previous, param) {
         var entryName = param.entryName;
         var entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
         var isSSR = Boolean(entryOptions);
+        var isWorker = Boolean(worker);
         var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
         var route = {
             urlPath: "/".concat(entryName === MAIN_ENTRY_NAME ? "" : entryName),
@@ -183,6 +184,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
             isSPA: true,
             isSSR: isSSR,
             responseHeaders: resHeaders,
+            worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
             bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
         };
         if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
@@ -200,7 +202,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
 };
 var collectStaticRoutes = function(appContext, config) {
     var appDirectory = appContext.appDirectory;
-    var configDir = config.source.configDir, _server = config.server, _publicRoutes = _server.publicRoutes, publicRoutes = _publicRoutes === void 0 ? {} : _publicRoutes;
+    var configDir = config.source.configDir, _config_server = config.server, _config_server_publicRoutes = _config_server.publicRoutes, publicRoutes = _config_server_publicRoutes === void 0 ? {} : _config_server_publicRoutes;
     var publicFolder = path.resolve(appDirectory, configDir || "", "public");
     return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(function(filePath) {
         var urlPath = "".concat(urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length)));