@modern-js/runtime 3.1.0 → 3.1.1

package/dist/cjs/cli/code.js

@@ -59,13 +59,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 nestedRoutesEntry
             });
             let indexCode = '';
-            indexCode = !ssrMode && config.server.rsc ? external_template_js_namespaceObject.entryForCSRWithRSC({
-                metaName,
-                entryName,
-                mountId,
-                urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
-                isNestedRouter: entrypoint.nestedRoutesEntry
-            }) : external_template_js_namespaceObject.index({
+            indexCode = ssrMode || !config.server.rsc || customEntry ? external_template_js_namespaceObject.index({
                 srcDirectory,
                 internalSrcAlias,
                 metaName,
@@ -75,6 +69,12 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 mountId,
                 enableRsc: config.server.rsc,
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
+            }) : external_template_js_namespaceObject.entryForCSRWithRSC({
+                metaName,
+                entryName,
+                mountId,
+                urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
+                isNestedRouter: entrypoint.nestedRoutesEntry
             });
             const indexFile = external_path_default().resolve(internalDirectory, `./${entryName}/${external_constants_js_namespaceObject.ENTRY_POINT_FILE_NAME}`);
             await utils_namespaceObject.fs.outputFile(indexFile, indexCode, 'utf8');
@@ -141,7 +141,8 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 });
                 await utils_namespaceObject.fs.outputFile(AppProxyPath, appProxyCode);
                 contextCode = external_template_js_namespaceObject.runtimeGlobalContextForRSCClient({
-                    metaName
+                    metaName,
+                    customEntry
                 });
                 const contextServerCode = external_template_js_namespaceObject.runtimeGlobalContextForRSCServer({
                     metaName

package/dist/cjs/cli/template.js

@@ -197,16 +197,54 @@ const runtimeGlobalContextForRSCServer = ({ metaName })=>`
     App: DefaultRoot,
     RSCRoot: AppProxy,
   });`;
-const runtimeGlobalContextForRSCClient = ({ metaName })=>`
-  import { createElement, Fragment } from 'react';
-  import { setGlobalContext } from '@${metaName}/runtime/context';
+const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
+   ${customEntry ? `import {
+     RscClientRoot,
+     createFromFetch,
+     createFromReadableStream,
+     isRedirectResponse,
+     rscStream,
+     callServer,
+     setServerCallback,
+   } from '@${metaName}/runtime/rsc/client';` : ''}
+   import { createElement, Fragment } from 'react';
+   import { setGlobalContext } from '@${metaName}/runtime/context';
 
-  const DefaultRoot = ({ children }: { children?: ReactNode }) =>
-    createElement(Fragment, null, children);
+   ${customEntry ? 'setServerCallback(callServer);' : ''}
 
-  setGlobalContext({
-    App: DefaultRoot
-  });`;
+   ${customEntry ? `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 && baseUrl !== '/') {
+         window.location.replace(baseUrl + location);
+       } else {
+         window.location.replace(location);
+       }
+       return res;
+     }
+     return res;
+   };
+
+   const data = ${process.env.MODERN_DISABLE_INJECT_RSC_DATA ? `createFromFetch(
+     fetch(location.pathname, {
+       headers: {
+         'x-rsc-tree': 'true',
+       },
+     }).then(handleRedirectResponse),
+   )` : `createFromReadableStream(rscStream, {
+     callServer: callServer,
+   })`};` : ''}
+
+   const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+     createElement(Fragment, null, children);
+
+   ${customEntry ? 'const RSCRoot = () => createElement(RscClientRoot, { rscPayload: data });' : ''}
+
+   setGlobalContext({
+     App: ${customEntry ? 'RSCRoot' : 'DefaultRoot'}
+   });`;
 const AppProxyForRSC = ({ srcDirectory, internalSrcAlias, entry, customEntry })=>`
   import App from '${(0, utils_namespaceObject.formatImportPath)(customEntry ? entry.replace(/entry\.[tj]sx/, 'App').replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace('.tsx', ''))}';
   import React from 'react';

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

@@ -18,9 +18,6 @@ var __webpack_require__ = {};
         });
     };
 })();
-(()=>{
-    __webpack_require__.e = ()=>Promise.resolve();
-})();
 (()=>{
     __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
 })();
@@ -183,7 +180,7 @@ const createPrefetchLink = (Link)=>/*#__PURE__*/ external_react_default().forwar
                     ...props,
                     ...prefetchHandlers
                 }),
-                shouldPrefetch && __webpack_require__.e && !isAbsolute ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(PrefetchPageLinks, {
+                shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(PrefetchPageLinks, {
                     path: resolvedPath
                 }) : null
             ]

package/dist/esm/cli/code.mjs

@@ -21,13 +21,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 nestedRoutesEntry
             });
             let indexCode = '';
