@modern-js/runtime 2.64.1 → 2.64.2

package/dist/cjs/core/server/string/prefetch.js

@@ -56,7 +56,7 @@ const prefetch = async (App, request, options, ssrConfig, { onError, onTiming })
         onTiming(import_tracer.SSRTimings.PRERENDER, cost);
       } catch (e) {
         const error = e;
-        onError(import_tracer.SSRErrors.PRERENDER, error);
+        onError(error, import_tracer.SSRErrors.PRERENDER);
         throw e;
       }
     }
@@ -73,13 +73,13 @@ const prefetch = async (App, request, options, ssrConfig, { onError, onTiming })
       const cost = end();
       onTiming(import_tracer.SSRTimings.USE_LOADER, cost);
     } catch (e) {
-      onError(import_tracer.SSRErrors.USE_LOADER, e);
+      onError(e, import_tracer.SSRErrors.USE_LOADER);
       throw e;
     }
     Object.keys(loadersData).forEach((id) => {
       const data = loadersData[id];
       if (data._error) {
-        onError(import_tracer.SSRErrors.USE_LOADER, data._error);
+        onError(data._error, import_tracer.SSRErrors.USE_LOADER);
         delete data._error;
       }
     });

package/dist/cjs/core/server/tracer.js

@@ -19,9 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var tracer_exports = {};
 __export(tracer_exports, {
   SSRErrors: () => SSRErrors,
-  SSRTimings: () => SSRTimings,
-  createOnError: () => createOnError,
-  createOnTiming: () => createOnTiming
+  SSRTimings: () => SSRTimings
 });
 module.exports = __toCommonJS(tracer_exports);
 var SSRTimings;
@@ -38,23 +36,10 @@ var SSRErrors;
   SSRErrors2["RENDER_HTML"] = "App Render To HTML";
   SSRErrors2["RENDER_STREAM"] = "An error occurs during streaming SSR";
   SSRErrors2["RENDER_SHELL"] = "An error occurs during streaming render shell";
+  SSRErrors2["LOADER_ERROR"] = "App error occurs during data loader";
 })(SSRErrors || (SSRErrors = {}));
-function createOnError(onError) {
-  return (key, e) => {
-    const error = e instanceof Error ? e : new Error("Unexpected Server Error");
-    error.name = key;
-    onError === null || onError === void 0 ? void 0 : onError(e);
-  };
-}
-function createOnTiming(onTiming) {
-  return (key, cost) => {
-    onTiming === null || onTiming === void 0 ? void 0 : onTiming(key, cost);
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SSRErrors,
-  SSRTimings,
-  createOnError,
-  createOnTiming
+  SSRTimings
 });

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

