@modern-js/runtime 2.68.0 → 2.68.2

package/dist/esm-node/cli/template.js

@@ -1,7 +1,21 @@
 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";
-const genRenderCode = ({ srcDirectory, internalSrcAlias, metaName, entry, customEntry, customBootstrap, mountId, enableRsc }) => {
+const genRenderStatement = ({ customBootstrap, enableRsc, mountId, isNestedRouter }) => {
+  if (customBootstrap) {
+    return `customBootstrap(ModernRoot, () => render(<ModernRoot />, '${mountId || "root"}'));`;
+  }
+  if (enableRsc) {
+    if (!isNestedRouter) {
+      return `render(<ModernRoot>
+                  <RscClientRoot rscPayload={data} />
+                </ModernRoot>, '${mountId || "root"}');`;
+    }
+    return `render(<ModernRoot rscPayload={data} />, '${mountId || "root"}');`;
+  }
+  return `render(<ModernRoot />, '${mountId || "root"}');`;
+};
+const genRenderCode = ({ srcDirectory, internalSrcAlias, metaName, entry, customEntry, customBootstrap, mountId, enableRsc, isNestedRouter }) => {
   if (customEntry) {
     return `import '${formatImportPath(entry.replace(srcDirectory, internalSrcAlias))}'`;
   }
@@ -20,11 +34,14 @@ ${customBootstrap ? `import customBootstrap from '${formatImportPath(customBoots
 
 const ModernRoot = createRoot();
 
-${customBootstrap ? `customBootstrap(ModernRoot, () => render(<ModernRoot />, '${mountId || "root"}'));` : enableRsc ? `render(<ModernRoot>
-                  <RscClientRoot data={data} />
-                </ModernRoot>, '${mountId || "root"}');` : `render(<ModernRoot />, '${mountId || "root"}');`}`;
+${genRenderStatement({
+    customBootstrap,
+    enableRsc,
+    mountId,
+    isNestedRouter
+  })}`;
 };
-const entryForCSRWithRSC = ({ metaName, entryName, urlPath = "/", mountId = "root" }) => {
+const entryForCSRWithRSC = ({ metaName, entryName, urlPath = "/", mountId = "root", isNestedRouter }) => {
   return `
   import '@${metaName}/runtime/registry/${entryName}';
   import { render } from '@${metaName}/runtime/browser';
@@ -32,28 +49,61 @@ const entryForCSRWithRSC = ({ metaName, entryName, urlPath = "/", mountId = "roo
 
   import {
     RscClientRoot,
-    createFromFetch
+    createFromFetch,
+    isRedirectResponse,
+    rscStream,
+    callServer,
+    createFromReadableStream
   } from '@${metaName}/runtime/rsc/client';
 
-  const content = createFromFetch(
-    fetch('${urlPath}', {
-      headers: {
-        'x-rsc-tree': 'true',
-      },
-    }),
-  );
+  const handleRedirectResponse = (res: Response) => {
+    const { headers } = res;
+    const location = headers.get('X-Modernjs-Redirect');
+    const baseUrl = headers.get('X-Modernjs-BaseUrl');
+    if (location) {
+      if (baseUrl !== '/') {
+        window.location.replace(baseUrl + location);
+      } else {
+        window.location.replace(location);
+      }
+      return;
+    }
+    return res;
+  };
+
+  ${process.env.MODERN_DISABLE_INJECT_RSC_DATA ? `
+      const data = createFromFetch(
+        fetch(location.pathname, {
+          headers: {
+            'x-rsc-tree': 'true',
+          },
+        }).then(handleRedirectResponse),
+      )
+      ` : `
+      const data = createFromReadableStream(rscStream, {
+        callServer: callServer,
+      });
+      `}
 
   const ModernRoot = createRoot();
 
-  render(
-    <ModernRoot>
-      <RscClientRoot data={content} />
-    </ModernRoot>,
-    '${mountId}',
-  );
+  ${isNestedRouter ? `
+      render(
+        <ModernRoot rscPayload={data}>
+        </ModernRoot>,
+        '${mountId}',
+      );
+      ` : `
+      render(
+        <ModernRoot>
+          <RscClientRoot rscPayload={data} />
+        </ModernRoot>,
+        '${mountId}',
+      );
+      `}
   `;
 };
-const index = ({ srcDirectory, internalSrcAlias, metaName, entry, entryName, customEntry, customBootstrap, mountId, enableRsc }) => `import '@${metaName}/runtime/registry/${entryName}';
+const index = ({ srcDirectory, internalSrcAlias, metaName, entry, entryName, customEntry, customBootstrap, mountId, enableRsc, isNestedRouter }) => `import '@${metaName}/runtime/registry/${entryName}';
 ${genRenderCode({
   srcDirectory,
   internalSrcAlias,
@@ -62,7 +112,8 @@ ${genRenderCode({
   customEntry,
   customBootstrap,
   mountId,
-  enableRsc
+  enableRsc,
+  isNestedRouter
 })}
 `;
 const register = () => `import './${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}';

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

@@ -24,6 +24,7 @@ import {
   createRequestHandler,
 } from '@#metaName/runtime/ssr/server';
 import { RSCServerSlot } from '@#metaName/runtime/rsc/client';
+import { renderRsc } from '@#metaName/runtime/rsc/server';
 export { handleAction } from '@#metaName/runtime/rsc/server';
 
 const handleRequest = async (request, ServerRoot, options) => {
@@ -34,7 +35,7 @@ const handleRequest = async (request, ServerRoot, options) => {
     </ServerRoot>,
     {
       ...options,
-      rscRoot: <options.RSCRoot />,
+      rscRoot: options.rscRoot,
     },
   );
 
@@ -46,7 +47,22 @@ const handleRequest = async (request, ServerRoot, options) => {
 };
 
 export const requestHandler = createRequestHandler(handleRequest, {
-  enableRsc: true,
+  enableRsc: true
+});
+
+const handleRSCRequest = async (request, ServerRoot, options) => {
+  const { serverPayload } = options;
+  const stream = renderRsc({
+    element: options.rscRoot,
+    clientManifest: options.rscClientManifest!,
+  });
+
+  return new Response(stream);
+}
+
+
+export const rscPayloadHandler = createRequestHandler(handleRSCRequest, {
+  enableRsc: true
 });
 `;
 const serverIndex = (options) => {
@@ -56,24 +72,57 @@ const serverIndex = (options) => {
     ${genHandlerCode(options)}
   `;
 };
-const entryForCSRWithRSC = ({ metaName }) => {
+const entryForCSRWithRSC = ({ metaName, entryName }) => {
   return `
-  import App from './AppProxy';
-  import { renderRsc } from '@${metaName}/runtime/rsc/server'
+  import '@${metaName}/runtime/registry/${entryName}';
+  import {
+    createRequestHandler,
+  } from '@${metaName}/runtime/ssr/server';
+  import { renderRsc, processRSCStream } from '@${metaName}/runtime/rsc/server'
   export { handleAction } from '@${metaName}/runtime/rsc/server';
 
+  const handleCSRRender = async (request, ServerRoot, options) => {
+    const rscPayloadStream = renderRsc({
+      element: options.rscRoot,
+      clientManifest: options.rscClientManifest!,
+    });
+    const stream = new ReadableStream({
+      start(controller) {
+        const encoder = new TextEncoder();
+
+        controller.enqueue(encoder.encode(options.html));
 
-  export const rscRequestHandler = ({
-    clientManifest
-  }) => {
+      processRSCStream(rscPayloadStream, controller, encoder)
+        .catch(err => {
+          controller.error(err);
+        });
+      }
+    });
+
+    return new Response(stream, {
+      status: 200,
+      headers: new Headers({
+        'content-type': 'text/html; charset=UTF-8',
+      }),
+    });
+  }
+
+  export const renderRscStreamHandler = createRequestHandler(handleCSRRender, {
+    enableRsc: true
+  });
+
+  const handleRequest = async (request, ServerRoot, options) => {
     const stream = renderRsc({
-      element: <App/>,
-      clientManifest,
-    })
+            element: options.rscRoot,
+      clientManifest: options.rscClientManifest!,
+    });
 
-    const response = new Response(stream);
-    return response
+    return new Response(stream);
   }
+
+  export const rscPayloadHandler = createRequestHandler(handleRequest, {
+    enableRsc: true
+  });
 `;
 };
 function genHandlerCode({ mode, metaName, customServerEntry, srcDirectory, internalSrcAlias, enableRsc }) {

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

@@ -1,5 +1,12 @@
 import { RuntimeReactContext, getInitialContext } from "./runtime";
 const 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-node/core/context/serverPayload.server.js

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

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

@@ -1,12 +1,37 @@
+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";
+async function handleRSCRequest(request, Root, context, options, handleRequest) {
+  const serverPayload = getServerPayload();
+  if (typeof serverPayload !== "undefined") {
+    return await handleRequest(request, Root, {
+      ...options,
+      runtimeContext: context,
+      rscRoot: serverPayload
+    });
+  }
+  const App = getGlobalRSCRoot();
+  if (App) {
+    return await handleRequest(request, Fragment, {
+      ...options,
+      runtimeContext: context,
+      rscRoot: /* @__PURE__ */ _jsx(App, {})
+    });
+  }
+  return await handleRequest(request, Root, {
+    ...options,
+    runtimeContext: context
+  });
+}
 function createSSRContext(request, options) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
   const { nonce, useJsonScript } = config;
@@ -77,7 +102,8 @@ const createRequestHandler = async (handleRequest, createRequestOptions) => {
       request,
       monitors: options.monitors,
       responseProxy,
-      activeDeferreds
+      activeDeferreds,
+      serverPayload: void 0
     }, async () => {
       var _context_routerContext, _context_routerContext1, _context_routerContext2;
       const Root = createRoot();
@@ -135,15 +161,25 @@ const createRequestHandler = async (handleRequest, createRequestOptions) => {
       context.initialData = initialData;
       const redirectResponse = getRedirectResponse(initialData);
       if (redirectResponse) {
-        return redirectResponse;
+        if (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) {
+          return initialData;
+        } else {
+          return redirectResponse;
+        }
+      }
+      if (!(createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc)) {
+        const { htmlTemplate } = options.resource;
+        options.resource.htmlTemplate = htmlTemplate.replace("</head>", `${CHUNK_CSS_PLACEHOLDER}</head>`);
+      }
+      let response;
+      if (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) {
+        response = await handleRSCRequest(request, Root, context, options, handleRequest);
+      } else {
+        response = await handleRequest(request, Root, {
+          ...options,
+          runtimeContext: context
+        });
       }
-      const { htmlTemplate } = options.resource;
-      options.resource.htmlTemplate = htmlTemplate.replace("</head>", `${CHUNK_CSS_PLACEHOLDER}</head>`);
-      const response = await handleRequest(request, Root, {
-        ...options,
-        runtimeContext: context,
-        RSCRoot: (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) && getGlobalRSCRoot()
-      });
       Object.entries(responseProxy.headers).forEach(([key, value]) => {
         response.headers.set(key, value);
       });

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

@@ -1,5 +1,5 @@
 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";
@@ -73,14 +73,15 @@ const generateCode = async (appContext, config, entrypoints, api, isRouterV5) =>
           code: await templates.fileSystemRoutes({
             metaName,
             routes,
-            ssrMode: useSSG ? "string" : mode,
+            ssrMode: useSSG ? "string" : isUseRsc(config2) ? "stream" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks,
+            isRscClient: isUseRsc(config2)
           })
         });
-        if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {
+        if (entrypoint.nestedRoutesEntry && (isUseSSRBundle(config2) || isUseRsc(config2))) {
           var _config_output1;
           const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
           const filtedRoutesForServer = filterRoutesForServer(routes);
@@ -97,7 +98,8 @@ const generateCode = async (appContext, config, entrypoints, api, isRouterV5) =>
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks,
+            isRscClient: false
           });
           await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, "utf8");
         }
@@ -114,7 +116,11 @@ const generateCode = async (appContext, config, entrypoints, api, isRouterV5) =>
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.js`), code, "utf8");
 }
+function generatorServerRegisterCode(internalDirectory, entryName, code) {
+  fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.server.js`), code, "utf8");
+}
 export {
   generateCode,
-  generatorRegisterCode
+  generatorRegisterCode,
+  generatorServerRegisterCode
 };

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

@@ -85,7 +85,7 @@ const routesForServer = ({ routesForServerLoaderMatches }) => {
 };
 const createMatchReg = (keyword) => new RegExp(`("${keyword}":\\s)"([^
 ]+)"`, "g");
-const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks = true }) => {
+const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks = true, isRscClient = false }) => {
   const components = [];
   const loadings = [];
   const errors = [];
@@ -111,14 +111,14 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
     return "";
   };
   const createLazyImport = ({ componentPath, routeId, webpackChunkName, eager }) => {
-    const importOptions = webpackChunkName ? `/* webpackChunkName: "${routeId}" */ ` : eager ? `/* webpackMode: "eager" */ ` : "";
+    const importOptions = webpackChunkName ? `/* webpackChunkName: "${routeId}" */  ` : eager ? `/* webpackMode: "eager" */  ` : "";
     return `() => import(${importOptions}'${componentPath}').then(routeModule => handleRouteModule(routeModule, "${routeId}")).catch(handleRouteModuleError)`;
   };