-            indexCode = !ssrMode && config.server.rsc ? entryForCSRWithRSC({
-                metaName,
-                entryName,
-                mountId,
-                urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
-                isNestedRouter: entrypoint.nestedRoutesEntry
-            }) : index({
+            indexCode = ssrMode || !config.server.rsc || customEntry ? index({
                 srcDirectory,
                 internalSrcAlias,
                 metaName,
@@ -37,6 +31,12 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 mountId,
                 enableRsc: config.server.rsc,
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
+            }) : entryForCSRWithRSC({
+                metaName,
+                entryName,
+                mountId,
+                urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
+                isNestedRouter: entrypoint.nestedRoutesEntry
             });
             const indexFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
             await fs.outputFile(indexFile, indexCode, 'utf8');
@@ -103,7 +103,8 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 });
                 await fs.outputFile(AppProxyPath, appProxyCode);
                 contextCode = runtimeGlobalContextForRSCClient({
-                    metaName
+                    metaName,
+                    customEntry
                 });
                 const contextServerCode = runtimeGlobalContextForRSCServer({
                     metaName

package/dist/esm/cli/index.mjs

@@ -89,4 +89,5 @@ const runtimePlugin = (params)=>({
         }
     });
 const cli = runtimePlugin;
-export { cli as default, documentPlugin, isRuntimeEntry, routerPlugin, runtimePlugin, ssrPlugin };
+export default cli;
+export { documentPlugin, isRuntimeEntry, routerPlugin, runtimePlugin, ssrPlugin };

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

@@ -105,4 +105,5 @@ const ssrPlugin = ()=>({
         }
     });
 const cli_ssr = ssrPlugin;
-export { cli_ssr as default, ssrPlugin };
+export default cli_ssr;
+export { ssrPlugin };

package/dist/esm/cli/ssr/loadable-bundler-plugin.mjs

@@ -73,4 +73,4 @@ class LoadablePlugin {
     }
 }
 const loadable_bundler_plugin = LoadablePlugin;
-export { loadable_bundler_plugin as default };
+export default loadable_bundler_plugin;

package/dist/esm/cli/template.mjs

@@ -152,16 +152,54 @@ const runtimeGlobalContextForRSCServer = ({ metaName })=>`
     App: DefaultRoot,
     RSCRoot: AppProxy,
   });`;
-const runtimeGlobalContextForRSCClient = ({ metaName })=>`
-  import { createElement, Fragment } from 'react';
-  import { setGlobalContext } from '@${metaName}/runtime/context';
-
-  const DefaultRoot = ({ children }: { children?: ReactNode }) =>
-    createElement(Fragment, null, children);
-
-  setGlobalContext({
-    App: DefaultRoot
-  });`;
+const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
+   ${customEntry ? `import {
+     RscClientRoot,
+     createFromFetch,
+     createFromReadableStream,
+     isRedirectResponse,
+     rscStream,
+     callServer,
+     setServerCallback,
+   } from '@${metaName}/runtime/rsc/client';` : ''}
+   import { createElement, Fragment } from 'react';
+   import { setGlobalContext } from '@${metaName}/runtime/context';
+
+   ${customEntry ? 'setServerCallback(callServer);' : ''}
+
+   ${customEntry ? `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 && baseUrl !== '/') {
+         window.location.replace(baseUrl + location);
+       } else {
+         window.location.replace(location);
+       }
+       return res;
+     }
+     return res;
+   };
+
+   const data = ${process.env.MODERN_DISABLE_INJECT_RSC_DATA ? `createFromFetch(
+     fetch(location.pathname, {
+       headers: {
+         'x-rsc-tree': 'true',
+       },
+     }).then(handleRedirectResponse),
+   )` : `createFromReadableStream(rscStream, {
+     callServer: callServer,
+   })`};` : ''}
+
+   const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+     createElement(Fragment, null, children);
+
+   ${customEntry ? 'const RSCRoot = () => createElement(RscClientRoot, { rscPayload: data });' : ''}
+
+   setGlobalContext({
+     App: ${customEntry ? 'RSCRoot' : 'DefaultRoot'}
+   });`;
 const AppProxyForRSC = ({ srcDirectory, internalSrcAlias, entry, customEntry })=>`
   import App from '${formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, 'App').replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace('.tsx', ''))}';
   import React from 'react';

package/dist/esm/core/constants.mjs

@@ -5,4 +5,4 @@ var constants_RenderLevel = /*#__PURE__*/ function(RenderLevel) {
 }({});
 const SSR_DATA_JSON_ID = '__MODERN_SSR_DATA__';
 const ROUTER_DATA_JSON_ID = '__MODERN_ROUTER_DATA__';
