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

package/dist/js/modern/config/legacy/createOutputConfig.js

@@ -0,0 +1,68 @@
+function createOutputConfig(config) {
+  const {
+    assetPrefix,
+    copy,
+    cssModuleLocalIdentName,
+    cssPath,
+    jsPath,
+    htmlPath,
+    mediaPath,
+    enableTsLoader,
+    path,
+    disableInlineRuntimeChunk,
+    disableCssExtract,
+    disableMinimize,
+    disableSourceMap,
+    disableTsChecker,
+    enableCssModuleTSDeclaration,
+    enableInlineScripts,
+    enableInlineStyles,
+    polyfill,
+    dataUriLimit,
+    disableAssetsCache,
+    enableLatestDecorators,
+    disableCssModuleExtension,
+    ssg,
+    disableNodePolyfill
+  } = config.output;
+  return {
+    assetPrefix,
+    copy,
+    distPath: {
+      root: path,
+      css: cssPath,
+      js: jsPath,
+      html: htmlPath,
+      svg: mediaPath || "media",
+      image: mediaPath || "media",
+      font: mediaPath || "media",
+      media: mediaPath || "media"
+    },
+    dataUriLimit: {
+      svg: dataUriLimit,
+      image: dataUriLimit,
+      font: dataUriLimit,
+      media: dataUriLimit
+    },
+    cssModuleLocalIdentName,
+    disableCssExtract,
+    disableCssModuleExtension,
+    disableInlineRuntimeChunk,
+    disableMinimize,
+    disableSourceMap,
+    disableTsChecker: disableTsChecker || enableTsLoader,
+    enableCssModuleTSDeclaration,
+    enableInlineScripts,
+    enableInlineStyles,
+    polyfill,
+    disableFilenameHash: disableAssetsCache,
+    enableLatestDecorators,
+    ssg,
+    enableAssetFallback: true,
+    enableAssetManifest: true,
+    disableNodePolyfill
+  };
+}
+export {
+  createOutputConfig
+};

package/dist/js/modern/config/legacy/createSourceConfig.js

@@ -0,0 +1,39 @@
+function createSourceConfig(config) {
+  const {
+    alias,
+    envVars,
+    globalVars,
+    include,
+    moduleScopes,
+    preEntry,
+    entries,
+    enableAsyncEntry,
+    disableDefaultEntries,
+    entriesDir,
+    configDir
+  } = config.source;
+  const builderGlobalVars = globalVars || {};
+  for (const envVar of envVars || []) {
+    const envVarValue = process.env[envVar];
+    envVarValue && (builderGlobalVars[`process.env.${envVar}`] = envVarValue);
+  }
+  return {
+    alias,
+    moduleScopes,
+    globalVars: builderGlobalVars,
+    include,
+    preEntry,
+    entries,
+    enableAsyncEntry,
+    disableDefaultEntries,
+    entriesDir,
+    configDir,
+    resolveExtensionPrefix: {
+      web: ".web",
+      node: ".node"
+    }
+  };
+}
+export {
+  createSourceConfig
+};

package/dist/js/modern/config/legacy/createToolsConfig.js

@@ -0,0 +1,42 @@
+function createToolsConfig(config) {
+  const {
+    autoprefixer,
+    babel,
+    minifyCss,
+    terser,
+    webpack,
+    webpackChain,
+    tsLoader,
+    styledComponents,
+    sass,
+    postcss,
+    less,
+    htmlPlugin,
+    devServer,
+    tailwindcss,
+    jest,
+    esbuild
+  } = config.tools;
+  const { enableTsLoader } = config.output;
+  return {
+    tsLoader: enableTsLoader ? tsLoader : void 0,
+    autoprefixer,
+    babel,
+    minifyCss,
+    terser,
+    webpack,
+    webpackChain,
+    styledComponents,
+    sass,
+    postcss,
+    less,
+    htmlPlugin,
+    devServer,
+    tailwindcss,
+    jest,
+    esbuild
+  };
+}
+export {
+  createToolsConfig
+};

package/dist/js/modern/config/legacy/index.js

@@ -0,0 +1,51 @@
+import { createToolsConfig } from "./createToolsConfig";
+import { createSourceConfig } from "./createSourceConfig";
+import { createOutputConfig } from "./createOutputConfig";
+import { createHtmlConfig } from "./createHtmlConfig";
+function transformNormalizedConfig(config) {
+  const html = createHtmlConfig(config);
+  const output = createOutputConfig(config);
+  const source = createSourceConfig(config);
+  const tools = createToolsConfig(config);
+  const {
+    bff,
+    dev,
+    deploy,
+    runtime,
+    runtimeByEntries,
+    server,
+    cliOptions,
+    plugins,
+    testing
+  } = config;
+  return {
+    source,
+    html,
+    output,
+    tools,
+    bff,
+    dev,
+    deploy,
+    runtime,
+    runtimeByEntries,
+    server,
+    cliOptions,
+    testing,
+    builderPlugins: [],
+    plugins,
+    security: {},
+    _raw: {},
+    experiments: {},
+    autoLoadPlugins: true,
+    performance: {
+      removeMomentLocale: true
+    }
+  };
+}
+function checkIsLegacyConfig(config) {
+  return Boolean(config.legacy);
+}
+export {
+  checkIsLegacyConfig,
+  transformNormalizedConfig
+};

