@modern-js/app-tools 2.27.1-alpha.0 → 2.28.1-alpha.0

package/dist/cjs/analyze/nestedRoutes.js

@@ -13,6 +13,9 @@ _export(exports, {
   getRouteId: function() {
     return getRouteId;
   },
+  optimizeRoute: function() {
+    return optimizeRoute;
+  },
   walk: function() {
     return walk;
   }
@@ -56,8 +59,35 @@ const createRoute = (routeInfo, rootDir, filename, entryName, isMainEntry) => {
     type: "nested"
   };
 };
-const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
-  var _route_children;
+const optimizeRoute = (routeTree) => {
+  if (!routeTree.children || routeTree.children.length === 0) {
+    return [
+      routeTree
+    ];
+  }
+  const { children } = routeTree;
+  if (!routeTree._component) {
+    const newRoutes = children.map((child) => {
+      var _routeTree_path;
+      const routePath = `${(_routeTree_path = routeTree.path) !== null && _routeTree_path !== void 0 ? _routeTree_path : ""}${child.path ? `/${child.path}` : ""}`;
+      return {
+        ...child,
+        path: routePath
+      };
+    });
+    if (newRoutes.length > 1) {
+      return newRoutes.flatMap((newRoute) => optimizeRoute(newRoute));
+    }
+    return newRoutes;
+  } else {
+    routeTree.children = children.flatMap(optimizeRoute);
+    return [
+      routeTree
+    ];
+  }
+};
+const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion) => {
+  var _routePath, _finalRoute_children;
   if (!await _utils.fs.pathExists(dirname)) {
     return null;
   }
@@ -77,7 +107,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
   }
   routePath = replaceDynamicPath(routePath);
   const route = {
-    path: routePath === null || routePath === void 0 ? void 0 : routePath.replace(/\$$/, "?"),
+    path: (_routePath = routePath) === null || _routePath === void 0 ? void 0 : _routePath.replace(/\$$/, "?"),
     children: [],
     isRoot
   };
