@modern-js/server-core 2.68.0 → 2.68.1

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

@@ -0,0 +1,78 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var csrRscRender_exports = {};
+__export(csrRscRender_exports, {
+  csrRscRender: () => csrRscRender
+});
+module.exports = __toCommonJS(csrRscRender_exports);
+var import_constants = require("@modern-js/utils/universal/constants");
+var import_utils = require("./utils");
+const csrRscRender = async (req, options) => {
+  var _serverManifest_renderBundles;
+  const { routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, logger, metrics, onError, onTiming, staticGenerate, html } = options;
+  const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
+  const loadableStats = serverManifest.loadableStats || {};
+  const routeManifest = serverManifest.routeManifest || {};
+  const config = (0, import_utils.createRequestHandlerConfig)(options.config);
+  const requestHandlerOptions = {
+    resource: {
+      route: routeInfo,
+      loadableStats,
+      routeManifest,
+      entryName: routeInfo.entryName || import_constants.MAIN_ENTRY_NAME
+    },
+    config,
+    params,
+    loaderContext,
+    html,
+    rscSSRManifest,
+    rscClientManifest,
+    rscServerManifest,
+    locals,
+    reporter,
+    staticGenerate,
+    logger,
+    metrics,
+    monitors,
+    onError,
+    onTiming
+  };
+  if (!serverBundle) {
+    return new Response("Cannot find server bundle for RSC", {
+      status: 500
+    });
+  }
+  const renderRscStreamHandler = await serverBundle.renderRscStreamHandler;
+  if (!renderRscStreamHandler) {
+    return new Response("Cannot find render handler for RSC", {
+      status: 500
+    });
+  }
+  if (!rscClientManifest) {
+    return new Response("Cannot find rsc client manifest", {
+      status: 500
+    });
+  }
+  const response = await renderRscStreamHandler(req, requestHandlerOptions);
+  return response;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  csrRscRender
+});

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

@@ -36,6 +36,7 @@ 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_csrRscRender = require("./csrRscRender");
 var import_dataHandler = require("./dataHandler");
 var import_renderRscHandler = require("./renderRscHandler");
 var import_serverActionHandler = require("./serverActionHandler");
@@ -193,12 +194,12 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
       const url = new URL(request.url);
       const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
       if (!matchedRoutes) {
-        response = csrRender(options.html);
+        response = await csrRender(request, options);
       } else {
         var _lastMatch_route;
         const lastMatch = matchedRoutes[matchedRoutes.length - 1];
         if (!(lastMatch === null || lastMatch === void 0 ? void 0 : (_lastMatch_route = lastMatch.route) === null || _lastMatch_route === void 0 ? void 0 : _lastMatch_route.id) || !ssrByRouteIds.includes(lastMatch.route.id)) {
-          response = csrRender(options.html);
+          response = await csrRender(request, options);
         }
       }
     }
@@ -209,14 +210,17 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
     } catch (e) {
       options.onError(e, import_utils2.ErrorDigest.ERENDER);
       await fallbackWrapper("error", e);
-      response = csrRender(injectFallbackReasonToHtml({
-        html: options.html,
-        reason: "error",
-        framework
-      }));
+      response = await csrRender(request, {
+        ...options,
+        html: injectFallbackReasonToHtml({
+          html: options.html,
+          reason: "error",
+          framework
+        })
+      });
     }
   } else {
-    response = csrRender(options.html);
+    response = await csrRender(request, options);
   }
   const { routeInfo } = options;
   applyExtendHeaders(response, routeInfo);
