@modern-js/app-tools 2.28.1-alpha.1 → 2.28.1-alpha.3

package/dist/cjs/analyze/generateCode.js

@@ -74,13 +74,13 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 const generateCode = async (appContext, config, entrypoints, api) => {
-  var _config, _config_runtime_router, _config_runtime, _config1;
+  var _config, _config1;
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
   const isV5 = (0, _utils.isRouterV5)(config);
   const getRoutes = isV5 ? _getClientRoutes.getClientRoutesLegacy : _getClientRoutes.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;
+  const oldVersion = typeof ((_config = config) === null || _config === void 0 ? void 0 : _config.runtime.router) === "object" ? Boolean(((_config1 = config) === null || _config1 === void 0 ? void 0 : _config1.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   return {
     importsStatemets

package/dist/cjs/analyze/nestedRoutes.js

@@ -66,20 +66,28 @@ const optimizeRoute = (routeTree) => {
     ];
   }
   const { children } = routeTree;
-  if (!routeTree._component) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
     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 {
+      const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
+      const newRoute = {
         ...child,
-        path: routePath
+        path: routePath.replace(/\/\//g, "/")
       };
+      if (routePath.length > 0) {
+        delete newRoute.index;
+      } else {
+        delete newRoute.path;
+      }
+      return newRoute;
     });
-    return newRoutes.flatMap((newRoute) => optimizeRoute(newRoute));
+    return Array.from(new Set(newRoutes)).flatMap(optimizeRoute);
   } else {
-    routeTree.children = children.flatMap(optimizeRoute);
+    const optimizedChildren = routeTree.children.flatMap(optimizeRoute);
     return [
-      routeTree
+      {
+        ...routeTree,
+        children: optimizedChildren
+      }
     ];
   }
 };
@@ -200,15 +208,6 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       };
     }
   }
-  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;

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

@@ -25,6 +25,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 +55,9 @@ class RouterPlugin {
       }
       return path;
     };
-    const chunkToSourceAndMap = /* @__PURE__ */ new Map();
+    const chunkToSource = /* @__PURE__ */ new Map();
+    const chunkToMap = /* @__PURE__ */ new Map();
+    const { minimize } = compiler.options.optimization;
     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({
@@ -126,31 +164,31 @@ 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++) {
+          var _source, _source1;
           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) => {
+              var _chunkNames;
+              const segments = routeId.split("_");
+              const chunkName = segments[0];
+              if ((_chunkNames = chunkNames) === null || _chunkNames === void 0 ? void 0 : _chunkNames.includes(chunkName)) {
+                relatedAssets[routeId] = routeAssets[routeId];
+              }
+            });
+          } else {
+            relatedAssets = routeAssets;
+          }
           const manifest2 = {
             routeAssets: relatedAssets
           };
@@ -166,14 +204,15 @@ class RouterPlugin {
           })};
             })();
           `;
-          const { source, map } = chunkToSourceAndMap.get(chunkId);
-          const newContent = `${injectedContent}${source.toString()}`;
+          const source = chunkToSource.get(chunkId);
+          const map = chunkToMap.get(chunkId);
+          const newContent = `${injectedContent}${(_source = source) === null || _source === void 0 ? void 0 : _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: minimize
           });
-          const newSource = new SourceMapSource(result.code, file, result.map, source.toString(), map);
+          const newSource = new SourceMapSource(result.code, file, result.map, (_source1 = source) === null || _source1 === void 0 ? void 0 : _source1.toString(), map);
           compilation.updateAsset(
             file,
             newSource,

package/dist/cjs/config/default.js

@@ -75,9 +75,21 @@ function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
+  const defaultTsCheckerConfig = {
+    tsChecker: {
+      issue: {
+        include: [
+          {
+            file: "**/src/**/*"
+          }
+        ]
+      }
+    }
+  };
   const tools = bundler === "webpack" ? {
-    ...defaultBuilderConfig.tools
-  } : void 0;
+    ...defaultBuilderConfig.tools,
+    ...defaultTsCheckerConfig
+  } : defaultTsCheckerConfig;
   return {
     source,
     output,

package/dist/cjs/config/initialize/index.js

@@ -12,8 +12,5 @@ const _inits = require("./inits");
 function initialNormalizedConfig(config, appContext, bundler) {
   (0, _inits.initHtmlConfig)(config, appContext);
   (0, _inits.initSourceConfig)(config, appContext, bundler);
-  if (bundler === "webpack") {
-    (0, _inits.initToolsConfig)(config);
-  }
   return config;
 }

package/dist/cjs/config/initialize/inits.js

@@ -15,9 +15,6 @@ _export(exports, {
   },
   initSourceConfig: function() {
     return initSourceConfig;
-  },
-  initToolsConfig: function() {
-    return initToolsConfig;
   }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
@@ -116,31 +113,3 @@ function initSourceConfig(config, appContext, bundler) {
     }
   }
 }
-function initToolsConfig(config) {
-  const defaultTsChecker = {
-    issue: {
-      include: [
-        {
-          file: "**/src/**/*"
-        }
-      ],
-      exclude: [
-        {
-          file: "**/*.(spec|test).ts"
-        },
-        {
-          file: "**/node_modules/**/*"
-        }
-      ]
-    }
-  };
-  const { tsChecker, tsLoader } = config.tools;
-  config.tools.tsChecker = (0, _utils.applyOptionsChain)(defaultTsChecker, tsChecker);
-  tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
-    (0, _utils.applyOptionsChain)({
-      ...tsLoaderConfig,
-      transpileOnly: false,
-      allowTsInNodeModules: true
-    }, tsLoader || {}, utils);
-  });
-}

package/dist/esm/analyze/generateCode.js

@@ -94,7 +94,7 @@ export var createImportStatements = function(statements) {
 };
 export var generateCode = function() {
   var _ref = _async_to_generator(function(appContext, config, entrypoints, api) {
-    var _config, _config_runtime_router, _config_runtime, _config1, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets, oldVersion;
+    var _config, _config1, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets, oldVersion;
     function generateEntryCode(entrypoint) {
       return _generateEntryCode.apply(this, arguments);
     }
@@ -294,7 +294,7 @@ export var generateCode = function() {
           isV5 = isRouterV5(config);
           getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
           importsStatemets = /* @__PURE__ */ new Map();
-          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;
+          oldVersion = typeof ((_config = config) === null || _config === void 0 ? void 0 : _config.runtime.router) === "object" ? Boolean(((_config1 = config) === null || _config1 === void 0 ? void 0 : _config1.runtime.router).oldVersion) : false;
           return [
             4,
             Promise.all(entrypoints.map(generateEntryCode))

package/dist/esm/analyze/nestedRoutes.js

@@ -45,27 +45,32 @@ export var optimizeRoute = function(routeTree) {
     ];
   }
   var children = routeTree.children;
-  if (!routeTree._component) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
     var newRoutes = children.map(function(child) {
-      var _routeTree_path;
-      var routePath = "".concat((_routeTree_path = routeTree.path) !== null && _routeTree_path !== void 0 ? _routeTree_path : "").concat(child.path ? "/".concat(child.path) : "");
-      return _object_spread_props(_object_spread({}, child), {
-        path: routePath
+      var routePath = "".concat(routeTree.path ? routeTree.path : "").concat(child.path ? "/".concat(child.path) : "");
+      var newRoute = _object_spread_props(_object_spread({}, child), {
+        path: routePath.replace(/\/\//g, "/")
       });
+      if (routePath.length > 0) {
+        delete newRoute.index;
+      } else {
+        delete newRoute.path;
+      }
+      return newRoute;
     });
-    return newRoutes.flatMap(function(newRoute) {
-      return optimizeRoute(newRoute);
-    });
+    return Array.from(new Set(newRoutes)).flatMap(optimizeRoute);
   } else {
-    routeTree.children = children.flatMap(optimizeRoute);
+    var optimizedChildren = routeTree.children.flatMap(optimizeRoute);
     return [
-      routeTree
+      _object_spread_props(_object_spread({}, routeTree), {
+        children: optimizedChildren
+      })
     ];
   }
 };
 export var walk = function() {
   var _ref = _async_to_generator(function(dirname, rootDir, alias, entryName, isMainEntry, oldVersion) {
-    var _routePath, _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, pageConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, _childRoutes, slatRouteIndex, _childRoutes1, _childRoutes2, optimizedRoutes;
+    var _routePath, _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, pageConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -277,17 +282,6 @@ export var walk = function() {
               });
             }
           }
-          if (splatRoute) {
-            ;
-            slatRouteIndex = (_childRoutes = childRoutes) === null || _childRoutes === void 0 ? void 0 : _childRoutes.findIndex(function(childRoute2) {
-              return childRoute2 === splatRoute;
-            });
-            if (typeof slatRouteIndex === "number" && slatRouteIndex !== -1) {
-              ;
-              (_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) {
             optimizedRoutes = optimizeRoute(finalRoute);
             return [

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

@@ -29,9 +29,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 +72,16 @@ export var RouterPlugin = /* @__PURE__ */ function() {
           }
           return path2;
         };
-        var chunkToSourceAndMap = /* @__PURE__ */ new Map();
+        var chunkToSource = /* @__PURE__ */ new Map();
+        var chunkToMap = /* @__PURE__ */ new Map();
+        var minimize = compiler.options.optimization.minimize;
         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 +95,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 +154,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 _source, _source1, 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 +187,18 @@ 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 _chunkNames;
+                              var segments = routeId.split("_");
+                              var chunkName = segments[0];
+                              if ((_chunkNames = chunkNames) === null || _chunkNames === void 0 ? void 0 : _chunkNames.includes(chunkName)) {
+                                relatedAssets[routeId] = routeAssets[routeId];
+                              }
+                            });
+                          } else {
+                            relatedAssets = routeAssets;
+                          }
                           manifest2 = {
                             routeAssets: relatedAssets
                           };
@@ -140,19 +210,20 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                             }
                             return v;
                           }), ";\n            })();\n          ");
-                          _chunkToSourceAndMap_get = chunkToSourceAndMap.get(chunkId), source = _chunkToSourceAndMap_get.source, map = _chunkToSourceAndMap_get.map;
-                          newContent = "".concat(injectedContent).concat(source.toString());
+                          source = chunkToSource.get(chunkId);
+                          map = chunkToMap.get(chunkId);
+                          newContent = "".concat(injectedContent).concat((_source = source) === null || _source === void 0 ? void 0 : _source.toString());
                           return [
                             4,
                             transform(newContent, {
                               loader: path.extname(file).slice(1),
                               sourcemap: true,
-                              minify: process.env.NODE_ENV === "production"
+                              minify: minimize
                             })
                           ];
                         case 1:
                           result = _state2.sent();
-                          newSource = new SourceMapSource(result.code, file, result.map, source.toString(), map);
+                          newSource = new SourceMapSource(result.code, file, result.map, (_source1 = source) === null || _source1 === void 0 ? void 0 : _source1.toString(), map);
                           compilation.updateAsset(
                             file,
                             newSource,
@@ -227,28 +298,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/config/default.js

@@ -51,7 +51,18 @@ export function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
-  var tools = bundler === "webpack" ? _object_spread({}, defaultBuilderConfig.tools) : void 0;
+  var defaultTsCheckerConfig = {
+    tsChecker: {
+      issue: {
+        include: [
+          {
+            file: "**/src/**/*"
+          }
+        ]
+      }
+    }
+  };
+  var tools = bundler === "webpack" ? _object_spread({}, defaultBuilderConfig.tools, defaultTsCheckerConfig) : defaultTsCheckerConfig;
   return {
     source: source,
     output: output,

package/dist/esm/config/initialize/index.js

@@ -1,9 +1,6 @@
-import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
+import { initHtmlConfig, initSourceConfig } from "./inits";
 export function initialNormalizedConfig(config, appContext, bundler) {
   initHtmlConfig(config, appContext);
   initSourceConfig(config, appContext, bundler);
-  if (bundler === "webpack") {
-    initToolsConfig(config);
-  }
   return config;
 }

package/dist/esm/config/initialize/inits.js

@@ -1,8 +1,6 @@
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import path, { dirname, isAbsolute, posix, sep } from "path";
-import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
+import { findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
 export function initHtmlConfig(config, appContext) {
   var createBuilderAppIcon = function createBuilderAppIcon2(config2, appContext2) {
     var configDir = config2.source.configDir;
@@ -100,30 +98,3 @@ export function initSourceConfig(config, appContext, bundler) {
     config.source.moduleScopes = createBuilderModuleScope(config);
   }
 }
-export function initToolsConfig(config) {
-  var defaultTsChecker = {
-    issue: {
-      include: [
-        {
-          file: "**/src/**/*"
-        }
-      ],
-      exclude: [
-        {
-          file: "**/*.(spec|test).ts"
-        },
-        {
-          file: "**/node_modules/**/*"
-        }
-      ]
-    }
-  };
-  var _config_tools = config.tools, tsChecker = _config_tools.tsChecker, tsLoader = _config_tools.tsLoader;
-  config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
-  tsLoader && (config.tools.tsLoader = function(tsLoaderConfig, utils) {
-    applyOptionsChain(_object_spread_props(_object_spread({}, tsLoaderConfig), {
-      transpileOnly: false,
-      allowTsInNodeModules: true
-    }), tsLoader || {}, utils);
-  });
-}

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

@@ -50,13 +50,13 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 export const generateCode = async (appContext, config, entrypoints, api) => {
-  var _config, _config_runtime_router, _config_runtime, _config1;
+  var _config, _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;
+  const oldVersion = typeof ((_config = config) === null || _config === void 0 ? void 0 : _config.runtime.router) === "object" ? Boolean(((_config1 = config) === null || _config1 === void 0 ? void 0 : _config1.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   return {
     importsStatemets

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

@@ -43,20 +43,28 @@ export const optimizeRoute = (routeTree) => {
     ];
   }
   const { children } = routeTree;
-  if (!routeTree._component) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
     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 {
+      const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
+      const newRoute = {
         ...child,
-        path: routePath
+        path: routePath.replace(/\/\//g, "/")
       };
+      if (routePath.length > 0) {
+        delete newRoute.index;
+      } else {
+        delete newRoute.path;
+      }
+      return newRoute;
     });
-    return newRoutes.flatMap((newRoute) => optimizeRoute(newRoute));
+    return Array.from(new Set(newRoutes)).flatMap(optimizeRoute);
   } else {
-    routeTree.children = children.flatMap(optimizeRoute);
+    const optimizedChildren = routeTree.children.flatMap(optimizeRoute);
     return [
-      routeTree
+      {
+        ...routeTree,
+        children: optimizedChildren
+      }
     ];
   }
 };
@@ -177,15 +185,6 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
       };
     }
   }
-  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;

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

@@ -14,6 +14,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 +44,9 @@ export class RouterPlugin {
       }
       return path2;
     };
-    const chunkToSourceAndMap = /* @__PURE__ */ new Map();
+    const chunkToSource = /* @__PURE__ */ new Map();
+    const chunkToMap = /* @__PURE__ */ new Map();
+    const { minimize } = compiler.options.optimization;
     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({
@@ -115,31 +153,31 @@ 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++) {
+          var _source, _source1;
           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) => {
+              var _chunkNames;
+              const segments = routeId.split("_");
+              const chunkName = segments[0];
+              if ((_chunkNames = chunkNames) === null || _chunkNames === void 0 ? void 0 : _chunkNames.includes(chunkName)) {
+                relatedAssets[routeId] = routeAssets[routeId];
+              }
+            });
+          } else {
+            relatedAssets = routeAssets;
+          }
           const manifest2 = {
             routeAssets: relatedAssets
           };
@@ -155,14 +193,15 @@ export class RouterPlugin {
           })};
             })();
           `;
-          const { source, map } = chunkToSourceAndMap.get(chunkId);
-          const newContent = `${injectedContent}${source.toString()}`;
+          const source = chunkToSource.get(chunkId);
+          const map = chunkToMap.get(chunkId);
+          const newContent = `${injectedContent}${(_source = source) === null || _source === void 0 ? void 0 : _source.toString()}`;
           const result = await transform(newContent, {
             loader: path.extname(file).slice(1),
             sourcemap: true,
-            minify: process.env.NODE_ENV === "production"
+            minify: minimize
           });
-          const newSource = new SourceMapSource(result.code, file, result.map, source.toString(), map);
+          const newSource = new SourceMapSource(result.code, file, result.map, (_source1 = source) === null || _source1 === void 0 ? void 0 : _source1.toString(), map);
           compilation.updateAsset(
             file,
             newSource,

package/dist/esm-node/config/default.js

@@ -56,9 +56,21 @@ export function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
+  const defaultTsCheckerConfig = {
+    tsChecker: {
+      issue: {
+        include: [
+          {
+            file: "**/src/**/*"
+          }
+        ]
+      }
+    }
+  };
   const tools = bundler === "webpack" ? {
-    ...defaultBuilderConfig.tools
-  } : void 0;
+    ...defaultBuilderConfig.tools,
+    ...defaultTsCheckerConfig
+  } : defaultTsCheckerConfig;
   return {
     source,
     output,

package/dist/esm-node/config/initialize/index.js

@@ -1,9 +1,6 @@
-import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
+import { initHtmlConfig, initSourceConfig } from "./inits";
 export function initialNormalizedConfig(config, appContext, bundler) {
   initHtmlConfig(config, appContext);
   initSourceConfig(config, appContext, bundler);
-  if (bundler === "webpack") {
-    initToolsConfig(config);
-  }
   return config;
 }

package/dist/esm-node/config/initialize/inits.js

@@ -1,5 +1,5 @@
 import path, { dirname, isAbsolute, posix, sep } from "path";
-import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
+import { findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
 export function initHtmlConfig(config, appContext) {
   const ICON_EXTENSIONS = [
     "png",
@@ -93,31 +93,3 @@ export function initSourceConfig(config, appContext, bundler) {
     }
   }
 }
-export function initToolsConfig(config) {
-  const defaultTsChecker = {
-    issue: {
-      include: [
-        {
-          file: "**/src/**/*"
-        }
-      ],
-      exclude: [
-        {
-          file: "**/*.(spec|test).ts"
-        },
-        {
-          file: "**/node_modules/**/*"
-        }
-      ]
-    }
-  };
-  const { tsChecker, tsLoader } = config.tools;
-  config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
-  tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
-    applyOptionsChain({
-      ...tsLoaderConfig,
-      transpileOnly: false,
-      allowTsInNodeModules: true
-    }, tsLoader || {}, utils);
-  });
-}

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

@@ -10,6 +10,8 @@ export interface RouteAssets {
 type Compiler = webpack.Compiler | Rspack.Compiler;
 export declare class RouterPlugin {
   private isTargetNodeOrWebWorker;
+  private getEntryChunks;
+  private getEntryChunkFiles;
   apply(compiler: Compiler): void;
 }
 export {};

package/dist/types/config/initialize/inits.d.ts

@@ -1,4 +1,3 @@
 import { AppNormalizedConfig, IAppContext } from '../../types';
 export declare function initHtmlConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext): import("@modern-js/builder-shared").SharedHtmlConfig;
-export declare function initSourceConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext, bundler: 'webpack' | 'rspack'): void;
-export declare function initToolsConfig(config: AppNormalizedConfig<'webpack'>): void;
+export declare function initSourceConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext, bundler: 'webpack' | 'rspack'): void;

package/package.json

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