@modern-js/app-tools 2.8.0 → 2.8.1-alpha.0

package/dist/cjs/analyze/generateCode.js

@@ -99,6 +99,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
+    var _a;
     const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
@@ -161,7 +162,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             ssrMode: useSSG ? "string" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
-            internalDirectory
+            internalDirectory,
+            splitRoutesChunks: (_a = config2 == null ? void 0 : config2.output) == null ? void 0 : _a.splitRoutesChunks
           })
         });
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {

package/dist/cjs/analyze/index.js

@@ -247,6 +247,14 @@ var analyze_default = ({
           imports
         };
       },
+      validateSchema() {
+        return {
+          target: "output.splitRoutesChunks",
+          schema: {
+            type: "boolean"
+          }
+        };
+      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const { appDirectory } = appContext;

package/dist/cjs/analyze/templates.js

@@ -182,8 +182,10 @@ const fileSystemRoutes = async ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory
+  internalDirectory,
+  splitRoutesChunks = true
 }) => {
+  const components = [];
   const loadings = [];
   const errors = [];
   const loaders = [];
@@ -242,20 +244,30 @@ const fileSystemRoutes = async ({
         };
       }
       if (route._component) {
-        if (route.isRoot) {
-          rootLayoutCode = `import RootLayout from '${route._component}'`;
-          component = `RootLayout`;
-        } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-          component = `loadable(${lazyImport})`;
+        if (splitRoutesChunks) {
+          if (route.isRoot) {
+            rootLayoutCode = `import RootLayout from '${route._component}'`;
+            component = `RootLayout`;
+          } else if (ssrMode === "string") {
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            component = `loadable(${lazyImport})`;
+          } else {
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            component = `lazy(${lazyImport})`;
+          }
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-          component = `lazy(${lazyImport})`;
+          components.push(route._component);
+          component = `component_${components.length - 1}`;
         }
       }
     } else if (route._component) {
-      lazyImport = `() => import('${route._component}')`;
-      component = `loadable(${lazyImport})`;
+      if (splitRoutesChunks) {
+        lazyImport = `() => import('${route._component}')`;
+        component = `loadable(${lazyImport})`;
+      } else {
+        components.push(route._component);
+        component = `component_${components.length - 1}`;
+      }
     }
     const finalRoute = {
       ...route,
@@ -276,20 +288,24 @@ const fileSystemRoutes = async ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/("component":\s)"([^"]+)"/g, "$1$2").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
       const finalRoute = {
         ...route,
         component
       };
-      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
+      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy[^"]*)"/g, "$2")},`;
     }
   }
   routeComponentsCode += `
 ];`;
   const importLoadingCode = loadings.map((loading, index2) => {
     return `import loading_${index2} from '${loading}';
+`;
+  }).join("");
+  const importComponentsCode = components.map((component, index2) => {
+    return `import component_${index2} from '${component}';
 `;
   }).join("");
   const importErrorComponentsCode = errors.map((error, index2) => {
@@ -314,6 +330,7 @@ const fileSystemRoutes = async ({
   await import_utils.fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
+    ${importComponentsCode}
     ${rootLayoutCode}
     ${importLoadingCode}
     ${importErrorComponentsCode}
@@ -337,7 +354,9 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
       internalDirectory,
       entryName
     );
-    const combinedModule = `export * from "${serverLoaderRuntime}"; export * from "${serverLoadersFile}"`;
+    const combinedModule = `export * from "${(0, import_utils.slash)(
+      serverLoaderRuntime
+    )}"; export * from "${(0, import_utils.slash)(serverLoadersFile)}"`;
     return combinedModule;
   }
   return null;

package/dist/cjs/analyze/utils.js

@@ -119,7 +119,15 @@ const isPageComponentFile = (filePath) => {
   }
   return false;
 };
