@modern-js/server-core 2.63.1 → 2.63.3

package/dist/cjs/adapters/node/plugins/resource.js

@@ -38,6 +38,7 @@ module.exports = __toCommonJS(resource_exports);
 var import_path = __toESM(require("path"));
 var import_fileReader = require("@modern-js/runtime-utils/fileReader");
 var import_utils = require("@modern-js/utils");
+var import_utils2 = require("../../../utils");
 async function getHtmlTemplates(pwd, routes) {
   const htmls = await Promise.all(routes.map(async (route) => {
     let html;
@@ -48,17 +49,17 @@ async function getHtmlTemplates(pwd, routes) {
     } catch (e) {
     }
     return [
-      route.entryName,
+      (0, import_utils2.uniqueKeyByRoute)(route),
       html
     ];
   }) || []);
   const templates = Object.fromEntries(htmls);
   return templates;
 }
-function injectTemplates(pwd, routes) {
+function injectTemplates(pwd, routes, htmlTemplatePromise) {
   return async (c, next) => {
     if (routes && !c.get("templates")) {
-      const templates = await getHtmlTemplates(pwd, routes);
+      const templates = await (htmlTemplatePromise || getHtmlTemplates(pwd, routes));
       c.set("templates", templates);
     }
     await next();
@@ -118,13 +119,18 @@ const injectResourcePlugin = () => ({
     return {
       async prepare() {
         const { middlewares, routes, distDirectory: pwd } = api.useAppContext();
+        let htmlTemplatePromise;
+        if ((0, import_utils.isProd)()) {
+          getServerManifest(pwd, routes || [], console);
+          htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
+        }
         middlewares.push({
           name: "inject-server-manifest",
           handler: injectServerManifest(pwd, routes)
         });
         middlewares.push({
           name: "inject-html",
-          handler: injectTemplates(pwd, routes)
+          handler: injectTemplates(pwd, routes, htmlTemplatePromise)
         });
       }
     };

package/dist/cjs/plugins/customServer/index.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var customServer_exports = {};
 __export(customServer_exports, {
   CustomServer: () => CustomServer,
-  getServerMidFromUnstableMid: () => getServerMidFromUnstableMid
+  getServerMidFromUnstableMid: () => getServerMidFromUnstableMid,
+  injectRoute: () => injectRoute
 });
 module.exports = __toCommonJS(customServer_exports);
 var import_time = require("@modern-js/runtime-utils/time");
@@ -95,13 +96,19 @@ class CustomServer {
       }
     };
   }
-  async getServerMiddleware() {
+  async getServerMiddleware(renderMiddlewares) {
     const serverMiddleware = await this.serverMiddlewarePromise;
     if (!serverMiddleware) {
-      return;
+      return renderMiddlewares;
     }
     if (Array.isArray(serverMiddleware)) {
-      return getServerMidFromUnstableMid(serverMiddleware);
+      const unstableMiddlewares = getServerMidFromUnstableMid(serverMiddleware);
+      return [
+        ...renderMiddlewares || [],
+        ...unstableMiddlewares
+      ];
+    } else if (renderMiddlewares) {
+      return renderMiddlewares;
     }
     return async (c, next) => {
       var _c_env_node_res, _c_env_node, _c_env;
@@ -189,6 +196,9 @@ async function createMiddlewareContextFromHono(c) {
     set response(newRes) {
       c.res = newRes;
     },
+    get route() {
+      return c.get("route");
+    },
     get(key) {
       return loaderContext.get(key);
     },
@@ -202,8 +212,17 @@ async function createMiddlewareContextFromHono(c) {
     redirect: c.redirect.bind(c)
   };
 }
+function injectRoute(route) {
+  return async (c, next) => {
+    if (route && !c.get("route")) {
+      c.set("route", route);
+    }
+    await next();
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CustomServer,
-  getServerMidFromUnstableMid
+  getServerMidFromUnstableMid,
+  injectRoute
 });

package/dist/cjs/plugins/render/index.js

@@ -44,19 +44,25 @@ const renderPlugin = () => ({
         const serverMiddleware = ((_config_render = config.render) === null || _config_render === void 0 ? void 0 : _config_render.middleware) && (0, import_customServer.getServerMidFromUnstableMid)(config.render.middleware);
         const pageRoutes = getPageRoutes(routes);
         for (const route of pageRoutes) {
-          const { urlPath: originUrlPath, entryName } = route;
+          const { urlPath: originUrlPath, entryName = import_constants.MAIN_ENTRY_NAME } = route;
           const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
           middlewares.push({
             name: "init-reporter",
-            handler: (0, import_monitors.initReporter)(entryName || import_constants.MAIN_ENTRY_NAME)
+            handler: (0, import_monitors.initReporter)(entryName)
+          });
+          const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
+          middlewares.push({
+            name: "inject-route-info",
+            handler: (0, import_customServer.injectRoute)({
+              entryName
+            })
           });
-          const customServerHookMiddleware = customServer.getHookMiddleware(entryName || "main", routes);
           middlewares.push({
             name: "custom-server-hook",
             path: urlPath,
             handler: customServerHookMiddleware
           });
-          const customServerMiddleware = serverMiddleware || await customServer.getServerMiddleware();
+          const customServerMiddleware = await customServer.getServerMiddleware(serverMiddleware);
           customServerMiddleware && middlewares.push({
             name: "custom-server-middleware",
             path: urlPath,

package/dist/cjs/plugins/render/render.js

@@ -35,6 +35,7 @@ var import_universal = require("@modern-js/utils/universal");
 var import_trie_router = require("hono/router/trie-router");
 var import_constants = require("../../constants");
 var import_utils = require("../../utils");
+var import_utils2 = require("../../utils");
 var import_dataHandler = require("./dataHandler");
 var import_ssrRender = require("./ssrRender");
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -49,8 +50,8 @@ function getRouter(routes) {
     }
   });
   const finalRoutes = [
-    ...normalRoutes.sort(import_utils.sortRoutes),
-    ...dynamicRoutes.sort(import_utils.sortRoutes)
+    ...normalRoutes.sort(import_utils2.sortRoutes),
+    ...dynamicRoutes.sort(import_utils2.sortRoutes)
   ];
   const router = new import_trie_router.TrieRouter();
   for (const route of finalRoutes) {
@@ -76,7 +77,7 @@ function getHeadersWithoutCookie(headers) {
 async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback: onFallbackFn }) {
   const router = getRouter(routes);
   return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext }) => {
-    const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils.getPathname)(req);
+    const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils2.getPathname)(req);
     const [routeInfo, params] = matchRoute(router, forMatchpathname);
     const framework = metaName || "modern-js";
     const fallbackHeader = `x-${(0, import_universal.cutNameByHyphen)(framework)}-ssr-fallback`;
@@ -90,16 +91,16 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       }, error);
     };
     if (!routeInfo) {
-      return new Response((0, import_utils.createErrorHtml)(404), {
+      return new Response((0, import_utils2.createErrorHtml)(404), {
         status: 404,
         headers: {
           "content-type": "text/html; charset=UTF-8"
         }
       });
     }
-    const html = templates[routeInfo.entryName];
+    const html = templates[(0, import_utils.uniqueKeyByRoute)(routeInfo)];
     if (!html) {
-      return new Response((0, import_utils.createErrorHtml)(404), {
+      return new Response((0, import_utils2.createErrorHtml)(404), {
         status: 404,
         headers: {
           "content-type": "text/html; charset=UTF-8"
@@ -107,7 +108,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       });
     }
     const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, onFallback);
-    const headerData = (0, import_utils.parseHeaders)(req);
+    const headerData = (0, import_utils2.parseHeaders)(req);
     const onError = (e) => {
       monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${e instanceof Error ? e.name : e}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
     };
@@ -115,7 +116,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
     };
     const onBoundError = async (e) => {
-      (0, import_utils.onError)(import_utils.ErrorDigest.ERENDER, e, monitors, req);
+      (0, import_utils2.onError)(import_utils2.ErrorDigest.ERENDER, e, monitors, req);
       await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
     };
     const renderOptions = {
@@ -166,7 +167,7 @@ async function renderHandler(request, options, mode, onError) {
   let response = null;
   const { serverManifest } = options;
   const ssrByRouteIds = (_options_config_server = options.config.server) === null || _options_config_server === void 0 ? void 0 : _options_config_server.ssrByRouteIds;
-  const runtimeEnv = (0, import_utils.getRuntimeEnv)();
+  const runtimeEnv = (0, import_utils2.getRuntimeEnv)();
   if (serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0 && runtimeEnv === "node") {
     const { nestedRoutesJson } = serverManifest;
     const routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
@@ -197,7 +198,7 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  const newRes = (0, import_utils.transformResponse)(response, injectServerData(serverData));
+  const newRes = (0, import_utils2.transformResponse)(response, injectServerData(serverData));
   const { routeInfo } = options;
   applyExtendHeaders(newRes, routeInfo);
   return newRes;
@@ -208,7 +209,7 @@ async function renderHandler(request, options, mode, onError) {
   }
 }
 async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback) {
-  const query = (0, import_utils.parseQuery)(req);
+  const query = (0, import_utils2.parseQuery)(req);
   if (isSSR) {
     if (query.__loader) {
       return "data";

package/dist/cjs/plugins/render/ssrRender.js

@@ -91,7 +91,7 @@ class IncomingMessgeProxy {
   }
 }
 function createRequestHandlerConfig(userConfig) {
-  const { output, server, security, html } = userConfig;
+  const { output, server, security, html, source } = userConfig;
   return {
     ssr: server === null || server === void 0 ? void 0 : server.ssr,
     ssrByEntries: server === null || server === void 0 ? void 0 : server.ssrByEntries,
@@ -99,7 +99,9 @@ function createRequestHandlerConfig(userConfig) {
     enableInlineScripts: output === null || output === void 0 ? void 0 : output.enableInlineScripts,
     enableInlineStyles: output === null || output === void 0 ? void 0 : output.enableInlineStyles,
     crossorigin: html === null || html === void 0 ? void 0 : html.crossorigin,
-    scriptLoading: html === null || html === void 0 ? void 0 : html.scriptLoading
+    scriptLoading: html === null || html === void 0 ? void 0 : html.scriptLoading,
+    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript,
+    enableAsyncEntry: source === null || source === void 0 ? void 0 : source.enableAsyncEntry
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/entry.js

@@ -18,13 +18,18 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var entry_exports = {};
 __export(entry_exports, {
-  sortRoutes: () => sortRoutes
+  sortRoutes: () => sortRoutes,
+  uniqueKeyByRoute: () => uniqueKeyByRoute
 });
 module.exports = __toCommonJS(entry_exports);
 const sortRoutes = (route1, route2) => {
   return route2.urlPath.length - route1.urlPath.length;
 };
+const uniqueKeyByRoute = (route) => {
+  return `${route.entryName}-${route.urlPath}`;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  sortRoutes
+  sortRoutes,
+  uniqueKeyByRoute
 });

package/dist/esm/adapters/node/plugins/resource.js

@@ -3,7 +3,8 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-import { fs, LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, compatibleRequire } from "@modern-js/utils";
+import { fs, LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, compatibleRequire, isProd } from "@modern-js/utils";
+import { uniqueKeyByRoute } from "../../../utils";
 function getHtmlTemplates(pwd, routes) {
   return _getHtmlTemplates.apply(this, arguments);
 }
@@ -48,7 +49,7 @@ function _getHtmlTemplates() {
                       return [
                         2,
                         [
-                          route.entryName,
+                          uniqueKeyByRoute(route),
                           html
                         ]
                       ];
@@ -72,7 +73,7 @@ function _getHtmlTemplates() {
   });
   return _getHtmlTemplates.apply(this, arguments);
 }
-function injectTemplates(pwd, routes) {
+function injectTemplates(pwd, routes, htmlTemplatePromise) {
   return function() {
     var _ref = _async_to_generator(function(c, next) {
       var templates;
@@ -86,7 +87,7 @@ function injectTemplates(pwd, routes) {
               ];
             return [
               4,
-              getHtmlTemplates(pwd, routes)
+              htmlTemplatePromise || getHtmlTemplates(pwd, routes)
             ];
           case 1:
             templates = _state.sent();
@@ -330,16 +331,20 @@ var injectResourcePlugin = function() {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _api_useAppContext, middlewares, routes, pwd;
+            var _api_useAppContext, middlewares, routes, pwd, htmlTemplatePromise;
             return _ts_generator(this, function(_state) {
               _api_useAppContext = api.useAppContext(), middlewares = _api_useAppContext.middlewares, routes = _api_useAppContext.routes, pwd = _api_useAppContext.distDirectory;
+              if (isProd()) {
+                getServerManifest(pwd, routes || [], console);
+                htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
+              }
               middlewares.push({
                 name: "inject-server-manifest",
                 handler: injectServerManifest(pwd, routes)
               });
               middlewares.push({
                 name: "inject-html",
-                handler: injectTemplates(pwd, routes)
+                handler: injectTemplates(pwd, routes, htmlTemplatePromise)
               });
               return [
                 2

package/dist/esm/plugins/customServer/index.js

@@ -1,5 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { time } from "@modern-js/runtime-utils/time";
 import { ServerTimings } from "../../constants";
@@ -155,10 +156,10 @@ var CustomServer = /* @__PURE__ */ function() {
       };
     }();
   };
-  _proto.getServerMiddleware = function getServerMiddleware() {
+  _proto.getServerMiddleware = function getServerMiddleware(renderMiddlewares) {
     var _this = this;
     return _async_to_generator(function() {
-      var serverMiddleware;
+      var serverMiddleware, unstableMiddlewares;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -170,13 +171,20 @@ var CustomServer = /* @__PURE__ */ function() {
             serverMiddleware = _state.sent();
             if (!serverMiddleware) {
               return [
-                2
+                2,
+                renderMiddlewares
               ];
             }
             if (Array.isArray(serverMiddleware)) {
+              unstableMiddlewares = getServerMidFromUnstableMid(serverMiddleware);
+              return [
+                2,
+                _to_consumable_array(renderMiddlewares || []).concat(_to_consumable_array(unstableMiddlewares))
+              ];
+            } else if (renderMiddlewares) {
               return [
                 2,
-                getServerMidFromUnstableMid(serverMiddleware)
+                renderMiddlewares
               ];
             }
             return [
@@ -325,6 +333,9 @@ function _createMiddlewareContextFromHono() {
               set response(newRes) {
                 c.res = newRes;
               },
+              get route() {
+                return c.get("route");
+              },
               get: function get(key) {
                 return loaderContext.get(key);
               },
@@ -343,7 +354,34 @@ function _createMiddlewareContextFromHono() {
   });
   return _createMiddlewareContextFromHono.apply(this, arguments);
 }
+function injectRoute(route) {
+  return function() {
+    var _ref = _async_to_generator(function(c, next) {
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            if (route && !c.get("route")) {
+              c.set("route", route);
+            }
+            return [
+              4,
+              next()
+            ];
+          case 1:
+            _state.sent();
+            return [
+              2
+            ];
+        }
+      });
+    });
+    return function(c, next) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}
 export {
   CustomServer,
-  getServerMidFromUnstableMid
+  getServerMidFromUnstableMid,
+  injectRoute
 };

package/dist/esm/plugins/render/index.js

@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { getLoaderCtx } from "../../helper";
 import { sortRoutes } from "../../utils";
-import { CustomServer, getServerMidFromUnstableMid } from "../customServer";
+import { CustomServer, getServerMidFromUnstableMid, injectRoute } from "../customServer";
 import { initReporter } from "../monitors";
 export * from "./inject";
 var renderPlugin = function() {
@@ -13,7 +13,7 @@ var renderPlugin = function() {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _config_render, _api_useAppContext, middlewares, routes, render, pwd, serverBase, runner, config, customServer, serverMiddleware, pageRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, originUrlPath, entryName, urlPath, customServerHookMiddleware, customServerMiddleware, _tmp, err;
+            var _config_render, _api_useAppContext, middlewares, routes, render, pwd, serverBase, runner, config, customServer, serverMiddleware, pageRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, originUrlPath, _route_entryName, entryName, urlPath, customServerHookMiddleware, customServerMiddleware, err;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -33,9 +33,9 @@ var renderPlugin = function() {
                 case 1:
                   _state.trys.push([
                     1,
+                    6,
                     7,
-                    8,
-                    9
+                    8
                   ]);
                   _iterator = pageRoutes[Symbol.iterator]();
                   _state.label = 2;
@@ -43,36 +43,33 @@ var renderPlugin = function() {
                   if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
                     return [
                       3,
-                      6
+                      5
                     ];
                   route = _step.value;
-                  originUrlPath = route.urlPath, entryName = route.entryName;
+                  originUrlPath = route.urlPath, _route_entryName = route.entryName, entryName = _route_entryName === void 0 ? MAIN_ENTRY_NAME : _route_entryName;
                   urlPath = originUrlPath.endsWith("/") ? "".concat(originUrlPath, "*") : "".concat(originUrlPath, "/*");
                   middlewares.push({
                     name: "init-reporter",
-                    handler: initReporter(entryName || MAIN_ENTRY_NAME)
+                    handler: initReporter(entryName)
+                  });
+                  customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
+                  middlewares.push({
+                    name: "inject-route-info",
+                    handler: injectRoute({
+                      entryName
+                    })
                   });
-                  customServerHookMiddleware = customServer.getHookMiddleware(entryName || "main", routes);
                   middlewares.push({
                     name: "custom-server-hook",
                     path: urlPath,
                     handler: customServerHookMiddleware
                   });
-                  _tmp = serverMiddleware;
-                  if (_tmp)
-                    return [
-                      3,
-                      4
-                    ];
                   return [
                     4,
-                    customServer.getServerMiddleware()
+                    customServer.getServerMiddleware(serverMiddleware)
                   ];
                 case 3:
-                  _tmp = _state.sent();
-                  _state.label = 4;
-                case 4:
-                  customServerMiddleware = _tmp;
+                  customServerMiddleware = _state.sent();
                   customServerMiddleware && middlewares.push({
                     name: "custom-server-middleware",
                     path: urlPath,
@@ -83,27 +80,27 @@ var renderPlugin = function() {
                     path: urlPath,
                     handler: createRenderHandler(render)
                   });
-                  _state.label = 5;
-                case 5:
+                  _state.label = 4;
+                case 4:
                   _iteratorNormalCompletion = true;
                   return [
                     3,
                     2
                   ];
-                case 6:
+                case 5:
                   return [
                     3,
-                    9
+                    8
                   ];
-                case 7:
+                case 6:
                   err = _state.sent();
                   _didIteratorError = true;
                   _iteratorError = err;
                   return [
                     3,
-                    9
+                    8
                   ];
-                case 8:
+                case 7:
                   try {
                     if (!_iteratorNormalCompletion && _iterator.return != null) {
                       _iterator.return();
@@ -116,7 +113,7 @@ var renderPlugin = function() {
                   return [
                     7
                   ];
-                case 9:
+                case 8:
                   return [
                     2
                   ];

package/dist/esm/plugins/render/render.js

@@ -9,6 +9,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
+import { uniqueKeyByRoute } from "../../utils";
 import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
@@ -113,7 +114,7 @@ function _createRender() {
                       })
                     ];
                   }
-                  html = templates[routeInfo.entryName];
+                  html = templates[uniqueKeyByRoute(routeInfo)];
                   if (!html) {
                     return [
                       2,

package/dist/esm/plugins/render/ssrRender.js

@@ -115,7 +115,7 @@ var IncomingMessgeProxy = function IncomingMessgeProxy2(req) {
   this.url = getPathname(req);
 };
 function createRequestHandlerConfig(userConfig) {
-  var output = userConfig.output, server = userConfig.server, security = userConfig.security, html = userConfig.html;
+  var output = userConfig.output, server = userConfig.server, security = userConfig.security, html = userConfig.html, source = userConfig.source;
   return {
     ssr: server === null || server === void 0 ? void 0 : server.ssr,
     ssrByEntries: server === null || server === void 0 ? void 0 : server.ssrByEntries,
@@ -123,7 +123,9 @@ function createRequestHandlerConfig(userConfig) {
     enableInlineScripts: output === null || output === void 0 ? void 0 : output.enableInlineScripts,
     enableInlineStyles: output === null || output === void 0 ? void 0 : output.enableInlineStyles,
     crossorigin: html === null || html === void 0 ? void 0 : html.crossorigin,
-    scriptLoading: html === null || html === void 0 ? void 0 : html.scriptLoading
+    scriptLoading: html === null || html === void 0 ? void 0 : html.scriptLoading,
+    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript,
+    enableAsyncEntry: source === null || source === void 0 ? void 0 : source.enableAsyncEntry
   };
 }
 export {

package/dist/esm/utils/entry.js

@@ -1,6 +1,10 @@
 var sortRoutes = function(route1, route2) {
   return route2.urlPath.length - route1.urlPath.length;
 };
+var uniqueKeyByRoute = function(route) {
+  return "".concat(route.entryName, "-").concat(route.urlPath);
+};
 export {
-  sortRoutes
+  sortRoutes,
+  uniqueKeyByRoute
 };

package/dist/esm-node/adapters/node/plugins/resource.js

@@ -1,6 +1,7 @@
 import path from "path";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-import { fs, LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, compatibleRequire } from "@modern-js/utils";
+import { fs, LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, compatibleRequire, isProd } from "@modern-js/utils";
+import { uniqueKeyByRoute } from "../../../utils";
 async function getHtmlTemplates(pwd, routes) {
   const htmls = await Promise.all(routes.map(async (route) => {
     let html;
@@ -11,17 +12,17 @@ async function getHtmlTemplates(pwd, routes) {
     } catch (e) {
     }
     return [
-      route.entryName,
+      uniqueKeyByRoute(route),
       html
     ];
   }) || []);
   const templates = Object.fromEntries(htmls);
   return templates;
 }
-function injectTemplates(pwd, routes) {
+function injectTemplates(pwd, routes, htmlTemplatePromise) {
   return async (c, next) => {
     if (routes && !c.get("templates")) {
-      const templates = await getHtmlTemplates(pwd, routes);
+      const templates = await (htmlTemplatePromise || getHtmlTemplates(pwd, routes));
       c.set("templates", templates);
     }
     await next();
@@ -81,13 +82,18 @@ const injectResourcePlugin = () => ({
     return {
       async prepare() {
         const { middlewares, routes, distDirectory: pwd } = api.useAppContext();
+        let htmlTemplatePromise;
+        if (isProd()) {
+          getServerManifest(pwd, routes || [], console);
+          htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
+        }
         middlewares.push({
           name: "inject-server-manifest",
           handler: injectServerManifest(pwd, routes)
         });
         middlewares.push({
           name: "inject-html",
-          handler: injectTemplates(pwd, routes)
+          handler: injectTemplates(pwd, routes, htmlTemplatePromise)
         });
       }
     };

package/dist/esm-node/plugins/customServer/index.js

@@ -71,13 +71,19 @@ class CustomServer {
       }
     };
   }
-  async getServerMiddleware() {
+  async getServerMiddleware(renderMiddlewares) {
     const serverMiddleware = await this.serverMiddlewarePromise;
     if (!serverMiddleware) {
-      return;
+      return renderMiddlewares;
     }
     if (Array.isArray(serverMiddleware)) {
-      return getServerMidFromUnstableMid(serverMiddleware);
+      const unstableMiddlewares = getServerMidFromUnstableMid(serverMiddleware);
+      return [
+        ...renderMiddlewares || [],
+        ...unstableMiddlewares
+      ];
+    } else if (renderMiddlewares) {
+      return renderMiddlewares;
     }
     return async (c, next) => {
       var _c_env_node_res, _c_env_node, _c_env;
@@ -165,6 +171,9 @@ async function createMiddlewareContextFromHono(c) {
     set response(newRes) {
       c.res = newRes;
     },
+    get route() {
+      return c.get("route");
+    },
     get(key) {
       return loaderContext.get(key);
     },
@@ -178,7 +187,16 @@ async function createMiddlewareContextFromHono(c) {
     redirect: c.redirect.bind(c)
   };
 }
+function injectRoute(route) {
+  return async (c, next) => {
+    if (route && !c.get("route")) {
+      c.set("route", route);
+    }
+    await next();
+  };
+}
 export {
   CustomServer,
-  getServerMidFromUnstableMid
+  getServerMidFromUnstableMid,
+  injectRoute
 };

package/dist/esm-node/plugins/render/index.js

@@ -1,7 +1,7 @@
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { getLoaderCtx } from "../../helper";
 import { sortRoutes } from "../../utils";
-import { CustomServer, getServerMidFromUnstableMid } from "../customServer";
+import { CustomServer, getServerMidFromUnstableMid, injectRoute } from "../customServer";
 import { initReporter } from "../monitors";
 export * from "./inject";
 const renderPlugin = () => ({
@@ -20,19 +20,25 @@ const renderPlugin = () => ({
         const serverMiddleware = ((_config_render = config.render) === null || _config_render === void 0 ? void 0 : _config_render.middleware) && getServerMidFromUnstableMid(config.render.middleware);
         const pageRoutes = getPageRoutes(routes);
         for (const route of pageRoutes) {
-          const { urlPath: originUrlPath, entryName } = route;
+          const { urlPath: originUrlPath, entryName = MAIN_ENTRY_NAME } = route;
           const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
           middlewares.push({
             name: "init-reporter",
-            handler: initReporter(entryName || MAIN_ENTRY_NAME)
+            handler: initReporter(entryName)
+          });
+          const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
+          middlewares.push({
+            name: "inject-route-info",
+            handler: injectRoute({
+              entryName
+            })
           });
-          const customServerHookMiddleware = customServer.getHookMiddleware(entryName || "main", routes);
           middlewares.push({
             name: "custom-server-hook",
             path: urlPath,
             handler: customServerHookMiddleware
           });
-          const customServerMiddleware = serverMiddleware || await customServer.getServerMiddleware();
+          const customServerMiddleware = await customServer.getServerMiddleware(serverMiddleware);
           customServerMiddleware && middlewares.push({
             name: "custom-server-middleware",
             path: urlPath,

package/dist/esm-node/plugins/render/render.js

@@ -1,6 +1,7 @@
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
+import { uniqueKeyByRoute } from "../../utils";
 import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
@@ -64,7 +65,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         }
       });
     }
-    const html = templates[routeInfo.entryName];
+    const html = templates[uniqueKeyByRoute(routeInfo)];
     if (!html) {
       return new Response(createErrorHtml(404), {
         status: 404,

package/dist/esm-node/plugins/render/ssrRender.js

@@ -68,7 +68,7 @@ class IncomingMessgeProxy {
   }
 }
 function createRequestHandlerConfig(userConfig) {
-  const { output, server, security, html } = userConfig;
+  const { output, server, security, html, source } = userConfig;
   return {
     ssr: server === null || server === void 0 ? void 0 : server.ssr,
     ssrByEntries: server === null || server === void 0 ? void 0 : server.ssrByEntries,
@@ -76,7 +76,9 @@ function createRequestHandlerConfig(userConfig) {
     enableInlineScripts: output === null || output === void 0 ? void 0 : output.enableInlineScripts,
     enableInlineStyles: output === null || output === void 0 ? void 0 : output.enableInlineStyles,
     crossorigin: html === null || html === void 0 ? void 0 : html.crossorigin,
-    scriptLoading: html === null || html === void 0 ? void 0 : html.scriptLoading
+    scriptLoading: html === null || html === void 0 ? void 0 : html.scriptLoading,
+    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript,
+    enableAsyncEntry: source === null || source === void 0 ? void 0 : source.enableAsyncEntry
   };
 }
 export {

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

@@ -1,6 +1,10 @@
 const sortRoutes = (route1, route2) => {
   return route2.urlPath.length - route1.urlPath.length;
 };
+const uniqueKeyByRoute = (route) => {
+  return `${route.entryName}-${route.urlPath}`;
+};
 export {
-  sortRoutes
+  sortRoutes,
+  uniqueKeyByRoute
 };

package/dist/types/adapters/node/plugins/resource.d.ts

@@ -1,7 +1,7 @@
 import type { Logger, ServerRoute } from '@modern-js/types';
 import type { Middleware, ServerEnv, ServerManifest, ServerPlugin } from '../../../types';
 export declare function getHtmlTemplates(pwd: string, routes: ServerRoute[]): Promise<Record<string, string>>;
-export declare function injectTemplates(pwd: string, routes?: ServerRoute[]): Middleware<ServerEnv>;
+export declare function injectTemplates(pwd: string, routes?: ServerRoute[], htmlTemplatePromise?: ReturnType<typeof getHtmlTemplates>): Middleware<ServerEnv>;
 export declare function getServerManifest(pwd: string, routes: ServerRoute[], logger: Logger): Promise<ServerManifest>;
 export declare function injectServerManifest(pwd: string, routes?: ServerRoute[]): Middleware<ServerEnv>;
 export declare const injectResourcePlugin: () => ServerPlugin;

package/dist/types/plugins/customServer/index.d.ts

@@ -8,6 +8,9 @@ export declare class CustomServer {
     private serverBase;
     constructor(runner: ServerHookRunner, serverBase: ServerBase, pwd: string);
     getHookMiddleware(entryName: string, routes: ServerRoute[]): Middleware<ServerEnv>;
-    getServerMiddleware(): Promise<Middleware<ServerNodeEnv & ServerEnv> | Array<Middleware<ServerNodeEnv & ServerEnv>> | undefined>;
+    getServerMiddleware(renderMiddlewares?: Middleware<ServerNodeEnv & ServerEnv>[]): Promise<Middleware<ServerNodeEnv & ServerEnv> | Array<Middleware<ServerNodeEnv & ServerEnv>> | undefined>;
 }
 export declare function getServerMidFromUnstableMid(serverMiddleware: UnstableMiddleware[]): Array<Middleware<ServerNodeEnv & ServerEnv>>;
+export declare function injectRoute(route: {
+    entryName: string;
+}): Middleware<ServerEnv>;

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

@@ -27,10 +27,13 @@ export interface ServerUserConfig {
     ssrByEntries?: SSRByEntries;
     baseUrl?: string | string[];
     port?: number;
-    enableMicroFrontendDebug?: boolean;
     watchOptions?: WatchOptions;
     compiler?: 'babel' | 'typescript';
-    enableFrameworkExt?: boolean;
+    /**
+     * @description use json script tag instead of inline script
+     * @default false
+     */
+    useJsonScript?: boolean;
 }
 export type ServerNormalizedConfig = ServerUserConfig;
 export {};

package/dist/types/types/config/source.d.ts

@@ -2,5 +2,6 @@ import type { Alias } from '@modern-js/utils';
 import type { ConfigChain } from './share';
 export interface SourceUserConfig {
     alias?: ConfigChain<Alias>;
+    enableAsyncEntry?: boolean;
 }
 export type SourceNormalizedConfig = SourceUserConfig;

package/dist/types/types/requestHandler.d.ts

@@ -1,5 +1,5 @@
 import type { Logger, Metrics, Reporter, ServerRoute } from '@modern-js/types';
-import type { ServerUserConfig } from './config';
+import type { ServerUserConfig, SourceUserConfig } from './config';
 export type Resource = {
     loadableStats: Record<string, any>;
     routeManifest: Record<string, any>;
@@ -16,6 +16,8 @@ export type RequestHandlerConfig = {
     enableInlineScripts?: boolean | RegExp;
     ssr?: ServerUserConfig['ssr'];
     ssrByEntries?: ServerUserConfig['ssrByEntries'];
+    useJsonScript?: ServerUserConfig['useJsonScript'];
+    enableAsyncEntry?: SourceUserConfig['enableAsyncEntry'];
 };
 export type LoaderContext = Map<string, any>;
 export type OnError = (err: unknown) => void;

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

@@ -43,6 +43,10 @@ type ServerVariables = {
      * Custom by ssrRuntime.
      */
     locals?: Record<string, any>;
+    /**
+     * The current matched route, now only expose entryName field.
+     */
+    route: Required<Pick<ServerRoute, 'entryName'>>;
 };
 export type ServerEnv = {
     Variables: ServerVariables;

package/dist/types/utils/entry.d.ts

@@ -1,2 +1,3 @@
 import type { ServerRoute } from '@modern-js/types';
 export declare const sortRoutes: (route1: ServerRoute, route2: ServerRoute) => number;
+export declare const uniqueKeyByRoute: (route: ServerRoute) => string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.1",
+  "version": "2.63.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -53,9 +53,9 @@
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/runtime-utils": "2.63.1",
-    "@modern-js/plugin": "2.63.1",
-    "@modern-js/utils": "2.63.1"
+    "@modern-js/runtime-utils": "2.63.3",
+    "@modern-js/utils": "2.63.3",
+    "@modern-js/plugin": "2.63.3"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.63.1",
-    "@scripts/build": "2.63.1",
-    "@scripts/jest-config": "2.63.1"
+    "@scripts/build": "2.63.3",
+    "@scripts/jest-config": "2.63.3",
+    "@modern-js/types": "2.63.3"
   },
   "sideEffects": false,
   "publishConfig": {