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

package/dist/cjs/analyze/utils.js

@@ -184,7 +184,8 @@ const checkIsBuildCommands = () => {
     "start",
     "build",
     "inspect",
-    "deploy"
+    "deploy",
+    "dev-worker"
   ];
   const command = (0, _utils.getCommand)();
   return buildCommands.includes(command);

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

@@ -87,8 +87,13 @@ function applyRouterPlugin(chain, options) {
   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 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);
+    chain.plugin("route-plugin").use(_bundlerPlugins.RouterPlugin, [
+      {
+        minimize
+      }
+    ]);
   }
 }
 function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {

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

@@ -8,6 +8,7 @@ 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");
@@ -25,6 +26,22 @@ 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)) {
@@ -39,7 +56,8 @@ class RouterPlugin {
       }
       return path;
     };
-    const chunkToSourceAndMap = /* @__PURE__ */ new Map();
+    const chunkToSource = /* @__PURE__ */ new Map();
+    const chunkToMap = /* @__PURE__ */ new Map();
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
       compilation.hooks.processAssets.tapPromise({
         name: PLUGIN_NAME,
@@ -55,14 +73,37 @@ class RouterPlugin {
         if (!namedChunkGroups) {
           return;
         }
-        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 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 { chunks = [], namedChunkGroups } = stats;
+        if (!namedChunkGroups) {
+          return;
+        }
+        const entryChunks = this.getEntryChunks(compilation, chunks);
         const entryChunkFiles = entryChunks.map((chunk) => [
           ...chunk.files || []
         ].find((fname) => fname.includes(".js")));
@@ -74,11 +115,8 @@ class RouterPlugin {
           if (!asset) {
             continue;
           }
-          const { source, map } = asset.sourceAndMap();
-          chunkToSourceAndMap.set(chunkId, {
-            source,
-            map
-          });
+          const { source } = asset.sourceAndMap();
+          chunkToSource.set(chunkId, source);
         }
       });
       compilation.hooks.processAssets.tapPromise({
@@ -111,6 +149,7 @@ class RouterPlugin {
           const referenceCssAssets = assets.filter((asset) => /\.css$/.test(asset));
           routeAssets[name] = {
             chunkIds: chunkGroup.chunks,
+            chunkName: chunkGroup.name,
             assets,
             referenceCssAssets
           };
@@ -126,31 +165,29 @@ class RouterPlugin {
         const manifest = {
           routeAssets
         };
-        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 entryChunks = this.getEntryChunks(compilation, chunks);
+        const entryChunkFiles = this.getEntryChunkFiles(entryChunks);
         const entryChunkFileIds = entryChunks.map((chunk) => chunk.id);
-        for (let i = 0; i <= entryChunkFiles.length - 1; i++) {
+        for (let i = 0; i < entryChunkFiles.length; i++) {
           const file = entryChunkFiles[i];
+          const chunkNames = entryChunks[i].names;
           const chunkId = entryChunkFileIds[i];
           const asset = compilation.assets[file];
           if (!asset || !chunkId) {
             continue;
           }
-          const relatedAssets = {};
-          Object.keys(routeAssets).forEach((routeId) => {
-            if (routeId.startsWith(`${chunkId}`)) {
-              relatedAssets[routeId] = routeAssets[routeId];
-            }
-          });
+          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 manifest2 = {
             routeAssets: relatedAssets
           };
@@ -166,12 +203,13 @@ class RouterPlugin {
           })};
             })();
           `;
-          const { source, map } = chunkToSourceAndMap.get(chunkId);
+          const source = chunkToSource.get(chunkId);
+          const map = chunkToMap.get(chunkId);
           const newContent = `${injectedContent}${source.toString()}`;
           const result = await (0, _esbuild.transform)(newContent, {
             loader: _path.default.extname(file).slice(1),
             sourcemap: true,
-            minify: process.env.NODE_ENV === "production"
+            minify: this.minimize
           });
           const newSource = new SourceMapSource(result.code, file, result.map, source.toString(), map);
           compilation.updateAsset(
@@ -194,4 +232,8 @@ class RouterPlugin {
       });
     });
   }
+  constructor(options) {
+    _define_property._(this, "minimize", false);
+    this.minimize = options.minimize;
+  }
 }

package/dist/cjs/commands/dev.js

@@ -15,7 +15,7 @@ const _createServer = require("../utils/createServer");
 const _routes = require("../utils/routes");
 const _config = require("../utils/config");
 const _getServerInternalPlugins = require("../utils/getServerInternalPlugins");
-const dev = async (api, options) => {
+const dev = async (api, options, devServerOptions = {}) => {
   var _normalizedConfig_tools;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
@@ -58,7 +58,8 @@ const dev = async (api, options) => {
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
-    internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins)
+    internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins),
+    ...devServerOptions
   };
   if (apiOnly) {
     var _normalizedConfig_dev;

package/dist/cjs/index.js

@@ -13,6 +13,9 @@ _export(exports, {
   mergeConfig: function() {
     return _core.mergeConfig;
   },
+  dev: function() {
+    return _commands.dev;
+  },
   devCommand: function() {
     return devCommand;
   },
@@ -41,6 +44,7 @@ const _locale = require("./locale");
 const _restart = require("./utils/restart");
 const _generateWatchFiles = require("./utils/generateWatchFiles");
 const _core = require("@modern-js/core");
+const _commands = require("./commands");
 _export_star._(require("./defineConfig"), exports);
 _export_star._(require("./types"), exports);
 const devCommand = async (program, api) => {

package/dist/esm/analyze/utils.js

@@ -207,7 +207,8 @@ export var checkIsBuildCommands = function() {
     "start",
     "build",
     "inspect",
-    "deploy"
+    "deploy",
+    "dev-worker"
   ];
   var command = getCommand();
   return buildCommands.includes(command);

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

@@ -127,8 +127,13 @@ function applyRouterPlugin(chain, options) {
   var routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
   var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
   var workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
+  var minimize = !normalizedConfig.output.disableMinimize && process.env.NODE_ENV === "production";
   if (existNestedRoutes || routerManifest || workerSSR) {
-    chain.plugin("route-plugin").use(RouterPlugin);
+    chain.plugin("route-plugin").use(RouterPlugin, [
+      {
+        minimize: minimize
+      }
+    ]);
   }
 }
 function applyFilterEntriesBySSRConfig(param) {

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

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
@@ -13,8 +14,10 @@ import { transform } from "esbuild";
 var PLUGIN_NAME = "ModernjsRoutePlugin";
 export var RouterPlugin = /* @__PURE__ */ function() {
   "use strict";
-  function RouterPlugin2() {
+  function RouterPlugin2(options) {
     _class_call_check(this, RouterPlugin2);
+    _define_property(this, "minimize", false);
+    this.minimize = options.minimize;
   }
   _create_class(RouterPlugin2, [
     {
@@ -29,9 +32,36 @@ export var RouterPlugin = /* @__PURE__ */ function() {
         return false;
       }
     },
+    {
+      key: "getEntryChunks",
+      value: function getEntryChunks(compilation, chunks) {
+        var entrypointsArray = Array.from(compilation.entrypoints.entries());
+        var entryChunkIds = entrypointsArray.map(function(entrypoint) {
+          return entrypoint[0];
+        });
+        var entryChunks = _to_consumable_array(chunks).filter(function(chunk) {
+          var _chunk_names;
+          return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some(function(name) {
+            return entryChunkIds.includes(name);
+          });
+        });
+        return entryChunks;
+      }
+    },
+    {
+      key: "getEntryChunkFiles",
+      value: function getEntryChunkFiles(entryChunks) {
+        return entryChunks.map(function(chunk) {
+          return _to_consumable_array(chunk.files || []).find(function(fname) {
+            return fname.includes(".js");
+          });
+        });
+      }
+    },
     {
       key: "apply",
       value: function apply(compiler) {
+        var _this = this;
         var target = compiler.options.target;
         if (this.isTargetNodeOrWebWorker(target)) {
           return;
@@ -45,13 +75,15 @@ export var RouterPlugin = /* @__PURE__ */ function() {
           }
           return path2;
         };
-        var chunkToSourceAndMap = /* @__PURE__ */ new Map();
+        var chunkToSource = /* @__PURE__ */ new Map();
+        var chunkToMap = /* @__PURE__ */ new Map();
         compiler.hooks.thisCompilation.tap(PLUGIN_NAME, function(compilation) {
+          var _this1 = _this;
           compilation.hooks.processAssets.tapPromise({
             name: PLUGIN_NAME,
             stage: Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING
           }, /* @__PURE__ */ _async_to_generator(function() {
-            var stats, _stats_chunks, chunks, namedChunkGroups, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i, file, chunkId, asset, _asset_sourceAndMap, source, map;
+            var stats, _stats_chunks, chunks, namedChunkGroups, entryChunks, entryChunkFiles, entryChunkFileIds, i, file, chunkId, asset, map;
             return _ts_generator(this, function(_state) {
               stats = compilation.getStats().toJson({
                 all: false,
@@ -65,16 +97,50 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                   2
                 ];
               }
-              entrypointsArray = Array.from(compilation.entrypoints.entries());
-              entryChunkIds = entrypointsArray.map(function(entrypoint) {
-                return entrypoint[0];
-              });
-              entryChunks = _to_consumable_array(chunks).filter(function(chunk) {
-                var _chunk_names;
-                return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some(function(name) {
-                  return entryChunkIds.includes(name);
+              entryChunks = _this1.getEntryChunks(compilation, chunks);
+              entryChunkFiles = entryChunks.map(function(chunk) {
+                return _to_consumable_array(chunk.files || []).find(function(fname) {
+                  return fname.includes(".js");
                 });
               });
+              entryChunkFileIds = entryChunks.map(function(chunk) {
+                return chunk.id;
+              });
+              for (i = 0; i <= entryChunkFiles.length - 1; i++) {
+                file = entryChunkFiles[i];
+                chunkId = entryChunkFileIds[i];
+                asset = compilation.assets[file];
+                if (!asset) {
+                  continue;
+                }
+                map = asset.sourceAndMap().map;
+                chunkToMap.set(chunkId, map);
+              }
+              return [
+                2
+              ];
+            });
+          }));
+          var _this2 = _this;
+          compilation.hooks.processAssets.tapPromise({
+            name: PLUGIN_NAME,
+            stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER
+          }, /* @__PURE__ */ _async_to_generator(function() {
+            var stats, _stats_chunks, chunks, namedChunkGroups, entryChunks, entryChunkFiles, entryChunkFileIds, i, file, chunkId, asset, source;
+            return _ts_generator(this, function(_state) {
+              stats = compilation.getStats().toJson({
+                all: false,
+                chunkGroups: true,
+                chunks: true,
+                ids: true
+              });
+              _stats_chunks = stats.chunks, chunks = _stats_chunks === void 0 ? [] : _stats_chunks, namedChunkGroups = stats.namedChunkGroups;
+              if (!namedChunkGroups) {
+                return [
+                  2
+                ];
+              }
+              entryChunks = _this2.getEntryChunks(compilation, chunks);
               entryChunkFiles = entryChunks.map(function(chunk) {
                 return _to_consumable_array(chunk.files || []).find(function(fname) {
                   return fname.includes(".js");
@@ -90,31 +156,30 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                 if (!asset) {
                   continue;
                 }
-                _asset_sourceAndMap = asset.sourceAndMap(), source = _asset_sourceAndMap.source, map = _asset_sourceAndMap.map;
-                chunkToSourceAndMap.set(chunkId, {
-                  source: source,
-                  map: map
-                });
+                source = asset.sourceAndMap().source;
+                chunkToSource.set(chunkId, source);
               }
               return [
                 2
               ];
             });
           }));
+          var _this3 = _this;
           compilation.hooks.processAssets.tapPromise({
             name: PLUGIN_NAME,
             stage: Compilation.PROCESS_ASSETS_STAGE_REPORT
           }, /* @__PURE__ */ _async_to_generator(function() {
-            var _loop, stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i;
+            var _loop, stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, entryChunks, entryChunkFiles, entryChunkFileIds, i;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   _loop = function(i2) {
-                    var file, chunkId, asset, relatedAssets, manifest2, injectedContent, _chunkToSourceAndMap_get, source, map, newContent, result, newSource;
+                    var file, chunkNames, chunkId, asset, relatedAssets, manifest2, injectedContent, source, map, newContent, result, newSource;
                     return _ts_generator(this, function(_state2) {
                       switch (_state2.label) {
                         case 0:
                           file = entryChunkFiles[i2];
+                          chunkNames = entryChunks[i2].names;
                           chunkId = entryChunkFileIds[i2];
                           asset = compilation.assets[file];
                           if (!asset || !chunkId) {
@@ -124,11 +189,17 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                             ];
                           }
                           relatedAssets = {};
-                          Object.keys(routeAssets).forEach(function(routeId) {
-                            if (routeId.startsWith("".concat(chunkId))) {
-                              relatedAssets[routeId] = routeAssets[routeId];
-                            }
-                          });
+                          if (entryChunkFiles.length > 1) {
+                            Object.keys(routeAssets).forEach(function(routeId) {
+                              var segments = routeId.split("_");
+                              var chunkName = segments[0];
+                              if (chunkNames === null || chunkNames === void 0 ? void 0 : chunkNames.includes(chunkName)) {
+                                relatedAssets[routeId] = routeAssets[routeId];
+                              }
+                            });
+                          } else {
+                            relatedAssets = routeAssets;
+                          }
                           manifest2 = {
                             routeAssets: relatedAssets
                           };
@@ -140,14 +211,15 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                             }
                             return v;
                           }), ";\n            })();\n          ");
-                          _chunkToSourceAndMap_get = chunkToSourceAndMap.get(chunkId), source = _chunkToSourceAndMap_get.source, map = _chunkToSourceAndMap_get.map;
+                          source = chunkToSource.get(chunkId);
+                          map = chunkToMap.get(chunkId);
                           newContent = "".concat(injectedContent).concat(source.toString());
                           return [
                             4,
                             transform(newContent, {
                               loader: path.extname(file).slice(1),
                               sourcemap: true,
-                              minify: process.env.NODE_ENV === "production"
+                              minify: _this3.minimize
                             })
                           ];
                         case 1:
@@ -198,6 +270,7 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                       });
                       routeAssets[name] = {
                         chunkIds: chunkGroup.chunks,
+                        chunkName: chunkGroup.name,
                         assets: assets,
                         referenceCssAssets: referenceCssAssets
                       };
@@ -227,28 +300,15 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                   manifest = {
                     routeAssets: routeAssets
                   };
-                  entrypointsArray = Array.from(compilation.entrypoints.entries());
-                  entryChunkIds = entrypointsArray.map(function(entrypoint) {
-                    return entrypoint[0];
-                  });
-                  entryChunks = _to_consumable_array(chunks).filter(function(chunk) {
-                    var _chunk_names;
-                    return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some(function(name2) {
-                      return entryChunkIds.includes(name2);
-                    });
-                  });
-                  entryChunkFiles = entryChunks.map(function(chunk) {
-                    return _to_consumable_array(chunk.files || []).find(function(fname) {
-                      return fname.includes(".js");
-                    });
-                  });
+                  entryChunks = _this3.getEntryChunks(compilation, chunks);
+                  entryChunkFiles = _this3.getEntryChunkFiles(entryChunks);
                   entryChunkFileIds = entryChunks.map(function(chunk) {
                     return chunk.id;
                   });
                   i = 0;
                   _state.label = 1;
                 case 1:
-                  if (!(i <= entryChunkFiles.length - 1))
+                  if (!(i < entryChunkFiles.length))
                     return [
                       3,
                       4

package/dist/esm/commands/dev.js

@@ -11,10 +11,12 @@ import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 export var dev = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var devServerOptions, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
+          devServerOptions = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
           if (options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
@@ -58,7 +60,7 @@ export var dev = function() {
           ];
         case 4:
           serverInternalPlugins = _state.sent();
-          serverOptions = {
+          serverOptions = _object_spread({
             dev: _object_spread({
               port: port,
               https: normalizedConfig.dev.https,
@@ -75,7 +77,7 @@ export var dev = function() {
             config: normalizedConfig,
             serverConfigFile: serverConfigFile,
             internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
-          };
+          }, devServerOptions);
           if (!apiOnly)
             return [
               3,

package/dist/esm/index.js

@@ -14,6 +14,7 @@ import { i18n, localeKeys } from "./locale";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 export { mergeConfig } from "@modern-js/core";
+export { dev } from "./commands";
 export * from "./defineConfig";
 export * from "./types";
 export var devCommand = function() {
@@ -31,7 +32,7 @@ export var devCommand = function() {
           devToolMetas = _state.sent();
           devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(function() {
             var _ref2 = _async_to_generator(function(options) {
-              var dev;
+              var dev2;
               return _ts_generator(this, function(_state2) {
                 switch (_state2.label) {
                   case 0:
@@ -40,10 +41,10 @@ export var devCommand = function() {
                       import("./commands/dev")
                     ];
                   case 1:
-                    dev = _state2.sent().dev;
+                    dev2 = _state2.sent().dev;
                     return [
                       4,
-                      dev(api, options)
+                      dev2(api, options)
                     ];
                   case 2:
                     _state2.sent();

package/dist/esm-node/analyze/utils.js

@@ -143,7 +143,8 @@ export const checkIsBuildCommands = () => {
     "start",
     "build",
     "inspect",
-    "deploy"
+    "deploy",
+    "dev-worker"
   ];
   const command = getCommand();
   return buildCommands.includes(command);

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -76,8 +76,13 @@ function applyRouterPlugin(chain, options) {
   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 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(RouterPlugin);
+    chain.plugin("route-plugin").use(RouterPlugin, [
+      {
+        minimize
+      }
+    ]);
   }
 }
 function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {

package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -1,3 +1,4 @@
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
 import { mergeWith } from "@modern-js/utils/lodash";
 import { ROUTE_MANIFEST_FILE } from "@modern-js/utils";
@@ -14,6 +15,22 @@ export 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)) {
@@ -28,7 +45,8 @@ export class RouterPlugin {
       }
       return path2;
     };
-    const chunkToSourceAndMap = /* @__PURE__ */ new Map();
+    const chunkToSource = /* @__PURE__ */ new Map();
+    const chunkToMap = /* @__PURE__ */ new Map();
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
       compilation.hooks.processAssets.tapPromise({
         name: PLUGIN_NAME,
@@ -44,14 +62,37 @@ export class RouterPlugin {
         if (!namedChunkGroups) {
           return;
         }
-        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 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 { chunks = [], namedChunkGroups } = stats;
+        if (!namedChunkGroups) {
+          return;
+        }
+        const entryChunks = this.getEntryChunks(compilation, chunks);
         const entryChunkFiles = entryChunks.map((chunk) => [
           ...chunk.files || []
         ].find((fname) => fname.includes(".js")));
@@ -63,11 +104,8 @@ export class RouterPlugin {
           if (!asset) {
             continue;
           }
-          const { source, map } = asset.sourceAndMap();
-          chunkToSourceAndMap.set(chunkId, {
-            source,
-            map
-          });
+          const { source } = asset.sourceAndMap();
+          chunkToSource.set(chunkId, source);
         }
       });
       compilation.hooks.processAssets.tapPromise({
@@ -100,6 +138,7 @@ export class RouterPlugin {
           const referenceCssAssets = assets.filter((asset) => /\.css$/.test(asset));
           routeAssets[name] = {
             chunkIds: chunkGroup.chunks,
+            chunkName: chunkGroup.name,
             assets,
             referenceCssAssets
           };
@@ -115,31 +154,29 @@ export class RouterPlugin {
         const manifest = {
           routeAssets
         };
-        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 entryChunks = this.getEntryChunks(compilation, chunks);
+        const entryChunkFiles = this.getEntryChunkFiles(entryChunks);
         const entryChunkFileIds = entryChunks.map((chunk) => chunk.id);
-        for (let i = 0; i <= entryChunkFiles.length - 1; i++) {
+        for (let i = 0; i < entryChunkFiles.length; i++) {
           const file = entryChunkFiles[i];
+          const chunkNames = entryChunks[i].names;
           const chunkId = entryChunkFileIds[i];
           const asset = compilation.assets[file];
           if (!asset || !chunkId) {
             continue;
           }
-          const relatedAssets = {};
-          Object.keys(routeAssets).forEach((routeId) => {
-            if (routeId.startsWith(`${chunkId}`)) {
-              relatedAssets[routeId] = routeAssets[routeId];
-            }
-          });
+          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 manifest2 = {
             routeAssets: relatedAssets
           };
@@ -155,12 +192,13 @@ export class RouterPlugin {
           })};
             })();
           `;
-          const { source, map } = chunkToSourceAndMap.get(chunkId);
+          const source = chunkToSource.get(chunkId);
+          const map = chunkToMap.get(chunkId);
           const newContent = `${injectedContent}${source.toString()}`;
           const result = await transform(newContent, {
             loader: path.extname(file).slice(1),
             sourcemap: true,
-            minify: process.env.NODE_ENV === "production"
+            minify: this.minimize
           });
           const newSource = new SourceMapSource(result.code, file, result.map, source.toString(), map);
           compilation.updateAsset(
@@ -183,4 +221,8 @@ export class RouterPlugin {
       });
     });
   }
