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

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

@@ -44,21 +44,19 @@ import {
   isDevCommand
 } from "@modern-js/utils";
 import { legacySchema, schema } from "../schema";
+import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
 import {
   checkIsLegacyConfig,
   createDefaultConfig,
-  createLegacyDefaultConfig,
-  transformNormalizedConfig
+  createLegacyDefaultConfig
 } from "../config";
-var initialize_default = ({
-  bundler
-}) => ({
+var initialize_default = () => ({
   name: "@modern-js/plugin-initialize",
   setup(api) {
     const config = () => {
       const appContext = api.useAppContext();
       const userConfig = api.useConfigContext();
-      return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
+      return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
     };
     const validateSchema = () => {
       const userConfig = api.useConfigContext();
@@ -83,41 +81,35 @@ var initialize_default = ({
           });
           api.setAppContext(appContext);
           const normalizedConfig = checkIsLegacyConfig(resolved) ? 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 };
+          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
+            }
+          };
         });
       }
     };
   }
 });
-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: "Web App 项目中执行生成器",
+      describe: "MWA 项目中执行生成器",
       debug: "开启 Debug 模式，打印调试日志信息",
       config: "生成器运行默认配置(JSON 字符串)",
       distTag: "生成器使用特殊的 npm Tag 版本",

package/dist/js/node/analyze/constants.js

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

package/dist/js/node/analyze/index.js

@@ -66,18 +66,16 @@ 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 = ({
-  bundler
-}) => ({
+var analyze_default = () => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
@@ -169,51 +167,56 @@ var analyze_default = ({
           if (buildCommands.includes(command)) {
             let _b;
             const normalizedConfig = api.useResolvedConfigContext();
-            const createBuilderForModern = yield (0, import_builder.createBuilderGenerator)(bundler);
-            const builder = yield createBuilderForModern({
+            const builder = yield (0, import_builder.createBuilderForModern)({
               normalizedConfig,
               appContext,
-              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);
+              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
+                        );
+                      }
                     }
-                  }
-                });
-              },
-              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 });
-                });
+                },
+                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 });
+                  });
+                }
               }
             });
             builder.addPlugins(resolvedConfig.builderPlugins);
@@ -256,7 +259,7 @@ var analyze_default = ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext, bundler);
+        const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext);
         return {
           resolved: config
         };

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

@@ -90,7 +90,7 @@ const createRoute = (routeInfo, rootDir, filename, entryName) => {
   });
 };
 const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   if (!(yield import_utils.fs.pathExists(dirname))) {
     return null;
   }
@@ -116,8 +116,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   };
   let pageLoaderFile = "";
   let pageRoute = null;
-  let splatLoaderFile = "";
-  let splatRoute = null;
   const items = yield import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -158,24 +156,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       }
       (_b = route.children) == null ? void 0 : _b.push(pageRoute);
     }
-    if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_LOADER_FILE) {
-      splatLoaderFile = itemPath;
-    }
-    if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_FILE) {
-      splatRoute = createRoute(
-        {
-          _component: (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name),
-          path: "*"
-        },
-        rootDir,
-        itemPath,
-        entryName
-      );
-      if (splatLoaderFile) {
-        splatRoute.loader = splatLoaderFile;
-      }
-      (_c = route.children) == null ? void 0 : _c.push(splatRoute);
-    }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LOADING_FILE) {
       route.loading = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
@@ -192,7 +172,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_d = route.children) == null ? void 0 : _d.filter((childRoute) => childRoute);
+  route.children = (_c = route.children) == null ? void 0 : _c.filter((childRoute) => childRoute);
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }

package/dist/js/node/analyze/templates.js

@@ -228,6 +228,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
+  let componentLoaderPath = "";
   const getDataLoaderPath = (loaderId) => {
     if (!ssrMode) {
       return "";
@@ -240,6 +241,12 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     }
     return dataLoaderPath;
   };
+  if (ssrMode) {
+    componentLoaderPath = `${import_path.default.join(
+      __dirname,
+      "../builder/loaders/routerLoader"
+    )}!`;
+  }
   const traverseRouteTree = (route) => {
     var _a;
     let children;
@@ -275,10 +282,10 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
           component = `loadable(${lazyImport})`;
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
           component = `lazy(${lazyImport})`;
         }
       }