-  const traverseRouteTree = (route) => {
+  const traverseRouteTree = (route, isRscClient2) => {
     let children;
     if ("children" in route && route.children) {
       var _route_children;
-      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map((child) => traverseRouteTree(child, isRscClient2));
     }
     let loading;
     let error;
@@ -201,7 +201,6 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
     }
     const finalRoute = {
       ...route,
-      lazyImport,
       loading,
       loader,
       action,
@@ -209,7 +208,10 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
       error,
       children
     };
-    if (route._component) {
+    if (!isRscClient2) {
+      finalRoute.lazyImport = lazyImport;
+    }
+    if (route._component && !isRscClient2) {
       finalRoute.component = component;
     }
     if (route.type === "nested" && route._component && (route.loader || route.data)) {
@@ -222,7 +224,7 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
   `;
   for (const route of routes) {
     if ("type" in route) {
-      const newRoute = traverseRouteTree(route);
+      const newRoute = traverseRouteTree(route, isRscClient);
       const routeStr = JSON.stringify(newRoute, null, 2);
       const keywords = [
         "component",
@@ -321,9 +323,9 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
   `;
   return `
     ${importLazyCode}
-    ${importComponentsCode}
+    ${!isRscClient ? importComponentsCode : ""}
     ${importRuntimeRouterCode}
-    ${rootLayoutCode}
+    ${!isRscClient ? rootLayoutCode : ""}
     ${importLoadingCode}
     ${importErrorComponentsCode}
     ${importLoadersCode}
@@ -362,7 +364,7 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
   }
   return null;
 }
-const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp }) => {
+const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp, rscType = false }) => {
   const imports = [
     `import { setGlobalContext } from '@${metaName}/runtime/context';`
   ];
@@ -407,18 +409,40 @@ const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedR
   } else {
     imports.push(`let layoutApp;`);
   }
-  return `${imports.join("\n")}
+  const isClient = rscType === "client";
+  const enableRsc = Boolean(rscType);
+  if (isClient) {
+    return `${imports.join("\n")}
+
+    import { routes } from './routes';
+
+    const entryName = '${entryName}';
+      setGlobalContext({
+        entryName,
+        layoutApp,
+        routes,
+        appInit,
+        appConfig,
+        isRscClient: true,
+        enableRsc: true,
+      });
+    `;
+  } else {
+    return `${imports.join("\n")}
 
-import { routes } from './routes';
+    import { routes } from './routes';
 
-const entryName = '${entryName}';
-setGlobalContext({
-  entryName,
-  layoutApp,
-  routes,
-  appInit,
-  appConfig,
-});`;
+    const entryName = '${entryName}';
+      setGlobalContext({
+        entryName,
+        layoutApp,
+        routes,
+        appInit,
+        appConfig,
+        enableRsc: ${enableRsc},
+      });
+    `;
+  }
 };
 export {
   fileSystemRoutes,

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

@@ -8,11 +8,13 @@ async function handleModifyEntrypoints(isRouterV5, entrypoints) {
   return modifyEntrypoints(entrypoints, isRouterV5);
 }
 async function handleGeneratorEntryCode(api, entrypoints, isRouterV5) {
+  var _resolvedConfig_server;
   const appContext = api.getAppContext();
   const { internalDirectory } = appContext;
   const resolvedConfig = api.getNormalizedConfig();
-  const { generatorRegisterCode, generateCode } = await import("./code");
+  const { generatorRegisterCode, generateCode, generatorServerRegisterCode } = await import("./code");
   originEntrypoints = cloneDeep(entrypoints);
+  const enableRsc = resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_server = resolvedConfig.server) === null || _resolvedConfig_server === void 0 ? void 0 : _resolvedConfig_server.rsc;
   await generateCode(appContext, resolvedConfig, entrypoints, api, isRouterV5);
   await Promise.all(entrypoints.map(async (entrypoint) => {
     if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
@@ -23,8 +25,21 @@ async function handleGeneratorEntryCode(api, entrypoints, isRouterV5) {
         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
       }));
+      if (enableRsc) {
+        var _entrypoint_fileSystemRoutes1;
+        generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await 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"
+        }));
+      }
     }
   }));
   return entrypoints;

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

@@ -25,7 +25,7 @@ const routerPlugin = () => ({
       if ((nestedRoutesEntry || pageRoutesEntry) && !isRouterV5) {
         plugins.push({
           name: "router",
-          path: `@${metaName2}/runtime/router`,
+          path: `@${metaName2}/runtime/router/internal`,
           config: typeof routerConfig === "boolean" ? {
             serverBase
           } : {
@@ -52,9 +52,10 @@ const routerPlugin = () => ({
             // 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"
@@ -75,7 +76,7 @@ const routerPlugin = () => ({
       const { internalDirectory, metaName: metaName2 } = api.useAppContext();
       const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
       if (!isRouterV5) {
-        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName2}/runtime/router'`);
+        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName2}/runtime/router/internal'`);
       }
     });
     api.onFileChanged(async (e) => {

package/dist/esm-node/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-node/router/internal.js

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

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

@@ -1,3 +1,4 @@
+"use client";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Link as RouterLink, NavLink as RouterNavLink, matchRoutes, useHref, useMatches, useResolvedPath } from "@modern-js/runtime-utils/router";
 import React, { useContext, useMemo } from "react";
@@ -187,6 +188,5 @@ const NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
 export {
   Link,
-  NavLink,
-  composeEventHandlers
+  NavLink
 };

package/dist/esm-node/router/runtime/constants.js

@@ -2,9 +2,9 @@ import { ROUTER_DATA_JSON_ID } from "../../core/constants";
 const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
 const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
-const mergeLoaderDataStr = `function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}`;
+const mergeLoaderDataStr = `function mergeLoaderData(e,n){var r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){var t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}`;
 const initRouterDataAttrs = `_ROUTER_DATA.s = ${setupFnStr}_ROUTER_DATA.r = ${resolveFnStr}_ROUTER_DATA.p = ${preResolvedFnStr}${mergeLoaderDataStr}`;
-const modernInline = `function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('${ROUTER_DATA_JSON_ID}');${initRouterDataAttrs}`;
+const modernInline = `function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")].apply(window,JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")].apply(_ROUTER_DATA,JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('${ROUTER_DATA_JSON_ID}');${initRouterDataAttrs}`;
 const runRouterDataFnStr = `runRouterDataFn();`;
 const runWindowFnStr = `runWindowFn();`;
 export {