-export { ROUTER_DATA_JSON_ID, constants_RenderLevel as RenderLevel, SSR_DATA_JSON_ID };
+export { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, constants_RenderLevel as RenderLevel };

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

@@ -1,5 +1,3 @@
-import { InternalRuntimeContext, RuntimeContext, getInitialContext } from "./runtime.mjs";
-import { getServerPayload, setServerPayload } from "./serverPayload/index.mjs";
 const globalContext = {};
 function getGlobalIsRscClient() {
     return globalContext.isRscClient;
@@ -42,4 +40,6 @@ function getGlobalLayoutApp() {
 function getGlobalBasename() {
     return globalContext.basename;
 }
-export { InternalRuntimeContext, RuntimeContext, getCurrentEntryName, getGlobalApp, getGlobalBasename, getGlobalEnableRsc, getGlobalInternalRuntimeContext, getGlobalIsRscClient, getGlobalLayoutApp, getGlobalRSCRoot, getGlobalRoutes, getInitialContext, getServerPayload, setGlobalContext, setGlobalInternalRuntimeContext, setServerPayload };
+export { InternalRuntimeContext, RuntimeContext, getInitialContext } from "./runtime.mjs";
+export { getServerPayload, setServerPayload } from "./serverPayload/index.mjs";
+export { getCurrentEntryName, getGlobalApp, getGlobalBasename, getGlobalEnableRsc, getGlobalInternalRuntimeContext, getGlobalIsRscClient, getGlobalLayoutApp, getGlobalRSCRoot, getGlobalRoutes, setGlobalContext, setGlobalInternalRuntimeContext };

package/dist/esm/core/index.mjs

@@ -1,3 +1,2 @@
-import { defineRuntimeConfig } from "./config.mjs";
-import { RuntimeContext, useRuntimeContext } from "./context/runtime.mjs";
-export { RuntimeContext, defineRuntimeConfig, useRuntimeContext };
+export { defineRuntimeConfig } from "./config.mjs";
+export { RuntimeContext, useRuntimeContext } from "./context/runtime.mjs";

package/dist/esm/core/server/index.mjs

@@ -1,7 +1,8 @@
-import { NoSSR, NoSSRCache } from "./react/index.mjs";
 const ssr = (_config)=>({
         name: '@modern-js/plugin-ssr',
         setup: (_api)=>{}
     });
 const server = ssr;
-export { NoSSR, NoSSRCache, server as default, ssr };
+export { NoSSR, NoSSRCache } from "./react/index.mjs";
+export default server;
+export { ssr };

package/dist/esm/core/server/react/index.mjs

@@ -1,3 +1,2 @@
-import { NoSSR } from "./nossr/index.mjs";
-import { NoSSRCache } from "./no-ssr-cache/index.mjs";
-export { NoSSR, NoSSRCache };
+export { NoSSR } from "./nossr/index.mjs";
+export { NoSSRCache } from "./no-ssr-cache/index.mjs";

package/dist/esm/core/server/server.mjs

@@ -1,4 +1,3 @@
-import { renderString } from "./string/index.mjs";
-import { renderStreaming } from "./stream/index.mjs";
-import { createRequestHandler } from "./requestHandler.mjs";
-export { createRequestHandler, renderStreaming, renderString };
+export { renderString } from "./string/index.mjs";
+export { renderStreaming } from "./stream/index.mjs";
+export { createRequestHandler } from "./requestHandler.mjs";

package/dist/esm/core/server/stream/shared.mjs

@@ -105,4 +105,4 @@ function createRenderStreaming(createReadableStreamPromise) {
         return stream;
     };
 }
-export { shared_ShellChunkStatus as ShellChunkStatus, createRenderStreaming, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode };
+export { createRenderStreaming, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode, shared_ShellChunkStatus as ShellChunkStatus };

package/dist/esm/document/cli/index.mjs

@@ -347,4 +347,5 @@ const documentPlugin = ()=>({
         }
     });
 const cli = documentPlugin;
-export { cli as default, documentPlugin, getDocumentByEntryName };
+export default cli;
+export { documentPlugin, getDocumentByEntryName };

package/dist/esm/exports/head.mjs

@@ -1,4 +1,5 @@
 "use client";
 import react_helmet, { Helmet } from "react-helmet";
 const head = react_helmet;
-export { Helmet, head as default };
+export default head;
+export { Helmet };

package/dist/esm/exports/loadable.mjs

@@ -1,4 +1,4 @@
-import component from "@loadable/component";
 export * from "@loadable/component";
+import component from "@loadable/component";
 const loadable = component;
-export { loadable as default };
+export default loadable;

package/dist/esm/index.mjs

