@modern-js/runtime 2.56.1 → 2.56.3-alpha.0

package/dist/cjs/cli/code.js

@@ -75,11 +75,15 @@ const generateCode = async (entrypoints, appContext, config, onCollectRuntimePlu
       });
       const indexFile = import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_FILE_NAME}`);
       import_utils.fs.outputFileSync(indexFile, indexCode, "utf8");
+      const ssrMode = getSSRMode(entryName, config);
       if (enableAsyncEntry) {
         const bootstrapFile = import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_BOOTSTRAP_FILE_NAME}`);
         import_utils.fs.outputFileSync(bootstrapFile, `import('./${import_constants.INDEX_FILE_NAME}');`, "utf8");
+        const bootstrapServerFile = import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_SERVER_BOOTSTRAP_FILE_NAME}`);
+        if (ssrMode) {
+          import_utils.fs.outputFileSync(bootstrapServerFile, `export const requestHandler = import('./${import_constants.SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, "utf8");
+        }
       }
-      const ssrMode = getSSRMode(entryName, config);
       if (ssrMode) {
         const indexServerCode = serverTemplate.serverIndex({
           entry,

package/dist/cjs/cli/constants.js

@@ -24,6 +24,7 @@ __export(constants_exports, {
   ENTRY_POINT_REGISTER_FILE_NAME: () => ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME: () => ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME: () => ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME: () => ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME: () => INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME: () => SERVER_ENTRY_POINT_FILE_NAME
 });
@@ -33,6 +34,7 @@ const ENTRY_POINT_FILE_NAME = "index.jsx";
 const SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 const INDEX_FILE_NAME = "index";
 const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+const ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 const ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 const ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
@@ -44,6 +46,7 @@ const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
   ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME
 });

package/dist/cjs/cli/index.js

@@ -124,7 +124,11 @@ const runtimePlugin = (params) => ({
               /**
               * Compatible with the reference path of the old version of the plugin.
               */
-              [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath()
+              [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
+              "@meta/runtime/browser": "@modern-js/runtime/browser",
+              "@meta/runtime/react": "@modern-js/runtime/react",
+              "@meta/runtime/context": "@modern-js/runtime/context",
+              "@meta/runtime": "@modern-js/runtime"
             },
             globalVars: {
               "process.env.IS_REACT18": process.env.IS_REACT18

package/dist/cjs/core/browser/hydrate.js

@@ -40,7 +40,7 @@ var import_constants = require("../constants");
 var import_withCallback = require("./withCallback");
 const isReact18 = () => process.env.IS_REACT18 === "true";
 function hydrateRoot(App, context, ModernRender, ModernHydrate) {
-  var _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
+  var _ssrContext_request, _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
   const hydrateContext = {
     ...context,
     get routes() {
@@ -50,8 +50,8 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
   };
   const { ssrContext } = hydrateContext;
   const currentPathname = (0, import_url.normalizePathname)(window.location.pathname);
-  const initialPathname = (0, import_url.normalizePathname)(ssrContext.request.pathname);
-  if (initialPathname !== currentPathname && context.router) {
+  const initialPathname = (ssrContext === null || ssrContext === void 0 ? void 0 : (_ssrContext_request = ssrContext.request) === null || _ssrContext_request === void 0 ? void 0 : _ssrContext_request.pathname) && (0, import_url.normalizePathname)(ssrContext.request.pathname);
+  if (initialPathname && initialPathname !== currentPathname && context.router) {
     const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
     console.error(errorMsg);
     window.location.reload();

package/dist/cjs/router/cli/code/index.js

@@ -34,6 +34,7 @@ __export(code_exports, {
 module.exports = __toCommonJS(code_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_lodash = require("@modern-js/utils/lodash");
 var import_constants = require("../constants");
 var import_constants2 = require("../../../cli/constants");
 var templates = __toESM(require("./templates"));
@@ -80,11 +81,14 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             }
           }
         }
+        const config2 = api.useResolvedConfigContext();
+        const ssrByRouteIds = config2.server.ssrByRouteIds || [];
+        const clonedRoutes = (0, import_lodash.cloneDeep)(initialRoutes);
+        const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
-          routes: initialRoutes
+          routes: markedRoutes
         });
-        const config2 = api.useResolvedConfigContext();
         const ssr = (0, import_utils.getEntryOptions)(entryName, isMainEntry, config2.server.ssr, config2.server.ssrByEntries, packageName);
         const useSSG = (0, import_utils.isSSGEntry)(config2, entryName, entrypoints);
         let mode;
@@ -111,23 +115,55 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           })
         });
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
+          var _config_output1;
           const routesServerFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
+          const filtedRoutesForServer = (0, import_utils.filterRoutesForServer)(routes);
+          const routesForServerLoaderMatches = (0, import_utils.filterRoutesLoader)(routes);
           const code2 = templates.routesForServer({
-            routes
+            routesForServerLoaderMatches
           });
           await import_utils.fs.ensureFile(routesServerFile);
           await import_utils.fs.writeFile(routesServerFile, code2);
+          const serverRoutesCode = await templates.fileSystemRoutes({
+            metaName,
+            routes: filtedRoutesForServer,
+            ssrMode: useSSG ? "string" : mode,
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+            entryName: entrypoint.entryName,
+            internalDirectory,
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
+          });
+          await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, "utf8");
         }
         const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
           const serverLoaderFile = (0, import_utils2.getServerCombinedModueFile)(internalDirectory, entryName);
           await import_utils.fs.outputFile(serverLoaderFile, serverLoaderCombined);
         }