@@ -261,14 +265,19 @@ function injectFallbackReasonToHtml({ html, reason, framework }) {
   })}</script>`;
   return html.replace(/<\/head>/, `${tag}</head>`);
 }
-function csrRender(html) {
-  return new Response(html, {
-    status: 200,
-    headers: new Headers({
-      "content-type": "text/html; charset=UTF-8",
-      [import_constants.X_MODERNJS_RENDER]: "client"
-    })
-  });
+async function csrRender(request, options) {
+  const { html, rscClientManifest } = options;
+  if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA) {
+    return new Response(html, {
+      status: 200,
+      headers: new Headers({
+        "content-type": "text/html; charset=UTF-8",
+        [import_constants.X_MODERNJS_RENDER]: "client"
+      })
+    });
+  } else {
+    return (0, import_csrRscRender.csrRscRender)(request, options);
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -22,16 +22,43 @@ __export(renderRscHandler_exports, {
 });
 module.exports = __toCommonJS(renderRscHandler_exports);
 var import_constants = require("@modern-js/utils/universal/constants");
-const renderRscHandler = async (req, { serverManifest, routeInfo, rscClientManifest }) => {
+var import_utils = require("./utils");
+const renderRscHandler = async (req, options) => {
   var _serverManifest_renderBundles;
+  const { routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, logger, metrics, onError, onTiming, staticGenerate } = options;
   const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
+  const loadableStats = serverManifest.loadableStats || {};
+  const routeManifest = serverManifest.routeManifest || {};
+  const config = (0, import_utils.createRequestHandlerConfig)(options.config);
+  const requestHandlerOptions = {
+    resource: {
+      route: routeInfo,
+      loadableStats,
+      routeManifest,
+      entryName: routeInfo.entryName || import_constants.MAIN_ENTRY_NAME
+    },
+    config,
+    params,
+    loaderContext,
+    rscSSRManifest,
+    rscClientManifest,
+    rscServerManifest,
+    locals,
+    reporter,
+    staticGenerate,
+    logger,
+    metrics,
+    monitors,
+    onError,
+    onTiming
+  };
   if (!serverBundle) {
     return new Response("Cannot find server bundle for RSC", {
       status: 500
     });
   }
-  const { rscRequestHandler } = serverBundle;
-  if (!rscRequestHandler) {
+  const rscPayloadHandler = await serverBundle.rscPayloadHandler;
+  if (!rscPayloadHandler) {
     return new Response("Cannot find request handler for RSC", {
       status: 500
     });
@@ -41,9 +68,7 @@ const renderRscHandler = async (req, { serverManifest, routeInfo, rscClientManif
       status: 500
     });
   }
-  return rscRequestHandler({
-    clientManifest: rscClientManifest
-  });
+  return rscPayloadHandler(req, requestHandlerOptions);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -25,6 +25,7 @@ var import_constants = require("@modern-js/utils/universal/constants");
 var import_constants2 = require("../../constants");
 var import_utils = require("../../utils");
 var import_ssrCache = require("./ssrCache");
+var import_utils2 = require("./utils");
 const SERVER_RUNTIME_ENTRY = "requestHandler";
 async function ssrRender(request, { routeInfo, html, config: userConfig, staticGenerate, nodeReq, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, cacheConfig, logger, metrics, onError, onTiming }) {
   var _serverManifest_renderBundles;
@@ -44,7 +45,7 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
     throw new Error(`Can't find renderBundle ${entryName || import_constants.MAIN_ENTRY_NAME}`);
   }
   const requestHandler = await renderBundle[SERVER_RUNTIME_ENTRY];
