@modern-js/server-core 2.63.2 → 2.63.3

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/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/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/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.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.2",
-    "@modern-js/plugin": "2.63.2",
-    "@modern-js/utils": "2.63.2"
+    "@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",
-    "@scripts/build": "2.63.2",
-    "@modern-js/types": "2.63.2",
-    "@scripts/jest-config": "2.63.2"
+    "@scripts/build": "2.63.3",
+    "@scripts/jest-config": "2.63.3",
+    "@modern-js/types": "2.63.3"
   },
   "sideEffects": false,
   "publishConfig": {