@@ -147,7 +147,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   }
 };
 function generatorRegisterCode(internalDirectory, entryName, code) {
-  import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
+  import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.js`), code, "utf8");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/rsc/client.js

@@ -0,0 +1,22 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var client_exports = {};
+module.exports = __toCommonJS(client_exports);
+__reExport(client_exports, require("@modern-js/render/client"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("@modern-js/render/client")
+});

package/dist/cjs/rsc/server.js

@@ -0,0 +1,22 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+module.exports = __toCommonJS(server_exports);
+__reExport(server_exports, require("@modern-js/render/rsc"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("@modern-js/render/rsc")
+});

package/dist/esm/cli/code.js

@@ -23,18 +23,18 @@ function getSSRMode(entry, config) {
 }
 var generateCode = function() {
   var _ref = _async_to_generator(function(entrypoints, appContext, config, hooks) {
-    var mountId, enableAsyncEntry, runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory;
+    var mountId, enableAsyncEntry, runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory, serverRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           mountId = config.html.mountId;
           enableAsyncEntry = config.source.enableAsyncEntry;
-          runtimeConfigFile = appContext.runtimeConfigFile, internalDirectory = appContext.internalDirectory, internalSrcAlias = appContext.internalSrcAlias, metaName = appContext.metaName, srcDirectory = appContext.srcDirectory;
+          runtimeConfigFile = appContext.runtimeConfigFile, internalDirectory = appContext.internalDirectory, internalSrcAlias = appContext.internalSrcAlias, metaName = appContext.metaName, srcDirectory = appContext.srcDirectory, serverRoutes = appContext.serverRoutes;
           return [
             4,
             Promise.all(entrypoints.map(function() {
               var _ref2 = _async_to_generator(function(entrypoint) {
-                var entryName, isAutoMount, entry, customEntry, customBootstrap, customServerEntry, _ref3, runtimePlugins, indexCode, indexFile, ssrMode, bootstrapFile, bootstrapServerFile, indexServerCode, indexServerFile, registerCode, registerFile, registerRuntimeCode, registerRuntimeFile, contextCode, contextFile;
+                var entryName, isAutoMount, entry, customEntry, customBootstrap, customServerEntry, _ref3, runtimePlugins, ssrMode, indexCode, _serverRoutes_find, indexFile, bootstrapFile, bootstrapServerFile, indexServerCode, indexServerFile, indexServerFile1, indexServerCode1, registerCode, registerFile, registerRuntimeCode, registerRuntimeFile, contextCode, AppProxyPath, appProxyCode, contextServerCode, contextFile, contextFile1;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -48,7 +48,24 @@ var generateCode = function() {
                       ];
                     case 1:
                       _ref3 = _state2.sent(), runtimePlugins = _ref3.plugins;
-                      if (isAutoMount) {
+                      if (!isAutoMount)
+                        return [
+                          3,
+                          17
+                        ];
+                      ssrMode = getSSRMode(entryName, config);
+                      indexCode = "";
+                      if (!ssrMode && config.server.rsc) {
+                        ;
+                        indexCode = template.entryForCSRWithRSC({
+                          metaName,
+                          entryName,
+                          mountId,
+                          urlPath: (_serverRoutes_find = serverRoutes.find(function(route) {
+                            return route.entryName === entryName;
+                          })) === null || _serverRoutes_find === void 0 ? void 0 : _serverRoutes_find.urlPath
+                        });
+                      } else {
                         indexCode = template.index({
                           srcDirectory,
                           internalSrcAlias,
@@ -57,55 +74,165 @@ var generateCode = function() {
                           entryName,
                           customEntry,
                           customBootstrap,
-                          mountId
-                        });
-                        indexFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_FILE_NAME));
-                        fs.outputFileSync(indexFile, indexCode, "utf8");
-                        ssrMode = getSSRMode(entryName, config);
-                        if (enableAsyncEntry) {
-                          bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
-                          fs.outputFileSync(bootstrapFile, 'import(/* webpackChunkName: "async-'.concat(entryName, `" */ './`).concat(INDEX_FILE_NAME, "');"), "utf8");
-                          bootstrapServerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_SERVER_BOOTSTRAP_FILE_NAME));
-                          if (ssrMode) {
-                            fs.outputFileSync(bootstrapServerFile, "export const requestHandler = import('./".concat(SERVER_ENTRY_POINT_FILE_NAME, "').then((m) => m.requestHandler)"), "utf8");
-                          }
-                        }
-                        if (ssrMode) {
-                          indexServerCode = serverTemplate.serverIndex({
-                            entry,
-                            entryName,
-                            internalSrcAlias,
-                            metaName,
-                            mode: ssrMode,
-                            customServerEntry,
-                            srcDirectory
-                          });
-                          indexServerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(SERVER_ENTRY_POINT_FILE_NAME));
-                          fs.outputFileSync(indexServerFile, indexServerCode, "utf8");
-                        }
-                        registerCode = template.register();
-                        registerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_REGISTER_FILE_NAME));
-                        fs.outputFileSync(registerFile, registerCode, "utf8");
-                        registerRuntimeCode = template.runtimeRegister({
-                          entryName,
-                          srcDirectory,
-                          internalSrcAlias,
-                          metaName,
-                          runtimeConfigFile,
-                          runtimePlugins
-                        });
-                        registerRuntimeFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME));
-                        fs.outputFileSync(registerRuntimeFile, registerRuntimeCode, "utf8");
-                        contextCode = template.runtimeGlobalContext({
-                          srcDirectory,
-                          internalSrcAlias,
-                          metaName,
-                          entry,
-                          customEntry
+                          mountId,
+                          enableRsc: config.server.rsc
                         });
