@bleedingdev/modern-js-runtime 3.5.0-ultramodern.102 → 3.5.0-ultramodern.103

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

@@ -40,6 +40,7 @@ const url_namespaceObject = require("@modern-js/runtime-utils/url");
 const external_react_namespaceObject = require("react");
 const index_js_namespaceObject = require("../../core/context/index.js");
 const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
+const external_PrefetchLink_js_namespaceObject = require("./PrefetchLink.js");
 const external_provider_js_namespaceObject = require("./provider.js");
 const external_rsc_router_js_namespaceObject = require("./rsc-router.js");
 const external_utils_js_namespaceObject = require("./utils.js");
@@ -73,9 +74,13 @@ const routerPlugin = (userConfig = {})=>({
                     }
                 }
                 context.router = {
+                    Link: external_PrefetchLink_js_namespaceObject.Link,
                     useMatches: router_namespaceObject.useMatches,
                     useLocation: router_namespaceObject.useLocation,
-                    useHref: router_namespaceObject.useHref
+                    useHref: router_namespaceObject.useHref,
+                    useInRouterContext: router_namespaceObject.useInRouterContext,
+                    useNavigate: router_namespaceObject.useNavigate,
+                    useParams: router_namespaceObject.useParams
                 };
                 Object.defineProperty(context, 'routes', {
                     get () {
@@ -99,7 +104,7 @@ const routerPlugin = (userConfig = {})=>({
                 };
                 let cachedRouter = null;
                 const RouterWrapper = (props)=>{
-                    const routerResult = useRouterCreation(process.env.MODERN_ENABLE_RSC ? {
+                    const routerResult = useRouterCreation(("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) ? {
                         ...props,
                         rscPayload: props?.rscPayload
                     } : props, {
@@ -156,15 +161,15 @@ function useRouterCreation(props, options) {
     const baseUrl = selectBasePath(location.pathname).replace(/^\/*/, '/');
     const _basename = '/' === baseUrl ? (0, external_utils_js_namespaceObject.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || basename || '') : baseUrl;
     const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
-    const rscPayload = process.env.MODERN_ENABLE_RSC && props?.rscPayload ? safeUse(props.rscPayload) : null;
-    let hydrationData = process.env.MODERN_ENABLE_RSC ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA;
+    const rscPayload = ("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) && props?.rscPayload ? safeUse(props.rscPayload) : null;
+    let hydrationData = "u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA : true === (0, index_js_namespaceObject.getGlobalEnableRsc)() ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA;
     return (0, external_react_namespaceObject.useMemo)(()=>{
         if (hydrationData?.errors) hydrationData = {
             ...hydrationData,
             errors: (0, external_utils_js_namespaceObject.deserializeErrors)(hydrationData.errors)
         };
         let routes = null;
-        routes = process.env.MODERN_ENABLE_RSC && (0, index_js_namespaceObject.getGlobalIsRscClient)() ? createRoutes ? createRoutes() : (0, external_utils_js_namespaceObject.createRouteObjectsFromConfig)({
+        routes = ("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) && (0, index_js_namespaceObject.getGlobalIsRscClient)() ? createRoutes ? createRoutes() : (0, external_utils_js_namespaceObject.createRouteObjectsFromConfig)({
             routesConfig: finalRouteConfig
         }) : createRoutes ? createRoutes() : (0, router_namespaceObject.createRoutesFromElements)((0, external_utils_js_namespaceObject.renderRoutes)({
             routesConfig: finalRouteConfig,
@@ -172,7 +177,7 @@ function useRouterCreation(props, options) {
         }));
         if (!routes) routes = [];
         const hooks = api.getHooks();
-        if (process.env.MODERN_ENABLE_RSC && rscPayload) try {
+        if (("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) && rscPayload) try {
             const router = (0, external_rsc_router_js_namespaceObject.createClientRouterFromPayload)(rscPayload, routes, _basename);
             return {
                 router,

package/dist/cjs/router/runtime/plugin.node.js

@@ -52,6 +52,7 @@ const index_server_js_namespaceObject = require("../../core/context/serverPayloa
 const external_DeferredDataScripts_node_js_namespaceObject = require("./DeferredDataScripts.node.js");
 var external_DeferredDataScripts_node_js_default = /*#__PURE__*/ __webpack_require__.n(external_DeferredDataScripts_node_js_namespaceObject);
 const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
+const external_PrefetchLink_js_namespaceObject = require("./PrefetchLink.js");
 const external_provider_js_namespaceObject = require("./provider.js");
 const external_rsc_router_js_namespaceObject = require("./rsc-router.js");
 const external_utils_js_namespaceObject = require("./utils.js");
@@ -89,6 +90,13 @@ const routerPlugin = (userConfig = {})=>({
         setup: (api)=>{
             let finalRouteConfig = {};
             api.onBeforeRender(async (context, interrupt)=>{
+                context.router = {
+                    Link: external_PrefetchLink_js_namespaceObject.Link,
+                    useInRouterContext: router_namespaceObject.useInRouterContext,
+                    useLocation: router_namespaceObject.useLocation,
+                    useNavigate: router_namespaceObject.useNavigate,
+                    useParams: router_namespaceObject.useParams
+                };
                 const pluginConfig = api.getRuntimeConfig();
                 const { basename = '', routesConfig, createRoutes } = (0, merge_namespaceObject.merge)(pluginConfig.router || {}, userConfig);
                 finalRouteConfig = {
@@ -177,10 +185,8 @@ const routerPlugin = (userConfig = {})=>({
                     const enableRsc = (0, index_js_namespaceObject.getGlobalEnableRsc)();
                     return (props)=>{
                         const context = (0, external_react_namespaceObject.useContext)(index_js_namespaceObject.InternalRuntimeContext);
-                        const { routerContext, ssrContext, routes } = context;
-                        const { nonce, mode, useJsonScript } = ssrContext;
+                        const { routerContext, routes } = context;
                         const { basename } = routerContext;
-                        const remixRouter = (0, router_namespaceObject.createStaticRouter)(routes, routerContext);
                         if (enableRsc) return App ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(App, {
                             children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_rsc_router_js_namespaceObject.RSCStaticRouter, {
                                 basename: basename
@@ -189,6 +195,8 @@ const routerPlugin = (userConfig = {})=>({
                             basename: basename
                         });
                         {
+                            const { nonce, mode, useJsonScript } = context.ssrContext;
+                            const remixRouter = (0, router_namespaceObject.createStaticRouter)(routes, routerContext);
                             const routerWrapper = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
                                 children: [
                                     /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(router_namespaceObject.StaticRouterProvider, {

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

@@ -53,7 +53,7 @@ function createRouterProviderRealm(registrations) {
     const providers = new Map();
     let defaultProvider;
     for (const registration of registrations){
-        if (!registration.name) throw new Error('[@modern-js/runtime] A router provider realm cannot contain an unnamed provider.');
+        if (0 === registration.name.length) throw new Error('[@modern-js/runtime] A router provider realm cannot contain an unnamed provider.');
         if (providers.has(registration.name)) throw new Error(`[@modern-js/runtime] Router provider "${registration.name}" is declared more than once in the same runtime realm.`);
         if (true === registration.isDefault && void 0 !== defaultProvider && defaultProvider !== registration.name) throw new Error(`[@modern-js/runtime] Router provider realm declares both "${defaultProvider}" and "${registration.name}" as defaults.`);
         providers.set(registration.name, registration.factory);
@@ -63,7 +63,7 @@ function createRouterProviderRealm(registrations) {
         ...providers.keys()
     ]);
     return Object.freeze({
-        ...defaultProvider ? {
+        ...void 0 !== defaultProvider ? {
             defaultProvider
         } : {},
         get: (name)=>providers.get(name),

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

@@ -0,0 +1,51 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+const handleRSCRedirect = (headers, basename, status)=>{
+    const newHeaders = new Headers(headers);
+    let redirectUrl = headers.get('Location');
+    if ('/' !== basename) redirectUrl = redirectUrl.replace(basename, '');
+    newHeaders.set('X-Modernjs-Redirect', redirectUrl);
+    newHeaders.set('X-Modernjs-BaseUrl', basename);
+    newHeaders.delete('Location');
+    return new Response(null, {
+        status,
+        headers: newHeaders
+    });
+};
+__webpack_require__.d(__webpack_exports__, {}, {
+    handleRSCRedirect: handleRSCRedirect
+});
+exports.handleRSCRedirect = __webpack_exports__.handleRSCRedirect;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "handleRSCRedirect"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

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

@@ -31,9 +31,11 @@ __webpack_require__.d(__webpack_exports__, {
     createShouldRevalidate: ()=>createShouldRevalidate,
     handleRouteModule: ()=>handleRouteModule,
     handleRouteModuleError: ()=>handleRouteModuleError,
+    isRouteErrorResponse: ()=>isRouteErrorResponse,
     resolveRouteComponent: ()=>resolveRouteComponent
 });
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
+const isRouteErrorResponse = (error)=>null !== error && 'object' == typeof error && 'number' == typeof error.status && 'string' == typeof error.statusText && 'boolean' == typeof error.internal && 'data' in error;
 const isObjectLike = (value)=>'object' == typeof value && null !== value || 'function' == typeof value;
 const isRouteComponent = (value)=>'function' == typeof value || isObjectLike(value) && '$$typeof' in value;
 const getRouteModules = ()=>{
@@ -89,11 +91,13 @@ const handleRouteModuleError = (error)=>{
 exports.createShouldRevalidate = __webpack_exports__.createShouldRevalidate;
 exports.handleRouteModule = __webpack_exports__.handleRouteModule;
 exports.handleRouteModuleError = __webpack_exports__.handleRouteModuleError;
+exports.isRouteErrorResponse = __webpack_exports__.isRouteErrorResponse;
 exports.resolveRouteComponent = __webpack_exports__.resolveRouteComponent;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createShouldRevalidate",
     "handleRouteModule",
     "handleRouteModuleError",
+    "isRouteErrorResponse",
     "resolveRouteComponent"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/router/runtime/rsc-router.js

@@ -40,7 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
     RSCStaticRouter: ()=>RSCStaticRouter,
     createClientRouterFromPayload: ()=>createClientRouterFromPayload,
     createServerPayload: ()=>createServerPayload,
-    handleRSCRedirect: ()=>handleRSCRedirect,
+    handleRSCRedirect: ()=>external_redirect_js_namespaceObject.handleRSCRedirect,
     prepareRSCRoutes: ()=>prepareRSCRoutes
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
@@ -49,6 +49,7 @@ const router_namespaceObject = require("@modern-js/runtime-utils/router");
 const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
 const external_CSSLinks_js_namespaceObject = require("./CSSLinks.js");
+const external_redirect_js_namespaceObject = require("./redirect.js");
 const safeUse = (value)=>{
     const reactUse = external_react_default().use;
     if ('function' == typeof reactUse) return reactUse(value);
@@ -131,18 +132,6 @@ const createServerPayload = (routerContext, routes)=>{
         })
     };
 };
-const handleRSCRedirect = (headers, basename, status)=>{
-    const newHeaders = new Headers(headers);
-    let redirectUrl = headers.get('Location');
-    if ('/' !== basename) redirectUrl = redirectUrl.replace(basename, '');
-    newHeaders.set('X-Modernjs-Redirect', redirectUrl);
-    newHeaders.set('X-Modernjs-BaseUrl', basename);
-    newHeaders.delete('Location');
-    return new Response(null, {
-        status: status,
-        headers: newHeaders
-    });
-};
 const prepareRSCRoutes = async (routes)=>{
     const isLazyComponent = (component)=>null != component && 'object' == typeof component && '_init' in component && '_payload' in component;
     const processRoutes = async (routesList)=>{

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

@@ -55,6 +55,7 @@ var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_
 const external_DefaultNotFound_js_namespaceObject = require("./DefaultNotFound.js");
 const external_DeferredDataScripts_js_namespaceObject = require("./DeferredDataScripts.js");
 var external_DeferredDataScripts_js_default = /*#__PURE__*/ __webpack_require__.n(external_DeferredDataScripts_js_namespaceObject);
+const external_routerHelper_js_namespaceObject = require("./routerHelper.js");
 function getRouteComponents(routes, { globalApp, ssrMode, props }) {
     const Layout = ({ Component, ...props })=>{
         const GlobalLayout = globalApp;
@@ -200,7 +201,7 @@ function serializeErrors(errors) {
     if (!errors) return null;
     const entries = Object.entries(errors);
     const serialized = {};
-    for (const [key, val] of entries)if ((0, router_namespaceObject.isRouteErrorResponse)(val)) serialized[key] = serializeRouteErrorResponse(val);
+    for (const [key, val] of entries)if ((0, external_routerHelper_js_namespaceObject.isRouteErrorResponse)(val)) serialized[key] = serializeRouteErrorResponse(val);
     else if (val instanceof Error) serialized[key] = serializeError(val);
     else serialized[key] = val;
     return serialized;
@@ -221,7 +222,7 @@ function serializeError(error) {
     };
 }
 function serializeRouteErrorResponse(error) {
-    if (!(0, router_namespaceObject.isRouteErrorResponse)(error)) return error;
+    if (!(0, external_routerHelper_js_namespaceObject.isRouteErrorResponse)(error)) return error;
     if (error.status >= 500 && shouldRedactServerError()) return {
         status: error.status,
         statusText: 'Internal Server Error',

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

@@ -106,6 +106,7 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                             'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv),
                             'process.env.MODERN_ENABLE_HYDRATION': JSON.stringify(isUseSSRBundle(userConfig)),
                             'process.env.MODERN_ENABLE_RSC': JSON.stringify(Boolean(userConfig.server?.rsc)),
+                            __MODERN_ENABLE_RSC__: JSON.stringify(Boolean(userConfig.server?.rsc)),
                             'process.env.MODERN_MF_APP_SSR': JSON.stringify(isModuleFederationAppSSR)
                         }
                     },

package/dist/esm/core/browser/hydrate.mjs

@@ -5,15 +5,23 @@ import { hydrateRoot } from "react-dom/client";
 import { RenderLevel } from "../constants.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
 import { WithCallback } from "./withCallback.mjs";
-const isReact18 = ()=>'true' === process.env.IS_REACT18;
 const runtimeProcess = Reflect.get(globalThis, 'process');
+const runtimeEnvironment = null !== runtimeProcess && 'object' == typeof runtimeProcess ? Reflect.get(runtimeProcess, 'env') : void 0;
+const readRuntimeEnvironment = (name)=>{
+    if (null === runtimeEnvironment || 'object' != typeof runtimeEnvironment) return;
+    const value = Reflect.get(runtimeEnvironment, name);
+    return 'string' == typeof value ? value : void 0;
+};
 const loadableReadyOptions = {
-    chunkLoadingGlobal: runtimeProcess?.env?.MODERN_CHUNK_LOADING_GLOBAL || '__LOADABLE_LOADED_CHUNKS__'
+    chunkLoadingGlobal: (()=>{
+        const configured = readRuntimeEnvironment('MODERN_CHUNK_LOADING_GLOBAL');
+        return void 0 === configured || '' === configured ? '__LOADABLE_LOADED_CHUNKS__' : configured;
+    })()
 };
-async function hydrateWithReact(App, rootElement) {
-    return hydrateRoot(rootElement, App, {
+function hydrateWithReact(App, rootElement) {
+    return Promise.resolve(hydrateRoot(rootElement, App, {
         identifierPrefix: SSR_HYDRATION_ID_PREFIX
-    });
+    }));
 }
 function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
     const hydrateContext = {
@@ -26,9 +34,9 @@ function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
     const callback = ()=>{
         delete hydrateContext._hydration;
     };
-    const renderLevel = window?._SSR_DATA?.renderLevel || RenderLevel.CLIENT_RENDER;
-    const renderMode = window?._SSR_DATA?.mode || 'string';
-    if (isReact18() && 'stream' === renderMode) return streamSSRHydrate();
+    const renderLevel = window?._SSR_DATA?.renderLevel ?? RenderLevel.CLIENT_RENDER;
+    const renderMode = window?._SSR_DATA?.mode ?? 'string';
+    if ('stream' === renderMode) return streamSSRHydrate();
     function streamSSRHydrate() {
         if (renderLevel !== RenderLevel.SERVER_RENDER) return ModernRender(wrapRuntimeContextProvider(App, context));
         {
@@ -42,23 +50,23 @@ function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
     return stringSSRHydrate();
     function stringSSRHydrate() {
         if (renderLevel === RenderLevel.CLIENT_RENDER) return ModernRender(wrapRuntimeContextProvider(App, context));
-        if (renderLevel === RenderLevel.SERVER_RENDER) return new Promise((resolve)=>{
-            isReact18() ? loadableReady(()=>{
+        {
+            if (renderLevel === RenderLevel.SERVER_RENDER) return loadableReady(()=>void 0, loadableReadyOptions).then(()=>{
                 const SSRApp = ()=>/*#__PURE__*/ jsx(WithCallback, {
                         callback: callback,
                         children: App
                     });
-                ModernHydrate(wrapRuntimeContextProvider(/*#__PURE__*/ jsx(SSRApp, {}), hydrateContext)).then((root)=>{
-                    resolve(root);
-                });
-            }, loadableReadyOptions) : loadableReady(()=>{
-                ModernHydrate(wrapRuntimeContextProvider(App, hydrateContext), callback).then((root)=>{
-                    resolve(root);
-                });
-            }, loadableReadyOptions);
-        });
-        console.warn(`unknow render level: ${renderLevel}, execute render()`);
-        return ModernRender(wrapRuntimeContextProvider(App, context));
+                return ModernHydrate(wrapRuntimeContextProvider(/*#__PURE__*/ jsx(SSRApp, {}), hydrateContext));
+            });
+            const runtimeConsole = Reflect.get(globalThis, 'console');
+            if (null !== runtimeConsole && 'object' == typeof runtimeConsole) {
+                const warn = Reflect.get(runtimeConsole, 'warn');
+                if ('function' == typeof warn) Reflect.apply(warn, runtimeConsole, [
+                    `unknow render level: ${renderLevel}, execute render()`
+                ]);
+            }
+            return ModernRender(wrapRuntimeContextProvider(App, context));
+        }
     }
 }
-export { hydrateWithReact, hydrate_hydrateRoot as hydrateRoot, isReact18 };
+export { hydrateWithReact, hydrate_hydrateRoot as hydrateRoot };

package/dist/esm/core/react/wrapper.mjs

@@ -3,39 +3,34 @@ import { HelmetProvider } from "react-helmet-async";
 import { InternalRuntimeContext, RuntimeContext, getGlobalEnableRsc } from "../context/index.mjs";
 import { stripRuntimeContextExtensions } from "../context/extensions.mjs";
 import { ensureHelmetContext } from "../context/helmetContext.mjs";
-function toRscSafeRecord(value) {
-    if (!value || 'object' != typeof value) return value;
-    return Object.fromEntries(Object.entries(value));
-}
-function createRscSafeSsrContext(ssrContext) {
-    if (!ssrContext) return ssrContext;
-    const { request } = ssrContext;
+function createRscSafeRequestContext(ssrContext) {
+    if (void 0 === ssrContext) return {
+        request: {},
+        response: {
+            locals: {}
+        }
+    };
+    const { request, response } = ssrContext;
     return {
-        nonce: ssrContext.nonce,
-        useJsonScript: ssrContext.useJsonScript,
-        htmlModifiers: [],
-        baseUrl: ssrContext.baseUrl,
-        request: request ? {
+        request: {
             url: request.url,
             userAgent: request.userAgent,
             cookie: request.cookie,
             pathname: request.pathname,
-            query: toRscSafeRecord(request.query),
-            params: toRscSafeRecord(request.params),
-            headers: toRscSafeRecord(request.headers),
+            query: {
+                ...request.query
+            },
+            params: {
+                ...request.params
+            },
+            headers: {
+                ...request.headers
+            },
             host: request.host,
             referer: request.referer
-        } : request,
-        mode: ssrContext.mode,
-        loaderFailureMode: ssrContext.loaderFailureMode
-    };
-}
-function createRscSafeRequestContext(ssrContext) {
-    const safeSsrContext = createRscSafeSsrContext(ssrContext);
-    return {
-        request: safeSsrContext?.request || {},
+        },
         response: {
-            locals: ssrContext?.response?.locals || {}
+            locals: response.locals ?? {}
         }
     };
 }
@@ -51,14 +46,14 @@ function wrapRuntimeContextProvider(App, contextValue) {
         ...rest
     };
     stripRuntimeContextExtensions(runtimeContextValue);
-    if (getGlobalEnableRsc() && !isBrowser) {
+    if (true === getGlobalEnableRsc() && false === isBrowser) {
         const rscSafeRequestContext = createRscSafeRequestContext(ssrContext);
         const rscInternalContextValue = {
             ...internalContextValue,
             context: rscSafeRequestContext,
-            requestContext: rscSafeRequestContext,
-            ssrContext: createRscSafeSsrContext(ssrContext)
+            requestContext: rscSafeRequestContext
         };
+        delete rscInternalContextValue.ssrContext;
         const rscRuntimeContextValue = {
             ...runtimeContextValue,
             context: rscSafeRequestContext,

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

@@ -1,5 +1,5 @@
 import { getRouterServerSnapshot } from "../../router/runtime/lifecycle.mjs";
-import { handleRSCRedirect } from "../../router/runtime/rsc-router.mjs";
+import { handleRSCRedirect } from "../../router/runtime/redirect.mjs";
 import { SSRErrors } from "./tracer.mjs";
 const isRedirectStatus = (status)=>status >= 300 && status <= 399;
 const isNullBodyStatus = (status)=>204 === status || 205 === status || 304 === status;
@@ -13,12 +13,12 @@ const processRedirect = (headers, status, ctx)=>{
 const applyRouterSnapshotResult = (context, onError)=>{
     const routerServerSnapshot = getRouterServerSnapshot(context);
     const routerStatusCode = routerServerSnapshot?.statusCode ?? context.routerContext?.statusCode;
-    if (routerStatusCode && 200 !== routerStatusCode) context.ssrContext?.response.status(routerStatusCode);
+    if (void 0 !== routerStatusCode && 0 !== routerStatusCode && !Number.isNaN(routerStatusCode) && 200 !== routerStatusCode) context.ssrContext?.response.status(routerStatusCode);
     const errors = Object.values(routerServerSnapshot?.errors || context.routerContext?.errors || {});
     if (errors.length > 0) onError(errors[0], SSRErrors.LOADER_ERROR);
 };
 const createLoaderRedirectResponse = (beforeRenderResult, redirectCtx)=>{
-    if (!beforeRenderResult || !isRedirectStatus(beforeRenderResult.status)) return;
+    if (void 0 === beforeRenderResult || !isRedirectStatus(beforeRenderResult.status)) return;
     if (beforeRenderResult.headers.has('X-Modernjs-Redirect')) return beforeRenderResult;
     const redirectUrl = beforeRenderResult.headers.get('Location') || '/';
     return processRedirect(new Headers({
@@ -26,7 +26,7 @@ const createLoaderRedirectResponse = (beforeRenderResult, redirectCtx)=>{
     }), beforeRenderResult.status, redirectCtx);
 };
 const finalizeRenderResponse = (response, responseProxy, redirectCtx, routerCleanup)=>{
-    if (-1 !== responseProxy.status && isRedirectStatus(responseProxy.status) && responseProxy.headers.Location) return processRedirect(new Headers(responseProxy.headers), responseProxy.status, redirectCtx);
+    if (-1 !== responseProxy.status && isRedirectStatus(responseProxy.status) && void 0 !== responseProxy.headers.Location && '' !== responseProxy.headers.Location) return processRedirect(new Headers(responseProxy.headers), responseProxy.status, redirectCtx);
     Object.entries(responseProxy.headers).forEach(([key, value])=>{
         response.headers.set(key, value);
     });

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

@@ -43,7 +43,7 @@ function getMatchedRouteAssets(runtimeContext, routeManifest) {
     return matchedRouteIds.flatMap((routeId)=>routeAssets[routeId]?.assets ?? []);
 }
 function getMatchedRouteChunks(runtimeContext, routeManifest, routeAssetToChunk) {
-    if (!routeManifest) return [];
+    if (void 0 === routeManifest) return [];
     return getMatchedRouteAssets(runtimeContext, routeManifest).map(routeAssetToChunk);
 }
 const orderHydrationScriptChunks = ({ asyncEntryChunks, collectedChunks, matchedRouteChunks, entryName })=>{

package/dist/esm/core/server/stream/beforeTemplate.worker.mjs

@@ -1,4 +1,3 @@
-import { matchRoutes } from "@modern-js/runtime-utils/router";
 import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants.mjs";
 import { createFederatedCssLinks } from "../federatedCss.mjs";
@@ -27,20 +26,12 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
         });
         return safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
         async function getCssChunks() {
-            const { routeManifest, routerContext, routes } = runtimeContext;
+            const { routeManifest } = runtimeContext;
             const routeAssets = routeManifest?.routeAssets;
             if (!routeAssets) return '';
             let matchedRouteManifests = [];
             const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext);
             if (matchedRouteIds?.length) matchedRouteManifests = matchedRouteIds.map((routeId)=>routeAssets[routeId]).filter(Boolean);
-            else if (routerContext && routes) {
-                const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-                matchedRouteManifests = matches?.map((match, index)=>{
-                    if (!index) return;
-                    const routeId = match.route.id;
-                    if (routeId) return routeAssets[routeId];
-                }).filter((routeManifest)=>void 0 !== routeManifest) ?? [];
-            }
             const asyncEntry = routeAssets[`async-${entryName}`];
             if (asyncEntry) matchedRouteManifests.push(asyncEntry);
             const cssChunks = matchedRouteManifests.reduce((chunks, routeManifest)=>{

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

@@ -1,4 +1,4 @@
-import { isRouteErrorResponse } from "@modern-js/runtime-utils/router";
+import { isRouteErrorResponse } from "../../router/runtime/routerHelper.mjs";
 function attributesToString(attributes) {
     return Object.entries(attributes).reduce((str, [key, value])=>void 0 === value ? str : `${str} ${key}="${value}"`, '');
 }

package/dist/esm/module-federation/distributed-ssr.mjs

@@ -7,24 +7,24 @@ function distributedSsrFragmentKey(remote, expose) {
 }
 function getDistributedSsrFragmentContext(response) {
     const locals = response?.locals;
-    if (!locals || 'object' != typeof locals) return;
-    const context = locals[DISTRIBUTED_SSR_FRAGMENTS_LOCALS_KEY];
-    if (!context || 'object' != typeof context) return;
+    if ('object' != typeof locals || null === locals) return;
+    const context = DISTRIBUTED_SSR_FRAGMENTS_LOCALS_KEY in locals ? locals[DISTRIBUTED_SSR_FRAGMENTS_LOCALS_KEY] : void 0;
+    if ('object' != typeof context || null === context) return;
     return context;
 }
 function useDistributedSsrFragmentProps({ boundaryId, expose }) {
     const runtimeContext = useRuntimeContext();
     const locals = runtimeContext.requestContext?.response?.locals;
-    const request = locals && 'object' == typeof locals ? locals[DISTRIBUTED_SSR_FRAGMENT_REQUEST_LOCALS_KEY] : void 0;
-    if (!request || 'object' != typeof request || request.boundaryId !== boundaryId || request.expose !== expose) throw new Error(`Distributed SSR fragment request contract mismatch for ${boundaryId} ${expose}.`);
-    const props = request.props;
-    if (!props || 'object' != typeof props || Array.isArray(props)) throw new Error(`Distributed SSR fragment request props must be an object for ${boundaryId} ${expose}.`);
+    const request = 'object' == typeof locals && null !== locals && DISTRIBUTED_SSR_FRAGMENT_REQUEST_LOCALS_KEY in locals ? locals[DISTRIBUTED_SSR_FRAGMENT_REQUEST_LOCALS_KEY] : void 0;
+    if ('object' != typeof request || null === request || !('boundaryId' in request) || request.boundaryId !== boundaryId || !('expose' in request) || request.expose !== expose) throw new Error(`Distributed SSR fragment request contract mismatch for ${boundaryId} ${expose}.`);
+    const props = 'props' in request ? request.props : void 0;
+    if ('object' != typeof props || null === props || Array.isArray(props)) throw new Error(`Distributed SSR fragment request props must be an object for ${boundaryId} ${expose}.`);
     return props;
 }
 function isThenable(value) {
-    return 'function' == typeof value.then;
+    return void 0 !== value && 'then' in value && 'function' == typeof value.then;
 }
-function DistributedSsrBoundary({ children, expose, fallback, fragmentProps = {}, remote }) {
+function DistributedSsrBoundary({ children, expose, fallback, fragmentProps, remote }) {
     const runtimeContext = useRuntimeContext();
     const key = distributedSsrFragmentKey(remote, expose);
     const attributes = {
@@ -35,12 +35,13 @@ function DistributedSsrBoundary({ children, expose, fallback, fragmentProps = {}
         children: children
     });
     const fragmentContext = getDistributedSsrFragmentContext(runtimeContext.requestContext?.response);
-    if (!fragmentContext) return /*#__PURE__*/ jsx("div", {
+    if (void 0 === fragmentContext) return /*#__PURE__*/ jsx("div", {
         ...attributes,
         children: children
     });
-    const fragmentOrPromise = fragmentContext.resolve?.(remote, expose, fragmentProps) ?? fragmentContext.fragments?.[key];
-    if (fragmentOrPromise && isThenable(fragmentOrPromise)) throw fragmentOrPromise;
+    const resolverFragmentProps = void 0 === fragmentProps ? {} : Object.fromEntries(Object.entries(fragmentProps));
+    const fragmentOrPromise = fragmentContext.resolve?.(remote, expose, resolverFragmentProps) ?? fragmentContext.fragments?.[key];
+    if (isThenable(fragmentOrPromise)) throw fragmentOrPromise;
     const fragment = fragmentOrPromise;
     if (fragment?.status === 'ready') return /*#__PURE__*/ jsx("div", {
         ...attributes,

package/dist/esm/module-federation/last-known-good.mjs

@@ -33,7 +33,7 @@ function staleRecordResult(ref, env, ageMs, maxStaleMs) {
 }
 function createLastKnownGoodProvider(options) {
     const storage = options.storage ?? createInMemoryLkgStorage();
-    const now = options.now ?? (()=>Date.now());
+    const now = options.now ?? (()=>Math.floor(performance.timeOrigin + performance.now()));
     const maxStaleMs = options.freshness?.maxStaleMs;
     async function serveFromCache(ref, env, fallback) {
         const key = deliveryUnitResolutionKey(ref.unitId, env);