-const replaceWithAlias = (base, filePath, alias) => (0, import_utils.normalizeToPosixPath)(import_path.default.join(alias, import_path.default.relative(base, filePath)));
+const replaceWithAlias = (base, filePath, alias) => {
+  if (filePath.includes(base)) {
+    return (0, import_utils.normalizeToPosixPath)(
+      import_path.default.join(alias, import_path.default.relative(base, filePath))
+    );
+  } else {
+    return filePath;
+  }
+};
 const parseModule = async ({
   source,
   filename

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

@@ -107,6 +107,9 @@ class RouterPlugin {
           );
           for (const file of entryChunkFiles) {
             const asset = compilation.assets[file];
+            if (!asset) {
+              continue;
+            }
             const newContent = `${injectedContent}${asset.source().toString()}`;
             newAssetsMap.set(import_path.default.join(outputPath, file), newContent);
             compilation.updateAsset(

package/dist/esm/analyze/generateCode.js

@@ -245,7 +245,7 @@ var generateCode = function() {
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, useSSG, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, serverLoaderCombined, serverLoaderFile, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config2_output, initialRoutes, nestedRoute, routes, config2, ssr, useSSG, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, serverLoaderCombined, serverLoaderFile, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -322,7 +322,8 @@ var generateCode = function() {
                                     ssrMode: useSSG ? "string" : mode,
                                     nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                                     entryName: entrypoint.entryName,
-                                    internalDirectory: internalDirectory
+                                    internalDirectory: internalDirectory,
+                                    splitRoutesChunks: config2 === null || config2 === void 0 ? void 0 : (_config2_output = config2.output) === null || _config2_output === void 0 ? void 0 : _config2_output.splitRoutesChunks
                                 })
                             ];
                         case 4:

package/dist/esm/analyze/index.js

@@ -638,6 +638,14 @@ var analyze_default = function(param) {
                         });
                     })();
                 },