-                        contextFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME));
-                        fs.outputFileSync(contextFile, contextCode, "utf8");
                       }
+                      indexFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_FILE_NAME));
+                      return [
+                        4,
+                        fs.outputFile(indexFile, indexCode, "utf8")
+                      ];
+                    case 2:
+                      _state2.sent();
+                      if (!enableAsyncEntry)
+                        return [
+                          3,
+                          5
+                        ];
+                      bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
+                      return [
+                        4,
+                        fs.outputFile(bootstrapFile, 'import(/* webpackChunkName: "async-'.concat(entryName, `" */ './`).concat(INDEX_FILE_NAME, "');"), "utf8")
+                      ];
+                    case 3:
+                      _state2.sent();
+                      bootstrapServerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_SERVER_BOOTSTRAP_FILE_NAME));
+                      if (!ssrMode)
+                        return [
+                          3,
+                          5
+                        ];
+                      return [
+                        4,
+                        fs.outputFile(bootstrapServerFile, "export const requestHandler = import('./".concat(SERVER_ENTRY_POINT_FILE_NAME, "').then((m) => m.requestHandler)"), "utf8")
+                      ];
+                    case 4:
+                      _state2.sent();
+                      _state2.label = 5;
+                    case 5:
+                      if (!ssrMode)
+                        return [
+                          3,
+                          7
+                        ];
+                      indexServerCode = serverTemplate.serverIndex({
+                        entry,
+                        entryName,
+                        internalSrcAlias,
+                        metaName,
+                        mode: ssrMode,
+                        customServerEntry,
+                        srcDirectory,
+                        enableRsc: config.server.rsc
+                      });
+                      indexServerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(SERVER_ENTRY_POINT_FILE_NAME));
+                      return [
+                        4,
+                        fs.outputFile(indexServerFile, indexServerCode, "utf8")
+                      ];
+                    case 6:
+                      _state2.sent();
+                      return [
+                        3,
+                        9
+                      ];
+                    case 7:
+                      if (!config.server.rsc)
+                        return [
+                          3,
+                          9
+                        ];
+                      indexServerFile1 = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(SERVER_ENTRY_POINT_FILE_NAME));
+                      indexServerCode1 = serverTemplate.entryForCSRWithRSC({
+                        metaName
+                      });
+                      return [
+                        4,
+                        fs.outputFile(indexServerFile1, indexServerCode1, "utf8")
+                      ];
+                    case 8:
+                      _state2.sent();
+                      _state2.label = 9;
+                    case 9:
+                      registerCode = template.register();
+                      registerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_REGISTER_FILE_NAME));
+                      return [
+                        4,
+                        fs.outputFile(registerFile, registerCode, "utf8")
+                      ];
+                    case 10:
+                      _state2.sent();
+                      registerRuntimeCode = template.runtimeRegister({
+                        entryName,
+                        srcDirectory,
+                        internalSrcAlias,
+                        metaName,
+                        runtimeConfigFile,
+                        runtimePlugins
+                      });
+                      registerRuntimeFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME));
+                      return [
+                        4,
+                        fs.outputFile(registerRuntimeFile, registerRuntimeCode, "utf8")
+                      ];
+                    case 11:
+                      _state2.sent();
+                      contextCode = "";
+                      if (!!config.server.rsc)
+                        return [
+                          3,
+                          12
+                        ];
+                      contextCode = template.runtimeGlobalContext({
+                        srcDirectory,
+                        internalSrcAlias,
+                        metaName,
+                        entry,
+                        customEntry
+                      });
+                      return [
+                        3,
+                        15
+                      ];
+                    case 12:
+                      AppProxyPath = path.join(internalDirectory, entryName, "./AppProxy.jsx");
+                      appProxyCode = template.AppProxyForRSC({
+                        srcDirectory,
+                        internalSrcAlias,
+                        entry,
+                        customEntry
+                      });
+                      return [
+                        4,
+                        fs.outputFile(AppProxyPath, appProxyCode)
+                      ];
+                    case 13:
+                      _state2.sent();
+                      contextCode = template.runtimeGlobalContextForRSCClient({
+                        metaName
+                      });
+                      contextServerCode = template.runtimeGlobalContextForRSCServer({
+                        metaName
+                      });
+                      contextFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ".server.js"));
+                      return [
+                        4,
+                        fs.outputFile(contextFile, contextServerCode, "utf8")
+                      ];
+                    case 14:
+                      _state2.sent();
+                      _state2.label = 15;
+                    case 15:
+                      contextFile1 = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ".js"));
+                      return [
+                        4,
+                        fs.outputFile(contextFile1, contextCode, "utf8")
+                      ];
+                    case 16:
+                      _state2.sent();
+                      _state2.label = 17;
+                    case 17:
                       return [
                         2
                       ];

package/dist/esm/cli/constants.js

@@ -5,7 +5,7 @@ var INDEX_FILE_NAME = "index";
 var ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
 var ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 var ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
-var ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
+var ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context";
 var ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
 export {
   APP_FILE_NAME,

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

@@ -47,13 +47,16 @@ var ssrBuilderPlugin = function(modernAPI) {
     setup: function setup(api) {
       api.modifyEnvironmentConfig(function(config, param) {
         var name = param.name, mergeEnvironmentConfig = param.mergeEnvironmentConfig;
+        var _userConfig_deploy_worker, _userConfig_deploy, _userConfig_server;
         var isServerEnvironment = config.output.target === "node" || name === "workerSSR";
         var userConfig = modernAPI.getNormalizedConfig();
+        var ssrEnv = ((_userConfig_deploy = userConfig.deploy) === null || _userConfig_deploy === void 0 ? void 0 : (_userConfig_deploy_worker = _userConfig_deploy.worker) === null || _userConfig_deploy_worker === void 0 ? void 0 : _userConfig_deploy_worker.ssr) || ((_userConfig_server = userConfig.server) === null || _userConfig_server === void 0 ? void 0 : _userConfig_server.rsc) ? "edge" : "node";
         var useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
         return mergeEnvironmentConfig(config, {
           source: {
             define: {
-              "process.env.MODERN_TARGET": isServerEnvironment ? JSON.stringify("node") : JSON.stringify("browser")
+              "process.env.MODERN_TARGET": isServerEnvironment ? JSON.stringify("node") : JSON.stringify("browser"),
+              "process.env.MODERN_SSR_ENV": JSON.stringify(ssrEnv)
             }
           },
           tools: {

package/dist/esm/cli/template.js

@@ -2,14 +2,18 @@ import path from "path";
 import { JS_EXTENSIONS, findExists, formatImportPath } from "@modern-js/utils";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME } from "./constants";
 var genRenderCode = function(param) {
-  var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry, customBootstrap = param.customBootstrap, mountId = param.mountId;
+  var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry, customBootstrap = param.customBootstrap, mountId = param.mountId, enableRsc = param.enableRsc;
   if (customEntry) {
     return "import '".concat(formatImportPath(entry.replace(srcDirectory, internalSrcAlias)), "'");
   }
-  return "import { createRoot } from '@".concat(metaName, "/runtime/react';\nimport { render } from '@").concat(metaName, "/runtime/browser';\n").concat(customBootstrap ? "import customBootstrap from '".concat(formatImportPath(customBootstrap.replace(srcDirectory, internalSrcAlias)), "';") : "", "\n\nconst ModernRoot = createRoot();\n\n").concat(customBootstrap ? "customBootstrap(ModernRoot, () => render(<ModernRoot />, '".concat(mountId || "root", "'));") : "render(<ModernRoot />, '".concat(mountId || "root", "');"));
+  return "import { createRoot } from '@".concat(metaName, "/runtime/react';\nimport { render } from '@").concat(metaName, "/runtime/browser';\n\n").concat(enableRsc ? "import { RscClientRoot, createFromReadableStream, rscStream, callServer } from '@".concat(metaName, "/runtime/rsc/client';") : "", "\n\n").concat(enableRsc ? "const data = createFromReadableStream(rscStream, {\n    callServer: callServer,\n  });" : "", "\n\n").concat(customBootstrap ? "import customBootstrap from '".concat(formatImportPath(customBootstrap.replace(srcDirectory, internalSrcAlias)), "';") : "", "\n\n\n\nconst ModernRoot = createRoot();\n\n").concat(customBootstrap ? "customBootstrap(ModernRoot, () => render(<ModernRoot />, '".concat(mountId || "root", "'));") : enableRsc ? "render(<ModernRoot>\n                  <RscClientRoot data={data} />\n                </ModernRoot>, '".concat(mountId || "root", "');") : "render(<ModernRoot />, '".concat(mountId || "root", "');"));
+};
+var entryForCSRWithRSC = function(param) {
+  var metaName = param.metaName, entryName = param.entryName, _param_urlPath = param.urlPath, urlPath = _param_urlPath === void 0 ? "/" : _param_urlPath, _param_mountId = param.mountId, mountId = _param_mountId === void 0 ? "root" : _param_mountId;
+  return "\n  import '@".concat(metaName, "/runtime/registry/").concat(entryName, "';\n  import { render } from '@").concat(metaName, "/runtime/browser';\n  import { createRoot } from '@").concat(metaName, "/runtime/react';\n\n  import {\n    RscClientRoot,\n    createFromFetch\n  } from '@").concat(metaName, "/runtime/rsc/client';\n\n  const content = createFromFetch(\n    fetch('").concat(urlPath, "', {\n      headers: {\n        'x-rsc-tree': 'true',\n      },\n    }),\n  );\n\n  const ModernRoot = createRoot();\n\n  render(\n    <ModernRoot>\n      <RscClientRoot data={content} />\n    </ModernRoot>,\n    '").concat(mountId, "',\n  );\n  ");
 };
 var index = function(param) {
-  var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, entryName = param.entryName, customEntry = param.customEntry, customBootstrap = param.customBootstrap, mountId = param.mountId;
+  var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, entryName = param.entryName, customEntry = param.customEntry, customBootstrap = param.customBootstrap, mountId = param.mountId, enableRsc = param.enableRsc;
   return "import '@".concat(metaName, "/runtime/registry/").concat(entryName, "';\n").concat(genRenderCode({
     srcDirectory,
     internalSrcAlias,
@@ -17,7 +21,8 @@ var index = function(param) {
     entry,
     customEntry,
     customBootstrap,
-    mountId
+    mountId,
+    enableRsc
   }), "\n");
 };
 var register = function() {
@@ -46,9 +51,29 @@ var runtimeGlobalContext = function(param) {
   var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry;
   return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, "")), "';\n\nsetGlobalContext({\n  App,\n});");
 };
+var runtimeGlobalContextForRSCServer = function(param) {
+  var metaName = param.metaName;
+  return "\n  import { createElement, Fragment } from 'react';\n  import { setGlobalContext } from '@".concat(metaName, "/runtime/context';\n  import AppProxy from './AppProxy';\n\n  const DefaultRoot = ({ children }: { children?: ReactNode }) =>\n    createElement(Fragment, null, children);\n\n\n  setGlobalContext({\n    App: DefaultRoot,\n    RSCRoot: AppProxy,\n  });");
+};
+var runtimeGlobalContextForRSCClient = function(param) {
+  var metaName = param.metaName;
+  return "\n  import { createElement, Fragment } from 'react';\n  import { setGlobalContext } from '@".concat(metaName, "/runtime/context';\n\n  const DefaultRoot = ({ children }: { children?: ReactNode }) =>\n    createElement(Fragment, null, children);\n\n  setGlobalContext({\n    App: DefaultRoot\n  });");
+};
+var AppProxyForRSC = function(param) {
+  var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, entry = param.entry, customEntry = param.customEntry;
+  return "\n  import App from '".concat(
+    // We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
+    formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", "")),
+    "';\n  import React from 'react';\n\n  export default function Root() {\n    return React.createElement(App, null);\n  }\n  "
+  );
+};
 export {
+  AppProxyForRSC,
+  entryForCSRWithRSC,
   index,
   register,
   runtimeGlobalContext,
+  runtimeGlobalContextForRSCClient,
+  runtimeGlobalContextForRSCServer,
   runtimeRegister
 };

package/dist/esm/cli/template.server.js

@@ -1,15 +1,22 @@
 import { formatImportPath } from "@modern-js/utils";
 var SERVER_ENTRY = "\nimport {\n  #render,\n  createRequestHandler,\n} from '@#metaName/runtime/ssr/server';\n\nconst handleRequest = async (request, ServerRoot, options) => {\n\n  const body = await #render(request, <ServerRoot />, options);\n\n  return new Response(body, {\n    headers: {\n      'content-type': 'text/html; charset=utf-8',\n      #headers\n    },\n  })\n};\n\nexport const requestHandler = createRequestHandler(handleRequest);\n";
+var SERVER_ENTRY_RSC = "\nimport {\n  renderStreaming,\n  createRequestHandler,\n} from '@#metaName/runtime/ssr/server';\nimport { RSCServerSlot } from '@#metaName/runtime/rsc/client';\nexport { handleAction } from '@#metaName/runtime/rsc/server';\n\nconst handleRequest = async (request, ServerRoot, options) => {\n\n  const body = await renderStreaming(request,\n    <ServerRoot>\n      <RSCServerSlot />\n    </ServerRoot>,\n    {\n      ...options,\n      rscRoot: <options.RSCRoot />,\n    },\n  );\n\n  return new Response(body, {\n    headers: {\n      'content-type': 'text/html; charset=utf-8',\n      #headers\n    },\n  })\n};\n\nexport const requestHandler = createRequestHandler(handleRequest, {\n  enableRsc: true,\n});\n";
 var serverIndex = function(options) {
   var _options_metaName = options.metaName, metaName = _options_metaName === void 0 ? "modern-js" : _options_metaName, entryName = options.entryName;
   return "\n    import '@".concat(metaName, "/runtime/registry/").concat(entryName, "';\n    ").concat(genHandlerCode(options), "\n  ");
 };
+var entryForCSRWithRSC = function(param) {
+  var metaName = param.metaName;
+  return "\n  import App from './AppProxy';\n  import { renderRsc } from '@".concat(metaName, "/runtime/rsc/server'\n  export { handleAction } from '@").concat(metaName, "/runtime/rsc/server';\n\n\n  export const rscRequestHandler = ({\n    clientManifest\n  }) => {\n    const stream = renderRsc({\n      element: <App/>,\n      clientManifest,\n    })\n\n    const response = new Response(stream, {\n      headers: {\n        'Transfer-Encoding': 'chunked',\n      },\n    });\n    return response\n  }\n");
+};
 function genHandlerCode(param) {
-  var mode = param.mode, metaName = param.metaName, customServerEntry = param.customServerEntry, srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias;
+  var mode = param.mode, metaName = param.metaName, customServerEntry = param.customServerEntry, srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, enableRsc = param.enableRsc;
   if (customServerEntry) {
-    return "export { default as requestHandler } from '".concat(formatImportPath(customServerEntry.replace(srcDirectory, internalSrcAlias)), "'");
+    var realEntryPath = formatImportPath(customServerEntry.replace(srcDirectory, internalSrcAlias));
+    return "\n      export * from '".concat(realEntryPath, "';\n      export { default as requestHandler } from '").concat(realEntryPath, "'");
   } else {
-    var serverEntry = transformServerEntry(SERVER_ENTRY, {
+    var entrySource = enableRsc ? SERVER_ENTRY_RSC : SERVER_ENTRY;
+    var serverEntry = transformServerEntry(entrySource, {
       metaName: metaName || "modern-js",
       mode
     });
@@ -22,5 +29,6 @@ function transformServerEntry(source, options) {
   return output;
 }
 export {
+  entryForCSRWithRSC,
   serverIndex
 };

package/dist/esm/core/context/index.js

@@ -6,6 +6,10 @@ function setGlobalContext(context) {
   globalContext.appInit = context.appInit;
   globalContext.appConfig = typeof context.appConfig === "function" ? context.appConfig() : context.appConfig;
   globalContext.layoutApp = context.layoutApp;
+  globalContext.RSCRoot = context.RSCRoot;
+}
+function getGlobalRSCRoot() {
+  return globalContext.RSCRoot;
 }
 function setGlobalInternalRuntimeContext(context) {
   globalContext.internalRuntimeContext = context;
@@ -37,6 +41,7 @@ export {
   getGlobalAppInit,
   getGlobalInternalRuntimeContext,
   getGlobalLayoutApp,
+  getGlobalRSCRoot,
   getGlobalRoutes,
   getInitialContext,
   setGlobalContext,

package/dist/esm/core/server/requestHandler.js

@@ -6,11 +6,12 @@ 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 { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/runtime-utils/universal/request";
-import { getGlobalAppInit, getGlobalInternalRuntimeContext } from "../context";
+import { getGlobalAppInit, getGlobalInternalRuntimeContext, getGlobalRSCRoot } from "../context";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
 import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
+import { SSRErrors } from "./tracer";
 import { getSSRConfigByEntry, getSSRMode } from "./utils";
 function createSSRContext(request, options) {
   var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
@@ -69,12 +70,12 @@ function createSSRContext(request, options) {
   };
 }
 var createRequestHandler = function() {
-  var _ref = _async_to_generator(function(handleRequest) {
+  var _ref = _async_to_generator(function(handleRequest, createRequestOptions) {
     var requestHandler;
     return _ts_generator(this, function(_state) {
       requestHandler = function() {
         var _ref2 = _async_to_generator(function(request, options) {
-          var _context_routerContext, _context_routerContext1, Root, internalRuntimeContext, hooks, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, _context_routerContext2, _context_ssrContext, redirectResponse, htmlTemplate, response;
+          var _context_routerContext, _context_routerContext1, _context_routerContext2, Root, internalRuntimeContext, hooks, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, _context_routerContext3, _context_ssrContext, errors, redirectResponse, htmlTemplate, response;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -154,7 +155,11 @@ var createRequestHandler = function() {
                 initialData = _state2.sent();
                 if (((_context_routerContext = context.routerContext) === null || _context_routerContext === void 0 ? void 0 : _context_routerContext.statusCode) && ((_context_routerContext1 = context.routerContext) === null || _context_routerContext1 === void 0 ? void 0 : _context_routerContext1.statusCode) !== 200) {
                   ;
-                  (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.response.status((_context_routerContext2 = context.routerContext) === null || _context_routerContext2 === void 0 ? void 0 : _context_routerContext2.statusCode);
+                  (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.response.status((_context_routerContext3 = context.routerContext) === null || _context_routerContext3 === void 0 ? void 0 : _context_routerContext3.statusCode);
+                }
+                errors = Object.values(((_context_routerContext2 = context.routerContext) === null || _context_routerContext2 === void 0 ? void 0 : _context_routerContext2.errors) || {});
+                if (errors.length > 0) {
+                  options.onError(errors[0], SSRErrors.LOADER_ERROR);
                 }
                 context.initialData = initialData;
                 redirectResponse = getRedirectResponse(initialData);
@@ -169,7 +174,8 @@ var createRequestHandler = function() {
                 return [
                   4,
                   handleRequest(request, Root, _object_spread_props(_object_spread({}, options), {
-                    runtimeContext: context
+                    runtimeContext: context,
+                    RSCRoot: (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) && getGlobalRSCRoot()
                   }))
                 ];
               case 2:
@@ -204,7 +210,7 @@ var createRequestHandler = function() {
       ];
     });
   });
-  return function createRequestHandler2(handleRequest) {
+  return function createRequestHandler2(handleRequest, createRequestOptions) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/core/server/stream/afterTemplate.js

@@ -31,6 +31,11 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       return _ts_generator(this, function(_state) {
         routeManifest = runtimeContext.routeManifest;
         routeAssets = routeManifest.routeAssets;
+        if (!routeAssets)
+          return [
+            2,
+            template
+          ];
         asyncEntry = routeAssets["async-".concat(entryName2)];
         if (asyncEntry) {
           ;