package/dist/js/node/builder/{shared/builderPlugins/adapterModern.js → builderPlugins/compatModern.js}

@@ -38,39 +38,25 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var adapterModern_exports = {};
-__export(adapterModern_exports, {
-  applyCallbacks: () => applyCallbacks,
-  builderPluginAdapterModern: () => builderPluginAdapterModern
+var compatModern_exports = {};
+__export(compatModern_exports, {
+  PluginCompatModern: () => PluginCompatModern
 });
-module.exports = __toCommonJS(adapterModern_exports);
+module.exports = __toCommonJS(compatModern_exports);
+var import_path = require("path");
 var import_builder_shared = require("@modern-js/builder-shared");
-var import_utils = require("@modern-js/utils");
-var import_html_webpack_plugin = __toESM(require("@modern-js/builder-webpack-provider/html-webpack-plugin"));
 var import_lodash = require("@modern-js/utils/lodash");
-var import_HtmlAsyncChunkPlugin = require("../bundlerPlugins/HtmlAsyncChunkPlugin");
-var import_HtmlBottomTemplate = require("../bundlerPlugins/HtmlBottomTemplate");
-const isStreamingSSR = (userConfig) => {
-  const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
-  const { server } = userConfig;
-  if (isStreaming(server.ssr)) {
-    return true;
-  }
-  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
-    for (const name of Object.keys(server.ssrByEntries)) {
-      if (isStreaming(server.ssrByEntries[name])) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
-const builderPluginAdapterModern = (options) => ({
-  name: "builder-plugin-adapter-modern",
+var import_html_webpack_plugin = __toESM(require("@modern-js/builder-webpack-provider/html-webpack-plugin"));
+var import_utils = require("@modern-js/utils");
+var import_htmlBottomTemplate = require("../webpackPlugins/htmlBottomTemplate");
+var import_htmlAsyncChunkPlugin = require("../webpackPlugins/htmlAsyncChunkPlugin");
+var import_share = require("../share");
+var import_routerPlugin = __toESM(require("../webpackPlugins/routerPlugin"));
+const PluginCompatModern = (appContext, modernConfig, options) => ({
+  name: "builder-plugin-compat-modern",
   setup(api) {
-    const { normalizedConfig, appContext } = options;
     api.modifyBuilderConfig((config) => {
-      if (isStreamingSSR(normalizedConfig)) {
+      if (isStreamingSSR(modernConfig)) {
         return (0, import_builder_shared.mergeBuilderConfig)(config, {
           html: {
             inject: "body"
@@ -79,8 +65,9 @@ const builderPluginAdapterModern = (options) => ({
       }
       return config;
     });
-    api.modifyBundlerChain((chain, { target, CHAIN_ID, isProd }) => {
-      const builderConfig = api.getNormalizedConfig();
+    api.modifyWebpackChain((chain, { target, CHAIN_ID, isProd }) => {
+      var _a;
+      const builderNormalizedConfig = api.getNormalizedConfig();
       if (target === "node") {
         chain.name("server");
       } else if (target === "modern-web") {
@@ -88,33 +75,61 @@ const builderPluginAdapterModern = (options) => ({
       } else {
         chain.name("client");
       }
+      chain.resolve.modules.add("node_modules").add((0, import_path.join)(api.context.rootPath, "node_modules"));
       if (target === "node") {
-        applyNodeCompat(chain, normalizedConfig, isProd);
+        applyNodeCompat(chain, modernConfig, isProd);
       }
-      if (isHtmlEnabled(builderConfig, target)) {
-        applyBottomHtmlPlugin({
+      if (isHtmlEnabled(builderNormalizedConfig, target)) {
+        applyBottomHtmlWebpackPlugin({
           api,
           chain,
-          modernConfig: normalizedConfig,
+          CHAIN_ID,
           appContext,
-          CHAIN_ID
+          modernConfig
         });
         applyAsyncChunkHtmlPlugin({
           chain,
-          modernConfig: normalizedConfig,
-          CHAIN_ID
+          CHAIN_ID,
+          modernConfig
         });
       }
+      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+        const defaultCopyPattern = (0, import_share.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_routerPlugin.default);
+      }
       if (target !== "node") {
         const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
       }
+      function isHtmlEnabled(config, target2) {
+        var _a2;
+        return ((_a2 = config.tools) == null ? void 0 : _a2.htmlPlugin) !== false && target2 !== "node" && target2 !== "web-worker";
+      }
     });
-    applyCallbacks(api, options);
-    function isHtmlEnabled(config, target) {
-      var _a;
-      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "web-worker";
+    if (options) {
+      applyCallbacks(api, options);
     }
   }
 });
@@ -128,49 +143,6 @@ function applyCallbacks(api, options) {
   options.onDevCompileDone && api.onDevCompileDone(options.onDevCompileDone);
   options.onExit && api.onExit(options.onExit);
 }
-function applyBottomHtmlPlugin({
-  api,
-  chain,
-  modernConfig,
-  appContext,
-  CHAIN_ID
-}) {
-  for (const entryName of Object.keys(api.context.entry)) {
-    const baseTemplateParams = __spreadValues({
-      entryName,
-      title: (0, import_utils.getEntryOptions)(
-        entryName,
-        modernConfig.html.title,
-        modernConfig.html.titleByEntries,
-        appContext.packageName
-      ),
-      mountId: modernConfig.html.mountId
-    }, (0, import_utils.getEntryOptions)(
-      entryName,
-      modernConfig.html.templateParameters,
-      modernConfig.html.templateParametersByEntries,
-      appContext.packageName
-    ));
-    chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
-      __spreadProps(__spreadValues({}, args[0] || {}), {
-        __internal__: true,
-        bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && (0, import_lodash.template)(appContext.htmlTemplates[`__${entryName}-bottom__`])(
-          baseTemplateParams
-        )
-      })
-    ]);
-  }
-  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(import_HtmlBottomTemplate.BottomTemplatePlugin, [import_html_webpack_plugin.default]);
-}
-function applyAsyncChunkHtmlPlugin({
-  chain,
-  modernConfig,
-  CHAIN_ID
-}) {
-  if (isStreamingSSR(modernConfig)) {
-    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(import_HtmlAsyncChunkPlugin.HtmlAsyncChunkPlugin, [import_html_webpack_plugin.default]);
-  }
-}
 function applyNodeCompat(chain, modernConfig, isProd) {
   for (const ext of [
     ".node.js",
@@ -222,8 +194,65 @@ function applyNodeCompat(chain, modernConfig, isProd) {
     });
   }
 }
+function applyBottomHtmlWebpackPlugin({
+  api,
+  chain,
+  modernConfig,
+  appContext,
+  CHAIN_ID
+}) {
+  for (const entryName of Object.keys(api.context.entry)) {
+    const baseTemplateParams = __spreadValues({
+      entryName,
+      title: (0, import_utils.getEntryOptions)(
+        entryName,
+        modernConfig.html.title,
+        modernConfig.html.titleByEntries,
+        appContext.packageName
+      ),
+      mountId: modernConfig.html.mountId
+    }, (0, import_utils.getEntryOptions)(
+      entryName,
+      modernConfig.html.templateParameters,
+      modernConfig.html.templateParametersByEntries,
+      appContext.packageName
+    ));
+    chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
+      __spreadProps(__spreadValues({}, args[0] || {}), {
+        __internal__: true,
+        bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && (0, import_lodash.template)(appContext.htmlTemplates[`__${entryName}-bottom__`])(
+          baseTemplateParams
+        )
+      })
+    ]);
+  }
+  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(import_htmlBottomTemplate.BottomTemplatePlugin, [import_html_webpack_plugin.default]);
+}
+const isStreamingSSR = (userConfig) => {
+  const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
+  const { server } = userConfig;
+  if (isStreaming(server.ssr)) {
+    return true;
+  }
+  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+    for (const name of Object.keys(server.ssrByEntries)) {
+      if (isStreaming(server.ssrByEntries[name])) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+function applyAsyncChunkHtmlPlugin({
+  chain,
+  modernConfig,
+  CHAIN_ID
+}) {
+  if (isStreamingSSR(modernConfig)) {
+    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(import_htmlAsyncChunkPlugin.HtmlAsyncChunkPlugin, [import_html_webpack_plugin.default]);
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  applyCallbacks,
-  builderPluginAdapterModern
+  PluginCompatModern
 });