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

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

@@ -1,7 +1,6 @@
 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";
@@ -14,10 +13,8 @@ import { transform } from "esbuild";
 var PLUGIN_NAME = "ModernjsRoutePlugin";
 export var RouterPlugin = /* @__PURE__ */ function() {
   "use strict";
-  function RouterPlugin2(options) {
+  function RouterPlugin2() {
     _class_call_check(this, RouterPlugin2);
-    _define_property(this, "minimize", false);
-    this.minimize = options.minimize;
   }
   _create_class(RouterPlugin2, [
     {
@@ -32,36 +29,9 @@ 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;
@@ -75,15 +45,13 @@ export var RouterPlugin = /* @__PURE__ */ function() {
           }
           return path2;
         };
-        var chunkToSource = /* @__PURE__ */ new Map();
-        var chunkToMap = /* @__PURE__ */ new Map();
+        var chunkToSourceAndMap = /* @__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, entryChunks, entryChunkFiles, entryChunkFileIds, i, file, chunkId, asset, map;
+            var stats, _stats_chunks, chunks, namedChunkGroups, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i, file, chunkId, asset, _asset_sourceAndMap, source, map;
             return _ts_generator(this, function(_state) {
               stats = compilation.getStats().toJson({
                 all: false,
@@ -97,50 +65,16 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                   2
                 ];
               }
-              entryChunks = _this1.getEntryChunks(compilation, chunks);
-              entryChunkFiles = entryChunks.map(function(chunk) {
-                return _to_consumable_array(chunk.files || []).find(function(fname) {
-                  return fname.includes(".js");
-                });
+              entrypointsArray = Array.from(compilation.entrypoints.entries());
+              entryChunkIds = entrypointsArray.map(function(entrypoint) {
+                return entrypoint[0];
               });
-              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
+              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);
+                });
               });
-              _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");
@@ -156,30 +90,31 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                 if (!asset) {
                   continue;
                 }
-                source = asset.sourceAndMap().source;
-                chunkToSource.set(chunkId, source);
+                _asset_sourceAndMap = asset.sourceAndMap(), source = _asset_sourceAndMap.source, map = _asset_sourceAndMap.map;
+                chunkToSourceAndMap.set(chunkId, {
+                  source: source,
+                  map: map
+                });
               }
               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, 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, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   _loop = function(i2) {
-                    var file, chunkNames, chunkId, asset, relatedAssets, manifest2, injectedContent, source, map, newContent, result, newSource;
+                    var file, chunkId, asset, relatedAssets, manifest2, injectedContent, _chunkToSourceAndMap_get, 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) {
@@ -189,17 +124,11 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                             ];
                           }
                           relatedAssets = {};
-                          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;
-                          }
+                          Object.keys(routeAssets).forEach(function(routeId) {
+                            if (routeId.startsWith("".concat(chunkId))) {
+                              relatedAssets[routeId] = routeAssets[routeId];
+                            }
+                          });
                           manifest2 = {
                             routeAssets: relatedAssets
                           };
@@ -211,15 +140,14 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                             }
                             return v;
                           }), ";\n            })();\n          ");
-                          source = chunkToSource.get(chunkId);
-                          map = chunkToMap.get(chunkId);
+                          _chunkToSourceAndMap_get = chunkToSourceAndMap.get(chunkId), source = _chunkToSourceAndMap_get.source, map = _chunkToSourceAndMap_get.map;
                           newContent = "".concat(injectedContent).concat(source.toString());
                           return [
                             4,
                             transform(newContent, {
                               loader: path.extname(file).slice(1),
                               sourcemap: true,
-                              minify: _this3.minimize
+                              minify: process.env.NODE_ENV === "production"
                             })
                           ];
                         case 1:
@@ -270,7 +198,6 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                       });
                       routeAssets[name] = {
                         chunkIds: chunkGroup.chunks,
-                        chunkName: chunkGroup.name,
                         assets: assets,
                         referenceCssAssets: referenceCssAssets
                       };
@@ -300,15 +227,28 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                   manifest = {
                     routeAssets: routeAssets
                   };
-                  entryChunks = _this3.getEntryChunks(compilation, chunks);
-                  entryChunkFiles = _this3.getEntryChunkFiles(entryChunks);
+                  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");
+                    });
+                  });
                   entryChunkFileIds = entryChunks.map(function(chunk) {
                     return chunk.id;
                   });
                   i = 0;
                   _state.label = 1;
                 case 1:
-                  if (!(i < entryChunkFiles.length))
+                  if (!(i <= entryChunkFiles.length - 1))
                     return [
                       3,
                       4

package/dist/esm/commands/build.js

@@ -8,11 +8,11 @@ import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 export var build = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
+    var _options, resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          if (options === null || options === void 0 ? void 0 : options.analyze) {
+          if ((_options = options) === null || _options === void 0 ? void 0 : _options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
           resolvedConfig = api.useResolvedConfigContext();

package/dist/esm/commands/inspect.js

@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { join } from "path";
 export var inspect = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var appContext;
+    var _appContext, appContext;
     return _ts_generator(this, function(_state) {
       appContext = api.useAppContext();
       if (!appContext.builder) {
@@ -14,7 +14,7 @@ export var inspect = function() {
         appContext.builder.inspectConfig({
           env: options.env,
           verbose: options.verbose,
-          outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+          outputPath: join((_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.builder.context.distPath, options.output),
           writeToDisk: true
         })
       ];

package/dist/esm/commands/serve.js

@@ -9,7 +9,7 @@ import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 export var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
+    var _userConfig_source, _userConfig, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -20,7 +20,7 @@ export var start = function() {
           logger.log(chalk.cyan("Starting the modern server..."));
           return [
             4,
-            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)
+            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)
           ];
         case 1:
           apiOnly = _state.sent();

package/dist/esm/index.js

@@ -273,6 +273,7 @@ export var appTools = function() {
   var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
     bundler: "webpack"
   };
+  var _options, _options1;
   return {
     name: "@modern-js/app-tools",
     post: [
@@ -288,10 +289,10 @@ export var appTools = function() {
     registerHook: hooks,
     usePlugins: [
       initializePlugin({
-        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"
       }),
       analyzePlugin({
-        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"
       }),
       lintPlugin()
     ],

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

@@ -50,11 +50,13 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 export const generateCode = async (appContext, config, entrypoints, api) => {
+  var _config, _config_runtime_router, _config_runtime, _config1;
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
   const isV5 = isRouterV5(config);
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
   const importsStatemets = /* @__PURE__ */ new Map();
+  const oldVersion = typeof ((_config = config) === null || _config === void 0 ? void 0 : _config.runtime.router) === "object" ? Boolean((_config1 = config) === null || _config1 === void 0 ? void 0 : (_config_runtime = _config1.runtime) === null || _config_runtime === void 0 ? void 0 : (_config_runtime_router = _config_runtime.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   return {
     importsStatemets
@@ -63,9 +65,9 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
     const { entryName, isMainEntry, isAutoMount, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
-        var _config_output;
+        var _config_output, _config2;
         let initialRoutes = [];
-        let nestedRoute = null;
+        let nestedRoutes = null;
         if (entrypoint.entry) {
           initialRoutes = getRoutes({
             entrypoint,
@@ -76,12 +78,19 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
           });
         }
         if (!isV5 && entrypoint.nestedRoutesEntry) {
-          nestedRoute = await walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
+          nestedRoutes = await walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
             name: internalSrcAlias,
             basename: srcDirectory
-          }, entrypoint.entryName, entrypoint.isMainEntry);
-          if (nestedRoute) {
-            initialRoutes.unshift(nestedRoute);
+          }, entrypoint.entryName, entrypoint.isMainEntry, oldVersion);
+          if (nestedRoutes) {
+            if (!Array.isArray(nestedRoutes)) {
+              nestedRoutes = [
+                nestedRoutes
+              ];
+            }
+            for (const route of nestedRoutes) {
+              initialRoutes.unshift(route);
+            }
           }
         }
         const { routes } = await hookRunners.modifyFileSystemRoutes({
@@ -110,7 +119,7 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
+            splitRouteChunks: (_config2 = config2) === null || _config2 === void 0 ? void 0 : (_config_output = _config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {

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

@@ -69,7 +69,8 @@ export const getFileSystemEntry = (appContext, config) => {
   const { source: { entriesDir, disableEntryDirs } } = config;
   let disabledDirs = [];
   if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
-    disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map((dir) => ensureAbsolutePath(appDirectory, dir));
+    var _disableEntryDirs;
+    disabledDirs = (_disableEntryDirs = disableEntryDirs) === null || _disableEntryDirs === void 0 ? void 0 : _disableEntryDirs.map((dir) => ensureAbsolutePath(appDirectory, dir));
   }
   const src = ensureAbsolutePath(appDirectory, entriesDir || "");
   if (fs.existsSync(src)) {

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

@@ -68,17 +68,18 @@ const applyRouteOptions = (original, routeOptions) => {
   return routes;
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
-  var _deploy_worker;
+  var _deploy_worker, _deploy;
   const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries }, deploy } = config;
   const { packageName } = appContext;
-  const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
+  const workerSSR = (_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
+    var _routes, _routes1;
     const isMainEntry = entryName === (mainEntryName || MAIN_ENTRY_NAME);
     const entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
     const isSSR = Boolean(entryOptions);
     const isWorker = Boolean(workerSSR);
     const isStream = typeof entryOptions === "object" && entryOptions.mode === "stream";
-    const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
+    const { resHeaders } = ((_routes = routes) === null || _routes === void 0 ? void 0 : _routes[entryName]) || {};
     let route = {
       urlPath: `/${isMainEntry ? "" : entryName}`,
       entryName,
@@ -90,7 +91,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
       worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
       bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
     };
-    if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
+    if ((_routes1 = routes) === null || _routes1 === void 0 ? void 0 : _routes1.hasOwnProperty(entryName)) {
       const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
         route: routes[entryName]
       };