@@ -1,6 +1,5 @@
-import { isBrowser } from "./common.mjs";
-import { getMonitors } from "./core/context/monitors/index.mjs";
-import { getRequest } from "./core/context/request/index.mjs";
-import { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
-import { RuntimeContext, defineRuntimeConfig, useRuntimeContext } from "./core/index.mjs";
-export { RuntimeContext, defineRuntimeConfig, getMonitors, getRequest, isBrowser, redirect, setHeaders, setStatus, useRuntimeContext };
+export { isBrowser } from "./common.mjs";
+export { getMonitors } from "./core/context/monitors/index.mjs";
+export { getRequest } from "./core/context/request/index.mjs";
+export { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
+export { RuntimeContext, defineRuntimeConfig, useRuntimeContext } from "./core/index.mjs";

package/dist/esm/internal.mjs

@@ -1,2 +1 @@
-import { InternalRuntimeContext } from "./core/context/runtime.mjs";
-export { InternalRuntimeContext };
+export { InternalRuntimeContext } from "./core/context/runtime.mjs";

package/dist/esm/react-server.mjs

@@ -1,4 +1,3 @@
-import { getRequest } from "./core/context/request/index.mjs";
-import { getMonitors } from "./core/context/monitors/index.mjs";
-import { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
-export { getMonitors, getRequest, redirect, setHeaders, setStatus };
+export { getRequest } from "./core/context/request/index.mjs";
+export { getMonitors } from "./core/context/monitors/index.mjs";
+export { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";

package/dist/esm/router/cli/code/getClientRoutes/index.mjs

@@ -1,2 +1 @@
-import { getClientRoutes } from "./getRoutes.mjs";
-export { getClientRoutes };
+export { getClientRoutes } from "./getRoutes.mjs";

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

@@ -77,4 +77,5 @@ const routerPlugin = ()=>({
         }
     });
 const cli = routerPlugin;
-export { cli as default, handleFileChange, handleModifyEntrypoints, isRouteEntry, routerPlugin };
+export default cli;
+export { handleFileChange, handleModifyEntrypoints, isRouteEntry, routerPlugin };

package/dist/esm/router/internal.mjs

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

package/dist/esm/router/runtime/DeferredDataScripts.mjs

@@ -1,2 +1,2 @@
 const DeferredDataScripts = ()=>null;
-export { DeferredDataScripts as default };
+export default DeferredDataScripts;

package/dist/esm/router/runtime/DeferredDataScripts.node.mjs

@@ -117,4 +117,4 @@ const DeferredDataScripts = (props)=>{
     });
 };
 const DeferredDataScripts_node = DeferredDataScripts;
-export { DeferredDataScripts_node as default };
+export default DeferredDataScripts_node;

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

@@ -3,10 +3,6 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Link as router_Link, NavLink, matchRoutes, useHref, useMatches, useResolvedPath } from "@modern-js/runtime-utils/router";
 import react, { useContext, useMemo } from "react";
 import { InternalRuntimeContext } from "../../core/context/index.mjs";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.e = ()=>Promise.resolve();
-})();
 function composeEventHandlers(theirHandler, ourHandler) {
     return (event)=>{
         theirHandler?.(event);
@@ -145,7 +141,7 @@ const createPrefetchLink = (Link)=>/*#__PURE__*/ react.forwardRef(({ to, prefetc
                     ...props,
                     ...prefetchHandlers
                 }),
-                shouldPrefetch && __webpack_require__.e && !isAbsolute ? /*#__PURE__*/ jsx(PrefetchPageLinks, {
+                shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /*#__PURE__*/ jsx(PrefetchPageLinks, {
                     path: resolvedPath
                 }) : null
             ]

package/dist/esm/router/runtime/index.mjs

@@ -1,9 +1,9 @@
-import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
-import { Link, NavLink } from "./PrefetchLink.mjs";
 export * from "@modern-js/runtime-utils/router";
 export * from "./withRouter.mjs";
+import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
 const runtime_useRouteLoaderData = (routeId)=>{
     const realRouteId = routeId.replace(/\[(.*?)\]/g, '($1)');
     return useRouteLoaderData(realRouteId);
 };
-export { Link, NavLink, runtime_useRouteLoaderData as useRouteLoaderData };
+export { Link, NavLink } from "./PrefetchLink.mjs";
+export { runtime_useRouteLoaderData as useRouteLoaderData };

package/dist/esm/router/runtime/internal.mjs

@@ -1,4 +1,5 @@
 import { modifyRoutes, routerPlugin } from "./plugin.mjs";
-import { renderRoutes } from "./utils.mjs";
 const internal = routerPlugin;
-export { internal as default, modifyRoutes, renderRoutes, routerPlugin };
+export { renderRoutes } from "./utils.mjs";
+export default internal;
+export { modifyRoutes, routerPlugin };

package/dist/esm/router/runtime/plugin.mjs

@@ -2,11 +2,11 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
 import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
 import { normalizePathname } from "@modern-js/runtime-utils/url";
+import * as __rspack_external_react from "react";
 import { InternalRuntimeContext, getGlobalIsRscClient, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context/index.mjs";
 import { modifyRoutes, onBeforeCreateRoutes } from "./hooks.mjs";
 import { createClientRouterFromPayload } from "./rsc-router.mjs";
 import { createRouteObjectsFromConfig, deserializeErrors, renderRoutes, urlJoin } from "./utils.mjs";
-import * as __rspack_external_react from "react";
 let finalRouteConfig = {
     routes: []
 };

package/dist/esm-node/cli/code.mjs

@@ -22,13 +22,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 nestedRoutesEntry
             });
             let indexCode = '';
-            indexCode = !ssrMode && config.server.rsc ? entryForCSRWithRSC({
-                metaName,
-                entryName,
-                mountId,
-                urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
-                isNestedRouter: entrypoint.nestedRoutesEntry
-            }) : index({
+            indexCode = ssrMode || !config.server.rsc || customEntry ? index({
                 srcDirectory,
                 internalSrcAlias,
                 metaName,
@@ -38,6 +32,12 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 mountId,
                 enableRsc: config.server.rsc,
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
+            }) : entryForCSRWithRSC({
+                metaName,
+                entryName,
+                mountId,
+                urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
+                isNestedRouter: entrypoint.nestedRoutesEntry
             });
             const indexFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
             await fs.outputFile(indexFile, indexCode, 'utf8');
@@ -104,7 +104,8 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 });
                 await fs.outputFile(AppProxyPath, appProxyCode);
                 contextCode = runtimeGlobalContextForRSCClient({
-                    metaName
+                    metaName,
+                    customEntry
                 });
                 const contextServerCode = runtimeGlobalContextForRSCServer({
                     metaName

package/dist/esm-node/cli/index.mjs

@@ -91,4 +91,5 @@ const runtimePlugin = (params)=>({
         }
     });
 const cli = runtimePlugin;
-export { cli as default, documentPlugin, isRuntimeEntry, routerPlugin, runtimePlugin, ssrPlugin };
+export default cli;
+export { documentPlugin, isRuntimeEntry, routerPlugin, runtimePlugin, ssrPlugin };

package/dist/esm-node/cli/ssr/index.mjs

@@ -107,4 +107,5 @@ const ssrPlugin = ()=>({
         }
     });
 const cli_ssr = ssrPlugin;
-export { cli_ssr as default, ssrPlugin };
+export default cli_ssr;
+export { ssrPlugin };

package/dist/esm-node/cli/ssr/loadable-bundler-plugin.mjs

@@ -74,4 +74,4 @@ class LoadablePlugin {
     }
 }
 const loadable_bundler_plugin = LoadablePlugin;
-export { loadable_bundler_plugin as default };
+export default loadable_bundler_plugin;

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

@@ -153,16 +153,54 @@ const runtimeGlobalContextForRSCServer = ({ metaName })=>`
     App: DefaultRoot,
     RSCRoot: AppProxy,
   });`;
-const runtimeGlobalContextForRSCClient = ({ metaName })=>`
-  import { createElement, Fragment } from 'react';
-  import { setGlobalContext } from '@${metaName}/runtime/context';
-
-  const DefaultRoot = ({ children }: { children?: ReactNode }) =>
-    createElement(Fragment, null, children);
-
-  setGlobalContext({
-    App: DefaultRoot
-  });`;
+const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
+   ${customEntry ? `import {
+     RscClientRoot,
+     createFromFetch,
+     createFromReadableStream,
+     isRedirectResponse,
+     rscStream,
+     callServer,
+     setServerCallback,
+   } from '@${metaName}/runtime/rsc/client';` : ''}
+   import { createElement, Fragment } from 'react';
+   import { setGlobalContext } from '@${metaName}/runtime/context';
+
+   ${customEntry ? 'setServerCallback(callServer);' : ''}
+
+   ${customEntry ? `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 && baseUrl !== '/') {
+         window.location.replace(baseUrl + location);
+       } else {
+         window.location.replace(location);
+       }
+       return res;
+     }
+     return res;
+   };
+
+   const data = ${process.env.MODERN_DISABLE_INJECT_RSC_DATA ? `createFromFetch(
+     fetch(location.pathname, {
+       headers: {
+         'x-rsc-tree': 'true',
+       },
+     }).then(handleRedirectResponse),
+   )` : `createFromReadableStream(rscStream, {
+     callServer: callServer,
+   })`};` : ''}
+
+   const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+     createElement(Fragment, null, children);
+
+   ${customEntry ? 'const RSCRoot = () => createElement(RscClientRoot, { rscPayload: data });' : ''}
+
+   setGlobalContext({
+     App: ${customEntry ? 'RSCRoot' : 'DefaultRoot'}
+   });`;
 const AppProxyForRSC = ({ srcDirectory, internalSrcAlias, entry, customEntry })=>`
   import App from '${formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, 'App').replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace('.tsx', ''))}';
   import React from 'react';

package/dist/esm-node/core/constants.mjs

@@ -6,4 +6,4 @@ var constants_RenderLevel = /*#__PURE__*/ function(RenderLevel) {
 }({});
 const SSR_DATA_JSON_ID = '__MODERN_SSR_DATA__';
 const ROUTER_DATA_JSON_ID = '__MODERN_ROUTER_DATA__';
-export { ROUTER_DATA_JSON_ID, constants_RenderLevel as RenderLevel, SSR_DATA_JSON_ID };
+export { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, constants_RenderLevel as RenderLevel };

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

@@ -1,6 +1,4 @@
 import "node:module";
-import { InternalRuntimeContext, RuntimeContext, getInitialContext } from "./runtime.mjs";
-import { getServerPayload, setServerPayload } from "./serverPayload/index.mjs";
 const globalContext = {};
 function getGlobalIsRscClient() {
     return globalContext.isRscClient;
@@ -43,4 +41,6 @@ function getGlobalLayoutApp() {
 function getGlobalBasename() {
     return globalContext.basename;
 }
-export { InternalRuntimeContext, RuntimeContext, getCurrentEntryName, getGlobalApp, getGlobalBasename, getGlobalEnableRsc, getGlobalInternalRuntimeContext, getGlobalIsRscClient, getGlobalLayoutApp, getGlobalRSCRoot, getGlobalRoutes, getInitialContext, getServerPayload, setGlobalContext, setGlobalInternalRuntimeContext, setServerPayload };
+export { InternalRuntimeContext, RuntimeContext, getInitialContext } from "./runtime.mjs";
+export { getServerPayload, setServerPayload } from "./serverPayload/index.mjs";
+export { getCurrentEntryName, getGlobalApp, getGlobalBasename, getGlobalEnableRsc, getGlobalInternalRuntimeContext, getGlobalIsRscClient, getGlobalLayoutApp, getGlobalRSCRoot, getGlobalRoutes, setGlobalContext, setGlobalInternalRuntimeContext };

package/dist/esm-node/core/index.mjs

@@ -1,4 +1,3 @@
 import "node:module";
-import { defineRuntimeConfig } from "./config.mjs";
-import { RuntimeContext, useRuntimeContext } from "./context/runtime.mjs";
-export { RuntimeContext, defineRuntimeConfig, useRuntimeContext };
+export { defineRuntimeConfig } from "./config.mjs";
+export { RuntimeContext, useRuntimeContext } from "./context/runtime.mjs";

package/dist/esm-node/core/server/index.mjs

@@ -1,8 +1,9 @@
 import "node:module";
-import { NoSSR, NoSSRCache } from "./react/index.mjs";
 const ssr = (_config)=>({
         name: '@modern-js/plugin-ssr',
         setup: (_api)=>{}
     });
 const server = ssr;
-export { NoSSR, NoSSRCache, server as default, ssr };
+export { NoSSR, NoSSRCache } from "./react/index.mjs";
+export default server;
+export { ssr };

package/dist/esm-node/core/server/react/index.mjs

@@ -1,4 +1,3 @@
 import "node:module";
-import { NoSSR } from "./nossr/index.mjs";
-import { NoSSRCache } from "./no-ssr-cache/index.mjs";
-export { NoSSR, NoSSRCache };
+export { NoSSR } from "./nossr/index.mjs";
+export { NoSSRCache } from "./no-ssr-cache/index.mjs";

package/dist/esm-node/core/server/server.mjs

@@ -1,5 +1,4 @@
 import "node:module";
-import { renderString } from "./string/index.mjs";
-import { renderStreaming } from "./stream/index.mjs";
-import { createRequestHandler } from "./requestHandler.mjs";
-export { createRequestHandler, renderStreaming, renderString };
+export { renderString } from "./string/index.mjs";
+export { renderStreaming } from "./stream/index.mjs";
+export { createRequestHandler } from "./requestHandler.mjs";

package/dist/esm-node/core/server/stream/shared.mjs

@@ -106,4 +106,4 @@ function createRenderStreaming(createReadableStreamPromise) {
         return stream;
     };
 }
-export { shared_ShellChunkStatus as ShellChunkStatus, createRenderStreaming, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode };
+export { createRenderStreaming, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode, shared_ShellChunkStatus as ShellChunkStatus };

package/dist/esm-node/document/cli/index.mjs

@@ -349,4 +349,5 @@ const documentPlugin = ()=>({
         }
     });
 const cli = documentPlugin;
-export { cli as default, documentPlugin, getDocumentByEntryName };
+export default cli;
+export { documentPlugin, getDocumentByEntryName };

package/dist/esm-node/exports/head.mjs

@@ -2,4 +2,5 @@ import "node:module";
 "use client";
 import react_helmet, { Helmet } from "react-helmet";
 const head = react_helmet;
-export { Helmet, head as default };
+export default head;
+export { Helmet };

package/dist/esm-node/exports/loadable.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-import component from "@loadable/component";
 export * from "@loadable/component";
+import component from "@loadable/component";
 const loadable = component;
-export { loadable as default };
+export default loadable;

package/dist/esm-node/index.mjs

@@ -1,7 +1,6 @@
 import "node:module";
-import { isBrowser } from "./common.mjs";
-import { getMonitors } from "./core/context/monitors/index.mjs";
-import { getRequest } from "./core/context/request/index.mjs";
-import { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
-import { RuntimeContext, defineRuntimeConfig, useRuntimeContext } from "./core/index.mjs";
-export { RuntimeContext, defineRuntimeConfig, getMonitors, getRequest, isBrowser, redirect, setHeaders, setStatus, useRuntimeContext };
+export { isBrowser } from "./common.mjs";
+export { getMonitors } from "./core/context/monitors/index.mjs";
+export { getRequest } from "./core/context/request/index.mjs";
+export { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
+export { RuntimeContext, defineRuntimeConfig, useRuntimeContext } from "./core/index.mjs";

package/dist/esm-node/internal.mjs

@@ -1,3 +1,2 @@
 import "node:module";
-import { InternalRuntimeContext } from "./core/context/runtime.mjs";
-export { InternalRuntimeContext };
+export { InternalRuntimeContext } from "./core/context/runtime.mjs";

package/dist/esm-node/react-server.mjs

@@ -1,5 +1,4 @@
 import "node:module";
-import { getRequest } from "./core/context/request/index.mjs";
-import { getMonitors } from "./core/context/monitors/index.mjs";
-import { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
-export { getMonitors, getRequest, redirect, setHeaders, setStatus };
+export { getRequest } from "./core/context/request/index.mjs";
+export { getMonitors } from "./core/context/monitors/index.mjs";
+export { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";

package/dist/esm-node/router/cli/code/getClientRoutes/index.mjs

@@ -1,3 +1,2 @@
 import "node:module";
-import { getClientRoutes } from "./getRoutes.mjs";
-export { getClientRoutes };
+export { getClientRoutes } from "./getRoutes.mjs";

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

@@ -81,4 +81,5 @@ const routerPlugin = ()=>({
         }
     });
 const cli = routerPlugin;
-export { cli as default, handleFileChange, handleModifyEntrypoints, isRouteEntry, routerPlugin };
+export default cli;
+export { handleFileChange, handleModifyEntrypoints, isRouteEntry, routerPlugin };

package/dist/esm-node/router/internal.mjs

@@ -1,4 +1,3 @@
 import "node:module";
-import { routerPlugin } from "./runtime/internal.mjs";
 export * from "./runtime/internal.mjs";
-export { routerPlugin as default };
+export { routerPlugin as default } from "./runtime/internal.mjs";

package/dist/esm-node/router/runtime/DeferredDataScripts.mjs

@@ -1,3 +1,3 @@
 import "node:module";
 const DeferredDataScripts = ()=>null;
-export { DeferredDataScripts as default };
+export default DeferredDataScripts;

package/dist/esm-node/router/runtime/DeferredDataScripts.node.mjs

@@ -118,4 +118,4 @@ const DeferredDataScripts = (props)=>{
     });
 };
 const DeferredDataScripts_node = DeferredDataScripts;
-export { DeferredDataScripts_node as default };
+export default DeferredDataScripts_node;

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

@@ -4,10 +4,6 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Link as router_Link, NavLink, matchRoutes, useHref, useMatches, useResolvedPath } from "@modern-js/runtime-utils/router";
 import react, { useContext, useMemo } from "react";
 import { InternalRuntimeContext } from "../../core/context/index.mjs";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.e = ()=>Promise.resolve();
-})();
 function composeEventHandlers(theirHandler, ourHandler) {
     return (event)=>{
         theirHandler?.(event);
@@ -146,7 +142,7 @@ const createPrefetchLink = (Link)=>/*#__PURE__*/ react.forwardRef(({ to, prefetc
                     ...props,
                     ...prefetchHandlers
                 }),
-                shouldPrefetch && __webpack_require__.e && !isAbsolute ? /*#__PURE__*/ jsx(PrefetchPageLinks, {
+                shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /*#__PURE__*/ jsx(PrefetchPageLinks, {
                     path: resolvedPath
                 }) : null
             ]

package/dist/esm-node/router/runtime/index.mjs

@@ -1,10 +1,10 @@
 import "node:module";
-import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
-import { Link, NavLink } from "./PrefetchLink.mjs";
 export * from "@modern-js/runtime-utils/router";
 export * from "./withRouter.mjs";
+import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
 const runtime_useRouteLoaderData = (routeId)=>{
     const realRouteId = routeId.replace(/\[(.*?)\]/g, '($1)');
     return useRouteLoaderData(realRouteId);
 };
-export { Link, NavLink, runtime_useRouteLoaderData as useRouteLoaderData };
+export { Link, NavLink } from "./PrefetchLink.mjs";
+export { runtime_useRouteLoaderData as useRouteLoaderData };

package/dist/esm-node/router/runtime/internal.mjs

@@ -1,5 +1,6 @@
 import "node:module";
 import { modifyRoutes, routerPlugin } from "./plugin.mjs";
-import { renderRoutes } from "./utils.mjs";
 const internal = routerPlugin;
-export { internal as default, modifyRoutes, renderRoutes, routerPlugin };
+export { renderRoutes } from "./utils.mjs";
+export default internal;
+export { modifyRoutes, routerPlugin };

package/dist/esm-node/router/runtime/plugin.mjs

@@ -3,11 +3,11 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
 import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
 import { normalizePathname } from "@modern-js/runtime-utils/url";
+import * as __rspack_external_react from "react";
 import { InternalRuntimeContext, getGlobalIsRscClient, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context/index.mjs";
 import { modifyRoutes, onBeforeCreateRoutes } from "./hooks.mjs";
 import { createClientRouterFromPayload } from "./rsc-router.mjs";
 import { createRouteObjectsFromConfig, deserializeErrors, renderRoutes, urlJoin } from "./utils.mjs";
-import * as __rspack_external_react from "react";
 let finalRouteConfig = {
     routes: []
 };

package/dist/types/cli/template.d.ts

@@ -38,8 +38,9 @@ export declare const runtimeGlobalContext: ({ entryName, srcDirectory, internalS
 export declare const runtimeGlobalContextForRSCServer: ({ metaName, }: {
     metaName: string;
 }) => string;
-export declare const runtimeGlobalContextForRSCClient: ({ metaName, }: {
+export declare const runtimeGlobalContextForRSCClient: ({ metaName, customEntry, }: {
     metaName: string;
+    customEntry?: boolean;
 }) => string;
 export declare const AppProxyForRSC: ({ srcDirectory, internalSrcAlias, entry, customEntry, }: {
     srcDirectory: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.0",
+  "version": "3.1.1",
   "engines": {
     "node": ">=20"
   },
@@ -215,12 +215,12 @@
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "@modern-js/plugin": "3.1.0",
-    "@modern-js/plugin-data-loader": "3.1.0",
-    "@modern-js/render": "3.1.0",
-    "@modern-js/runtime-utils": "3.1.0",
-    "@modern-js/types": "3.1.0",
-    "@modern-js/utils": "3.1.0"
+    "@modern-js/plugin-data-loader": "3.1.1",
+    "@modern-js/render": "3.1.1",
+    "@modern-js/plugin": "3.1.1",
+    "@modern-js/runtime-utils": "3.1.1",
+    "@modern-js/types": "3.1.1",
+    "@modern-js/utils": "3.1.1"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -229,7 +229,7 @@
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
     "@rsbuild/core": "2.0.0-beta.4",
-    "@rslib/core": "0.19.6",
+    "@rslib/core": "0.20.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/cookie": "0.6.0",
@@ -240,9 +240,9 @@
     "react-dom": "^19.2.4",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/rslib": "2.68.10",
+    "@modern-js/app-tools": "3.1.1",
     "@scripts/rstest-config": "2.66.0",
-    "@modern-js/app-tools": "3.1.0"
+    "@modern-js/rslib": "2.68.10"
   },
   "sideEffects": false,
   "publishConfig": {

package/{rstest.config.ts → rstest.config.mts}

@@ -5,12 +5,6 @@ const commonConfig: ProjectConfig = {
   setupFiles: ['@scripts/rstest-config/setup.ts'],
   globals: true,
   tools: {
-    rspack: {
-      optimization: {
-        // Disable tree shaking to avoid issues with rstest mocking '@modern-js/utils'.
-        providedExports: false,
-      },
-    },
     swc: {
       jsc: {
         transform: {