+  constructor(options) {
+    _define_property(this, "minimize", false);
+    this.minimize = options.minimize;
+  }
 }

package/dist/esm-node/commands/dev.js

@@ -5,7 +5,7 @@ import { setServer, createServer, injectDataLoaderPlugin } from "../utils/create
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
-export const dev = async (api, options) => {
+export const dev = async (api, options, devServerOptions = {}) => {
   var _normalizedConfig_tools;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
@@ -48,7 +48,8 @@ export const dev = async (api, options) => {
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
-    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
+    ...devServerOptions
   };
   if (apiOnly) {
     var _normalizedConfig_dev;

package/dist/esm-node/index.js

@@ -10,14 +10,15 @@ import { i18n, localeKeys } from "./locale";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 export { mergeConfig } from "@modern-js/core";
+export { dev } from "./commands";
 export * from "./defineConfig";
 export * from "./types";
 export const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
   const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
-    const { dev } = await import("./commands/dev");
-    await dev(api, options);
+    const { dev: dev2 } = await import("./commands/dev");
+    await dev2(api, options);
   });
   for (const meta of devToolMetas) {
     if (!meta.subCommands) {

package/dist/types/analyze/getClientRoutes/getRoutes.d.ts

@@ -1,4 +1,4 @@
-import type { Entrypoint, NestedRoute, PageRoute } from '@modern-js/types';
+import type { Entrypoint, NestedRouteForCli, PageRoute } from '@modern-js/types';
 export declare const getClientRoutes: ({
   entrypoint,
   srcDirectory,
@@ -11,4 +11,4 @@ export declare const getClientRoutes: ({
   srcAlias: string;
   internalDirectory: string;
   internalDirAlias: string;
-}) => (NestedRoute | PageRoute)[];
+}) => (NestedRouteForCli | PageRoute)[];

package/dist/types/analyze/nestedRoutes.d.ts

@@ -1,6 +1,6 @@
-import type { NestedRoute } from '@modern-js/types';
+import type { NestedRouteForCli } from '@modern-js/types';
 export declare const getRouteId: (componentPath: string, routesDir: string, entryName: string, isMainEntry: boolean) => string;
 export declare const walk: (dirname: string, rootDir: string, alias: {
   name: string;
   basename: string;
-}, entryName: string, isMainEntry: boolean) => Promise<NestedRoute | null>;
+}, entryName: string, isMainEntry: boolean) => Promise<NestedRouteForCli | null>;

package/dist/types/analyze/templates.d.ts

@@ -1,4 +1,4 @@
-import type { Entrypoint, NestedRoute, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
+import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
 import type { AppNormalizedConfig, IAppContext, RuntimePlugin } from '../types';
 export declare const index: ({
   mountId,
@@ -28,7 +28,7 @@ export declare const html: (partials: {
 export declare const routesForServer: ({
   routes
 }: {
-  routes: (NestedRoute | PageRoute)[];
+  routes: (NestedRouteForCli | PageRoute)[];
 }) => string;
 export declare const fileSystemRoutes: ({
   routes,
@@ -38,7 +38,7 @@ export declare const fileSystemRoutes: ({
   internalDirectory,
   splitRouteChunks
 }: {
-  routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
+  routes: RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
   ssrMode?: SSRMode | undefined;
   nestedRoutesEntry?: string | undefined;
   entryName: string;

package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts

@@ -3,13 +3,21 @@ import type { Rspack } from '@modern-js/builder-rspack-provider';
 export interface RouteAssets {
   [routeId: string]: {
     chunkIds?: (string | number)[];
+    chunkName: string;
     assets?: string[];
     referenceCssAssets?: string[];
   };
 }
 type Compiler = webpack.Compiler | Rspack.Compiler;
+type Options = {
+  minimize: boolean;
+};
 export declare class RouterPlugin {
+  private minimize;
+  constructor(options: Options);
   private isTargetNodeOrWebWorker;
+  private getEntryChunks;
+  private getEntryChunkFiles;
   apply(compiler: Compiler): void;
 }
 export {};

package/dist/types/commands/dev.d.ts

@@ -1,4 +1,7 @@
 import { PluginAPI } from '@modern-js/core';
 import { DevOptions } from '../utils/types';
 import type { AppTools } from '../types';
-export declare const dev: (api: PluginAPI<AppTools<'shared'>>, options: DevOptions) => Promise<void>;
+export interface ExtraServerOptions {
+  useSSRWorker?: boolean;
+}
+export declare const dev: (api: PluginAPI<AppTools<'shared'>>, options: DevOptions, devServerOptions?: ExtraServerOptions) => Promise<void>;

package/dist/types/index.d.ts

@@ -2,6 +2,7 @@ import { Command } from '@modern-js/utils';
 import { CliPlugin, PluginAPI } from '@modern-js/core';
 import { AppTools } from './types';
 export { mergeConfig } from '@modern-js/core';
+export { dev } from './commands';
 export * from './defineConfig';
 export * from './types';
 export type { RuntimeUserConfig } from './types/config';

package/dist/types/types/hooks.d.ts

@@ -1,6 +1,6 @@
 import type { webpack } from '@modern-js/builder-webpack-provider';
 import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js/plugin';
-import type { Entrypoint, HtmlPartials, NestedRoute, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
+import type { Entrypoint, HtmlPartials, NestedRouteForCli, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
 import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
 import type { Stats, MultiStats } from '@modern-js/builder-shared';
 import type { Rspack } from '@modern-js/builder-rspack-provider';
@@ -43,7 +43,7 @@ export type AppToolsHooks<B extends Bundler = 'webpack'> = {
   }>;
   modifyFileSystemRoutes: AsyncWaterfall<{
     entrypoint: Entrypoint;
-    routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
+    routes: RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
   }>;
   modifyServerRoutes: AsyncWaterfall<{
     routes: ServerRoute[];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.27.0",
+  "version": "2.27.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -74,23 +74,23 @@
     "rspack-plugin-virtual-module": "0.1.0",
     "@swc/helpers": "0.5.1",
     "@modern-js/builder": "2.27.0",
-    "@modern-js/builder-plugin-esbuild": "2.27.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.27.0",
-    "@modern-js/builder-shared": "2.27.0",
     "@modern-js/builder-webpack-provider": "2.27.0",
-    "@modern-js/core": "2.27.0",
+    "@modern-js/builder-plugin-esbuild": "2.27.0",
     "@modern-js/new-action": "2.27.0",
+    "@modern-js/core": "2.27.0",
+    "@modern-js/builder-shared": "2.27.0",
     "@modern-js/node-bundle-require": "2.27.0",
-    "@modern-js/plugin": "2.27.0",
-    "@modern-js/plugin-data-loader": "2.27.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.27.0",
     "@modern-js/plugin-i18n": "2.27.0",
-    "@modern-js/plugin-lint": "2.27.0",
     "@modern-js/prod-server": "2.27.0",
+    "@modern-js/plugin-lint": "2.27.0",
+    "@modern-js/plugin": "2.27.0",
     "@modern-js/server": "2.27.0",
     "@modern-js/types": "2.27.0",
     "@modern-js/upgrade": "2.27.0",
     "@modern-js/utils": "2.27.0",
-    "@modern-js/server-core": "2.27.0"
+    "@modern-js/server-core": "2.27.0",
+    "@modern-js/plugin-data-loader": "2.27.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -99,10 +99,10 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/builder-plugin-swc": "2.27.0",
     "@modern-js/builder-rspack-provider": "2.27.0",
-    "@scripts/build": "2.27.0",
-    "@scripts/jest-config": "2.27.0"
+    "@modern-js/builder-plugin-swc": "2.27.0",
+    "@scripts/jest-config": "2.27.0",
+    "@scripts/build": "2.27.0"
   },
   "peerDependencies": {
     "@modern-js/builder-rspack-provider": "^2.27.0"