-        import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
+        await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
       }
     }
   }
 };
+function markRoutes(routes, routeIds) {
+  return routes.map((route) => {
+    if (route.type !== "nested") {
+      return route;
+    }
+    if (route.children && route.children.length > 0) {
+      route.children = markRoutes(route.children, routeIds);
+    }
+    if (route.children && route.children.length > 0) {
+      route.inValidSSRRoute = route.children.every((child) => {
+        var _child_inValidSSRRoute;
+        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
+      });
+    } else if (route.id) {
+      route.inValidSSRRoute = !routeIds.includes(route.id);
+    }
+    return route;
+  });
+}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants2.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }

package/dist/cjs/router/cli/code/templates.js

@@ -39,7 +39,7 @@ var import_utils = require("@modern-js/utils");
 var import_constants = require("@modern-js/utils/universal/constants");
 var import_constants2 = require("../constants");
 var import_utils2 = require("./utils");
-const routesForServer = ({ routes }) => {
+const routesForServer = ({ routesForServerLoaderMatches }) => {
   const loaders = [];
   const actions = [];
   const loadersMap = {};
@@ -82,7 +82,7 @@ const routesForServer = ({ routes }) => {
   let routesCode = `
   export const routes = [
   `;
-  for (const route of routes) {
+  for (const route of routesForServerLoaderMatches) {
     if ("type" in route) {
       const keywords = [
         "loader",
@@ -135,13 +135,14 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
     import loadable, { lazy as loadableLazy } from "@${metaName}/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  const getDataLoaderPath = ({ loaderId, clientData, action, inline, routeId }) => {
+  const getDataLoaderPath = ({ loaderId, clientData, action, inline, routeId, inValidSSRRoute }) => {
     if (!ssrMode) {
       return "";
     }
     const clientDataStr = clientData ? `&clientData=${clientData}` : "";
+    const retain = inValidSSRRoute !== null && inValidSSRRoute !== void 0 ? inValidSSRRoute : false;
     if (nestedRoutesEntry) {
-      return `?loaderId=${loaderId}${clientDataStr}&action=${action ? (0, import_utils.slash)(action) : action}&inline=${inline}&routeId=${routeId}`;
+      return `?loaderId=${loaderId}${clientDataStr}&action=${action ? (0, import_utils.slash)(action) : action}&inline=${inline}&routeId=${routeId}&retain=${retain}`;
     }
     return "";
   };
@@ -175,6 +176,7 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
         loadersMap[loader] = {
           loaderId,
           routeId: route.id,
+          inValidSSRRoute: route.inValidSSRRoute,
           filePath: route.data || route.loader,
           clientData: Boolean(route.clientData),
           route,
@@ -299,7 +301,8 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
           clientData: loaderInfo.clientData,
           action: route.action,
           inline: loaderInfo.inline,
-          routeId: loaderInfo.routeId
+          routeId: loaderInfo.routeId,
+          inValidSSRRoute: loaderInfo.inValidSSRRoute
         })}";
 `;
       } else {
@@ -308,7 +311,8 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
           clientData: loaderInfo.clientData,
           action: false,
           inline: loaderInfo.inline,
-          routeId: route.id
+          routeId: route.id,
+          inValidSSRRoute: loaderInfo.inValidSSRRoute
         })}";
 `;
       }
@@ -318,7 +322,8 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
         clientData: loaderInfo.clientData,
         action: false,
         inline: loaderInfo.inline,
-        routeId: loaderInfo.routeId
+        routeId: loaderInfo.routeId,
+        inValidSSRRoute: loaderInfo.inValidSSRRoute
       })}";
 `;
     }
@@ -360,7 +365,17 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
     const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
     const combinedModule = `export * from "${(0, import_utils.slash)(serverLoaderRuntime)}"; export * from "${(0, import_utils.slash)(serverLoadersFile)}"`;
-    return combinedModule;
+    if (!config.source.enableAsyncEntry) {
+      return combinedModule;
+    }
+    return `export default Promise.all([import("${(0, import_utils.slash)(serverLoaderRuntime)}"),import("${(0, import_utils.slash)(serverLoadersFile)}")]).then(res=>{
+      return res.reduce((sum,cur)=>{
+        return {
+          ...sum,
+          ...cur
+        }
+     },{})
+    })`;
   }
   return null;
 }
@@ -408,7 +423,7 @@ const runtimeGlobalContext = async ({ metaName, srcDirectory, nestedRoutesEntry,
   }
   return `${imports.join("\n")}
 
-import { routes } from './routes.js';
+import { routes } from './routes';
 
 setGlobalContext({
   layoutApp,

package/dist/cjs/router/cli/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var cli_exports = {};
 __export(cli_exports, {
@@ -25,6 +35,7 @@ __export(cli_exports, {
   routerPlugin: () => routerPlugin
 });
 module.exports = __toCommonJS(cli_exports);
+var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_entry = require("./entry");
 var import_handler = require("./handler");
@@ -36,6 +47,8 @@ const routerPlugin = () => ({
     "@modern-js/runtime"
   ],
   setup: (api) => {
+    const nestedRoutes = {};
+    const nestedRoutesForServer = {};
     return {
       _internalRuntimePlugins({ entrypoint, plugins }) {
         var _getEntryOptions;
@@ -60,10 +73,10 @@ const routerPlugin = () => ({
           plugins
         };
       },
-      checkEntryPoint({ path, entry }) {
+      checkEntryPoint({ path: path2, entry }) {
         return {
-          path,
-          entry: entry || (0, import_entry.isRouteEntry)(path)
+          path: path2,
+          entry: entry || (0, import_entry.isRouteEntry)(path2)
         };
       },
       config() {
@@ -99,6 +112,22 @@ const routerPlugin = () => ({
       },
       async fileChange(e) {
         await (0, import_handler.handleFileChange)(api, e);
+      },
+      async modifyFileSystemRoutes({ entrypoint, routes }) {
+        nestedRoutes[entrypoint.entryName] = routes;
+        nestedRoutesForServer[entrypoint.entryName] = (0, import_utils.filterRoutesForServer)(routes);
+        return {
+          entrypoint,
+          routes
+        };
+      },
+      async beforeGenerateRoutes({ entrypoint, code }) {
+        const { distDirectory } = api.useAppContext();
+        await import_utils.fs.outputJSON(import_node_path.default.resolve(distDirectory, import_utils.NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer);
+        return {
+          entrypoint,
+          code
+        };
       }
     };
   }

package/dist/esm/cli/code.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { MAIN_ENTRY_NAME, fs } from "@modern-js/utils";
-import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants";
+import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME } from "./constants";
 import * as template from "./template";
 import * as serverTemplate from "./template.server";
 function getSSRMode() {
@@ -35,7 +35,7 @@ var generateCode = function() {
             4,
             Promise.all(entrypoints.map(function() {
               var _ref2 = _async_to_generator(function(entrypoint) {
-                var entryName, isAutoMount, entry, customEntry, customBootstrap, customServerEntry, _ref3, runtimePlugins, indexCode, indexFile, bootstrapFile, ssrMode, indexServerCode, indexServerFile, registerCode, registerFile, registerRuntimeCode, registerRuntimeFile, contextCode, contextFile;
+                var entryName, isAutoMount, entry, customEntry, customBootstrap, customServerEntry, _ref3, runtimePlugins, indexCode, indexFile, ssrMode, bootstrapFile, bootstrapServerFile, indexServerCode, indexServerFile, registerCode, registerFile, registerRuntimeCode, registerRuntimeFile, contextCode, contextFile;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -62,11 +62,15 @@ var generateCode = function() {
                         });
                         indexFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_FILE_NAME));
                         fs.outputFileSync(indexFile, indexCode, "utf8");
+                        ssrMode = getSSRMode(entryName, config);
                         if (enableAsyncEntry) {
                           bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                           fs.outputFileSync(bootstrapFile, "import('./".concat(INDEX_FILE_NAME, "');"), "utf8");
+                          bootstrapServerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_SERVER_BOOTSTRAP_FILE_NAME));
+                          if (ssrMode) {
+                            fs.outputFileSync(bootstrapServerFile, "export const requestHandler = import('./".concat(SERVER_ENTRY_POINT_FILE_NAME, "').then((m) => m.requestHandler)"), "utf8");
+                          }
                         }
-                        ssrMode = getSSRMode(entryName, config);
                         if (ssrMode) {
                           indexServerCode = serverTemplate.serverIndex({
                             entry,

package/dist/esm/cli/constants.js

@@ -3,6 +3,7 @@ var ENTRY_POINT_FILE_NAME = "index.jsx";
 var SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 var INDEX_FILE_NAME = "index";
 var ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+var ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 var ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 var ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 var ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
@@ -13,6 +14,7 @@ export {
   ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME
 };

package/dist/esm/cli/index.js

@@ -94,23 +94,22 @@ var runtimePlugin = function(params) {
           var isReact18 = checkIsReact18(appDirectory);
           process.env.IS_REACT18 = isReact18.toString();
           var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
+          var _obj;
           return {
             runtime: {},
             runtimeByEntries: {},
             source: {
-              alias: (
+              alias: (_obj = {
                 /**
-                * Compatible with the reference path of the old version of the plugin.
+                * twin.macro inserts styled-components into the code during the compilation process
+                * But it will not be installed under the user project.
+                * So need to add alias
                 */
-                _define_property({
-                  /**
-                  * twin.macro inserts styled-components into the code during the compilation process
-                  * But it will not be installed under the user project.
-                  * So need to add alias
-                  */
-                  "styled-components": require.resolve("styled-components")
-                }, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath())
-              ),
+                "styled-components": require.resolve("styled-components")
+              }, /**
+              * Compatible with the reference path of the old version of the plugin.
+              */
+              _define_property(_obj, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath()), _define_property(_obj, "@meta/runtime/browser", "@modern-js/runtime/browser"), _define_property(_obj, "@meta/runtime/react", "@modern-js/runtime/react"), _define_property(_obj, "@meta/runtime/context", "@modern-js/runtime/context"), _define_property(_obj, "@meta/runtime", "@modern-js/runtime"), _obj),
               globalVars: {
                 "process.env.IS_REACT18": process.env.IS_REACT18
               }

package/dist/esm/core/browser/hydrate.js

@@ -10,7 +10,7 @@ var isReact18 = function() {
   return process.env.IS_REACT18 === "true";
 };
 function hydrateRoot(App, context, ModernRender, ModernHydrate) {
-  var _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
+  var _ssrContext_request, _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
   var hydrateContext = _object_spread_props(_object_spread({}, context), {
     get routes() {
       return context.routes;
@@ -19,8 +19,8 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
   });
   var ssrContext = hydrateContext.ssrContext;
   var currentPathname = normalizePathname(window.location.pathname);
-  var initialPathname = normalizePathname(ssrContext.request.pathname);
-  if (initialPathname !== currentPathname && context.router) {
+  var initialPathname = (ssrContext === null || ssrContext === void 0 ? void 0 : (_ssrContext_request = ssrContext.request) === null || _ssrContext_request === void 0 ? void 0 : _ssrContext_request.pathname) && normalizePathname(ssrContext.request.pathname);
+  if (initialPathname && initialPathname !== currentPathname && context.router) {
     var errorMsg = "The initial URL ".concat(initialPathname, " and the URL ").concat(currentPathname, " to be hydrated do not match, reload.");
     console.error(errorMsg);
     window.location.reload();

package/dist/esm/router/cli/code/index.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, filterRoutesForServer, filterRoutesLoader } from "@modern-js/utils";
+import { cloneDeep } from "@modern-js/utils/lodash";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import * as templates from "./templates";
@@ -16,7 +17,7 @@ var generateCode = function() {
     }
     function _generateEntryCode() {
       _generateEntryCode = _async_to_generator(function(entrypoint) {
-        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile;
+        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, _$config, ssrByRouteIds, clonedRoutes, markedRoutes, routes, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, _config_output1, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, serverLoaderCombined, serverLoaderFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -25,12 +26,12 @@ var generateCode = function() {
               if (!isAutoMount)
                 return [
                   3,
-                  11
+                  14
                 ];
               if (!(pageRoutesEntry || nestedRoutesEntry))
                 return [
                   3,
-                  11
+                  14
                 ];
               initialRoutes = [];
               nestedRoutes = null;
@@ -86,16 +87,19 @@ var generateCode = function() {
               }
               _state.label = 2;
             case 2:
+              _$config = api.useResolvedConfigContext();
+              ssrByRouteIds = _$config.server.ssrByRouteIds || [];
+              clonedRoutes = cloneDeep(initialRoutes);
+              markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
               return [
                 4,
                 hookRunners.modifyFileSystemRoutes({
                   entrypoint,
-                  routes: initialRoutes
+                  routes: markedRoutes
                 })
               ];
             case 3:
               routes = _state.sent().routes;
-              _$config = api.useResolvedConfigContext();
               ssr = getEntryOptions(entryName, isMainEntry, _$config.server.ssr, _$config.server.ssrByEntries, packageName);
               useSSG = isSSGEntry(_$config, entryName, entrypoints);
               if (ssr) {
@@ -138,11 +142,13 @@ var generateCode = function() {
               if (!(entrypoint.nestedRoutesEntry && isUseSSRBundle(_$config)))
                 return [
                   3,
-                  8
+                  10
                 ];
               routesServerFile = getServerLoadersFile(internalDirectory, entryName);
+              filtedRoutesForServer = filterRoutesForServer(routes);
+              routesForServerLoaderMatches = filterRoutesLoader(routes);
               code1 = templates.routesForServer({
-                routes
+                routesForServerLoaderMatches
               });
               return [
                 4,
@@ -156,26 +162,51 @@ var generateCode = function() {
               ];
             case 7:
               _state.sent();
-              _state.label = 8;
+              return [
+                4,
+                templates.fileSystemRoutes({
+                  metaName,
+                  routes: filtedRoutesForServer,
+                  ssrMode: useSSG ? "string" : mode,
+                  nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+                  entryName: entrypoint.entryName,
+                  internalDirectory,
+                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output1 = _$config.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
+                })
+              ];
             case 8:
+              serverRoutesCode = _state.sent();
+              return [
+                4,
+                fs.outputFile(path.resolve(internalDirectory, "./".concat(entryName, "/routes.server.js")), serverRoutesCode, "utf8")
+              ];
+            case 9:
+              _state.sent();
+              _state.label = 10;
+            case 10:
               serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, _$config, appContext);
               if (!serverLoaderCombined)
                 return [
                   3,
-                  10
+                  12
                 ];
               serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
               return [
                 4,
                 fs.outputFile(serverLoaderFile, serverLoaderCombined)
               ];
-            case 9:
-              _state.sent();
-              _state.label = 10;
-            case 10:
-              fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code, "utf8");
-              _state.label = 11;
             case 11:
+              _state.sent();
+              _state.label = 12;
+            case 12:
+              return [
+                4,
+                fs.outputFile(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code, "utf8")
+              ];
+            case 13:
+              _state.sent();
+              _state.label = 14;
+            case 14:
               return [
                 2
               ];
@@ -208,6 +239,25 @@ var generateCode = function() {
     return _ref.apply(this, arguments);
   };
 }();
+function markRoutes(routes, routeIds) {
+  return routes.map(function(route) {
+    if (route.type !== "nested") {
+      return route;
+    }
+    if (route.children && route.children.length > 0) {
+      route.children = markRoutes(route.children, routeIds);
+    }
+    if (route.children && route.children.length > 0) {
+      route.inValidSSRRoute = route.children.every(function(child) {
+        var _child_inValidSSRRoute;
+        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
+      });
+    } else if (route.id) {
+      route.inValidSSRRoute = !routeIds.includes(route.id);
+    }
+    return route;
+  });
+}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME)), code, "utf8");
 }

package/dist/esm/router/cli/code/templates.js

@@ -9,7 +9,7 @@ import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, TEMP_LOADERS_DIR } from "../constants";
 import { getPathWithoutExt, getServerLoadersFile, parseModule, replaceWithAlias } from "./utils";
 var routesForServer = function(param) {
-  var routes = param.routes;
+  var routesForServerLoaderMatches = param.routesForServerLoaderMatches;
   var loaders = [];
   var actions = [];
   var loadersMap = {};
@@ -51,7 +51,7 @@ var routesForServer = function(param) {
   var routesCode = "\n  export const routes = [\n  ";
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
-    for (var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (var _iterator = routesForServerLoaderMatches[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var route = _step.value;
       if ("type" in route) {
         var keywords = [
@@ -136,13 +136,14 @@ var fileSystemRoutes = function() {
           importLazyCode = '\n    import { lazy } from "react";\n    import loadable, { lazy as loadableLazy } from "@'.concat(metaName, '/runtime/loadable"\n  ');
           rootLayoutCode = "";
           getDataLoaderPath = function(param2) {
-            var loaderId = param2.loaderId, clientData = param2.clientData, action = param2.action, inline = param2.inline, routeId = param2.routeId;
+            var loaderId = param2.loaderId, clientData = param2.clientData, action = param2.action, inline = param2.inline, routeId = param2.routeId, inValidSSRRoute = param2.inValidSSRRoute;
             if (!ssrMode) {
               return "";
             }
             var clientDataStr = clientData ? "&clientData=".concat(clientData) : "";
+            var retain = inValidSSRRoute !== null && inValidSSRRoute !== void 0 ? inValidSSRRoute : false;
             if (nestedRoutesEntry) {
-              return "?loaderId=".concat(loaderId).concat(clientDataStr, "&action=").concat(action ? slash(action) : action, "&inline=").concat(inline, "&routeId=").concat(routeId);
+              return "?loaderId=".concat(loaderId).concat(clientDataStr, "&action=").concat(action ? slash(action) : action, "&inline=").concat(inline, "&routeId=").concat(routeId, "&retain=").concat(retain);
             }
             return "";
           };
@@ -176,6 +177,7 @@ var fileSystemRoutes = function() {
                 loadersMap[loader] = {
                   loaderId,
                   routeId: route2.id,
+                  inValidSSRRoute: route2.inValidSSRRoute,
                   filePath: route2.data || route2.loader,
                   clientData: Boolean(route2.clientData),
                   route: route2,
@@ -316,7 +318,8 @@ var fileSystemRoutes = function() {
                     clientData: loaderInfo.clientData,
                     action: route1.action,
                     inline: loaderInfo.inline,
-                    routeId: loaderInfo.routeId
+                    routeId: loaderInfo.routeId,
+                    inValidSSRRoute: loaderInfo.inValidSSRRoute
                   }), '";\n');
                 } else {
                   importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(slash(loaderInfo.filePath)).concat(getDataLoaderPath({
@@ -324,7 +327,8 @@ var fileSystemRoutes = function() {
                     clientData: loaderInfo.clientData,
                     action: false,
                     inline: loaderInfo.inline,
-                    routeId: route1.id
+                    routeId: route1.id,
+                    inValidSSRRoute: loaderInfo.inValidSSRRoute
                   }), '";\n');
                 }
               } else {
@@ -333,7 +337,8 @@ var fileSystemRoutes = function() {
                   clientData: loaderInfo.clientData,
                   action: false,
                   inline: loaderInfo.inline,
-                  routeId: loaderInfo.routeId
+                  routeId: loaderInfo.routeId,
+                  inValidSSRRoute: loaderInfo.inValidSSRRoute
                 }), '";\n');
               }
             }
@@ -406,7 +411,10 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     var serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
     var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
     var combinedModule = 'export * from "'.concat(slash(serverLoaderRuntime), '"; export * from "').concat(slash(serverLoadersFile), '"');
-    return combinedModule;
+    if (!config.source.enableAsyncEntry) {
+      return combinedModule;
+    }
+    return 'export default Promise.all([import("'.concat(slash(serverLoaderRuntime), '"),import("').concat(slash(serverLoadersFile), '")]).then(res=>{\n      return res.reduce((sum,cur)=>{\n        return {\n          ...sum,\n          ...cur\n        }\n     },{})\n    })');
   }
   return null;
 }
@@ -493,7 +501,7 @@ var runtimeGlobalContext = function() {
           }
           return [
             2,
-            "".concat(imports.join("\n"), "\n\nimport { routes } from './routes.js';\n\nsetGlobalContext({\n  layoutApp,\n  routes,\n  appInit,\n  appConfig,\n});")
+            "".concat(imports.join("\n"), "\n\nimport { routes } from './routes';\n\nsetGlobalContext({\n  layoutApp,\n  routes,\n  appInit,\n  appConfig,\n});")
           ];
       }
     });

package/dist/esm/router/cli/index.js

@@ -2,7 +2,8 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import path from "node:path";
+import { createRuntimeExportsUtils, filterRoutesForServer, fs, getEntryOptions, isRouterV5 as isV5, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";
@@ -14,6 +15,8 @@ var routerPlugin = function() {
       "@modern-js/runtime"
     ],
     setup: function(api) {
+      var nestedRoutes = {};
+      var nestedRoutesForServer = {};
       return {
         _internalRuntimePlugins: function _internalRuntimePlugins(param) {
           var entrypoint = param.entrypoint, plugins = param.plugins;
@@ -45,10 +48,10 @@ var routerPlugin = function() {
           };
         },
         checkEntryPoint: function checkEntryPoint(param) {
-          var path = param.path, entry = param.entry;
+          var path2 = param.path, entry = param.entry;
           return {
-            path,
-            entry: entry || isRouteEntry(path)
+            path: path2,
+            entry: entry || isRouteEntry(path2)
           };
         },
         config: function config() {
@@ -132,6 +135,47 @@ var routerPlugin = function() {
               }
             });
           })();
+        },
+        modifyFileSystemRoutes: function modifyFileSystemRoutes(param) {
+          var entrypoint = param.entrypoint, routes = param.routes;
+          return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+              nestedRoutes[entrypoint.entryName] = routes;
+              nestedRoutesForServer[entrypoint.entryName] = filterRoutesForServer(routes);
+              return [
+                2,
+                {
+                  entrypoint,
+                  routes
+                }
+              ];
+            });
+          })();
+        },
+        beforeGenerateRoutes: function beforeGenerateRoutes(param) {
+          var entrypoint = param.entrypoint, code = param.code;
+          return _async_to_generator(function() {
+            var distDirectory;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  distDirectory = api.useAppContext().distDirectory;
+                  return [
+                    4,
+                    fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer)
+                  ];
+                case 1:
+                  _state.sent();
+                  return [
+                    2,
+                    {
+                      entrypoint,
+                      code
+                    }
+                  ];
+              }
+            });
+          })();
         }
       };
     }

package/dist/esm-node/cli/code.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { MAIN_ENTRY_NAME, fs } from "@modern-js/utils";
-import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants";
+import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME } from "./constants";
 import * as template from "./template";
 import * as serverTemplate from "./template.server";
 function getSSRMode(entry = MAIN_ENTRY_NAME, config) {
@@ -42,11 +42,15 @@ const generateCode = async (entrypoints, appContext, config, onCollectRuntimePlu
       });
       const indexFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
       fs.outputFileSync(indexFile, indexCode, "utf8");
+      const ssrMode = getSSRMode(entryName, config);
       if (enableAsyncEntry) {
         const bootstrapFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_BOOTSTRAP_FILE_NAME}`);
         fs.outputFileSync(bootstrapFile, `import('./${INDEX_FILE_NAME}');`, "utf8");
+        const bootstrapServerFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_SERVER_BOOTSTRAP_FILE_NAME}`);
+        if (ssrMode) {
+          fs.outputFileSync(bootstrapServerFile, `export const requestHandler = import('./${SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, "utf8");
+        }
       }
-      const ssrMode = getSSRMode(entryName, config);
       if (ssrMode) {
         const indexServerCode = serverTemplate.serverIndex({
           entry,

package/dist/esm-node/cli/constants.js

@@ -3,6 +3,7 @@ const ENTRY_POINT_FILE_NAME = "index.jsx";
 const SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 const INDEX_FILE_NAME = "index";
 const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+const ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 const ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 const ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
@@ -13,6 +14,7 @@ export {
   ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME
 };

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

@@ -85,7 +85,11 @@ const runtimePlugin = (params) => ({
               /**
               * Compatible with the reference path of the old version of the plugin.
               */
-              [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath()
+              [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
+              "@meta/runtime/browser": "@modern-js/runtime/browser",
+              "@meta/runtime/react": "@modern-js/runtime/react",
+              "@meta/runtime/context": "@modern-js/runtime/context",
+              "@meta/runtime": "@modern-js/runtime"
             },
             globalVars: {
               "process.env.IS_REACT18": process.env.IS_REACT18

package/dist/esm-node/core/browser/hydrate.js

@@ -6,7 +6,7 @@ import { RenderLevel } from "../constants";
 import { WithCallback } from "./withCallback";
 const isReact18 = () => process.env.IS_REACT18 === "true";
 function hydrateRoot(App, context, ModernRender, ModernHydrate) {
-  var _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
+  var _ssrContext_request, _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
   const hydrateContext = {
     ...context,
     get routes() {
@@ -16,8 +16,8 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
   };
   const { ssrContext } = hydrateContext;
   const currentPathname = normalizePathname(window.location.pathname);
-  const initialPathname = normalizePathname(ssrContext.request.pathname);
-  if (initialPathname !== currentPathname && context.router) {
+  const initialPathname = (ssrContext === null || ssrContext === void 0 ? void 0 : (_ssrContext_request = ssrContext.request) === null || _ssrContext_request === void 0 ? void 0 : _ssrContext_request.pathname) && normalizePathname(ssrContext.request.pathname);
+  if (initialPathname && initialPathname !== currentPathname && context.router) {
     const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
     console.error(errorMsg);
     window.location.reload();

package/dist/esm-node/router/cli/code/index.js

@@ -1,5 +1,6 @@
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, filterRoutesForServer, filterRoutesLoader } from "@modern-js/utils";
+import { cloneDeep } from "@modern-js/utils/lodash";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import * as templates from "./templates";
@@ -46,11 +47,14 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             }
           }
         }
+        const config2 = api.useResolvedConfigContext();
+        const ssrByRouteIds = config2.server.ssrByRouteIds || [];
+        const clonedRoutes = cloneDeep(initialRoutes);
+        const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
-          routes: initialRoutes
+          routes: markedRoutes
         });
-        const config2 = api.useResolvedConfigContext();
         const ssr = getEntryOptions(entryName, isMainEntry, config2.server.ssr, config2.server.ssrByEntries, packageName);
         const useSSG = isSSGEntry(config2, entryName, entrypoints);
         let mode;
@@ -77,23 +81,55 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {
+          var _config_output1;
           const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
+          const filtedRoutesForServer = filterRoutesForServer(routes);
+          const routesForServerLoaderMatches = filterRoutesLoader(routes);
           const code2 = templates.routesForServer({
-            routes
+            routesForServerLoaderMatches
           });
           await fs.ensureFile(routesServerFile);
           await fs.writeFile(routesServerFile, code2);
+          const serverRoutesCode = await templates.fileSystemRoutes({
+            metaName,
+            routes: filtedRoutesForServer,
+            ssrMode: useSSG ? "string" : mode,
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+            entryName: entrypoint.entryName,
+            internalDirectory,
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
+          });
+          await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, "utf8");
         }
         const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
           const serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
           await fs.outputFile(serverLoaderFile, serverLoaderCombined);
         }
-        fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
+        await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
       }
     }
   }
 };
+function markRoutes(routes, routeIds) {
+  return routes.map((route) => {
+    if (route.type !== "nested") {
+      return route;
+    }
+    if (route.children && route.children.length > 0) {
+      route.children = markRoutes(route.children, routeIds);
+    }
+    if (route.children && route.children.length > 0) {
+      route.inValidSSRRoute = route.children.every((child) => {
+        var _child_inValidSSRRoute;
+        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
+      });
+    } else if (route.id) {
+      route.inValidSSRRoute = !routeIds.includes(route.id);
+    }
+    return route;
+  });
+}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }

package/dist/esm-node/router/cli/code/templates.js

@@ -3,7 +3,7 @@ import { findExists, formatImportPath, fs, getEntryOptions, isSSGEntry, slash }
 import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, TEMP_LOADERS_DIR } from "../constants";
 import { getPathWithoutExt, getServerLoadersFile, parseModule, replaceWithAlias } from "./utils";
-const routesForServer = ({ routes }) => {
+const routesForServer = ({ routesForServerLoaderMatches }) => {
   const loaders = [];
   const actions = [];
   const loadersMap = {};
@@ -46,7 +46,7 @@ const routesForServer = ({ routes }) => {
   let routesCode = `
   export const routes = [
   `;
-  for (const route of routes) {
+  for (const route of routesForServerLoaderMatches) {
     if ("type" in route) {
       const keywords = [
         "loader",
@@ -99,13 +99,14 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
     import loadable, { lazy as loadableLazy } from "@${metaName}/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  const getDataLoaderPath = ({ loaderId, clientData, action, inline, routeId }) => {
+  const getDataLoaderPath = ({ loaderId, clientData, action, inline, routeId, inValidSSRRoute }) => {
     if (!ssrMode) {
       return "";
     }
     const clientDataStr = clientData ? `&clientData=${clientData}` : "";
+    const retain = inValidSSRRoute !== null && inValidSSRRoute !== void 0 ? inValidSSRRoute : false;
     if (nestedRoutesEntry) {
-      return `?loaderId=${loaderId}${clientDataStr}&action=${action ? slash(action) : action}&inline=${inline}&routeId=${routeId}`;
+      return `?loaderId=${loaderId}${clientDataStr}&action=${action ? slash(action) : action}&inline=${inline}&routeId=${routeId}&retain=${retain}`;
     }
     return "";
   };
@@ -139,6 +140,7 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
         loadersMap[loader] = {
           loaderId,
           routeId: route.id,
+          inValidSSRRoute: route.inValidSSRRoute,
           filePath: route.data || route.loader,
           clientData: Boolean(route.clientData),
           route,
@@ -263,7 +265,8 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
           clientData: loaderInfo.clientData,
           action: route.action,
           inline: loaderInfo.inline,
-          routeId: loaderInfo.routeId
+          routeId: loaderInfo.routeId,
+          inValidSSRRoute: loaderInfo.inValidSSRRoute
         })}";
 `;
       } else {
@@ -272,7 +275,8 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
           clientData: loaderInfo.clientData,
           action: false,
           inline: loaderInfo.inline,
-          routeId: route.id
+          routeId: route.id,
+          inValidSSRRoute: loaderInfo.inValidSSRRoute
         })}";
 `;
       }
@@ -282,7 +286,8 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
         clientData: loaderInfo.clientData,
         action: false,
         inline: loaderInfo.inline,
-        routeId: loaderInfo.routeId
+        routeId: loaderInfo.routeId,
+        inValidSSRRoute: loaderInfo.inValidSSRRoute
       })}";
 `;
     }
@@ -324,7 +329,17 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
     const serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
     const combinedModule = `export * from "${slash(serverLoaderRuntime)}"; export * from "${slash(serverLoadersFile)}"`;
-    return combinedModule;
+    if (!config.source.enableAsyncEntry) {
+      return combinedModule;
+    }
+    return `export default Promise.all([import("${slash(serverLoaderRuntime)}"),import("${slash(serverLoadersFile)}")]).then(res=>{
+      return res.reduce((sum,cur)=>{
+        return {
+          ...sum,
+          ...cur
+        }
+     },{})
+    })`;
   }
   return null;
 }
@@ -372,7 +387,7 @@ const runtimeGlobalContext = async ({ metaName, srcDirectory, nestedRoutesEntry,
   }
   return `${imports.join("\n")}
 
-import { routes } from './routes.js';
+import { routes } from './routes';
 
 setGlobalContext({
   layoutApp,

package/dist/esm-node/router/cli/index.js

@@ -1,4 +1,5 @@
-import { createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import path from "node:path";
+import { createRuntimeExportsUtils, filterRoutesForServer, fs, getEntryOptions, isRouterV5 as isV5, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";
@@ -9,6 +10,8 @@ const routerPlugin = () => ({
     "@modern-js/runtime"
   ],
   setup: (api) => {
+    const nestedRoutes = {};
+    const nestedRoutesForServer = {};
     return {
       _internalRuntimePlugins({ entrypoint, plugins }) {
         var _getEntryOptions;
@@ -33,10 +36,10 @@ const routerPlugin = () => ({
           plugins
         };
       },
-      checkEntryPoint({ path, entry }) {
+      checkEntryPoint({ path: path2, entry }) {
         return {
-          path,
-          entry: entry || isRouteEntry(path)
+          path: path2,
+          entry: entry || isRouteEntry(path2)
         };
       },
       config() {
@@ -72,6 +75,22 @@ const routerPlugin = () => ({
       },
       async fileChange(e) {
         await handleFileChange(api, e);
+      },
+      async modifyFileSystemRoutes({ entrypoint, routes }) {
+        nestedRoutes[entrypoint.entryName] = routes;
+        nestedRoutesForServer[entrypoint.entryName] = filterRoutesForServer(routes);
+        return {
+          entrypoint,
+          routes
+        };
+      },
+      async beforeGenerateRoutes({ entrypoint, code }) {
+        const { distDirectory } = api.useAppContext();
+        await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer);
+        return {
+          entrypoint,
+          code
+        };
       }
     };
   }

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

@@ -3,6 +3,7 @@ export declare const ENTRY_POINT_FILE_NAME = "index.jsx";
 export declare const SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 export declare const INDEX_FILE_NAME = "index";
 export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+export declare const ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 export declare const ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 export declare const ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 export declare const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";

package/dist/types/exports/server.d.ts

@@ -1,5 +1,5 @@
 import { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
-export type { Container, CacheControl, CacheOptionProvider, CacheOption, UnstableMiddlewareContext, UnstableMiddleware, UnstableNext, } from '@modern-js/types';
+export type { Container, CacheControl, CacheOptionProvider, CacheOption, UnstableMiddlewareContext, UnstableMiddleware, UnstableNext, MonitorEvent, Monitors, CoreMonitor, LogEvent, LogLevel, TimingEvent, } from '@modern-js/types';
 export declare const hook: (attacher: ({ addMiddleware, afterMatch, afterRender, }: {
     addMiddleware: (mid: Middleware) => void;
     afterRender: (hook: AfterRenderHook) => void;

package/dist/types/router/cli/code/templates.d.ts

@@ -1,7 +1,7 @@
 import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
 import type { AppNormalizedConfig, IAppContext } from '@modern-js/app-tools';
-export declare const routesForServer: ({ routes, }: {
-    routes: (NestedRouteForCli | PageRoute)[];
+export declare const routesForServer: ({ routesForServerLoaderMatches, }: {
+    routesForServerLoaderMatches: (NestedRouteForCli | PageRoute)[];
 }) => string;
 export declare const fileSystemRoutes: ({ metaName, routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks, }: {
     metaName: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.1",
+  "version": "2.56.3-alpha.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -199,11 +199,11 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/types": "2.56.1",
-    "@modern-js/plugin": "2.56.1",
-    "@modern-js/utils": "2.56.1",
-    "@modern-js/plugin-data-loader": "2.56.1",
-    "@modern-js/runtime-utils": "2.56.1"
+    "@modern-js/plugin": "2.56.2",
+    "@modern-js/utils": "2.56.2",
+    "@modern-js/types": "2.56.2",
+    "@modern-js/runtime-utils": "2.56.2",
+    "@modern-js/plugin-data-loader": "2.56.2"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -226,16 +226,15 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@modern-js/app-tools": "2.56.1",
-    "@modern-js/core": "2.56.1",
-    "@scripts/build": "2.56.1",
-    "@scripts/jest-config": "2.56.1"
+    "@modern-js/app-tools": "2.56.2",
+    "@modern-js/core": "2.56.2",
+    "@scripts/build": "2.56.2",
+    "@scripts/jest-config": "2.56.2"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "dev": "modern-lib build --watch",