+                validateSchema: function validateSchema() {
+                    return {
+                        target: "output.splitRoutesChunks",
+                        schema: {
+                            type: "boolean"
+                        }
+                    };
+                },
                 fileChange: function fileChange(e) {
                     return _asyncToGenerator(function() {
                         var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints;

package/dist/esm/analyze/templates.js

@@ -298,11 +298,12 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRoutesChunks, splitRoutesChunks, components, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory;
+                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, _param_splitRoutesChunks = param.splitRoutesChunks, splitRoutesChunks = _param_splitRoutesChunks === void 0 ? true : _param_splitRoutesChunks;
+                    components = [];
                     loadings = [];
                     errors = [];
                     loaders = [];
@@ -351,20 +352,30 @@ var fileSystemRoutes = function() {
                                 };
                             }
                             if (route._component) {
-                                if (route.isRoot) {
-                                    rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
-                                    component = "RootLayout";
-                                } else if (ssrMode === "string") {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
-                                    component = "loadable(".concat(lazyImport, ")");
+                                if (splitRoutesChunks) {
+                                    if (route.isRoot) {
+                                        rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
+                                        component = "RootLayout";
+                                    } else if (ssrMode === "string") {
+                                        lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
+                                        component = "loadable(".concat(lazyImport, ")");
+                                    } else {
+                                        lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
+                                        component = "lazy(".concat(lazyImport, ")");
+                                    }
                                 } else {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
-                                    component = "lazy(".concat(lazyImport, ")");
+                                    components.push(route._component);
+                                    component = "component_".concat(components.length - 1);
                                 }
                             }
                         } else if (route._component) {
-                            lazyImport = "() => import('".concat(route._component, "')");
-                            component = "loadable(".concat(lazyImport, ")");
+                            if (splitRoutesChunks) {
+                                lazyImport = "() => import('".concat(route._component, "')");
+                                component = "loadable(".concat(lazyImport, ")");
+                            } else {
+                                components.push(route._component);
+                                component = "component_".concat(components.length - 1);
+                            }
                         }
                         var finalRoute = _objectSpreadProps(_objectSpread({}, route), {
                             lazyImport: lazyImport,
@@ -385,13 +396,13 @@ var fileSystemRoutes = function() {
                             route = _step.value;
                             if ("type" in route) {
                                 newRoute = traverseRouteTree(route);
-                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
+                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/("component":\s)"([^"]+)"/g, "$1$2").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
                             } else {
                                 component = "loadable(() => import('".concat(route._component, "'))");
                                 finalRoute = _objectSpreadProps(_objectSpread({}, route), {
                                     component: component
                                 });
-                                routeComponentsCode += "".concat(JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1"), ",");
+                                routeComponentsCode += "".concat(JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy[^"]*)"/g, "$2"), ",");
                             }
                         }
                     } catch (err) {
@@ -412,6 +423,9 @@ var fileSystemRoutes = function() {
                     importLoadingCode = loadings.map(function(loading, index2) {
                         return "import loading_".concat(index2, " from '").concat(loading, "';\n");
                     }).join("");
+                    importComponentsCode = components.map(function(component, index2) {
+                        return "import component_".concat(index2, " from '").concat(component, "';\n");
+                    }).join("");
                     importErrorComponentsCode = errors.map(function(error, index2) {
                         return "import error_".concat(index2, " from '").concat(error, "';\n");
                     }).join("");
@@ -454,7 +468,7 @@ var fileSystemRoutes = function() {
                     _state.sent();
                     return [
                         2,
-                        "\n    ".concat(importLazyCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(routeComponentsCode, "\n  ")
+                        "\n    ".concat(importLazyCode, "\n    ").concat(importComponentsCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(routeComponentsCode, "\n  ")
                     ];
             }
         });
@@ -471,7 +485,7 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     if (entrypoint.nestedRoutesEntry && (ssr || ssg)) {
         var serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
         var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
-        var combinedModule = 'export * from "'.concat(serverLoaderRuntime, '"; export * from "').concat(serverLoadersFile, '"');
+        var combinedModule = 'export * from "'.concat(slash(serverLoaderRuntime), '"; export * from "').concat(slash(serverLoadersFile), '"');
         return combinedModule;
     }
     return null;

package/dist/esm/analyze/utils.js

@@ -287,7 +287,11 @@ var isPageComponentFile = function(filePath) {
     return false;
 };
 var replaceWithAlias = function(base, filePath, alias) {
-    return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
+    if (filePath.includes(base)) {
+        return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
+    } else {
+        return filePath;
+    }
 };
 var parseModule = function() {
     var _ref = _asyncToGenerator(function(param) {

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

@@ -303,6 +303,9 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                         for(_iterator1 = entryChunkFiles[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
                                             file = _step1.value;
                                             asset = compilation.assets[file];
+                                            if (!asset) {
+                                                continue;
+                                            }
                                             newContent = "".concat(injectedContent).concat(asset.source().toString());
                                             newAssetsMap.set(path.join(outputPath, file), newContent);
                                             compilation.updateAsset(file, new RawSource(newContent), // FIXME: The arguments third of updatgeAsset is a optional function in webpack.

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

@@ -81,6 +81,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
+    var _a;
     const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
@@ -143,7 +144,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             ssrMode: useSSG ? "string" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
-            internalDirectory
+            internalDirectory,
+            splitRoutesChunks: (_a = config2 == null ? void 0 : config2.output) == null ? void 0 : _a.splitRoutesChunks
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {

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

@@ -227,6 +227,14 @@ var analyze_default = ({
           imports
         };
       },
+      validateSchema() {
+        return {
+          target: "output.splitRoutesChunks",
+          schema: {
+            type: "boolean"
+          }
+        };
+      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const { appDirectory } = appContext;

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

@@ -145,8 +145,10 @@ const fileSystemRoutes = async ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory
+  internalDirectory,
+  splitRoutesChunks = true
 }) => {
+  const components = [];
   const loadings = [];
   const errors = [];
   const loaders = [];
@@ -205,20 +207,30 @@ const fileSystemRoutes = async ({
         };
       }
       if (route._component) {
-        if (route.isRoot) {
-          rootLayoutCode = `import RootLayout from '${route._component}'`;
-          component = `RootLayout`;
-        } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-          component = `loadable(${lazyImport})`;
+        if (splitRoutesChunks) {
+          if (route.isRoot) {
+            rootLayoutCode = `import RootLayout from '${route._component}'`;
+            component = `RootLayout`;
+          } else if (ssrMode === "string") {
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            component = `loadable(${lazyImport})`;
+          } else {
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+            component = `lazy(${lazyImport})`;
+          }
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
-          component = `lazy(${lazyImport})`;
+          components.push(route._component);
+          component = `component_${components.length - 1}`;
         }
       }
     } else if (route._component) {
-      lazyImport = `() => import('${route._component}')`;
-      component = `loadable(${lazyImport})`;
+      if (splitRoutesChunks) {
+        lazyImport = `() => import('${route._component}')`;
+        component = `loadable(${lazyImport})`;
+      } else {
+        components.push(route._component);
+        component = `component_${components.length - 1}`;
+      }
     }
     const finalRoute = {
       ...route,
@@ -239,20 +251,24 @@ const fileSystemRoutes = async ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/("component":\s)"([^"]+)"/g, "$1$2").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
       const finalRoute = {
         ...route,
         component
       };
-      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
+      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy[^"]*)"/g, "$2")},`;
     }
   }
   routeComponentsCode += `
 ];`;
   const importLoadingCode = loadings.map((loading, index2) => {
     return `import loading_${index2} from '${loading}';
+`;
+  }).join("");
+  const importComponentsCode = components.map((component, index2) => {
+    return `import component_${index2} from '${component}';
 `;
   }).join("");
   const importErrorComponentsCode = errors.map((error, index2) => {
@@ -277,6 +293,7 @@ const fileSystemRoutes = async ({
   await fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
+    ${importComponentsCode}
     ${rootLayoutCode}
     ${importLoadingCode}
     ${importErrorComponentsCode}
@@ -300,7 +317,9 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
       internalDirectory,
       entryName
     );
-    const combinedModule = `export * from "${serverLoaderRuntime}"; export * from "${serverLoadersFile}"`;
+    const combinedModule = `export * from "${slash(
+      serverLoaderRuntime
+    )}"; export * from "${slash(serverLoadersFile)}"`;
     return combinedModule;
   }
   return null;

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

@@ -84,7 +84,15 @@ const isPageComponentFile = (filePath) => {
   }
   return false;
 };
-const replaceWithAlias = (base, filePath, alias) => normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
+const replaceWithAlias = (base, filePath, alias) => {
+  if (filePath.includes(base)) {
+    return normalizeToPosixPath(
+      path.join(alias, path.relative(base, filePath))
+    );
+  } else {
+    return filePath;
+  }
+};
 const parseModule = async ({
   source,
   filename

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

@@ -80,6 +80,9 @@ class RouterPlugin {
           );
           for (const file of entryChunkFiles) {
             const asset = compilation.assets[file];
+            if (!asset) {
+              continue;
+            }
             const newContent = `${injectedContent}${asset.source().toString()}`;
             newAssetsMap.set(path.join(outputPath, file), newContent);
             compilation.updateAsset(

package/dist/js/modern/analyze/constants.js

@@ -0,0 +1,54 @@
+const JS_EXTENSIONS = [".js", ".ts", ".jsx", ".tsx"];
+const INDEX_FILE_NAME = "index";
+const APP_FILE_NAME = "App";
+const PAGES_DIR_NAME = "pages";
+const NESTED_ROUTES_DIR = "routes";
+const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+const LOADER_EXPORT_NAME = "loader";
+const TEMP_LOADERS_DIR = "__loaders__";
+const ENTRY_POINT_FILE_NAME = "index.js";
+const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
+const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
+const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
+const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
+const FILE_SYSTEM_ROUTES_INDEX = "index";
+const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
+const HTML_PARTIALS_FOLDER = "html";
+const HTML_PARTIALS_EXTENSIONS = [".htm", ".html", ".ejs"];
+const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+const NESTED_ROUTE = {
+  LAYOUT_FILE: "layout",
+  LAYOUT_LOADER_FILE: "layout.loader",
+  PAGE_FILE: "page",
+  PAGE_LOADER_FILE: "page.loader",
+  LOADING_FILE: "loading",
+  ERROR_FILE: "error",
+  LOADER_FILE: "loader"
+};
+const APP_CONFIG_NAME = "config";
+const APP_INIT_EXPORTED = "init";
+const APP_INIT_IMPORTED = "appInit";
+export {
+  APP_CONFIG_NAME,
+  APP_FILE_NAME,
+  APP_INIT_EXPORTED,
+  APP_INIT_IMPORTED,
+  ENTRY_BOOTSTRAP_FILE_NAME,
+  ENTRY_POINT_FILE_NAME,
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+  FILE_SYSTEM_ROUTES_FILE_NAME,
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX,
+  FILE_SYSTEM_ROUTES_INDEX,
+  FILE_SYSTEM_ROUTES_LAYOUT,
+  HTML_PARTIALS_EXTENSIONS,
+  HTML_PARTIALS_FOLDER,
+  INDEX_FILE_NAME,
+  JS_EXTENSIONS,
+  LOADER_EXPORT_NAME,
+  NESTED_ROUTE,
+  NESTED_ROUTES_DIR,
+  PAGES_DIR_NAME,
+  TEMP_LOADERS_DIR
+};