@modern-js/server-core 2.63.2 → 2.63.4

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

@@ -56,10 +56,10 @@ async function getHtmlTemplates(pwd, routes) {
   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();
@@ -119,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/render/render.js

@@ -158,12 +158,6 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
 }
 async function renderHandler(request, options, mode, onError) {
   var _options_config_server;
-  const serverData = {
-    router: {
-      baseUrl: options.routeInfo.urlPath,
-      params: options.params
-    }
-  };
   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;
@@ -198,10 +192,9 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  const newRes = (0, import_utils2.transformResponse)(response, injectServerData(serverData));
   const { routeInfo } = options;
-  applyExtendHeaders(newRes, routeInfo);
-  return newRes;
+  applyExtendHeaders(response, routeInfo);
+  return response;
   function applyExtendHeaders(r, route) {
     Object.entries(route.responseHeaders || {}).forEach(([k, v]) => {
       r.headers.set(k, v);
@@ -236,12 +229,6 @@ function csrRender(html) {
     })
   });
 }
-function injectServerData(serverData) {
-  const { head } = import_constants.REPLACE_REG.before;
-  const searchValue = new RegExp(head);
-  const replcaeCb = (beforeHead) => `${beforeHead}<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(serverData)}</script>`;
-  return (template) => template.replace(searchValue, replcaeCb);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createRender

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

@@ -23,8 +23,9 @@ __export(ssrCache_exports, {
 });
 module.exports = __toCommonJS(ssrCache_exports);
 var import_storer = require("@modern-js/runtime-utils/storer");
+var import_utils = require("@modern-js/utils");
 var import_constants = require("../../constants");
-var import_utils = require("../../utils");
+var import_utils2 = require("../../utils");
 const ZERO_RENDER_LEVEL = /"renderLevel":0/;
 const NO_SSR_CACHE = /<meta\s+[^>]*name=["']no-ssr-cache["'][^>]*>/i;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {
@@ -32,7 +33,7 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
   const { onError } = requestHandlerOptions;
   const decoder = new TextDecoder();
   if (response.body) {
-    const stream = (0, import_utils.createTransformStream)();
+    const stream = (0, import_utils2.createTransformStream)();
     const reader = response.body.getReader();
     const writer = stream.writable.getWriter();
     let html = "";
@@ -77,9 +78,9 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
 const CACHE_NAMESPACE = "__ssr__cache";
 const storage = (0, import_storer.createMemoryStorage)(CACHE_NAMESPACE);
 function computedKey(req, cacheControl) {
-  const pathname = (0, import_utils.getPathname)(req);
+  const pathname = (0, import_utils2.getPathname)(req);
   const { customKey } = cacheControl;
-  const defaultKey = pathname.replace(/.+\/+$/, "");
+  const defaultKey = pathname === "/" ? pathname : (0, import_utils.removeTailSlash)(pathname);
   if (customKey) {
     if (typeof customKey === "string") {
       return customKey;

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,
@@ -100,7 +100,8 @@ function createRequestHandlerConfig(userConfig) {
     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,
-    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript
+    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/esm/adapters/node/plugins/resource.js

@@ -3,7 +3,7 @@ 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);
@@ -73,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;
@@ -87,7 +87,7 @@ function injectTemplates(pwd, routes) {
               ];
             return [
               4,
-              getHtmlTemplates(pwd, routes)
+              htmlTemplatePromise || getHtmlTemplates(pwd, routes)
             ];
           case 1:
             templates = _state.sent();
@@ -331,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/render/render.js

@@ -8,9 +8,9 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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 { X_MODERNJS_RENDER } from "../../constants";
 import { uniqueKeyByRoute } from "../../utils";
-import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
+import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
 var DYNAMIC_ROUTE_REG = /\/:./;
@@ -264,7 +264,7 @@ function renderHandler(request, options, mode, onError) {
 }
 function _renderHandler() {
   _renderHandler = _async_to_generator(function(request, options, mode, onError) {
-    var _options_config_server, serverData, response, serverManifest, ssrByRouteIds, runtimeEnv, nestedRoutesJson, routes, urlPath, pathToFileURL, matchRoutes, url, matchedRoutes, _lastMatch_route, lastMatch, e, newRes, routeInfo;
+    var _options_config_server, response, serverManifest, ssrByRouteIds, runtimeEnv, nestedRoutesJson, routes, urlPath, pathToFileURL, matchRoutes, url, matchedRoutes, _lastMatch_route, lastMatch, e, routeInfo;
     function applyExtendHeaders(r, route) {
       Object.entries(route.responseHeaders || {}).forEach(function(param) {
         var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
@@ -274,12 +274,6 @@ function _renderHandler() {
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          serverData = {
-            router: {
-              baseUrl: options.routeInfo.urlPath,
-              params: options.params
-            }
-          };
           response = null;
           serverManifest = options.serverManifest;
           ssrByRouteIds = (_options_config_server = options.config.server) === null || _options_config_server === void 0 ? void 0 : _options_config_server.ssrByRouteIds;
@@ -367,12 +361,11 @@ function _renderHandler() {
           response = csrRender(options.html);
           _state.label = 10;
         case 10:
-          newRes = transformResponse(response, injectServerData(serverData));
           routeInfo = options.routeInfo;
-          applyExtendHeaders(newRes, routeInfo);
+          applyExtendHeaders(response, routeInfo);
           return [
             2,
-            newRes
+            response
           ];
       }
     });
@@ -460,16 +453,6 @@ function csrRender(html) {
     }, X_MODERNJS_RENDER, "client"))
   });
 }
-function injectServerData(serverData) {
-  var head = REPLACE_REG.before.head;
-  var searchValue = new RegExp(head);
-  var replcaeCb = function(beforeHead) {
-    return "".concat(beforeHead, '<script type="application/json" id="__MODERN_SERVER_DATA__">').concat(JSON.stringify(serverData), "</script>");
-  };
-  return function(template) {
-    return template.replace(searchValue, replcaeCb);
-  };
-}
 export {
   createRender
 };

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

@@ -4,6 +4,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createMemoryStorage } from "@modern-js/runtime-utils/storer";
+import { removeTailSlash } from "@modern-js/utils";
 import { X_RENDER_CACHE } from "../../constants";
 import { createTransformStream, getPathname } from "../../utils";
 var ZERO_RENDER_LEVEL = /"renderLevel":0/;
@@ -87,7 +88,7 @@ var storage = createMemoryStorage(CACHE_NAMESPACE);
 function computedKey(req, cacheControl) {
   var pathname = getPathname(req);
   var customKey = cacheControl.customKey;
-  var defaultKey = pathname.replace(/.+\/+$/, "");
+  var defaultKey = pathname === "/" ? pathname : removeTailSlash(pathname);
   if (customKey) {
     if (typeof customKey === "string") {
       return customKey;

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,
@@ -124,7 +124,8 @@ function createRequestHandlerConfig(userConfig) {
     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,
-    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript
+    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/adapters/node/plugins/resource.js

@@ -1,6 +1,6 @@
 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) => {
@@ -19,10 +19,10 @@ async function getHtmlTemplates(pwd, routes) {
   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();
@@ -82,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/render/render.js

@@ -1,8 +1,8 @@
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
-import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
+import { X_MODERNJS_RENDER } from "../../constants";
 import { uniqueKeyByRoute } from "../../utils";
-import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
+import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -125,12 +125,6 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
 }
 async function renderHandler(request, options, mode, onError) {
   var _options_config_server;
-  const serverData = {
-    router: {
-      baseUrl: options.routeInfo.urlPath,
-      params: options.params
-    }
-  };
   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;
@@ -165,10 +159,9 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  const newRes = transformResponse(response, injectServerData(serverData));
   const { routeInfo } = options;
-  applyExtendHeaders(newRes, routeInfo);
-  return newRes;
+  applyExtendHeaders(response, routeInfo);
+  return response;
   function applyExtendHeaders(r, route) {
     Object.entries(route.responseHeaders || {}).forEach(([k, v]) => {
       r.headers.set(k, v);
@@ -203,12 +196,6 @@ function csrRender(html) {
     })
   });
 }
-function injectServerData(serverData) {
-  const { head } = REPLACE_REG.before;
-  const searchValue = new RegExp(head);
-  const replcaeCb = (beforeHead) => `${beforeHead}<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(serverData)}</script>`;
-  return (template) => template.replace(searchValue, replcaeCb);
-}
 export {
   createRender
 };

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

@@ -1,4 +1,5 @@
 import { createMemoryStorage } from "@modern-js/runtime-utils/storer";
+import { removeTailSlash } from "@modern-js/utils";
 import { X_RENDER_CACHE } from "../../constants";
 import { createTransformStream, getPathname } from "../../utils";
 const ZERO_RENDER_LEVEL = /"renderLevel":0/;
@@ -55,7 +56,7 @@ const storage = createMemoryStorage(CACHE_NAMESPACE);
 function computedKey(req, cacheControl) {
   const pathname = getPathname(req);
   const { customKey } = cacheControl;
-  const defaultKey = pathname.replace(/.+\/+$/, "");
+  const defaultKey = pathname === "/" ? pathname : removeTailSlash(pathname);
   if (customKey) {
     if (typeof customKey === "string") {
       return customKey;

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,
@@ -77,7 +77,8 @@ function createRequestHandlerConfig(userConfig) {
     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,
-    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript
+    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript,
+    enableAsyncEntry: source === null || source === void 0 ? void 0 : source.enableAsyncEntry
   };
 }
 export {

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/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>;
@@ -17,6 +17,7 @@ export type RequestHandlerConfig = {
     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/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.2",
+  "version": "2.63.4",
   "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.2",
-    "@modern-js/plugin": "2.63.2",
-    "@modern-js/utils": "2.63.2"
+    "@modern-js/plugin": "2.63.4",
+    "@modern-js/runtime-utils": "2.63.4",
+    "@modern-js/utils": "2.63.4"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@scripts/build": "2.63.2",
-    "@modern-js/types": "2.63.2",
-    "@scripts/jest-config": "2.63.2"
+    "@modern-js/types": "2.63.4",
+    "@scripts/build": "2.63.4",
+    "@scripts/jest-config": "2.63.4"
   },
   "sideEffects": false,
   "publishConfig": {