-  const config = createRequestHandlerConfig(userConfig);
+  const config = (0, import_utils2.createRequestHandlerConfig)(userConfig);
   const requestHandlerOptions = {
     resource: {
       route: routeInfo,
@@ -94,20 +95,6 @@ class IncomingMessgeProxy {
     this.url = (0, import_utils.getPathname)(req);
   }
 }
-function createRequestHandlerConfig(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,
-    nonce: security === null || security === void 0 ? void 0 : security.nonce,
-    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,
-    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:
 0 && (module.exports = {
   ssrRender

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

@@ -0,0 +1,41 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  createRequestHandlerConfig: () => createRequestHandlerConfig
+});
+module.exports = __toCommonJS(utils_exports);
+function createRequestHandlerConfig(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,
+    nonce: security === null || security === void 0 ? void 0 : security.nonce,
+    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,
+    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:
+0 && (module.exports = {
+  createRequestHandlerConfig
+});

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

@@ -0,0 +1,88 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
+import { createRequestHandlerConfig } from "./utils";
+var csrRscRender = function() {
+  var _ref = _async_to_generator(function(req, options) {
+    var _serverManifest_renderBundles, routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, logger, metrics, onError, onTiming, staticGenerate, html, serverBundle, loadableStats, routeManifest, config, requestHandlerOptions, renderRscStreamHandler, response;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          routeInfo = options.routeInfo, serverManifest = options.serverManifest, rscSSRManifest = options.rscSSRManifest, rscClientManifest = options.rscClientManifest, rscServerManifest = options.rscServerManifest, locals = options.locals, params = options.params, loaderContext = options.loaderContext, reporter = options.reporter, monitors = options.monitors, logger = options.logger, metrics = options.metrics, onError = options.onError, onTiming = options.onTiming, staticGenerate = options.staticGenerate, html = options.html;
+          serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || MAIN_ENTRY_NAME];
+          loadableStats = serverManifest.loadableStats || {};
+          routeManifest = serverManifest.routeManifest || {};
+          config = createRequestHandlerConfig(options.config);
+          requestHandlerOptions = {
+            resource: {
+              route: routeInfo,
+              loadableStats,
+              routeManifest,
+              entryName: routeInfo.entryName || MAIN_ENTRY_NAME
+            },
+            config,
+            params,
+            loaderContext,
+            html,
+            rscSSRManifest,
+            rscClientManifest,
+            rscServerManifest,
+            locals,
+            reporter,
+            staticGenerate,
+            logger,
+            metrics,
+            monitors,
+            onError,
+            onTiming
+          };
+          if (!serverBundle) {
+            return [
+              2,
+              new Response("Cannot find server bundle for RSC", {
+                status: 500
+              })
+            ];
+          }
+          return [
+            4,
+            serverBundle.renderRscStreamHandler
+          ];
+        case 1:
+          renderRscStreamHandler = _state.sent();
+          if (!renderRscStreamHandler) {
+            return [
+              2,
+              new Response("Cannot find render handler for RSC", {
+                status: 500
+              })
+            ];
+          }
+          if (!rscClientManifest) {
+            return [
+              2,
+              new Response("Cannot find rsc client manifest", {
+                status: 500
+              })
+            ];
+          }
+          return [
+            4,
+            renderRscStreamHandler(req, requestHandlerOptions)
+          ];
+        case 2:
+          response = _state.sent();
+          return [
+            2,
+            response
+          ];
+      }
+    });
+  });
+  return function csrRscRender2(req, options) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export {
+  csrRscRender
+};

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

@@ -11,6 +11,7 @@ import { TrieRouter } from "hono/router/trie-router";
 import { X_MODERNJS_RENDER } from "../../constants";
 import { uniqueKeyByRoute } from "../../utils";
 import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes } from "../../utils";
+import { csrRscRender } from "./csrRscRender";
 import { dataHandler } from "./dataHandler";
 import { renderRscHandler } from "./renderRscHandler";
 import { serverActionHandler } from "./serverActionHandler";