@@ -93,10 +123,10 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory2 = (await _utils.fs.stat(itemPath)).isDirectory();
     if (isDirectory2) {
-      const childRoute = await walk(itemPath, rootDir, alias, entryName, isMainEntry);
-      if (childRoute) {
-        var _route_children1;
-        (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
+      const childRoute = await walk(itemPath, rootDir, alias, entryName, isMainEntry, oldVersion);
+      if (childRoute && !Array.isArray(childRoute)) {
+        var _route_children;
+        (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.push(childRoute);
       }
     }
     if (extname && (!_constants.JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
@@ -122,7 +152,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       pageConfigFile = itemPath;
     }
     if (itemWithoutExt === _constants.NESTED_ROUTE.PAGE_FILE) {
-      var _route_children2;
+      var _route_children1;
       pageRoute = createIndexRoute({
         _component: (0, _utils1.replaceWithAlias)(alias.basename, itemPath, alias.name)
       }, rootDir, itemPath, entryName, isMainEntry);
@@ -132,13 +162,13 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       if (pageConfigFile) {
         pageRoute.config = pageConfigFile;
       }
-      (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
+      (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(pageRoute);
     }
     if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_LOADER_FILE) {
       splatLoaderFile = itemPath;
     }
     if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_FILE) {
-      var _route_children3;
+      var _route_children2;
       splatRoute = createRoute({
         _component: (0, _utils1.replaceWithAlias)(alias.basename, itemPath, alias.name),
         path: "*"
@@ -146,7 +176,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       if (splatLoaderFile) {
         splatRoute.loader = splatLoaderFile;
       }
-      (_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
+      (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === _constants.NESTED_ROUTE.LOADING_FILE) {
       route.loading = (0, _utils1.replaceWithAlias)(alias.basename, itemPath, alias.name);
@@ -159,12 +189,12 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter((childRoute) => childRoute);
-  if (route.children && route.children.length === 0 && !route.index) {
+  const childRoutes = finalRoute.children = (_finalRoute_children = finalRoute.children) === null || _finalRoute_children === void 0 ? void 0 : _finalRoute_children.filter((childRoute) => childRoute);
+  if (childRoutes && childRoutes.length === 0 && !finalRoute.index) {
     return null;
   }
-  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
-    const childRoute = finalRoute.children[0];
+  if (childRoutes && childRoutes.length === 1 && !finalRoute._component) {
+    const childRoute = childRoutes[0];
     if (childRoute.path === "*") {
       const path = `${finalRoute.path || ""}/${childRoute.path || ""}`;
       finalRoute = {
@@ -173,5 +203,18 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       };
     }
   }
+  if (splatRoute) {
+    var _childRoutes;
+    const slatRouteIndex = (_childRoutes = childRoutes) === null || _childRoutes === void 0 ? void 0 : _childRoutes.findIndex((childRoute) => childRoute === splatRoute);
+    if (typeof slatRouteIndex === "number" && slatRouteIndex !== -1) {
+      var _childRoutes1, _childRoutes2;
+      (_childRoutes1 = childRoutes) === null || _childRoutes1 === void 0 ? void 0 : _childRoutes1.splice(slatRouteIndex, 1);
+      (_childRoutes2 = childRoutes) === null || _childRoutes2 === void 0 ? void 0 : _childRoutes2.push(splatRoute);
+    }
+  }
+  if (isRoot && !oldVersion) {
+    const optimizedRoutes = optimizeRoute(finalRoute);
+    return optimizedRoutes;
+  }
   return finalRoute;
 };

package/dist/cjs/analyze/templates.js

@@ -111,8 +111,8 @@ const routesForServer = ({ routes }) => {
   const traverseRouteTree = (route) => {
     let children;
     if ("children" in route && route.children) {
-      var _route_children;
-      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      var _route_children, _route;
+      children = (_route = route) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loader;
     if (route.type === "nested") {
@@ -179,8 +179,8 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
   const traverseRouteTree = (route) => {
     let children;
     if ("children" in route && route.children) {
-      var _route_children;
-      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      var _route_children, _route;
+      children = (_route = route) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loading;
     let error;

package/dist/cjs/builder/builder-rspack/adapterCopy.js

@@ -13,52 +13,50 @@ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _fsextra = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/fs-extra"));
 const _utils = require("@modern-js/utils");
 const _shared = require("../shared");
-const builderPluginAdpaterCopy = (options) => {
-  return {
-    name: "builder-plugin-adapter-rspack-copy",
-    setup(api) {
-      let publicPath;
-      api.modifyRspackConfig((config) => {
-        var _config_builtins, _config_builtins_copy, _config_output;
-        config.builtins = {
-          ...config.builtins || {},
-          copy: {
-            patterns: [
-              ...((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || [],
-              ...createConfigBuiltinCopy(options)
-            ]
-          }
-        };
-        publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
-      });
-      api.onDevCompileDone(async () => {
-        await transformHtmlFiles();
-      });
-      api.onAfterBuild(async () => {
-        await transformHtmlFiles();
-      });
-      async function transformHtmlFiles() {
-        var _normalizedConfig_output_distPath;
-        const { normalizedConfig } = options;
-        const publicDir = _path.default.resolve(((_normalizedConfig_output_distPath = normalizedConfig.output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.root) || "./dist", "./public");
-        if (!_fsextra.default.existsSync(publicDir) || !_fsextra.default.statSync(publicDir).isDirectory()) {
-          return;
+const builderPluginAdpaterCopy = (options) => ({
+  name: "builder-plugin-adapter-rspack-copy",
+  setup(api) {
+    let publicPath;
+    api.modifyRspackConfig((config) => {
+      var _config_builtins_copy, _config_builtins, _config_output;
+      config.builtins = {
+        ...config.builtins || {},
+        copy: {
+          patterns: [
+            ...((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || [],
+            ...createConfigBuiltinCopy(options)
+          ]
         }
-        const HTML_REGEXP = /\.html?$/;
-        const filepaths = (await _fsextra.default.readdir(publicDir)).map((file) => _path.default.resolve(publicDir, file));
-        await Promise.all(filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
-          const content = await _fsextra.default.readFile(file, "utf-8");
-          if (publicPath) {
-            await _fsextra.default.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, (0, _utils.removeTailSlash)(publicPath)));
-          } else {
-            _utils.logger.warn("Expect get a string from `publicPath`, but receive `undefined`.");
-            await _fsextra.default.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, (0, _utils.removeTailSlash)("/")));
-          }
-        }));
+      };
+      publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
+    });
+    api.onDevCompileDone(async () => {
+      await transformHtmlFiles();
+    });
+    api.onAfterBuild(async () => {
+      await transformHtmlFiles();
+    });
+    async function transformHtmlFiles() {
+      var _normalizedConfig_output_distPath;
+      const { normalizedConfig } = options;
+      const publicDir = _path.default.resolve(((_normalizedConfig_output_distPath = normalizedConfig.output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.root) || "./dist", "./public");
+      if (!_fsextra.default.existsSync(publicDir) || !_fsextra.default.statSync(publicDir).isDirectory()) {
+        return;
       }
+      const HTML_REGEXP = /\.html?$/;
+      const filepaths = (await _fsextra.default.readdir(publicDir)).map((file) => _path.default.resolve(publicDir, file));
+      await Promise.all(filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
+        const content = await _fsextra.default.readFile(file, "utf-8");
+        if (publicPath) {
+          await _fsextra.default.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, (0, _utils.removeTailSlash)(publicPath)));
+        } else {
+          _utils.logger.warn("Expect get a string from `publicPath`, but receive `undefined`.");
+          await _fsextra.default.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, (0, _utils.removeTailSlash)("/")));
+        }
+      }));
     }
-  };
-};
+  }
+});
 function createConfigBuiltinCopy(options) {
   const { normalizedConfig, appContext } = options;
   const { publicDir } = (0, _shared.createCopyInfo)(appContext, normalizedConfig);

package/dist/cjs/builder/builder-webpack/adapterModern.js

@@ -10,28 +10,26 @@ Object.defineProperty(exports, "builderPluginAdapterModern", {
 });
 const _path = require("path");
 const _createCopyPattern = require("./createCopyPattern");
-const builderPluginAdapterModern = (options) => {
-  return {
-    name: "builder-plugin-adapter-modern",
-    setup(api) {
-      const { normalizedConfig: modernConfig, appContext } = options;
-      api.modifyWebpackChain((chain, { CHAIN_ID }) => {
-        chain.resolve.modules.add("node_modules").add((0, _path.join)(api.context.rootPath, "node_modules"));
-        if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
-          const defaultCopyPattern = (0, _createCopyPattern.createPublicPattern)(appContext, modernConfig, chain);
-          chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
-            var _args_;
-            return [
-              {
-                patterns: [
-                  ...((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || [],
-                  defaultCopyPattern
-                ]
-              }
-            ];
-          });
-        }
-      });
-    }
-  };
-};
+const builderPluginAdapterModern = (options) => ({
+  name: "builder-plugin-adapter-modern",
+  setup(api) {
+    const { normalizedConfig: modernConfig, appContext } = options;
+    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+      chain.resolve.modules.add("node_modules").add((0, _path.join)(api.context.rootPath, "node_modules"));
+      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+        const defaultCopyPattern = (0, _createCopyPattern.createPublicPattern)(appContext, modernConfig, chain);
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
+          var _args_;
+          return [
+            {
+              patterns: [
+                ...((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || [],
+                defaultCopyPattern
+              ]
+            }
+          ];
+        });
+      }
+    });
+  }
+});

package/dist/cjs/builder/generator/createBuilderProviderConfig.js

@@ -10,9 +10,10 @@ Object.defineProperty(exports, "createBuilderProviderConfig", {
 });
 const _createCopyPattern = require("../builder-webpack/createCopyPattern");
 function modifyOutputConfig(config, appContext) {
+  var _copy;
   const defaultCopyPattern = (0, _createCopyPattern.createUploadPattern)(appContext, config);
   const { copy } = config.output;
-  const copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
+  const copyOptions = Array.isArray(copy) ? copy : (_copy = copy) === null || _copy === void 0 ? void 0 : _copy.patterns;
   const builderCopy = [
     ...copyOptions || [],
     defaultCopyPattern

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -58,12 +58,13 @@ const builderPluginAdapterSSR = (options) => ({
   }
 });
 const isStreamingSSR = (userConfig) => {
+  var _server;
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
   const { server } = userConfig;
   if (isStreaming(server.ssr)) {
     return true;
   }
-  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if (((_server = server) === null || _server === void 0 ? void 0 : _server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (isStreaming(server.ssrByEntries[name])) {
         return true;
@@ -80,38 +81,33 @@ function applyAsyncChunkHtmlPlugin({ chain, modernConfig, CHAIN_ID, HtmlBundlerP
   }
 }
 function applyRouterPlugin(chain, options) {
-  var _normalizedConfig_runtime, _normalizedConfig_deploy_worker;
+  var _normalizedConfig_runtime, _normalizedConfig, _routerConfig, _normalizedConfig_deploy_worker;
   const { appContext, normalizedConfig } = options;
   const { entrypoints } = appContext;
   const existNestedRoutes = entrypoints.some((entrypoint) => entrypoint.nestedRoutesEntry);
-  const routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
-  const routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
+  const routerConfig = (_normalizedConfig = normalizedConfig) === null || _normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = _normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
+  const routerManifest = Boolean((_routerConfig = routerConfig) === null || _routerConfig === void 0 ? void 0 : _routerConfig.manifest);
   const workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
-  const minimize = !normalizedConfig.output.disableMinimize && process.env.NODE_ENV === "production";
   if (existNestedRoutes || routerManifest || workerSSR) {
-    chain.plugin("route-plugin").use(_bundlerPlugins.RouterPlugin, [
-      {
-        minimize
-      }
-    ]);
+    chain.plugin("route-plugin").use(_bundlerPlugins.RouterPlugin);
   }
 }
 function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
-  var _ref;
+  var _outputConfig, _this, _outputConfig1, _outputConfig2, _outputConfig3;
   const { server: serverConfig, output: outputConfig } = appNormalizedConfig;
   const entries = chain.entryPoints.entries();
-  if (isProd && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof ((_ref = outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === null || _ref === void 0 ? void 0 : _ref[0]) === "function")) {
+  if (isProd && (((_outputConfig = outputConfig) === null || _outputConfig === void 0 ? void 0 : _outputConfig.ssg) === true || typeof ((_this = (_outputConfig1 = outputConfig) === null || _outputConfig1 === void 0 ? void 0 : _outputConfig1.ssg) === null || _this === void 0 ? void 0 : _this[0]) === "function")) {
     return;
   }
   if (typeof entries === "undefined") {
     throw new Error("No entry found, one of src/routes/layout.tsx, src/App.tsx, src/index.tsx is required");
   }
   const entryNames = Object.keys(entries);
-  if (isProd && entryNames.length === 1 && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
+  if (isProd && entryNames.length === 1 && ((_outputConfig2 = outputConfig) === null || _outputConfig2 === void 0 ? void 0 : _outputConfig2.ssg)) {
     return;
   }
   const ssgEntries = [];
-  if (isProd && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
+  if (isProd && ((_outputConfig3 = outputConfig) === null || _outputConfig3 === void 0 ? void 0 : _outputConfig3.ssg)) {
     const { ssg } = outputConfig;
     entryNames.forEach((name) => {
       if (ssg[name]) {
@@ -121,7 +117,8 @@ function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
   }
   const { ssr, ssrByEntries } = serverConfig || {};
   entryNames.forEach((name) => {
-    if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
+    var _ssrByEntries, _ssrByEntries1;
+    if (!ssgEntries.includes(name) && (ssr && ((_ssrByEntries = ssrByEntries) === null || _ssrByEntries === void 0 ? void 0 : _ssrByEntries[name]) === false || !ssr && !((_ssrByEntries1 = ssrByEntries) === null || _ssrByEntries1 === void 0 ? void 0 : _ssrByEntries1[name]))) {
       chain.entryPoints.delete(name);
     }
   });

package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "RouterPlugin", {
     return RouterPlugin;
   }
 });
-const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _lodash = require("@modern-js/utils/lodash");
@@ -26,22 +25,6 @@ class RouterPlugin {
     }
     return false;
   }
-  getEntryChunks(compilation, chunks) {
-    const entrypointsArray = Array.from(compilation.entrypoints.entries());
-    const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
-    const entryChunks = [
-      ...chunks
-    ].filter((chunk) => {
-      var _chunk_names;
-      return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some((name) => entryChunkIds.includes(name));
-    });
-    return entryChunks;
-  }
-  getEntryChunkFiles(entryChunks) {
-    return entryChunks.map((chunk) => [
-      ...chunk.files || []
-    ].find((fname) => fname.includes(".js")));
-  }
   apply(compiler) {
     const { target } = compiler.options;
     if (this.isTargetNodeOrWebWorker(target)) {
@@ -56,8 +39,7 @@ class RouterPlugin {
       }
       return path;
     };
-    const chunkToSource = /* @__PURE__ */ new Map();
-    const chunkToMap = /* @__PURE__ */ new Map();
+    const chunkToSourceAndMap = /* @__PURE__ */ new Map();
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
       compilation.hooks.processAssets.tapPromise({
         name: PLUGIN_NAME,
@@ -73,37 +55,14 @@ class RouterPlugin {
         if (!namedChunkGroups) {
           return;
         }
-        const entryChunks = this.getEntryChunks(compilation, chunks);
-        const entryChunkFiles = entryChunks.map((chunk) => [
-          ...chunk.files || []
-        ].find((fname) => fname.includes(".js")));
-        const entryChunkFileIds = entryChunks.map((chunk) => chunk.id);
-        for (let i = 0; i <= entryChunkFiles.length - 1; i++) {
-          const file = entryChunkFiles[i];
-          const chunkId = entryChunkFileIds[i];
-          const asset = compilation.assets[file];
-          if (!asset) {
-            continue;
-          }
-          const { map } = asset.sourceAndMap();
-          chunkToMap.set(chunkId, map);
-        }
-      });
-      compilation.hooks.processAssets.tapPromise({
-        name: PLUGIN_NAME,
-        stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER
-      }, async () => {
-        const stats = compilation.getStats().toJson({
-          all: false,
-          chunkGroups: true,
-          chunks: true,
-          ids: true
+        const entrypointsArray = Array.from(compilation.entrypoints.entries());
+        const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
+        const entryChunks = [
+          ...chunks
+        ].filter((chunk) => {
+          var _chunk_names;
+          return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some((name) => entryChunkIds.includes(name));
         });
-        const { chunks = [], namedChunkGroups } = stats;
-        if (!namedChunkGroups) {
-          return;
-        }
-        const entryChunks = this.getEntryChunks(compilation, chunks);
         const entryChunkFiles = entryChunks.map((chunk) => [
           ...chunk.files || []
         ].find((fname) => fname.includes(".js")));
@@ -115,8 +74,11 @@ class RouterPlugin {
           if (!asset) {
             continue;
           }
-          const { source } = asset.sourceAndMap();
-          chunkToSource.set(chunkId, source);
+          const { source, map } = asset.sourceAndMap();
+          chunkToSourceAndMap.set(chunkId, {
+            source,
+            map
+          });
         }
       });
       compilation.hooks.processAssets.tapPromise({
@@ -149,7 +111,6 @@ class RouterPlugin {
           const referenceCssAssets = assets.filter((asset) => /\.css$/.test(asset));
           routeAssets[name] = {
             chunkIds: chunkGroup.chunks,
-            chunkName: chunkGroup.name,
             assets,
             referenceCssAssets
           };
@@ -165,29 +126,31 @@ class RouterPlugin {
         const manifest = {
           routeAssets
         };
-        const entryChunks = this.getEntryChunks(compilation, chunks);
-        const entryChunkFiles = this.getEntryChunkFiles(entryChunks);
+        const entrypointsArray = Array.from(compilation.entrypoints.entries());
+        const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
+        const entryChunks = [
+          ...chunks
+        ].filter((chunk) => {
+          var _chunk_names;
+          return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some((name) => entryChunkIds.includes(name));
+        });
+        const entryChunkFiles = entryChunks.map((chunk) => [
+          ...chunk.files || []
+        ].find((fname) => fname.includes(".js")));
         const entryChunkFileIds = entryChunks.map((chunk) => chunk.id);
-        for (let i = 0; i < entryChunkFiles.length; i++) {
+        for (let i = 0; i <= entryChunkFiles.length - 1; i++) {
           const file = entryChunkFiles[i];
-          const chunkNames = entryChunks[i].names;
           const chunkId = entryChunkFileIds[i];
           const asset = compilation.assets[file];
           if (!asset || !chunkId) {
             continue;
           }
-          let relatedAssets = {};
-          if (entryChunkFiles.length > 1) {
-            Object.keys(routeAssets).forEach((routeId) => {
-              const segments = routeId.split("_");
-              const chunkName = segments[0];
-              if (chunkNames === null || chunkNames === void 0 ? void 0 : chunkNames.includes(chunkName)) {
-                relatedAssets[routeId] = routeAssets[routeId];
-              }
-            });
-          } else {
-            relatedAssets = routeAssets;
-          }
+          const relatedAssets = {};
+          Object.keys(routeAssets).forEach((routeId) => {
+            if (routeId.startsWith(`${chunkId}`)) {
+              relatedAssets[routeId] = routeAssets[routeId];
+            }
+          });
           const manifest2 = {
             routeAssets: relatedAssets
           };
@@ -203,13 +166,12 @@ class RouterPlugin {
           })};
             })();
           `;
-          const source = chunkToSource.get(chunkId);
-          const map = chunkToMap.get(chunkId);
+          const { source, map } = chunkToSourceAndMap.get(chunkId);
           const newContent = `${injectedContent}${source.toString()}`;
           const result = await (0, _esbuild.transform)(newContent, {
             loader: _path.default.extname(file).slice(1),
             sourcemap: true,
-            minify: this.minimize
+            minify: process.env.NODE_ENV === "production"
           });
           const newSource = new SourceMapSource(result.code, file, result.map, source.toString(), map);
           compilation.updateAsset(
@@ -232,8 +194,4 @@ class RouterPlugin {
       });
     });
   }
-  constructor(options) {
-    _define_property._(this, "minimize", false);
-    this.minimize = options.minimize;
-  }
 }

package/dist/cjs/commands/build.js

@@ -13,7 +13,8 @@ const _utils = require("@modern-js/utils");
 const _routes = require("../utils/routes");
 const _config = require("../utils/config");
 const build = async (api, options) => {
-  if (options === null || options === void 0 ? void 0 : options.analyze) {
+  var _options;
+  if ((_options = options) === null || _options === void 0 ? void 0 : _options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
   let resolvedConfig = api.useResolvedConfigContext();

package/dist/cjs/commands/inspect.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "inspect", {
 });
 const _path = require("path");
 const inspect = async (api, options) => {
+  var _appContext;
   const appContext = api.useAppContext();
   if (!appContext.builder) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
@@ -17,7 +18,7 @@ const inspect = async (api, options) => {
   return appContext.builder.inspectConfig({
     env: options.env,
     verbose: options.verbose,
-    outputPath: (0, _path.join)(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+    outputPath: (0, _path.join)((_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.builder.context.distPath, options.output),
     writeToDisk: true
   });
 };

package/dist/cjs/commands/serve.js

@@ -15,13 +15,13 @@ const _printInstructions = require("../utils/printInstructions");
 const _createServer = require("../utils/createServer");
 const _getServerInternalPlugins = require("../utils/getServerInternalPlugins");
 const start = async (api) => {
-  var _userConfig_source, _userConfig_output_distPath;
+  var _userConfig_source, _userConfig, _userConfig_output_distPath;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
   const { appDirectory, port, serverConfigFile, metaName } = appContext;
   _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
-  const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
+  const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, (_userConfig = userConfig) === null || _userConfig === void 0 ? void 0 : (_userConfig_source = _userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
   const serverInternalPlugins = await (0, _getServerInternalPlugins.getServerInternalPlugins)(api);
   const app = await (0, _prodserver.default)({
     pwd: appDirectory,

package/dist/cjs/index.js

@@ -94,6 +94,7 @@ const buildCommand = async (program, api) => {
 const appTools = (options = {
   bundler: "webpack"
 }) => {
+  var _options, _options1;
   return {
     name: "@modern-js/app-tools",
     post: [
@@ -109,10 +110,10 @@ const appTools = (options = {
     registerHook: _hooks.hooks,
     usePlugins: [
       (0, _initialize.default)({
-        bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+        bundler: ((_options = options) === null || _options === void 0 ? void 0 : _options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
       (0, _analyze.default)({
-        bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+        bundler: ((_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
       (0, _pluginlint.lintPlugin)()
     ],