package/dist/js/modern/index.js

@@ -103,7 +103,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",
@@ -116,7 +118,15 @@ var src_default = () => ({
     "@modern-js/plugin-polyfill"
   ],
   registerHook: hooks,
-  usePlugins: [initializePlugin(), analyzePlugin(), lintPlugin()],
+  usePlugins: [
+    initializePlugin({
+      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    analyzePlugin({
+      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    lintPlugin()
+  ],
   setup: (api) => {
     const locale = getLocaleLanguage();
     i18n.changeLanguage({ locale });
@@ -135,19 +145,19 @@ var src_default = () => ({
           program.command("deploy").usage("[options]").option(
             "-c --config <config>",
             i18n.t(localeKeys.command.shared.config)
-          ).description(i18n.t(localeKeys.command.deploy.describe)).action((options) => __async(this, null, function* () {
+          ).description(i18n.t(localeKeys.command.deploy.describe)).action((options2) => __async(this, null, function* () {
             const { build } = yield import("./commands/build");
             yield build(api);
             const { deploy } = yield import("./commands/deploy");
-            yield deploy(api, options);
+            yield deploy(api, options2);
             process.exit(0);
           }));
           program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option(
             "-c, --config <config>",
             i18n.t(localeKeys.command.new.config)
-          ).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action((options) => __async(this, null, function* () {
+          ).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action((options2) => __async(this, null, function* () {
             const { MWANewAction } = yield import("@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>`,
@@ -160,9 +170,9 @@ var src_default = () => ({
           ).option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option(
             "-c --config <config>",
             i18n.t(localeKeys.command.shared.config)
-          ).action((options) => __async(this, null, function* () {
+          ).action((options2) => __async(this, null, function* () {
             const { inspect } = yield import("./commands/inspect");
-            inspect(api, options);
+            inspect(api, options2);
           }));
           upgradeModel.defineCommand(program.command("upgrade"));
         });

package/dist/js/modern/initialize/index.js

@@ -44,19 +44,21 @@ import {
   isDevCommand
 } from "@modern-js/utils";
 import { legacySchema, schema } from "../schema";
-import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
 import {
   checkIsLegacyConfig,
   createDefaultConfig,
-  createLegacyDefaultConfig
+  createLegacyDefaultConfig,
+  transformNormalizedConfig
 } from "../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 checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
+      return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
     };
     const validateSchema = () => {
       const userConfig = api.useConfigContext();
@@ -81,35 +83,41 @@ var initialize_default = () => ({
           });
           api.setAppContext(appContext);
           const normalizedConfig = checkIsLegacyConfig(resolved) ? 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
-            }
-          };
+          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/modern/locale/zh.js

@@ -17,7 +17,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/analyze/index.js

@@ -66,16 +66,18 @@ module.exports = __toCommonJS(analyze_exports);
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
-var import_builder = require("../builder");
 var import_printInstructions = require("../utils/printInstructions");
 var import_routes = require("../utils/routes");
 var import_config = require("../utils/config");
 var import_getSelectedEntries = require("../utils/getSelectedEntries");
 var import_config2 = require("../config");
+var import_builder = require("../builder");
 var import_utils2 = require("./utils");
 var import_constants = require("./constants");
 const debug = (0, import_utils.createDebugger)("plugin-analyze");
-var analyze_default = () => ({
+var analyze_default = ({
+  bundler
+}) => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
@@ -167,56 +169,51 @@ var analyze_default = () => ({
           if (buildCommands.includes(command)) {
             let _b;
             const normalizedConfig = api.useResolvedConfigContext();
-            const builder = yield (0, import_builder.createBuilderForModern)({
+            const createBuilderForModern = yield (0, import_builder.createBuilderGenerator)(bundler);
+            const builder = yield createBuilderForModern({
               normalizedConfig,
               appContext,
-              compatPluginConfig: {
-                onBeforeBuild(_0) {
-                  return __async(this, arguments, function* ({ bundlerConfigs }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield (0, import_routes.generateRoutes)(appContext);
-                    yield hookRunners2.beforeBuild({ bundlerConfigs });
-                  });
-                },
-                onAfterBuild(_0) {
-                  return __async(this, arguments, function* ({ stats }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.afterBuild({ stats });
-                    yield (0, import_config.emitResolvedConfig)(
-                      appContext.appDirectory,
-                      normalizedConfig
-                    );
-                  });
-                },
-                onDevCompileDone(_0) {
-                  return __async(this, arguments, function* ({ isFirstCompile }) {
-                    const hookRunners2 = api.useHookRunners();
-                    if (process.stdout.isTTY || isFirstCompile) {
-                      hookRunners2.afterDev();
-                      if (isFirstCompile) {
-                        (0, import_printInstructions.printInstructions)(
-                          hookRunners2,
-                          appContext,
-                          normalizedConfig
-                        );
-                      }
+              onBeforeBuild(_0) {
+                return __async(this, arguments, function* ({ bundlerConfigs }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield (0, import_routes.generateRoutes)(appContext);
+                  yield hookRunners2.beforeBuild({ bundlerConfigs });
+                });
+              },
+              onAfterBuild(_0) {
+                return __async(this, arguments, function* ({ stats }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.afterBuild({ stats });
+                  yield (0, import_config.emitResolvedConfig)(
+                    appContext.appDirectory,
+                    normalizedConfig
+                  );
+                });
+              },
+              onDevCompileDone(_0) {
+                return __async(this, arguments, function* ({ isFirstCompile }) {
+                  const hookRunners2 = api.useHookRunners();
+                  if (process.stdout.isTTY || isFirstCompile) {
+                    hookRunners2.afterDev();
+                    if (isFirstCompile) {
+                      (0, import_printInstructions.printInstructions)(hookRunners2, appContext, normalizedConfig);
                     }
+                  }
+                });
+              },
+              onBeforeCreateCompiler(_0) {
+                return __async(this, arguments, function* ({ bundlerConfigs }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.beforeCreateCompiler({
+                    bundlerConfigs
                   });
-                },
-                onBeforeCreateCompiler(_0) {
-                  return __async(this, arguments, function* ({ bundlerConfigs }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.beforeCreateCompiler({
-                      bundlerConfigs
-                    });
-                  });
-                },
-                onAfterCreateCompiler(_0) {
-                  return __async(this, arguments, function* ({ compiler }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.afterCreateCompiler({ compiler });
-                  });
-                }
+                });
+              },
+              onAfterCreateCompiler(_0) {
+                return __async(this, arguments, function* ({ compiler }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.afterCreateCompiler({ compiler });
+                });
               }
             });
             builder.addPlugins(resolvedConfig.builderPlugins);
@@ -259,7 +256,7 @@ var analyze_default = () => ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext);
+        const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext, bundler);
         return {
           resolved: config
         };

package/dist/js/node/analyze/nestedRoutes.js

@@ -183,7 +183,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       route.error = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
   }
-  let finalRoute = createRoute(
+  const finalRoute = createRoute(
     route,
     rootDir,
     path.join(dirname, `${import_constants.NESTED_ROUTE.LAYOUT_FILE}.ts`),
@@ -196,15 +196,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }
-  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
-    const childRoute = finalRoute.children[0];
-    if (childRoute.path === "*") {
-      const path2 = `${finalRoute.path || ""}/${childRoute.path || ""}`;
-      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
-        path: path2
-      });
-    }
-  }
   return finalRoute;
 });
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -0,0 +1,31 @@
+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))
+      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 builder_rspack_exports = {};
+__export(builder_rspack_exports, {
+  createRspackBuilderForModern: () => createRspackBuilderForModern
+});
+module.exports = __toCommonJS(builder_rspack_exports);
+var import_builder_rspack_provider = require("@modern-js/builder-rspack-provider");
+var import_generator = require("../generator");
+function createRspackBuilderForModern(options) {
+  return (0, import_generator.generateBuilder)(options, import_builder_rspack_provider.builderRspackProvider);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRspackBuilderForModern
+});

package/dist/js/node/builder/builder-webpack/builderPlugins/compatModern.js

@@ -0,0 +1,64 @@
+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))
+      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 compatModern_exports = {};
+__export(compatModern_exports, {
+  PluginCompatModern: () => PluginCompatModern
+});
+module.exports = __toCommonJS(compatModern_exports);
+var import_path = require("path");
+var import_shared = require("../../shared");
+var import_webpackPlugins = require("../webpackPlugins");
+const PluginCompatModern = (options) => ({
+  name: "builder-plugin-compat-modern",
+  setup(api) {
+    const { normalizedConfig: modernConfig, appContext } = options;
+    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+      var _a;
+      chain.resolve.modules.add("node_modules").add((0, import_path.join)(api.context.rootPath, "node_modules"));
+      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+        const defaultCopyPattern = (0, import_shared.createCopyPattern)(
+          appContext,
+          modernConfig,
+          "public",
+          chain
+        );
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
+          var _a2;
+          return [
+            {
+              patterns: [...((_a2 = args[0]) == null ? void 0 : _a2.patterns) || [], defaultCopyPattern]
+            }
+          ];
+        });
+      }
+      const { entrypoints } = appContext;
+      const existNestedRoutes = entrypoints.some(
+        (entrypoint) => entrypoint.nestedRoutesEntry
+      );
+      const routerConfig = (_a = modernConfig == null ? void 0 : modernConfig.runtime) == null ? void 0 : _a.router;
+      const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
+      if (existNestedRoutes || routerManifest) {
+        chain.plugin("route-plugin").use(import_webpackPlugins.RouterPlugin);
+      }
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PluginCompatModern
+});