@modern-js/runtime 2.68.0 → 2.68.2

package/dist/esm/cli/code.js

@@ -63,7 +63,8 @@ var generateCode = function() {
                           mountId,
                           urlPath: (_serverRoutes_find = serverRoutes.find(function(route) {
                             return route.entryName === entryName;
-                          })) === null || _serverRoutes_find === void 0 ? void 0 : _serverRoutes_find.urlPath
+                          })) === null || _serverRoutes_find === void 0 ? void 0 : _serverRoutes_find.urlPath,
+                          isNestedRouter: entrypoint.nestedRoutesEntry
                         });
                       } else {
                         indexCode = template.index({
@@ -75,7 +76,8 @@ var generateCode = function() {
                           customEntry,
                           customBootstrap,
                           mountId,
-                          enableRsc: config.server.rsc
+                          enableRsc: config.server.rsc,
+                          isNestedRouter: !!entrypoint.nestedRoutesEntry
                         });
                       }
                       indexFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_FILE_NAME));
@@ -145,6 +147,7 @@ var generateCode = function() {
                         ];
                       indexServerFile1 = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(SERVER_ENTRY_POINT_FILE_NAME));
                       indexServerCode1 = serverTemplate.entryForCSRWithRSC({
+                        entryName,
                         metaName
                       });
                       return [
@@ -179,7 +182,7 @@ var generateCode = function() {
                     case 11:
                       _state2.sent();
                       contextCode = "";
-                      if (!!config.server.rsc)
+                      if (!(!config.server.rsc || entrypoint.nestedRoutesEntry))
                         return [
                           3,
                           12

package/dist/esm/cli/template.js

@@ -1,19 +1,37 @@
 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 genRenderStatement = function(param) {
+  var customBootstrap = param.customBootstrap, enableRsc = param.enableRsc, mountId = param.mountId, isNestedRouter = param.isNestedRouter;
+  if (customBootstrap) {
+    return "customBootstrap(ModernRoot, () => render(<ModernRoot />, '".concat(mountId || "root", "'));");
+  }
+  if (enableRsc) {
+    if (!isNestedRouter) {
+      return "render(<ModernRoot>\n                  <RscClientRoot rscPayload={data} />\n                </ModernRoot>, '".concat(mountId || "root", "');");
+    }
+    return "render(<ModernRoot rscPayload={data} />, '".concat(mountId || "root", "');");
+  }
+  return "render(<ModernRoot />, '".concat(mountId || "root", "');");
+};
 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, enableRsc = param.enableRsc;
+  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, isNestedRouter = param.isNestedRouter;
   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\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", "');"));
+  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(genRenderStatement({
+    customBootstrap,
+    enableRsc,
+    mountId,
+    isNestedRouter
+  }));
 };
 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 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, isNestedRouter = param.isNestedRouter;
+  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    isRedirectResponse,\n    rscStream,\n    callServer,\n    createFromReadableStream\n  } from '@").concat(metaName, "/runtime/rsc/client';\n\n  const handleRedirectResponse = (res: Response) => {\n    const { headers } = res;\n    const location = headers.get('X-Modernjs-Redirect');\n    const baseUrl = headers.get('X-Modernjs-BaseUrl');\n    if (location) {\n      if (baseUrl !== '/') {\n        window.location.replace(baseUrl + location);\n      } else {\n        window.location.replace(location);\n      }\n      return;\n    }\n    return res;\n  };\n\n  ").concat(process.env.MODERN_DISABLE_INJECT_RSC_DATA ? "\n      const data = createFromFetch(\n        fetch(location.pathname, {\n          headers: {\n            'x-rsc-tree': 'true',\n          },\n        }).then(handleRedirectResponse),\n      )\n      " : "\n      const data = createFromReadableStream(rscStream, {\n        callServer: callServer,\n      });\n      ", "\n\n  const ModernRoot = createRoot();\n\n  ").concat(isNestedRouter ? "\n      render(\n        <ModernRoot rscPayload={data}>\n        </ModernRoot>,\n        '".concat(mountId, "',\n      );\n      ") : "\n      render(\n        <ModernRoot>\n          <RscClientRoot rscPayload={data} />\n        </ModernRoot>,\n        '".concat(mountId, "',\n      );\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, enableRsc = param.enableRsc;
+  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, isNestedRouter = param.isNestedRouter;
   return "import '@".concat(metaName, "/runtime/registry/").concat(entryName, "';\n").concat(genRenderCode({
     srcDirectory,
     internalSrcAlias,
@@ -22,7 +40,8 @@ var index = function(param) {
     customEntry,
     customBootstrap,
     mountId,
-    enableRsc
+    enableRsc,
+    isNestedRouter
   }), "\n");
 };
 var register = function() {

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

@@ -1,13 +1,13 @@
 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    },\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    },\n  })\n};\n\nexport const requestHandler = createRequestHandler(handleRequest, {\n  enableRsc: true,\n});\n";