@@ -313,14 +314,14 @@ function _renderHandler() {
           if (!(serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0 && runtimeEnv === "node"))
             return [
               3,
-              3
+              6
             ];
           nestedRoutesJson = serverManifest.nestedRoutesJson;
           routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
           if (!routes)
             return [
               3,
-              3
+              6
             ];
           urlPath = "node:url";
           return [
@@ -337,67 +338,98 @@ function _renderHandler() {
           matchRoutes = _state.sent().matchRoutes;
           url = new URL(request.url);
           matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
-          if (!matchedRoutes) {
-            response = csrRender(options.html);
-          } else {
-            ;
-            lastMatch = matchedRoutes[matchedRoutes.length - 1];
-            if (!(lastMatch === null || lastMatch === void 0 ? void 0 : (_lastMatch_route = lastMatch.route) === null || _lastMatch_route === void 0 ? void 0 : _lastMatch_route.id) || !ssrByRouteIds.includes(lastMatch.route.id)) {
-              response = csrRender(options.html);
-            }
-          }
-          _state.label = 3;
+          if (!!matchedRoutes)
+            return [
+              3,
+              4
+            ];
+          return [
+            4,
+            csrRender(request, options)
+          ];
         case 3:
+          response = _state.sent();
+          return [
+            3,
+            6
+          ];
+        case 4:
+          lastMatch = matchedRoutes[matchedRoutes.length - 1];
+          if (!(!(lastMatch === null || lastMatch === void 0 ? void 0 : (_lastMatch_route = lastMatch.route) === null || _lastMatch_route === void 0 ? void 0 : _lastMatch_route.id) || !ssrByRouteIds.includes(lastMatch.route.id)))
+            return [
+              3,
+              6
+            ];
+          return [
+            4,
+            csrRender(request, options)
+          ];
+        case 5:
+          response = _state.sent();
+          _state.label = 6;
+        case 6:
           if (!(mode === "ssr" && !response))
             return [
               3,
-              9
+              13
             ];
-          _state.label = 4;
-        case 4:
+          _state.label = 7;
+        case 7:
           _state.trys.push([
-            4,
-            6,
+            7,
+            9,
             ,
-            8
+            12
           ]);
           return [
             4,
             ssrRender(request, options)
           ];
-        case 5:
+        case 8:
           response = _state.sent();
           return [
             3,
-            8
+            12
           ];
-        case 6:
+        case 9:
           e = _state.sent();
           options.onError(e, ErrorDigest.ERENDER);
           return [
             4,
             fallbackWrapper("error", e)
           ];
-        case 7:
+        case 10:
           _state.sent();
-          response = csrRender(injectFallbackReasonToHtml({
-            html: options.html,
-            reason: "error",
-            framework
-          }));
+          return [
+            4,
+            csrRender(request, _object_spread_props(_object_spread({}, options), {
+              html: injectFallbackReasonToHtml({
+                html: options.html,
+                reason: "error",
+                framework
+              })
+            }))
+          ];
+        case 11:
+          response = _state.sent();
           return [
             3,
-            8
+            12
           ];
-        case 8:
+        case 12:
           return [
             3,
-            10
+            15
           ];
-        case 9:
-          response = csrRender(options.html);
-          _state.label = 10;
-        case 10:
+        case 13:
+          return [
+            4,
+            csrRender(request, options)
+          ];
+        case 14:
+          response = _state.sent();
+          _state.label = 15;
+        case 15:
           routeInfo = options.routeInfo;
           applyExtendHeaders(response, routeInfo);
           return [
@@ -503,13 +535,36 @@ function injectFallbackReasonToHtml(param) {
   }), "</script>");
   return html.replace(/<\/head>/, "".concat(tag, "</head>"));
 }
-function csrRender(html) {
-  return new Response(html, {
-    status: 200,
-    headers: new Headers(_define_property({
-      "content-type": "text/html; charset=UTF-8"
-    }, X_MODERNJS_RENDER, "client"))
+function csrRender(request, options) {
+  return _csrRender.apply(this, arguments);
+}
+function _csrRender() {
+  _csrRender = _async_to_generator(function(request, options) {
+    var html, rscClientManifest;
+    return _ts_generator(this, function(_state) {
+      html = options.html, rscClientManifest = options.rscClientManifest;
+      if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA) {
+        return [
+          2,
+          new Response(html, {
+            status: 200,
+            headers: new Headers(_define_property({
+              "content-type": "text/html; charset=UTF-8"
+            }, X_MODERNJS_RENDER, "client"))
+          })
+        ];
+      } else {
+        return [
+          2,
+          csrRscRender(request, options)
+        ];
+      }
+      return [
+        2
+      ];
+    });
   });
+  return _csrRender.apply(this, arguments);
 }
 export {
   createRender

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

@@ -1,46 +1,78 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
+import { createRequestHandlerConfig } from "./utils";
 var renderRscHandler = function() {
-  var _ref = _async_to_generator(function(req, param) {
-    var serverManifest, routeInfo, rscClientManifest, _serverManifest_renderBundles, serverBundle, rscRequestHandler;
+  var _ref = _async_to_generator(function(req, options) {
+    var _serverManifest_renderBundles, routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, logger, metrics, onError, onTiming, staticGenerate, serverBundle, loadableStats, routeManifest, config, requestHandlerOptions, rscPayloadHandler;
     return _ts_generator(this, function(_state) {
-      serverManifest = param.serverManifest, routeInfo = param.routeInfo, rscClientManifest = param.rscClientManifest;
-      serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || MAIN_ENTRY_NAME];
-      if (!serverBundle) {
-        return [
-          2,
-          new Response("Cannot find server bundle for RSC", {
-            status: 500
-          })
-        ];
+      switch (_state.label) {
+        case 0:
+          routeInfo = options.routeInfo, serverManifest = options.serverManifest, rscSSRManifest = options.rscSSRManifest, rscClientManifest = options.rscClientManifest, rscServerManifest = options.rscServerManifest, locals = options.locals, params = options.params, loaderContext = options.loaderContext, reporter = options.reporter, monitors = options.monitors, logger = options.logger, metrics = options.metrics, onError = options.onError, onTiming = options.onTiming, staticGenerate = options.staticGenerate;
+          serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || MAIN_ENTRY_NAME];
+          loadableStats = serverManifest.loadableStats || {};
+          routeManifest = serverManifest.routeManifest || {};
+          config = createRequestHandlerConfig(options.config);
+          requestHandlerOptions = {
+            resource: {
+              route: routeInfo,
+              loadableStats,
+              routeManifest,
+              entryName: routeInfo.entryName || MAIN_ENTRY_NAME
+            },
+            config,
+            params,
+            loaderContext,
+            rscSSRManifest,
+            rscClientManifest,
+            rscServerManifest,
+            locals,
+            reporter,
+            staticGenerate,
+            logger,
+            metrics,
+            monitors,
+            onError,
+            onTiming
+          };
+          if (!serverBundle) {
+            return [
+              2,
+              new Response("Cannot find server bundle for RSC", {
+                status: 500
+              })
+            ];
+          }
+          return [
+            4,
+            serverBundle.rscPayloadHandler
+          ];
+        case 1:
+          rscPayloadHandler = _state.sent();
+          if (!rscPayloadHandler) {
+            return [
+              2,
+              new Response("Cannot find request handler for RSC", {
+                status: 500
+              })
+            ];
+          }
+          if (!rscClientManifest) {
+            return [
+              2,
+              new Response("Cannot find rsc client manifest", {
+                status: 500
+              })
+            ];
+          }
+          return [
+            2,
+            rscPayloadHandler(req, requestHandlerOptions)
+          ];
       }
-      rscRequestHandler = serverBundle.rscRequestHandler;
-      if (!rscRequestHandler) {
-        return [
-          2,
-          new Response("Cannot find request handler for RSC", {
-            status: 500
-          })
-        ];
-      }
-      if (!rscClientManifest) {
-        return [
-          2,
-          new Response("Cannot find rsc client manifest", {
-            status: 500
-          })
-        ];
-      }
-      return [
-        2,
-        rscRequestHandler({
-          clientManifest: rscClientManifest
-        })
-      ];
     });
   });
-  return function renderRscHandler2(req, _) {
+  return function renderRscHandler2(req, options) {
     return _ref.apply(this, arguments);
   };
 }();

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

@@ -5,6 +5,7 @@ import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { X_MODERNJS_RENDER } from "../../constants";
 import { getPathname, parseHeaders } from "../../utils";
 import { getCacheResult, matchCacheControl } from "./ssrCache";
+import { createRequestHandlerConfig } from "./utils";
 var SERVER_RUNTIME_ENTRY = "requestHandler";
 function ssrRender(request, _) {
   return _ssrRender.apply(this, arguments);
@@ -118,20 +119,6 @@ var IncomingMessgeProxy = function IncomingMessgeProxy2(req) {
   this.method = req.method;
   this.url = getPathname(req);
 };
-function createRequestHandlerConfig(userConfig) {
-  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,
-    nonce: security === null || security === void 0 ? void 0 : security.nonce,
-    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,
-    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript,
-    enableAsyncEntry: source === null || source === void 0 ? void 0 : source.enableAsyncEntry
-  };
-}
 export {
   ssrRender
 };

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

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

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

@@ -0,0 +1,54 @@
+import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
+import { createRequestHandlerConfig } from "./utils";
+const csrRscRender = async (req, options) => {
+  var _serverManifest_renderBundles;
+  const { routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, logger, metrics, onError, onTiming, staticGenerate, html } = options;
+  const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || MAIN_ENTRY_NAME];
+  const loadableStats = serverManifest.loadableStats || {};
+  const routeManifest = serverManifest.routeManifest || {};
+  const config = createRequestHandlerConfig(options.config);
+  const requestHandlerOptions = {
+    resource: {
+      route: routeInfo,
+      loadableStats,
+      routeManifest,
+      entryName: routeInfo.entryName || MAIN_ENTRY_NAME
+    },
+    config,
+    params,
+    loaderContext,
+    html,
+    rscSSRManifest,
+    rscClientManifest,
+    rscServerManifest,
+    locals,
+    reporter,
+    staticGenerate,
+    logger,
+    metrics,
+    monitors,
+    onError,
+    onTiming
+  };
+  if (!serverBundle) {
+    return new Response("Cannot find server bundle for RSC", {
+      status: 500
+    });
+  }
+  const renderRscStreamHandler = await serverBundle.renderRscStreamHandler;
+  if (!renderRscStreamHandler) {
+    return new Response("Cannot find render handler for RSC", {
+      status: 500
+    });
+  }
+  if (!rscClientManifest) {
+    return new Response("Cannot find rsc client manifest", {
+      status: 500
+    });
+  }
+  const response = await renderRscStreamHandler(req, requestHandlerOptions);
+  return response;
+};
+export {
+  csrRscRender
+};

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

@@ -3,6 +3,7 @@ import { TrieRouter } from "hono/router/trie-router";
 import { X_MODERNJS_RENDER } from "../../constants";
 import { uniqueKeyByRoute } from "../../utils";
 import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes } from "../../utils";
+import { csrRscRender } from "./csrRscRender";
 import { dataHandler } from "./dataHandler";
 import { renderRscHandler } from "./renderRscHandler";
 import { serverActionHandler } from "./serverActionHandler";
@@ -160,12 +161,12 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
       const url = new URL(request.url);
       const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
       if (!matchedRoutes) {
-        response = csrRender(options.html);
+        response = await csrRender(request, options);
       } else {
         var _lastMatch_route;
         const lastMatch = matchedRoutes[matchedRoutes.length - 1];
         if (!(lastMatch === null || lastMatch === void 0 ? void 0 : (_lastMatch_route = lastMatch.route) === null || _lastMatch_route === void 0 ? void 0 : _lastMatch_route.id) || !ssrByRouteIds.includes(lastMatch.route.id)) {
-          response = csrRender(options.html);
+          response = await csrRender(request, options);
         }
       }
     }
@@ -176,14 +177,17 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
     } catch (e) {
       options.onError(e, ErrorDigest.ERENDER);
       await fallbackWrapper("error", e);
-      response = csrRender(injectFallbackReasonToHtml({
-        html: options.html,
-        reason: "error",
-        framework
-      }));
+      response = await csrRender(request, {
+        ...options,
+        html: injectFallbackReasonToHtml({
+          html: options.html,
+          reason: "error",
+          framework
+        })
+      });
     }
   } else {
-    response = csrRender(options.html);
+    response = await csrRender(request, options);
   }
   const { routeInfo } = options;
   applyExtendHeaders(response, routeInfo);
@@ -228,14 +232,19 @@ function injectFallbackReasonToHtml({ html, reason, framework }) {
   })}</script>`;
   return html.replace(/<\/head>/, `${tag}</head>`);
 }
-function csrRender(html) {
-  return new Response(html, {
-    status: 200,
-    headers: new Headers({
-      "content-type": "text/html; charset=UTF-8",
-      [X_MODERNJS_RENDER]: "client"
-    })
-  });
+async function csrRender(request, options) {
+  const { html, rscClientManifest } = options;
+  if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA) {
+    return new Response(html, {
+      status: 200,
+      headers: new Headers({
+        "content-type": "text/html; charset=UTF-8",
+        [X_MODERNJS_RENDER]: "client"
+      })
+    });
+  } else {
+    return csrRscRender(request, options);
+  }
 }
 export {
   createRender

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

@@ -1,14 +1,41 @@
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
-const renderRscHandler = async (req, { serverManifest, routeInfo, rscClientManifest }) => {
+import { createRequestHandlerConfig } from "./utils";
+const renderRscHandler = async (req, options) => {
   var _serverManifest_renderBundles;
+  const { routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, logger, metrics, onError, onTiming, staticGenerate } = options;
   const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || MAIN_ENTRY_NAME];
+  const loadableStats = serverManifest.loadableStats || {};
+  const routeManifest = serverManifest.routeManifest || {};
+  const config = createRequestHandlerConfig(options.config);
+  const requestHandlerOptions = {
+    resource: {
+      route: routeInfo,
+      loadableStats,
+      routeManifest,
+      entryName: routeInfo.entryName || MAIN_ENTRY_NAME
+    },
+    config,
+    params,
+    loaderContext,
+    rscSSRManifest,
+    rscClientManifest,
+    rscServerManifest,
+    locals,
+    reporter,
+    staticGenerate,
+    logger,
+    metrics,
+    monitors,
+    onError,
+    onTiming
+  };
   if (!serverBundle) {
     return new Response("Cannot find server bundle for RSC", {
       status: 500
     });
   }
-  const { rscRequestHandler } = serverBundle;
-  if (!rscRequestHandler) {
+  const rscPayloadHandler = await serverBundle.rscPayloadHandler;
+  if (!rscPayloadHandler) {
     return new Response("Cannot find request handler for RSC", {
       status: 500
     });
@@ -18,9 +45,7 @@ const renderRscHandler = async (req, { serverManifest, routeInfo, rscClientManif
       status: 500
     });
   }
-  return rscRequestHandler({
-    clientManifest: rscClientManifest
-  });
+  return rscPayloadHandler(req, requestHandlerOptions);
 };
 export {
   renderRscHandler

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

@@ -2,6 +2,7 @@ import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
 import { X_MODERNJS_RENDER } from "../../constants";
 import { getPathname, parseHeaders } from "../../utils";
 import { getCacheResult, matchCacheControl } from "./ssrCache";
+import { createRequestHandlerConfig } from "./utils";
 const SERVER_RUNTIME_ENTRY = "requestHandler";
 async function ssrRender(request, { routeInfo, html, config: userConfig, staticGenerate, nodeReq, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, cacheConfig, logger, metrics, onError, onTiming }) {
   var _serverManifest_renderBundles;
@@ -71,20 +72,6 @@ class IncomingMessgeProxy {
     this.url = getPathname(req);
   }
 }
-function createRequestHandlerConfig(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,
-    nonce: security === null || security === void 0 ? void 0 : security.nonce,
-    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,
-    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript,
-    enableAsyncEntry: source === null || source === void 0 ? void 0 : source.enableAsyncEntry
-  };
-}
 export {
   ssrRender
 };

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

@@ -0,0 +1,17 @@
+function createRequestHandlerConfig(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,
+    nonce: security === null || security === void 0 ? void 0 : security.nonce,
+    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,
+    useJsonScript: server === null || server === void 0 ? void 0 : server.useJsonScript,
+    enableAsyncEntry: source === null || source === void 0 ? void 0 : source.enableAsyncEntry
+  };
+}
+export {
+  createRequestHandlerConfig
+};

package/dist/types/plugins/default.d.ts

@@ -4,4 +4,4 @@ import { type InjectRenderHandlerOptions } from './render';
 export type CreateDefaultPluginsOptions = InjectRenderHandlerOptions & {
     logger?: Logger | false;
 };
-export declare function createDefaultPlugins(options?: CreateDefaultPluginsOptions): (ServerPluginLegacy | ServerPlugin)[];
+export declare function createDefaultPlugins(options?: CreateDefaultPluginsOptions): (ServerPlugin | ServerPluginLegacy)[];

package/dist/types/plugins/render/csrRscRender.d.ts

@@ -0,0 +1,2 @@
+import type { SSRRenderOptions } from './ssrRender';
+export declare const csrRscRender: (req: Request, options: SSRRenderOptions) => Promise<Response>;

package/dist/types/plugins/render/renderRscHandler.d.ts

@@ -1,2 +1,2 @@
 import type { SSRRenderOptions } from './ssrRender';
-export declare const renderRscHandler: (req: Request, { serverManifest, routeInfo, rscClientManifest }: SSRRenderOptions) => Promise<Response>;
+export declare const renderRscHandler: (req: Request, options: SSRRenderOptions) => Promise<Response>;

package/dist/types/plugins/render/utils.d.ts

@@ -0,0 +1,3 @@
+import type { UserConfig } from '../../types';
+import type { RequestHandlerConfig } from '../../types/requestHandler';
+export declare function createRequestHandlerConfig(userConfig: UserConfig): RequestHandlerConfig;

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

@@ -28,11 +28,13 @@ export type RequestHandlerOptions = {
     config: RequestHandlerConfig;
     params: Params;
     loaderContext: LoaderContext;
+    html?: string;
     rscServerManifest?: RscServerManifest;
     rscClientManifest?: RscClientManifest;
     rscSSRManifest?: RscSSRManifest;
     RSCRoot?: any;
     rscRoot?: any;
+    serverPayload?: any;
     /** @deprecated  */
     locals?: Record<string, any>;
     /** @deprecated  */

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

@@ -1,6 +1,6 @@
 import type { Logger, Metrics, Monitors, NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
 import type { ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types/server';
-import type { RequestHandler as BundleRequestHandler, OnError, OnTiming } from './requestHandler';
+import type { RequestHandler as BundleRequestHandler, OnError, OnTiming, RequestHandlerOptions, Resource } from './requestHandler';
 export type RequestHandler = (request: Request, ...args: any[]) => Response | Promise<Response>;
 export type ServerLoaderBundle = {
     routes: NestedRoute[];
@@ -17,14 +17,16 @@ export type ServerLoaderBundle = {
         onTiming?: OnTiming;
     }) => Promise<any>;
 };
+export type RscPayloadHandlerOptions = Omit<RequestHandlerOptions, 'resource'> & {
+    resource: Omit<Resource, 'htmlTemplate'>;
+};
 type ServerRenderBundle = {
     requestHandler?: Promise<BundleRequestHandler>;
     handleAction?: (req: Request, options: {
         clientManifest: RscClientManifest;
     }) => Promise<Response>;
-    rscRequestHandler?: (options: {
-        clientManifest: RscClientManifest;
-    }) => Promise<Response>;
+    rscPayloadHandler?: (req: Request, options: RscPayloadHandlerOptions) => Promise<Response>;
+    renderRscStreamHandler?: (req: Request, options: RscPayloadHandlerOptions) => Promise<Response>;
 };
 export type ServerManifest = {
     loaderBundles?: Record<string, ServerLoaderBundle>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.0",
+  "version": "2.68.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -54,10 +54,10 @@
     "flatted": "^3.3.3",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.68.0",
-    "@modern-js/plugin-v2": "2.68.0",
-    "@modern-js/runtime-utils": "2.68.0",
-    "@modern-js/utils": "2.68.0"
+    "@modern-js/plugin": "2.68.1",
+    "@modern-js/plugin-v2": "2.68.1",
+    "@modern-js/utils": "2.68.1",
+    "@modern-js/runtime-utils": "2.68.1"
   },
   "devDependencies": {
     "@types/cloneable-readable": "^2.0.3",
@@ -68,7 +68,7 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.68.0",
+    "@modern-js/types": "2.68.1",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },