@modern-js/app-tools 2.40.0 → 2.42.0

package/dist/cjs/analyze/getHtmlTemplate.js

@@ -63,7 +63,7 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
   for (const entrypoint of entrypoints) {
     const { entryName, isMainEntry } = entrypoint;
     const name = entrypoints.length === 1 && isMainEntry ? "" : entryName;
-    const customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
+    const customIndexTemplate = findPartials(htmlDir, name, "index");
     if (customIndexTemplate) {
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
@@ -71,9 +71,9 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
       const { partials } = await hookRunners.htmlPartials({
         entrypoint,
         partials: [
-          PartialPosition.TOP,
-          PartialPosition.HEAD,
-          PartialPosition.BODY
+          "top",
+          "head",
+          "body"
         ].reduce((previous, position) => {
           const found = findPartials(htmlDir, name, position);
           previous[position] = found ? [
@@ -90,7 +90,7 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
       import_utils.fs.outputFileSync(templatePath, templates.html(partials), "utf8");
       htmlTemplates[entryName] = templatePath;
       partialsByEntrypoint[entryName] = partials;
-      const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
+      const bottomTemplate = findPartials(htmlDir, name, "bottom");
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
       }

package/dist/cjs/analyze/templates.js

@@ -190,7 +190,8 @@ const routesForServer = ({ routes }) => {
     ${routesCode}
   `;
 };
-const createMatchReg = (keyword) => new RegExp(`("${keyword}":\\s)"([^,]+)"`, "g");
+const createMatchReg = (keyword) => new RegExp(`("${keyword}":\\s)"([^
+]+)"`, "g");
 const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks = true }) => {
   const components = [];
   const loadings = [];
@@ -264,18 +265,18 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
       if (route._component) {
         if (splitRouteChunks) {
           if (route.isRoot) {
-            lazyImport = `() => import('${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+            lazyImport = `() => import('${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             rootLayoutCode = `import RootLayout from '${route._component}'`;
             component = `RootLayout`;
           } else if (ssrMode === "string") {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             component = `loadable(${lazyImport})`;
           } else {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             component = `lazy(${lazyImport})`;
           }
         } else {
-          lazyImport = `() => import(/* webpackMode: "eager" */  '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+          lazyImport = `() => import(/* webpackMode: "eager" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
           if (ssrMode === "string") {
             component = `loadable(${lazyImport})`;
           } else {
@@ -402,7 +403,7 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
   await import_utils.fs.ensureFile(loadersMapFile);
   await import_utils.fs.writeJSON(loadersMapFile, loadersMap);
   const importRuntimeRouterCode = `
-    import { createShouldRevalidate } from '@modern-js/runtime/router';
+    import { createShouldRevalidate, handleRouteModule,  handleRouteModuleError} from '@modern-js/runtime/router';
   `;
   const routeModulesCode = `
     if(typeof document !== 'undefined'){

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

@@ -109,12 +109,14 @@ function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
   const routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
   const routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
   const workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
+  const { enableInlineRouteManifests, disableInlineRouteManifests } = normalizedConfig.output;
+  const inlineRouteManifests = disableInlineRouteManifests ? !disableInlineRouteManifests : enableInlineRouteManifests;
   if (existNestedRoutes || routerManifest || workerSSR) {
     var _normalizedConfig_output_distPath, _normalizedConfig_output, _normalizedConfig_output1, _normalizedConfig_html, _normalizedConfig_security;
     chain.plugin(pluginName).use(import_bundlerPlugins.RouterPlugin, [
       {
         HtmlBundlerPlugin,
-        enableInlineRouteManifests: normalizedConfig.output.enableInlineRouteManifests,
+        enableInlineRouteManifests: inlineRouteManifests,
         staticJsDir: (_normalizedConfig_output = normalizedConfig.output) === null || _normalizedConfig_output === void 0 ? void 0 : (_normalizedConfig_output_distPath = _normalizedConfig_output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.js,
         disableFilenameHash: (_normalizedConfig_output1 = normalizedConfig.output) === null || _normalizedConfig_output1 === void 0 ? void 0 : _normalizedConfig_output1.disableFilenameHash,
         scriptLoading: (_normalizedConfig_html = normalizedConfig.html) === null || _normalizedConfig_html === void 0 ? void 0 : _normalizedConfig_html.scriptLoading,

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

@@ -62,7 +62,7 @@ class RouterPlugin {
       return;
     }
     const { webpack } = compiler;
-    const isRspack = webpack.rspackVersion;
+    const isRspack = "rspackVersion" in webpack;
     const { Compilation, sources } = webpack;
     const { RawSource } = sources;
     const normalizePath = (path) => {

package/dist/cjs/config/default.js

@@ -36,7 +36,8 @@ function createDefaultConfig(appContext, bundler) {
   const output = {
     ...defaultBuilderConfig.output,
     disableNodePolyfill: true,
-    enableInlineRouteManifests: true
+    enableInlineRouteManifests: true,
+    disableInlineRouteManifests: false
   };
   const source = {
     ...defaultBuilderConfig.source,

package/dist/cjs/defineConfig.js

@@ -23,12 +23,14 @@ __export(defineConfig_exports, {
 });
 module.exports = __toCommonJS(defineConfig_exports);
 const defineConfig = (config) => config;
-var _config_autoLoadPlugins;
-const defineLegacyConfig = (config) => ({
-  ...config,
-  legacy: true,
-  autoLoadPlugins: (_config_autoLoadPlugins = config.autoLoadPlugins) !== null && _config_autoLoadPlugins !== void 0 ? _config_autoLoadPlugins : true
-});
+const defineLegacyConfig = (config) => {
+  var _config_autoLoadPlugins;
+  return {
+    ...config,
+    legacy: true,
+    autoLoadPlugins: (_config_autoLoadPlugins = config.autoLoadPlugins) !== null && _config_autoLoadPlugins !== void 0 ? _config_autoLoadPlugins : true
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig,

package/dist/esm/analyze/getHtmlTemplate.js

@@ -59,7 +59,7 @@ var getHtmlTemplate = function() {
                   entrypoint = _step.value;
                   entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry;
                   name = entrypoints.length === 1 && isMainEntry ? "" : entryName;
-                  customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
+                  customIndexTemplate = findPartials(htmlDir, name, "index");
                   if (!customIndexTemplate)
                     return [
                       3,
@@ -77,9 +77,9 @@ var getHtmlTemplate = function() {
                     hookRunners.htmlPartials({
                       entrypoint,
                       partials: [
-                        PartialPosition.TOP,
-                        PartialPosition.HEAD,
-                        PartialPosition.BODY
+                        "top",
+                        "head",
+                        "body"
                       ].reduce(function(previous, position) {
                         var found = findPartials(htmlDir, name, position);
                         previous[position] = found ? [
@@ -99,7 +99,7 @@ var getHtmlTemplate = function() {
                   fs.outputFileSync(templatePath, templates.html(partials), "utf8");
                   htmlTemplates[entryName] = templatePath;
                   partialsByEntrypoint[entryName] = partials;
-                  bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
+                  bottomTemplate = findPartials(htmlDir, name, "bottom");
                   if (bottomTemplate) {
                     htmlTemplates["__".concat(entryName, "-bottom__")] = bottomTemplate.content;
                   }

package/dist/esm/analyze/templates.js

@@ -131,7 +131,7 @@ var routesForServer = function(param) {
   return "\n    ".concat(importLoadersCode, "\n    ").concat(routesCode, "\n  ");
 };
 var createMatchReg = function(keyword) {
-  return new RegExp('("'.concat(keyword, '":\\s)"([^,]+)"'), "g");
+  return new RegExp('("'.concat(keyword, '":\\s)"([^\n]+)"'), "g");
 };
 var fileSystemRoutes = function() {
   var _ref = _async_to_generator(function(param) {
@@ -210,18 +210,18 @@ var fileSystemRoutes = function() {
               if (route2._component) {
                 if (splitRouteChunks) {
                   if (route2.isRoot) {
-                    lazyImport = "() => import('".concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
+                    lazyImport = "() => import('".concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
                     rootLayoutCode = "import RootLayout from '".concat(route2._component, "'");
                     component2 = "RootLayout";
                   } else if (ssrMode === "string") {
-                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
+                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
                     component2 = "loadable(".concat(lazyImport, ")");
                   } else {
-                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
+                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
                     component2 = "lazy(".concat(lazyImport, ")");
                   }
                 } else {
-                  lazyImport = `() => import(/* webpackMode: "eager" */  '`.concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
+                  lazyImport = `() => import(/* webpackMode: "eager" */  '`.concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
                   if (ssrMode === "string") {
                     component2 = "loadable(".concat(lazyImport, ")");
                   } else {
@@ -400,7 +400,7 @@ var fileSystemRoutes = function() {
           ];
         case 2:
           _state.sent();
-          importRuntimeRouterCode = "\n    import { createShouldRevalidate } from '@modern-js/runtime/router';\n  ";
+          importRuntimeRouterCode = "\n    import { createShouldRevalidate, handleRouteModule,  handleRouteModuleError} from '@modern-js/runtime/router';\n  ";
           routeModulesCode = "\n    if(typeof document !== 'undefined'){\n      window.".concat(ROUTE_MODULES, " = {}\n    }\n  ");
           return [
             2,

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

@@ -127,14 +127,16 @@ function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
   var routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
   var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
   var workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
+  var _normalizedConfig_output = normalizedConfig.output, enableInlineRouteManifests = _normalizedConfig_output.enableInlineRouteManifests, disableInlineRouteManifests = _normalizedConfig_output.disableInlineRouteManifests;
+  var inlineRouteManifests = disableInlineRouteManifests ? !disableInlineRouteManifests : enableInlineRouteManifests;
   if (existNestedRoutes || routerManifest || workerSSR) {
-    var _normalizedConfig_output_distPath, _normalizedConfig_output, _normalizedConfig_output1, _normalizedConfig_html, _normalizedConfig_security;
+    var _normalizedConfig_output_distPath, _normalizedConfig_output1, _normalizedConfig_output2, _normalizedConfig_html, _normalizedConfig_security;
     chain.plugin(pluginName).use(RouterPlugin, [
       {
         HtmlBundlerPlugin,
-        enableInlineRouteManifests: normalizedConfig.output.enableInlineRouteManifests,
-        staticJsDir: (_normalizedConfig_output = normalizedConfig.output) === null || _normalizedConfig_output === void 0 ? void 0 : (_normalizedConfig_output_distPath = _normalizedConfig_output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.js,
-        disableFilenameHash: (_normalizedConfig_output1 = normalizedConfig.output) === null || _normalizedConfig_output1 === void 0 ? void 0 : _normalizedConfig_output1.disableFilenameHash,
+        enableInlineRouteManifests: inlineRouteManifests,
+        staticJsDir: (_normalizedConfig_output1 = normalizedConfig.output) === null || _normalizedConfig_output1 === void 0 ? void 0 : (_normalizedConfig_output_distPath = _normalizedConfig_output1.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.js,
+        disableFilenameHash: (_normalizedConfig_output2 = normalizedConfig.output) === null || _normalizedConfig_output2 === void 0 ? void 0 : _normalizedConfig_output2.disableFilenameHash,
         scriptLoading: (_normalizedConfig_html = normalizedConfig.html) === null || _normalizedConfig_html === void 0 ? void 0 : _normalizedConfig_html.scriptLoading,
         nonce: (_normalizedConfig_security = normalizedConfig.security) === null || _normalizedConfig_security === void 0 ? void 0 : _normalizedConfig_security.nonce
       }

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

@@ -80,7 +80,7 @@ var RouterPlugin = /* @__PURE__ */ function() {
           return;
         }
         var webpack = compiler.webpack;
-        var isRspack = webpack.rspackVersion;
+        var isRspack = "rspackVersion" in webpack;
         var Compilation = webpack.Compilation, sources = webpack.sources;
         var RawSource = sources.RawSource;
         var normalizePath = function(path) {

package/dist/esm/config/default.js

@@ -13,7 +13,8 @@ function createDefaultConfig(appContext, bundler) {
   });
   var output = _object_spread_props(_object_spread({}, defaultBuilderConfig.output), {
     disableNodePolyfill: true,
-    enableInlineRouteManifests: true
+    enableInlineRouteManifests: true,
+    disableInlineRouteManifests: false
   });
   var _obj;
   var source = _object_spread_props(_object_spread({}, defaultBuilderConfig.source), {

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

@@ -1,31 +1,31 @@
 import path, { isAbsolute } from "path";
 import { findExists } from "@modern-js/utils";
 function initHtmlConfig(config, appContext) {
-  var createBuilderAppIcon = function createBuilderAppIcon2(config2, appContext2) {
+  var ICON_EXTENSIONS = [
+    "png",
+    "jpg",
+    "jpeg",
+    "svg",
+    "ico"
+  ];
+  config.html.appIcon = createBuilderAppIcon(config, appContext);
+  config.html.favicon = createBuilderFavicon(config, appContext);
+  return config.html;
+  function createBuilderAppIcon(config2, appContext2) {
     var configDir = config2.source.configDir;
     var appIcon = findExists(ICON_EXTENSIONS.map(function(ext) {
       return path.resolve(appContext2.appDirectory, configDir || "./config", "icon.".concat(ext));
     }));
     return typeof appIcon === "string" ? appIcon : void 0;
-  };
-  var createBuilderFavicon = function createBuilderFavicon2(config2, appContext2) {
+  }
+  function createBuilderFavicon(config2, appContext2) {
     var configDir = config2.source.configDir;
     var favicon = config2.html.favicon;
     var defaultFavicon = findExists(ICON_EXTENSIONS.map(function(ext) {
       return path.resolve(appContext2.appDirectory, configDir || "./config", "favicon.".concat(ext));
     }));
     return favicon || defaultFavicon || void 0;
-  };
-  var ICON_EXTENSIONS = [
-    "png",
-    "jpg",
-    "jpeg",
-    "svg",
-    "ico"
-  ];
-  config.html.appIcon = createBuilderAppIcon(config, appContext);
-  config.html.favicon = createBuilderFavicon(config, appContext);
-  return config.html;
+  }
 }
 function initSourceConfig(config, appContext, bundler) {
   config.source.include = createBuilderInclude(config, appContext);
@@ -50,11 +50,6 @@ function createBuilderInclude(config, appContext) {
   return transformInclude;
 }
 function createBuilderModuleScope(config) {
-  var isPrimitiveScope = function isPrimitiveScope2(items) {
-    return items.every(function(item) {
-      return typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]";
-    });
-  };
   var moduleScopes = config.source.moduleScopes;
   if (moduleScopes) {
     var DEFAULT_SCOPES = [
@@ -67,6 +62,11 @@ function createBuilderModuleScope(config) {
   } else {
     return void 0;
   }
+  function isPrimitiveScope(items) {
+    return items.every(function(item) {
+      return typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]";
+    });
+  }
   function applyScopeOptions(defaults, options) {
     if (Array.isArray(options)) {
       if (isPrimitiveScope(options)) {

package/dist/esm/defineConfig.js

@@ -3,8 +3,8 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 var defineConfig = function(config) {
   return config;
 };
-var _config_autoLoadPlugins;
 var defineLegacyConfig = function(config) {
+  var _config_autoLoadPlugins;
   return _object_spread_props(_object_spread({}, config), {
     legacy: true,
     autoLoadPlugins: (_config_autoLoadPlugins = config.autoLoadPlugins) !== null && _config_autoLoadPlugins !== void 0 ? _config_autoLoadPlugins : true

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

@@ -30,7 +30,7 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
   for (const entrypoint of entrypoints) {
     const { entryName, isMainEntry } = entrypoint;
     const name = entrypoints.length === 1 && isMainEntry ? "" : entryName;
-    const customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
+    const customIndexTemplate = findPartials(htmlDir, name, "index");
     if (customIndexTemplate) {
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
@@ -38,9 +38,9 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
       const { partials } = await hookRunners.htmlPartials({
         entrypoint,
         partials: [
-          PartialPosition.TOP,
-          PartialPosition.HEAD,
-          PartialPosition.BODY
+          "top",
+          "head",
+          "body"
         ].reduce((previous, position) => {
           const found = findPartials(htmlDir, name, position);
           previous[position] = found ? [
@@ -57,7 +57,7 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
       fs.outputFileSync(templatePath, templates.html(partials), "utf8");
       htmlTemplates[entryName] = templatePath;
       partialsByEntrypoint[entryName] = partials;
-      const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
+      const bottomTemplate = findPartials(htmlDir, name, "bottom");
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
       }

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

@@ -152,7 +152,8 @@ const routesForServer = ({ routes }) => {
     ${routesCode}
   `;
 };
-const createMatchReg = (keyword) => new RegExp(`("${keyword}":\\s)"([^,]+)"`, "g");
+const createMatchReg = (keyword) => new RegExp(`("${keyword}":\\s)"([^
+]+)"`, "g");
 const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks = true }) => {
   const components = [];
   const loadings = [];
@@ -226,18 +227,18 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
       if (route._component) {
         if (splitRouteChunks) {
           if (route.isRoot) {
-            lazyImport = `() => import('${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+            lazyImport = `() => import('${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             rootLayoutCode = `import RootLayout from '${route._component}'`;
             component = `RootLayout`;
           } else if (ssrMode === "string") {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             component = `loadable(${lazyImport})`;
           } else {
-            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+            lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             component = `lazy(${lazyImport})`;
           }
         } else {
-          lazyImport = `() => import(/* webpackMode: "eager" */  '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
+          lazyImport = `() => import(/* webpackMode: "eager" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
           if (ssrMode === "string") {
             component = `loadable(${lazyImport})`;
           } else {
@@ -364,7 +365,7 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
   await fs.ensureFile(loadersMapFile);
   await fs.writeJSON(loadersMapFile, loadersMap);
   const importRuntimeRouterCode = `
-    import { createShouldRevalidate } from '@modern-js/runtime/router';
+    import { createShouldRevalidate, handleRouteModule,  handleRouteModuleError} from '@modern-js/runtime/router';
   `;
   const routeModulesCode = `
     if(typeof document !== 'undefined'){

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

@@ -76,12 +76,14 @@ function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
   const routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
   const routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
   const workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
+  const { enableInlineRouteManifests, disableInlineRouteManifests } = normalizedConfig.output;
+  const inlineRouteManifests = disableInlineRouteManifests ? !disableInlineRouteManifests : enableInlineRouteManifests;
   if (existNestedRoutes || routerManifest || workerSSR) {
     var _normalizedConfig_output_distPath, _normalizedConfig_output, _normalizedConfig_output1, _normalizedConfig_html, _normalizedConfig_security;
     chain.plugin(pluginName).use(RouterPlugin, [
       {
         HtmlBundlerPlugin,
-        enableInlineRouteManifests: normalizedConfig.output.enableInlineRouteManifests,
+        enableInlineRouteManifests: inlineRouteManifests,
         staticJsDir: (_normalizedConfig_output = normalizedConfig.output) === null || _normalizedConfig_output === void 0 ? void 0 : (_normalizedConfig_output_distPath = _normalizedConfig_output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.js,
         disableFilenameHash: (_normalizedConfig_output1 = normalizedConfig.output) === null || _normalizedConfig_output1 === void 0 ? void 0 : _normalizedConfig_output1.disableFilenameHash,
         scriptLoading: (_normalizedConfig_html = normalizedConfig.html) === null || _normalizedConfig_html === void 0 ? void 0 : _normalizedConfig_html.scriptLoading,

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

@@ -39,7 +39,7 @@ class RouterPlugin {
       return;
     }
     const { webpack } = compiler;
-    const isRspack = webpack.rspackVersion;
+    const isRspack = "rspackVersion" in webpack;
     const { Compilation, sources } = webpack;
     const { RawSource } = sources;
     const normalizePath = (path) => {

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

@@ -12,7 +12,8 @@ function createDefaultConfig(appContext, bundler) {
   const output = {
     ...defaultBuilderConfig.output,
     disableNodePolyfill: true,
-    enableInlineRouteManifests: true
+    enableInlineRouteManifests: true,
+    disableInlineRouteManifests: false
   };
   const source = {
     ...defaultBuilderConfig.source,

package/dist/esm-node/defineConfig.js

@@ -1,10 +1,12 @@
 const defineConfig = (config) => config;
-var _config_autoLoadPlugins;
-const defineLegacyConfig = (config) => ({
-  ...config,
-  legacy: true,
-  autoLoadPlugins: (_config_autoLoadPlugins = config.autoLoadPlugins) !== null && _config_autoLoadPlugins !== void 0 ? _config_autoLoadPlugins : true
-});
+const defineLegacyConfig = (config) => {
+  var _config_autoLoadPlugins;
+  return {
+    ...config,
+    legacy: true,
+    autoLoadPlugins: (_config_autoLoadPlugins = config.autoLoadPlugins) !== null && _config_autoLoadPlugins !== void 0 ? _config_autoLoadPlugins : true
+  };
+};
 export {
   defineConfig,
   defineLegacyConfig

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

@@ -18,25 +18,25 @@ export declare const HTML_PARTIALS_FOLDER = "html";
 export declare const HTML_PARTIALS_EXTENSIONS: string[];
 export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
 export declare const NESTED_ROUTE: {
-  LAYOUT_FILE: string;
-  LAYOUT_CONFIG_FILE: string;
-  LAYOUT_LOADER_FILE: string;
-  LAYOUT_DATA_FILE: string;
-  LAYOUT_CLIENT_LOADER: string;
-  PAGE_FILE: string;
-  PAGE_CONFIG_FILE: string;
-  PAGE_LOADER_FILE: string;
-  PAGE_DATA_FILE: string;
-  PAGE_CLIENT_LOADER: string;
-  SPLATE_FILE: string;
-  SPLATE_CONFIG_FILE: string;
-  SPLATE_LOADER_FILE: string;
-  SPLATE_DATA_FILE: string;
-  SPLATE_CLIENT_DATA: string;
-  LOADING_FILE: string;
-  ERROR_FILE: string;
-  LOADER_FILE: string;
+    LAYOUT_FILE: string;
+    LAYOUT_CONFIG_FILE: string;
+    LAYOUT_LOADER_FILE: string;
+    LAYOUT_DATA_FILE: string;
+    LAYOUT_CLIENT_LOADER: string;
+    PAGE_FILE: string;
+    PAGE_CONFIG_FILE: string;
+    PAGE_LOADER_FILE: string;
+    PAGE_DATA_FILE: string;
+    PAGE_CLIENT_LOADER: string;
+    SPLATE_FILE: string;
+    SPLATE_CONFIG_FILE: string;
+    SPLATE_LOADER_FILE: string;
+    SPLATE_DATA_FILE: string;
+    SPLATE_CLIENT_DATA: string;
+    LOADING_FILE: string;
+    ERROR_FILE: string;
+    LOADER_FILE: string;
 };
 export declare const APP_CONFIG_NAME = "config";
 export declare const APP_INIT_EXPORTED = "init";
-export declare const APP_INIT_IMPORTED = "appInit";
+export declare const APP_INIT_IMPORTED = "appInit";

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

@@ -4,20 +4,13 @@ import { BundlerConfig } from '@modern-js/builder-shared';
 import { AppNormalizedConfig, AppTools, ImportStatement } from '../types';
 export declare const createImportStatements: (statements: ImportStatement[]) => string;
 export declare const generateCode: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>, entrypoints: Entrypoint[], api: PluginAPI<AppTools<'shared'>>) => Promise<{
-  importsStatemets: Map<string, ImportStatement[]>;
+    importsStatemets: Map<string, ImportStatement[]>;
 }>;
-export declare const generateIndexCode: ({
-  appContext,
-  api,
-  entrypoints,
-  config,
-  importsStatemets,
-  bundlerConfigs
-}: {
-  appContext: IAppContext;
-  api: PluginAPI<AppTools<'shared'>>;
-  entrypoints: Entrypoint[];
-  config: AppNormalizedConfig<'shared'>;
-  importsStatemets: Map<string, ImportStatement[]>;
-  bundlerConfigs?: BundlerConfig[] | undefined;
-}) => Promise<void>;
+export declare const generateIndexCode: ({ appContext, api, entrypoints, config, importsStatemets, bundlerConfigs, }: {
+    appContext: IAppContext;
+    api: PluginAPI<AppTools<'shared'>>;
+    entrypoints: Entrypoint[];
+    config: AppNormalizedConfig<'shared'>;
+    importsStatemets: Map<string, ImportStatement[]>;
+    bundlerConfigs?: BundlerConfig[] | undefined;
+}) => Promise<void>;

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

@@ -1,3 +1,3 @@
 import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig, IAppContext } from '../types';
-export declare const getBundleEntry: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Entrypoint[];
+export declare const getBundleEntry: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Entrypoint[];

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

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

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

@@ -1,15 +1,9 @@
 import type { Entrypoint, RouteLegacy } from '@modern-js/types';
 export type { RouteLegacy as Route };
-export declare const getClientRoutes: ({
-  entrypoint,
-  srcDirectory,
-  srcAlias,
-  internalDirectory,
-  internalDirAlias
-}: {
-  entrypoint: Entrypoint;
-  srcDirectory: string;
-  srcAlias: string;
-  internalDirectory: string;
-  internalDirAlias: string;
-}) => RouteLegacy[];
+export declare const getClientRoutes: ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias, }: {
+    entrypoint: Entrypoint;
+    srcDirectory: string;
+    srcAlias: string;
+    internalDirectory: string;
+    internalDirAlias: string;
+}) => RouteLegacy[];

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

@@ -1,2 +1,2 @@
 export { getClientRoutes } from './getRoutes';
-export { getClientRoutes as getClientRoutesLegacy } from './getRoutesLegacy';
+export { getClientRoutes as getClientRoutesLegacy } from './getRoutesLegacy';

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

@@ -2,4 +2,4 @@ declare const debug: import("@modern-js/utils/compiled/debug").Debugger;
 export { debug };
 export declare const findLayout: (dir: string) => string | false;
 export declare const getRouteWeight: (route: string) => number;
-export declare const shouldSkip: (file: string) => boolean;
+export declare const shouldSkip: (file: string) => boolean;

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

@@ -1,4 +1,4 @@
 import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig, IAppContext } from '../types';
 export type { Entrypoint };
-export declare const getFileSystemEntry: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Entrypoint[];
+export declare const getFileSystemEntry: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Entrypoint[];