+var SERVER_ENTRY_RSC = "\nimport {\n  renderStreaming,\n  createRequestHandler,\n} from '@#metaName/runtime/ssr/server';\nimport { RSCServerSlot } from '@#metaName/runtime/rsc/client';\nimport { renderRsc } from '@#metaName/runtime/rsc/server';\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    },\n  })\n};\n\nexport const requestHandler = createRequestHandler(handleRequest, {\n  enableRsc: true\n});\n\nconst handleRSCRequest = async (request, ServerRoot, options) => {\n  const { serverPayload } = options;\n  const stream = renderRsc({\n    element: options.rscRoot,\n    clientManifest: options.rscClientManifest!,\n  });\n\n  return new Response(stream);\n}\n\n\nexport const rscPayloadHandler = createRequestHandler(handleRSCRequest, {\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    return response\n  }\n");
+  var metaName = param.metaName, entryName = param.entryName;
+  return "\n  import '@".concat(metaName, "/runtime/registry/").concat(entryName, "';\n  import {\n    createRequestHandler,\n  } from '@").concat(metaName, "/runtime/ssr/server';\n  import { renderRsc, processRSCStream } from '@").concat(metaName, "/runtime/rsc/server'\n  export { handleAction } from '@").concat(metaName, "/runtime/rsc/server';\n\n  const handleCSRRender = async (request, ServerRoot, options) => {\n    const rscPayloadStream = renderRsc({\n      element: options.rscRoot,\n      clientManifest: options.rscClientManifest!,\n    });\n    const stream = new ReadableStream({\n      start(controller) {\n        const encoder = new TextEncoder();\n\n        controller.enqueue(encoder.encode(options.html));\n\n      processRSCStream(rscPayloadStream, controller, encoder)\n        .catch(err => {\n          controller.error(err);\n        });\n      }\n    });\n\n    return new Response(stream, {\n      status: 200,\n      headers: new Headers({\n        'content-type': 'text/html; charset=UTF-8',\n      }),\n    });\n  }\n\n  export const renderRscStreamHandler = createRequestHandler(handleCSRRender, {\n    enableRsc: true\n  });\n\n  const handleRequest = async (request, ServerRoot, options) => {\n    const stream = renderRsc({\n            element: options.rscRoot,\n      clientManifest: options.rscClientManifest!,\n    });\n\n    return new Response(stream);\n  }\n\n  export const rscPayloadHandler = createRequestHandler(handleRequest, {\n    enableRsc: true\n  });\n");
 };
 function genHandlerCode(param) {
   var mode = param.mode, metaName = param.metaName, customServerEntry = param.customServerEntry, srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, enableRsc = param.enableRsc;

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

@@ -1,5 +1,12 @@
 import { RuntimeReactContext, getInitialContext } from "./runtime";
 var globalContext = {};
+import { getServerPayload, setServerPayload } from "./serverPayload.server";
+function getGlobalIsRscClient() {
+  return globalContext.isRscClient;
+}
+function getGlobalEnableRsc() {
+  return globalContext.enableRsc;
+}
 function setGlobalContext(context) {
   globalContext.entryName = context.entryName;
   globalContext.App = context.App;
@@ -8,6 +15,8 @@ function setGlobalContext(context) {
   globalContext.appConfig = typeof context.appConfig === "function" ? context.appConfig() : context.appConfig;
   globalContext.layoutApp = context.layoutApp;
   globalContext.RSCRoot = context.RSCRoot;
+  globalContext.isRscClient = context.isRscClient;
+  globalContext.enableRsc = context.enableRsc;
 }
 function getCurrentEntryName() {
   return globalContext.entryName;
@@ -44,11 +53,15 @@ export {
   getGlobalApp,
   getGlobalAppConfig,
   getGlobalAppInit,
+  getGlobalEnableRsc,
   getGlobalInternalRuntimeContext,
+  getGlobalIsRscClient,
   getGlobalLayoutApp,
   getGlobalRSCRoot,
   getGlobalRoutes,
   getInitialContext,
+  getServerPayload,
   setGlobalContext,
-  setGlobalInternalRuntimeContext
+  setGlobalInternalRuntimeContext,
+  setServerPayload
 };

package/dist/esm/core/context/serverPayload.server.js

@@ -0,0 +1,15 @@
+import { storage } from "@modern-js/runtime-utils/node";
+var getServerPayload = function() {
+  var context = storage.useContext();
+  return context === null || context === void 0 ? void 0 : context.serverPayload;
+};
+var setServerPayload = function(payload) {
+  var context = storage.useContext();
+  if (context) {
+    context.serverPayload = payload;
+  }
+};
+export {
+  getServerPayload,
+  setServerPayload
+};

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

@@ -5,15 +5,81 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 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 { jsx as _jsx } from "react/jsx-runtime";
 import { storage } from "@modern-js/runtime-utils/node";
 import { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/runtime-utils/universal/request";
+import { Fragment } from "react";
 import { getGlobalAppInit, getGlobalInternalRuntimeContext, getGlobalRSCRoot } from "../context";
 import { getInitialContext } from "../context/runtime";
+import { getServerPayload } from "../context/serverPayload.server";
 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 handleRSCRequest(request, Root, context, options, handleRequest) {
+  return _handleRSCRequest.apply(this, arguments);
+}
+function _handleRSCRequest() {
+  _handleRSCRequest = _async_to_generator(function(request, Root, context, options, handleRequest) {
+    var serverPayload, App;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          serverPayload = getServerPayload();
+          if (!(typeof serverPayload !== "undefined"))
+            return [
+              3,
+              2
+            ];
+          return [
+            4,
+            handleRequest(request, Root, _object_spread_props(_object_spread({}, options), {
+              runtimeContext: context,
+              rscRoot: serverPayload
+            }))
+          ];
+        case 1:
+          return [
+            2,
+            _state.sent()
+          ];
+        case 2:
+          App = getGlobalRSCRoot();
+          if (!App)
+            return [
+              3,
+              4
+            ];
+          return [
+            4,
+            handleRequest(request, Fragment, _object_spread_props(_object_spread({}, options), {
+              runtimeContext: context,
+              rscRoot: /* @__PURE__ */ _jsx(App, {})
+            }))
+          ];
+        case 3:
+          return [
+            2,
+            _state.sent()
+          ];
+        case 4:
+          return [
+            4,
+            handleRequest(request, Root, _object_spread_props(_object_spread({}, options), {
+              runtimeContext: context
+            }))
+          ];
+        case 5:
+          return [
+            2,
+            _state.sent()
+          ];
+      }
+    });
+  });
+  return _handleRSCRequest.apply(this, arguments);
+}
 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;
   var nonce = config.nonce, useJsonScript = config.useJsonScript;
@@ -92,7 +158,8 @@ var createRequestHandler = function() {
                 request,
                 monitors: options.monitors,
                 responseProxy,
-                activeDeferreds
+                activeDeferreds,
+                serverPayload: void 0
               }, /* @__PURE__ */ _async_to_generator(function() {
                 var _context_routerContext, _context_routerContext1, _context_routerContext2, Root, internalRuntimeContext, hooks, routeManifest, context, runBeforeRender, ssrContext, getRedirectResponse, initialData, _context_routerContext3, _context_ssrContext, errors, redirectResponse, htmlTemplate, response;
                 return _ts_generator(this, function(_state3) {
@@ -179,22 +246,48 @@ var createRequestHandler = function() {
                       context.initialData = initialData;
                       redirectResponse = getRedirectResponse(initialData);
                       if (redirectResponse) {
+                        if (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) {
+                          return [
+                            2,
+                            initialData
+                          ];
+                        } else {
+                          return [
+                            2,
+                            redirectResponse
+                          ];
+                        }
+                      }
+                      if (!(createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc)) {
+                        htmlTemplate = options.resource.htmlTemplate;
+                        options.resource.htmlTemplate = htmlTemplate.replace("</head>", "".concat(CHUNK_CSS_PLACEHOLDER, "</head>"));
+                      }
+                      if (!(createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc))
                         return [
-                          2,
-                          redirectResponse
+                          3,
+                          3
                         ];
-                      }
-                      htmlTemplate = options.resource.htmlTemplate;
-                      options.resource.htmlTemplate = htmlTemplate.replace("</head>", "".concat(CHUNK_CSS_PLACEHOLDER, "</head>"));
+                      return [
+                        4,
+                        handleRSCRequest(request, Root, context, options, handleRequest)
+                      ];
+                    case 2:
+                      response = _state3.sent();
+                      return [
+                        3,
+                        5
+                      ];
+                    case 3:
                       return [
                         4,
                         handleRequest(request, Root, _object_spread_props(_object_spread({}, options), {
-                          runtimeContext: context,
-                          RSCRoot: (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) && getGlobalRSCRoot()
+                          runtimeContext: context
                         }))
                       ];
-                    case 2:
+                    case 4:
                       response = _state3.sent();
+                      _state3.label = 5;
+                    case 5:
                       Object.entries(responseProxy.headers).forEach(function(param) {
                         var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
                         response.headers.set(key, value);

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

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, getEntryOptions, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isSSGEntry, isUseRsc, isUseSSRBundle, logger } from "@modern-js/utils";
 import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
@@ -125,11 +125,12 @@ var generateCode = function() {
                 templates.fileSystemRoutes({
                   metaName,
                   routes,
-                  ssrMode: useSSG ? "string" : mode,
+                  ssrMode: useSSG ? "string" : isUseRsc(_$config) ? "stream" : mode,
                   nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                   entryName: entrypoint.entryName,
                   internalDirectory,
-                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output = _$config.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
+                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output = _$config.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks,
+                  isRscClient: isUseRsc(_$config)
                 })
               ];
             case 4:
@@ -141,7 +142,7 @@ var generateCode = function() {
               ];
             case 5:
               code = _state.sent().code;
-              if (!(entrypoint.nestedRoutesEntry && isUseSSRBundle(_$config)))
+              if (!(entrypoint.nestedRoutesEntry && (isUseSSRBundle(_$config) || isUseRsc(_$config))))
                 return [
                   3,
                   10
@@ -173,7 +174,8 @@ var generateCode = function() {
                   nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                   entryName: entrypoint.entryName,
                   internalDirectory,
-                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output1 = _$config.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
+                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output1 = _$config.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks,
+                  isRscClient: false
                 })
               ];
             case 8:
@@ -243,7 +245,11 @@ var generateCode = function() {
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ".js")), code, "utf8");
 }
+function generatorServerRegisterCode(internalDirectory, entryName, code) {
+  fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ".server.js")), code, "utf8");
+}
 export {
   generateCode,
-  generatorRegisterCode
+  generatorRegisterCode,
+  generatorServerRegisterCode
 };

package/dist/esm/router/cli/code/templates.js

@@ -120,11 +120,11 @@ var createMatchReg = function(keyword) {
 };
 var fileSystemRoutes = function() {
   var _ref = _async_to_generator(function(param) {
-    var metaName, routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRouteChunks, splitRouteChunks, components, loadings, errors, loaders, loadersMap, configs, configsMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, createLazyImport, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, routeStr, keywords, regs, newRouteStr, component, finalRoute, keywords1, routeStr1, regs1, newRouteStr1, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo, route1, importConfigsCode, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, _step_value1, key1, configPath, importRuntimeRouterCode, routeModulesCode;
+    var metaName, routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRouteChunks, splitRouteChunks, _param_isRscClient, isRscClient, components, loadings, errors, loaders, loadersMap, configs, configsMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, createLazyImport, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, routeStr, keywords, regs, newRouteStr, component, finalRoute, keywords1, routeStr1, regs1, newRouteStr1, importLoadingCode, importComponentsCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo, route1, importConfigsCode, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, _step_value1, key1, configPath, importRuntimeRouterCode, routeModulesCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          metaName = param.metaName, routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, _param_splitRouteChunks = param.splitRouteChunks, splitRouteChunks = _param_splitRouteChunks === void 0 ? true : _param_splitRouteChunks;
+          metaName = param.metaName, routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, _param_splitRouteChunks = param.splitRouteChunks, splitRouteChunks = _param_splitRouteChunks === void 0 ? true : _param_splitRouteChunks, _param_isRscClient = param.isRscClient, isRscClient = _param_isRscClient === void 0 ? false : _param_isRscClient;
           components = [];
           loadings = [];
           errors = [];
@@ -149,14 +149,16 @@ var fileSystemRoutes = function() {
           };
           createLazyImport = function(param2) {
             var componentPath = param2.componentPath, routeId = param2.routeId, webpackChunkName = param2.webpackChunkName, eager = param2.eager;
-            var importOptions = webpackChunkName ? '/* webpackChunkName: "'.concat(routeId, '" */ ') : eager ? '/* webpackMode: "eager" */ ' : "";
+            var importOptions = webpackChunkName ? '/* webpackChunkName: "'.concat(routeId, '" */  ') : eager ? '/* webpackMode: "eager" */  ' : "";
             return "() => import(".concat(importOptions, "'").concat(componentPath, `').then(routeModule => handleRouteModule(routeModule, "`).concat(routeId, '")).catch(handleRouteModuleError)');
           };
-          traverseRouteTree = function(route2) {
+          traverseRouteTree = function(route2, isRscClient2) {
             var children;
             if ("children" in route2 && route2.children) {
               var _route_children;
-              children = route2 === null || route2 === void 0 ? void 0 : (_route_children = route2.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+              children = route2 === null || route2 === void 0 ? void 0 : (_route_children = route2.children) === null || _route_children === void 0 ? void 0 : _route_children.map(function(child) {
+                return traverseRouteTree(child, isRscClient2);
+              });
             }
             var loading;
             var error;
@@ -238,7 +240,6 @@ var fileSystemRoutes = function() {
               }
             }
             var finalRoute2 = _object_spread_props(_object_spread({}, route2), {
-              lazyImport,
               loading,
               loader,
               action,
@@ -246,7 +247,10 @@ var fileSystemRoutes = function() {
               error,
               children
             });
-            if (route2._component) {
+            if (!isRscClient2) {
+              finalRoute2.lazyImport = lazyImport;
+            }
+            if (route2._component && !isRscClient2) {
               finalRoute2.component = component2;
             }
             if (route2.type === "nested" && route2._component && (route2.loader || route2.data)) {
@@ -260,7 +264,7 @@ var fileSystemRoutes = function() {
             for (_iterator = routes[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
               route = _step.value;
               if ("type" in route) {
-                newRoute = traverseRouteTree(route);
+                newRoute = traverseRouteTree(route, isRscClient);
                 routeStr = JSON.stringify(newRoute, null, 2);
                 keywords = [
                   "component",
@@ -406,7 +410,7 @@ var fileSystemRoutes = function() {
           routeModulesCode = "\n    if(typeof document !== 'undefined'){\n      window.".concat(ROUTE_MODULES, " = {}\n    }\n  ");
           return [
             2,
-            "\n    ".concat(importLazyCode, "\n    ").concat(importComponentsCode, "\n    ").concat(importRuntimeRouterCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(importConfigsCode, "\n    ").concat(routeModulesCode, "\n    ").concat(routeComponentsCode, "\n  ")
+            "\n    ".concat(importLazyCode, "\n    ").concat(!isRscClient ? importComponentsCode : "", "\n    ").concat(importRuntimeRouterCode, "\n    ").concat(!isRscClient ? rootLayoutCode : "", "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(importConfigsCode, "\n    ").concat(routeModulesCode, "\n    ").concat(routeComponentsCode, "\n  ")
           ];
       }
     });
@@ -433,11 +437,11 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
 }
 var runtimeGlobalContext = function() {
   var _ref = _async_to_generator(function(param) {
-    var entryName, metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp, imports, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, _ref2, moduleExports, hasAppConfig, hasAppInit, layoutPath;
+    var entryName, metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp, _param_rscType, rscType, imports, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, _ref2, moduleExports, hasAppConfig, hasAppInit, layoutPath, isClient, enableRsc;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          entryName = param.entryName, metaName = param.metaName, srcDirectory = param.srcDirectory, nestedRoutesEntry = param.nestedRoutesEntry, internalSrcAlias = param.internalSrcAlias, globalApp = param.globalApp;
+          entryName = param.entryName, metaName = param.metaName, srcDirectory = param.srcDirectory, nestedRoutesEntry = param.nestedRoutesEntry, internalSrcAlias = param.internalSrcAlias, globalApp = param.globalApp, _param_rscType = param.rscType, rscType = _param_rscType === void 0 ? false : _param_rscType;
           imports = [
             "import { setGlobalContext } from '@".concat(metaName, "/runtime/context';")
           ];
@@ -519,9 +523,21 @@ var runtimeGlobalContext = function() {
           } else {
             imports.push("let layoutApp;");
           }
+          isClient = rscType === "client";
+          enableRsc = Boolean(rscType);
+          if (isClient) {
+            return [
+              2,
+              "".concat(imports.join("\n"), "\n\n    import { routes } from './routes';\n\n    const entryName = '").concat(entryName, "';\n      setGlobalContext({\n        entryName,\n        layoutApp,\n        routes,\n        appInit,\n        appConfig,\n        isRscClient: true,\n        enableRsc: true,\n      });\n    ")
+            ];
+          } else {
+            return [
+              2,
+              "".concat(imports.join("\n"), "\n\n    import { routes } from './routes';\n\n    const entryName = '").concat(entryName, "';\n      setGlobalContext({\n        entryName,\n        layoutApp,\n        routes,\n        appInit,\n        appConfig,\n        enableRsc: ").concat(enableRsc, ",\n      });\n    ")
+            ];
+          }
           return [
-            2,
-            "".concat(imports.join("\n"), "\n\nimport { routes } from './routes';\n\nconst entryName = '").concat(entryName, "';\nsetGlobalContext({\n  entryName,\n  layoutApp,\n  routes,\n  appInit,\n  appConfig,\n});")
+            2
           ];
       }
     });

package/dist/esm/router/cli/handler.js

@@ -25,7 +25,7 @@ function handleGeneratorEntryCode(api, entrypoints, isRouterV5) {
 }
 function _handleGeneratorEntryCode() {
   _handleGeneratorEntryCode = _async_to_generator(function(api, entrypoints, isRouterV5) {
-    var appContext, internalDirectory, resolvedConfig, _ref, generatorRegisterCode, generateCode;
+    var _resolvedConfig_server, appContext, internalDirectory, resolvedConfig, _ref, generatorRegisterCode, generateCode, generatorServerRegisterCode, enableRsc;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -37,8 +37,9 @@ function _handleGeneratorEntryCode() {
             import("./code")
           ];
         case 1:
-          _ref = _state.sent(), generatorRegisterCode = _ref.generatorRegisterCode, generateCode = _ref.generateCode;
+          _ref = _state.sent(), generatorRegisterCode = _ref.generatorRegisterCode, generateCode = _ref.generateCode, generatorServerRegisterCode = _ref.generatorServerRegisterCode;
           originEntrypoints = cloneDeep(entrypoints);
+          enableRsc = resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_server = resolvedConfig.server) === null || _resolvedConfig_server === void 0 ? void 0 : _resolvedConfig_server.rsc;
           return [
             4,
             generateCode(appContext, resolvedConfig, entrypoints, api, isRouterV5)
@@ -49,14 +50,14 @@ function _handleGeneratorEntryCode() {
             4,
             Promise.all(entrypoints.map(function() {
               var _ref2 = _async_to_generator(function(entrypoint) {
-                var _entrypoint_fileSystemRoutes, _tmp;
+                var _entrypoint_fileSystemRoutes, _tmp, _entrypoint_fileSystemRoutes1, _tmp1;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
                       if (!(entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry))
                         return [
                           3,
-                          2
+                          3
                         ];
                       _tmp = [
                         internalDirectory,
@@ -70,15 +71,41 @@ function _handleGeneratorEntryCode() {
                           srcDirectory: appContext.srcDirectory,
                           nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                           internalSrcAlias: appContext.internalSrcAlias,
-                          globalApp: (_entrypoint_fileSystemRoutes = entrypoint.fileSystemRoutes) === null || _entrypoint_fileSystemRoutes === void 0 ? void 0 : _entrypoint_fileSystemRoutes.globalApp
+                          globalApp: (_entrypoint_fileSystemRoutes = entrypoint.fileSystemRoutes) === null || _entrypoint_fileSystemRoutes === void 0 ? void 0 : _entrypoint_fileSystemRoutes.globalApp,
+                          rscType: enableRsc ? "client" : void 0
                         })
                       ];
                     case 1:
                       generatorRegisterCode.apply(void 0, _tmp.concat([
                         _state2.sent()
                       ]));
-                      _state2.label = 2;
+                      if (!enableRsc)
+                        return [
+                          3,
+                          3
+                        ];
+                      _tmp1 = [
+                        internalDirectory,
+                        entrypoint.entryName
+                      ];
+                      return [
+                        4,
+                        templates.runtimeGlobalContext({
+                          entryName: entrypoint.entryName,
+                          metaName: appContext.metaName,
+                          srcDirectory: appContext.srcDirectory,
+                          nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+                          internalSrcAlias: appContext.internalSrcAlias,
+                          globalApp: (_entrypoint_fileSystemRoutes1 = entrypoint.fileSystemRoutes) === null || _entrypoint_fileSystemRoutes1 === void 0 ? void 0 : _entrypoint_fileSystemRoutes1.globalApp,
+                          rscType: "server"
+                        })
+                      ];
                     case 2:
+                      generatorServerRegisterCode.apply(void 0, _tmp1.concat([
+                        _state2.sent()
+                      ]));
+                      _state2.label = 3;
+                    case 3:
                       return [
                         2
                       ];

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

@@ -37,7 +37,7 @@ var routerPlugin = function() {
         if ((nestedRoutesEntry || pageRoutesEntry) && !isRouterV5) {
           plugins.push({
             name: "router",
-            path: "@".concat(metaName2, "/runtime/router"),
+            path: "@".concat(metaName2, "/runtime/router/internal"),
             config: typeof routerConfig === "boolean" ? {
               serverBase
             } : _object_spread_props(_object_spread({}, routerConfig), {
@@ -64,9 +64,10 @@ var routerPlugin = function() {
               // react-router v6 is no longer support ie 11
               // so we need to compile these packages to ensure the compatibility
               // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
-              /node_modules\/react-router/,
-              /node_modules\/react-router-dom/,
-              /node_modules\/@remix-run\/router/
+              /[\\/]node_modules[\\/]react-router[\\/]/,
+              /[\\/]node_modules[\\/]react-router-dom[\\/]/,
+              /[\\/]node_modules[\\/]@remix-run[\\/]router[\\/]/,
+              path.resolve(__dirname, "../runtime").replace("cjs", "esm")
             ],
             globalVars: {
               "process.env._MODERN_ROUTER_VERSION": "v6"
@@ -127,7 +128,7 @@ var routerPlugin = function() {
         var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName2 = _api_useAppContext.metaName;
         var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
         if (!isRouterV5) {
-          pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName2, "/runtime/router'"));
+          pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName2, "/runtime/router/internal'"));
         }
       });
       api.onFileChanged(function() {

package/dist/esm/router/index.js

@@ -1,7 +1 @@
-import { default as default2 } from "./runtime";
-import { default as default3 } from "./runtime";
 export * from "./runtime";
-export {
-  default3 as default,
-  default2 as router
-};

package/dist/esm/router/internal.js

@@ -0,0 +1,5 @@
+export * from "./runtime/internal";
+import { routerPlugin } from "./runtime/internal";
+export {
+  routerPlugin as default
+};

package/dist/esm/router/runtime/PrefetchLink.js

@@ -1,3 +1,4 @@
+"use client";
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
@@ -242,6 +243,5 @@ var NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
 export {
   Link,
-  NavLink,
-  composeEventHandlers
+  NavLink
 };