@bleedingdev/modern-js-runtime 3.5.0-ultramodern.4 → 3.5.0-ultramodern.41

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

@@ -3,7 +3,7 @@ import { cloneDeep } from "@modern-js/utils/lodash";
 import path from "path";
 import { isPageComponentFile } from "./code/utils.mjs";
 import { modifyEntrypoints } from "./entry.mjs";
-import * as __rspack_external__code_templates_mjs_5e908598 from "./code/templates.mjs";
+import * as __rspack_external__code_templates_mjs_f6c22489 from "./code/templates.mjs";
 const DEFAULT_ENTRYPOINTS_KEY = '__default_router_entries__';
 const originEntrypointsByKey = new Map();
 async function handleModifyEntrypoints(entrypoints, routesDir, options = {}) {
@@ -25,7 +25,7 @@ async function handleGeneratorEntryCode(api, entrypoints, options = {}) {
         if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
             const route = appContext.serverRoutes.find((r)=>r.entryName === entrypoint.entryName);
             const basename = route?.urlPath || '/';
-            generatorRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_5e908598.runtimeGlobalContext({
+            generatorRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_f6c22489.runtimeGlobalContext({
                 entryName: entrypoint.entryName,
                 metaName: appContext.metaName,
                 srcDirectory: appContext.srcDirectory,
@@ -35,7 +35,7 @@ async function handleGeneratorEntryCode(api, entrypoints, options = {}) {
                 rscType: enableRsc ? 'client' : void 0,
                 basename
             }));
-            if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_5e908598.runtimeGlobalContext({
+            if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_f6c22489.runtimeGlobalContext({
                 entryName: entrypoint.entryName,
                 metaName: appContext.metaName,
                 srcDirectory: appContext.srcDirectory,

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

@@ -1,6 +1,7 @@
 import node_path from "node:path";
 import { setTimeout as promises_setTimeout } from "node:timers/promises";
 import { fs } from "@modern-js/utils";
+import { cloneDeep } from "@modern-js/utils/lodash";
 const lockPollIntervalMs = 25;
 const staleLockAgeMs = 120000;
 const pendingUpdates = new Map();
@@ -43,6 +44,7 @@ async function writeJSONAtomically(filePath, value) {
 }
 async function updateNestedRoutesSpec(specPath, nextRoutes) {
     const resolvedSpecPath = node_path.resolve(specPath);
+    const nextRoutesSnapshot = cloneDeep(nextRoutes);
     const previousUpdate = pendingUpdates.get(resolvedSpecPath) ?? Promise.resolve();
     const currentUpdate = previousUpdate.catch(()=>void 0).then(async ()=>{
         const releaseLock = await acquireSpecLock(resolvedSpecPath);
@@ -50,7 +52,7 @@ async function updateNestedRoutesSpec(specPath, nextRoutes) {
             const existingRoutes = await fs.pathExists(resolvedSpecPath) ? await fs.readJSON(resolvedSpecPath) : {};
             await writeJSONAtomically(resolvedSpecPath, {
                 ...existingRoutes,
-                ...nextRoutes
+                ...nextRoutesSnapshot
             });
         } finally{
             await releaseLock();

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

@@ -1,8 +1,9 @@
 import { createSyncHook } from "@modern-js/plugin";
-const modifyRoutes = createSyncHook();
-const onBeforeCreateRoutes = createSyncHook();
-const onBeforeCreateRouter = createSyncHook();
-const onAfterCreateRouter = createSyncHook();
-const onBeforeHydrateRouter = createSyncHook();
-const onAfterHydrateRouter = createSyncHook();
+const createRouterSyncHook = ()=>createSyncHook();
+const modifyRoutes = createRouterSyncHook();
+const onBeforeCreateRoutes = createRouterSyncHook();
+const onBeforeCreateRouter = createRouterSyncHook();
+const onAfterCreateRouter = createRouterSyncHook();
+const onBeforeHydrateRouter = createRouterSyncHook();
+const onAfterHydrateRouter = createRouterSyncHook();
 export { modifyRoutes, onAfterCreateRouter, onAfterHydrateRouter, onBeforeCreateRouter, onBeforeCreateRoutes, onBeforeHydrateRouter };

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

@@ -40,7 +40,7 @@ function registerRouterProvider(name, factory, options = {}) {
 }
 function resolveRouterProvider(framework, options = {}) {
     const registry = getRegistry();
-    const name = framework || registry.defaultProvider || options.localDefault?.name;
+    const name = framework || options.localDefault?.name || registry.defaultProvider;
     if (void 0 === name) throw new Error('[@modern-js/runtime] No default router provider is registered. This is a bug in the runtime setup.');
     if (void 0 !== options.localDefault && name === options.localDefault.name) return options.localDefault.factory;
     const factory = registry.providers.get(name);

package/dist/esm-node/boundary-debugger/index.mjs

@@ -110,9 +110,20 @@ function BoundaryDebugger({ controlMode = 'visible', enabledByDefault = false, l
     ]);
     useEffect(()=>{
         if (!enabled) return void setBoxes([]);
+        let resizeObserver;
+        const observedElements = new Set();
+        const observeBoundaryElements = (elements)=>{
+            if (void 0 === resizeObserver) return;
+            for (const element of elements)if (!observedElements.has(element)) {
+                observedElements.add(element);
+                resizeObserver.observe(element);
+            }
+        };
         const readBoxes = ()=>{
+            const elements = collectBoundaryElements(legacySelector);
+            observeBoundaryElements(elements);
             const seenBoxes = new Set();
-            const nextBoxes = collectBoundaryElements(legacySelector).map((element)=>{
+            const nextBoxes = elements.map((element)=>{
                 const boundaryId = getBoundaryId(element);
                 if (void 0 === boundaryId || '' === boundaryId) return;
                 const rect = element.getBoundingClientRect();
@@ -140,9 +151,8 @@ function BoundaryDebugger({ controlMode = 'visible', enabledByDefault = false, l
             }).filter((box)=>void 0 !== box);
             setBoxes(nextBoxes);
         };
+        resizeObserver = "u" < typeof ResizeObserver ? void 0 : new ResizeObserver(readBoxes);
         readBoxes();
-        const resizeObserver = "u" < typeof ResizeObserver ? void 0 : new ResizeObserver(readBoxes);
-        for (const element of collectBoundaryElements(legacySelector))resizeObserver?.observe(element);
         const mutationObserver = new MutationObserver(readBoxes);
         mutationObserver.observe(document.body, {
             childList: true,

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

@@ -3,8 +3,8 @@ import { formatImportPath, fs } from "@modern-js/utils";
 import path from "path";
 import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants.mjs";
 import { resolveSSRMode } from "./ssr/mode.mjs";
-import * as __rspack_external__template_mjs_d6ab8956 from "./template.mjs";
-import * as __rspack_external__template_server_mjs_38d6edb1 from "./template.server.mjs";
+import * as __rspack_external__template_mjs_d1604447 from "./template.mjs";
+import * as __rspack_external__template_server_mjs_f98cfe58 from "./template.server.mjs";
 const normalizePreEntry = (preEntry)=>{
     if (!preEntry) return [];
     if (Array.isArray(preEntry)) return preEntry.filter((v)=>'string' == typeof v && v.length > 0);
@@ -36,7 +36,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 nestedRoutesEntry
             });
             let indexCode = '';
-            indexCode = ssrMode || !config.server.rsc || customEntry ? __rspack_external__template_mjs_d6ab8956.index({
+            indexCode = ssrMode || !config.server.rsc || customEntry ? __rspack_external__template_mjs_d1604447.index({
                 srcDirectory,
                 internalSrcAlias,
                 metaName,
@@ -46,7 +46,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 mountId,
                 enableRsc: config.server.rsc,
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
-            }) : __rspack_external__template_mjs_d6ab8956.entryForCSRWithRSC({
+            }) : __rspack_external__template_mjs_d1604447.entryForCSRWithRSC({
                 metaName,
                 entryName,
                 mountId,
@@ -77,7 +77,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 if (ssrMode) await fs.outputFile(bootstrapServerFile, `export const requestHandler = import('./${SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, 'utf8');
             }
             if (ssrMode) {
-                const indexServerCode = __rspack_external__template_server_mjs_38d6edb1.serverIndex({
+                const indexServerCode = __rspack_external__template_server_mjs_f98cfe58.serverIndex({
                     entry,
                     entryName,
                     internalSrcAlias,
@@ -91,16 +91,16 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
             } else if (config.server.rsc) {
                 const indexServerFile = path.resolve(internalDirectory, `./${entryName}/${SERVER_ENTRY_POINT_FILE_NAME}`);
-                const indexServerCode = __rspack_external__template_server_mjs_38d6edb1.entryForCSRWithRSC({
+                const indexServerCode = __rspack_external__template_server_mjs_f98cfe58.entryForCSRWithRSC({
                     entryName,
                     metaName
                 });
                 await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
             }
-            const registerCode = __rspack_external__template_mjs_d6ab8956.register();
+            const registerCode = __rspack_external__template_mjs_d1604447.register();
             const registerFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_REGISTER_FILE_NAME}`);
             await fs.outputFile(registerFile, registerCode, 'utf8');
-            const registerRuntimeCode = __rspack_external__template_mjs_d6ab8956.runtimeRegister({
+            const registerRuntimeCode = __rspack_external__template_mjs_d1604447.runtimeRegister({
                 entryName,
                 srcDirectory,
                 internalSrcAlias,
@@ -114,7 +114,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
             if (!config.server.rsc || entrypoint.nestedRoutesEntry) {
                 const route = serverRoutes.find((r)=>r.entryName === entryName);
                 const basename = route?.urlPath || '/';
-                contextCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContext({
+                contextCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContext({
                     entryName,
                     srcDirectory,
                     internalSrcAlias,
@@ -125,18 +125,18 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 });
             } else {
                 const AppProxyPath = path.join(internalDirectory, entryName, './AppProxy.jsx');
-                const appProxyCode = __rspack_external__template_mjs_d6ab8956.AppProxyForRSC({
+                const appProxyCode = __rspack_external__template_mjs_d1604447.AppProxyForRSC({
                     srcDirectory,
                     internalSrcAlias,
                     entry,
                     customEntry
                 });
                 await fs.outputFile(AppProxyPath, appProxyCode);
-                contextCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContextForRSCClient({
+                contextCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContextForRSCClient({
                     metaName,
                     customEntry
                 });
-                const contextServerCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContextForRSCServer({
+                const contextServerCode = __rspack_external__template_mjs_d1604447.runtimeGlobalContextForRSCServer({
                     metaName
                 });
                 const contextFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.server.js`);

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

@@ -86,14 +86,13 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                 const hasServerRendering = hasServerRenderingConfig(userConfig);
                 const hasModuleFederationRuntimeMarker = hasServerRendering && shouldUseModuleFederationNodeOutput(config);
                 const hasExplicitMfSsrFlag = isModuleFederationAppSSREnabled(userConfig);
-                const isCloudflareWorkerSSR = 'workerSSR' === name && userConfig.deploy?.target === 'cloudflare';
                 const requireExplicitMfSsrFlag = 'true' === process.env.MODERN_MF_APP_SSR_REQUIRE_EXPLICIT;
                 if (hasServerRendering && hasModuleFederationRuntimeMarker && !hasExplicitMfSsrFlag) {
                     const warningMessage = '[modernjs][mf-ssr] Module Federation SSR was auto-detected from runtime markers. Set server.ssr.moduleFederationAppSSR=true explicitly in host and remotes to avoid heuristic drift.';
                     if (requireExplicitMfSsrFlag) throw new Error(`${warningMessage} (enforced by MODERN_MF_APP_SSR_REQUIRE_EXPLICIT=true)`);
                     console.warn(warningMessage);
                 }
-                const isModuleFederationAppSSR = hasServerRendering && hasExplicitMfSsrFlag && !isCloudflareWorkerSSR;
+                const isModuleFederationAppSSR = hasServerRendering && hasExplicitMfSsrFlag;
                 const ssrEnv = userConfig.deploy?.worker?.ssr || userConfig.server?.rsc ? 'edge' : 'node';
                 const appContext = modernAPI.getAppContext();
                 const { appDirectory, entrypoints } = appContext;

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

@@ -0,0 +1,6 @@
+import "node:module";
+import { createContext, useContext } from "react";
+const RuntimeContext = createContext({});
+const ReactRuntimeContext = RuntimeContext;
+const useRuntimeContext = ()=>useContext(RuntimeContext);
+export { ReactRuntimeContext, RuntimeContext, useRuntimeContext };

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

@@ -1,9 +1,7 @@
 import "node:module";
-import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
-import { createContext, useContext } from "react";
+import { createContext } from "react";
+const ROUTE_MANIFEST = '_MODERNJS_ROUTE_MANIFEST';
 const InternalRuntimeContext = createContext({});
-const RuntimeContext = createContext({});
-const ReactRuntimeContext = RuntimeContext;
 const getInitialContext = (isBrowser = true, routeManifest)=>{
     const requestContext = {
         request: {},
@@ -16,5 +14,5 @@ const getInitialContext = (isBrowser = true, routeManifest)=>{
         context: requestContext
     };
 };
-const useRuntimeContext = ()=>useContext(RuntimeContext);
-export { InternalRuntimeContext, ReactRuntimeContext, RuntimeContext, getInitialContext, useRuntimeContext };
+export { ReactRuntimeContext, RuntimeContext, useRuntimeContext } from "./public.mjs";
+export { InternalRuntimeContext, getInitialContext };

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

@@ -1,9 +1,45 @@
 import "node:module";
 import { jsx } from "react/jsx-runtime";
 import { HelmetProvider } from "react-helmet-async";
-import { InternalRuntimeContext, RuntimeContext } from "../context/index.mjs";
+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;
+    return {
+        nonce: ssrContext.nonce,
+        useJsonScript: ssrContext.useJsonScript,
+        htmlModifiers: [],
+        baseUrl: ssrContext.baseUrl,
+        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),
+            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 || {}
+        }
+    };
+}
 function wrapRuntimeContextProvider(App, contextValue) {
     const { isBrowser, initialData, routes, context, routeManifest, routerContext, unstable_getBlockNavState, ssrContext, _internalContext, _internalRouterBaseName, ...rest } = contextValue;
     const internalContextValue = contextValue;
@@ -16,6 +52,27 @@ function wrapRuntimeContextProvider(App, contextValue) {
         ...rest
     };
     stripRuntimeContextExtensions(runtimeContextValue);
+    if (getGlobalEnableRsc() && !isBrowser) {
+        const rscSafeRequestContext = createRscSafeRequestContext(ssrContext);
+        const rscInternalContextValue = {
+            ...internalContextValue,
+            context: rscSafeRequestContext,
+            requestContext: rscSafeRequestContext,
+            ssrContext: createRscSafeSsrContext(ssrContext)
+        };
+        const rscRuntimeContextValue = {
+            ...runtimeContextValue,
+            context: rscSafeRequestContext,
+            requestContext: rscSafeRequestContext
+        };
+        return /*#__PURE__*/ jsx(InternalRuntimeContext.Provider, {
+            value: rscInternalContextValue,
+            children: /*#__PURE__*/ jsx(RuntimeContext.Provider, {
+                value: rscRuntimeContextValue,
+                children: App
+            })
+        });
+    }
     return /*#__PURE__*/ jsx(InternalRuntimeContext.Provider, {
         value: internalContextValue,
         children: /*#__PURE__*/ jsx(RuntimeContext.Provider, {

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

@@ -1,13 +1,17 @@
 import "node:module";
 import { attributesToString } from "./utils.mjs";
+const escapeHtmlAttribute = (value)=>value.replaceAll('&', '&amp;').replaceAll('"', '&quot;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
 const createFederatedCssLinks = (assets, options)=>{
     if (void 0 === assets || 0 === assets.length) return '';
     const seen = new Set(options.existingAssets || []);
     const attributes = attributesToString(options.attributes || {});
     const links = [];
-    for (const asset of assets)if (!('' === asset || seen.has(asset) || options.template.includes(asset))) {
-        seen.add(asset);
-        links.push(`<link${attributes} href="${asset}" rel="stylesheet" />`);
+    for (const asset of assets){
+        const href = escapeHtmlAttribute(asset);
+        if (!('' === asset || seen.has(asset) || options.template.includes(asset) || options.template.includes(href))) {
+            seen.add(asset);
+            links.push(`<link${attributes} href="${href}" rel="stylesheet" />`);
+        }
     }
     return links.join('');
 };

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

@@ -3,15 +3,13 @@ import { 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 react, { Fragment } from "react";
-import { getRouterServerSnapshot } from "../../router/runtime/lifecycle.mjs";
-import { handleRSCRedirect } from "../../router/runtime/rsc-router.mjs";
 import { getGlobalInternalRuntimeContext, getGlobalRSCRoot } from "../context/index.mjs";
 import { getInitialContext } from "../context/runtime.mjs";
 import { getServerPayload } from "../context/serverPayload/index.mjs";
 import { createRoot } from "../react/index.mjs";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants.mjs";
-import { withRouterCleanup } from "./routerCleanup.mjs";
-import { SSRErrors } from "./tracer.mjs";
+import { applyRouterSnapshotResult, createLoaderRedirectResponse, finalizeRenderResponse } from "./requestResponse.mjs";
+import { createRouterCleanup, finishWithRouterCleanup, runWithRouterCleanupOnError } from "./routerCleanup.mjs";
 import { getSSRConfigByEntry, getSSRMode } from "./utils.mjs";
 async function handleRSCRequest(request, Root, context, options, handleRequest) {
     const serverPayload = getServerPayload();
@@ -31,29 +29,6 @@ async function handleRSCRequest(request, Root, context, options, handleRequest)
         runtimeContext: context
     });
 }
-const isRedirectStatus = (status)=>status >= 300 && status <= 399;
-const processRedirect = (headers, status, ctx)=>{
-    if (ctx.enableRsc && ctx.isRSCNavigation) return handleRSCRedirect(headers, ctx.basename, status);
-    return new Response(null, {
-        status,
-        headers
-    });
-};
-const applyRouterSnapshotResult = (context, onError)=>{
-    const routerServerSnapshot = getRouterServerSnapshot(context);
-    const routerStatusCode = routerServerSnapshot?.statusCode ?? context.routerContext?.statusCode;
-    if (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 (beforeRenderResult.headers.has('X-Modernjs-Redirect')) return beforeRenderResult;
-    const redirectUrl = beforeRenderResult.headers.get('Location') || '/';
-    return processRedirect(new Headers({
-        Location: redirectUrl
-    }), beforeRenderResult.status, redirectCtx);
-};
 const renderRequest = async (request, Root, context, options, handleRequest, enableRsc)=>{
     if (enableRsc) return handleRSCRequest(request, Root, context, options, handleRequest);
     return handleRequest(request, Root, {
@@ -61,17 +36,6 @@ const renderRequest = async (request, Root, context, options, handleRequest, ena
         runtimeContext: context
     });
 };
-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);
-    Object.entries(responseProxy.headers).forEach(([key, value])=>{
-        response.headers.set(key, value);
-    });
-    if (-1 !== responseProxy.status) return routerCleanup.deferUntilBodyDone(new Response(response.body, {
-        status: responseProxy.status,
-        headers: response.headers
-    }));
-    return routerCleanup.deferUntilBodyDone(response);
-};
 function createSSRContext(request, options) {
     const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, reporter } = options;
     const { nonce, useJsonScript } = config;
@@ -167,20 +131,26 @@ const createRequestHandler = async (handleRequest, createRequestOptions)=>{
                 isRSCNavigation: 'true' === request.headers.get('x-rsc-tree'),
                 basename: ssrContext.baseUrl || '/'
             };
-            return withRouterCleanup(context, options.onError, async (routerCleanup)=>{
-                const beforeRenderResult = await runBeforeRender(context);
+            const routerCleanup = createRouterCleanup(context, options.onError);
+            const beforeRenderResult = await runWithRouterCleanupOnError(routerCleanup, ()=>runBeforeRender(context));
+            await runWithRouterCleanupOnError(routerCleanup, ()=>{
                 applyRouterSnapshotResult(context, options.onError);
-                if ("u" > typeof Response) {
-                    const redirectResponse = createLoaderRedirectResponse(beforeRenderResult, redirectCtx);
-                    if (redirectResponse) return redirectResponse;
+            });
+            if ("u" > typeof Response) {
+                const redirectResponse = await runWithRouterCleanupOnError(routerCleanup, ()=>createLoaderRedirectResponse(beforeRenderResult, redirectCtx));
+                if (redirectResponse) {
+                    await routerCleanup.run();
+                    return redirectResponse;
                 }
+            }
+            await runWithRouterCleanupOnError(routerCleanup, ()=>{
                 if (!createRequestOptions?.enableRsc) {
                     const { htmlTemplate } = options.resource;
                     options.resource.htmlTemplate = htmlTemplate.replace('</head>', `${CHUNK_CSS_PLACEHOLDER}</head>`);
                 }
-                const response = await renderRequest(request, Root, context, options, handleRequest, !!createRequestOptions?.enableRsc);
-                return finalizeRenderResponse(response, responseProxy, redirectCtx, routerCleanup);
             });
+            const response = await runWithRouterCleanupOnError(routerCleanup, ()=>renderRequest(request, Root, context, options, handleRequest, !!createRequestOptions?.enableRsc));
+            return finishWithRouterCleanup(routerCleanup, ()=>finalizeRenderResponse(response, responseProxy, redirectCtx, routerCleanup));
         });
     };
     return requestHandler;

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

@@ -0,0 +1,40 @@
+import "node:module";
+import { getRouterServerSnapshot } from "../../router/runtime/lifecycle.mjs";
+import { handleRSCRedirect } from "../../router/runtime/rsc-router.mjs";
+import { SSRErrors } from "./tracer.mjs";
+const isRedirectStatus = (status)=>status >= 300 && status <= 399;
+const isNullBodyStatus = (status)=>204 === status || 205 === status || 304 === status;
+const processRedirect = (headers, status, ctx)=>{
+    if (ctx.enableRsc && ctx.isRSCNavigation) return handleRSCRedirect(headers, ctx.basename, status);
+    return new Response(null, {
+        status,
+        headers
+    });
+};
+const applyRouterSnapshotResult = (context, onError)=>{
+    const routerServerSnapshot = getRouterServerSnapshot(context);
+    const routerStatusCode = routerServerSnapshot?.statusCode ?? context.routerContext?.statusCode;
+    if (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 (beforeRenderResult.headers.has('X-Modernjs-Redirect')) return beforeRenderResult;
+    const redirectUrl = beforeRenderResult.headers.get('Location') || '/';
+    return processRedirect(new Headers({
+        Location: redirectUrl
+    }), 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);
+    Object.entries(responseProxy.headers).forEach(([key, value])=>{
+        response.headers.set(key, value);
+    });
+    if (-1 !== responseProxy.status) return routerCleanup.deferUntilBodyDone(new Response(isNullBodyStatus(responseProxy.status) ? null : response.body, {
+        status: responseProxy.status,
+        headers: response.headers
+    }));
+    return routerCleanup.deferUntilBodyDone(response);
+};
+export { applyRouterSnapshotResult, createLoaderRedirectResponse, finalizeRenderResponse };

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

@@ -1,10 +1,17 @@
 import "node:module";
 import { getRouterRuntimeState } from "../../router/runtime/lifecycle.mjs";
 const ROUTER_CLEANUP_ERROR = 'An error occurs during router runtime cleanup';
-async function withRouterCleanup(runtimeContext, onError, callback) {
-    const routerCleanup = createRouterCleanup(runtimeContext, onError);
+async function runWithRouterCleanupOnError(routerCleanup, callback) {
     try {
-        return await callback(routerCleanup);
+        return await callback();
+    } catch (error) {
+        await routerCleanup.run();
+        throw error;
+    }
+}
+async function finishWithRouterCleanup(routerCleanup, callback) {
+    try {
+        return await callback();
     } finally{
         if (!routerCleanup.deferred) await routerCleanup.run();
     }
@@ -64,4 +71,4 @@ function createRouterCleanup(runtimeContext, onError) {
         deferUntilBodyDone
     };
 }
-export { ROUTER_CLEANUP_ERROR, createRouterCleanup, withRouterCleanup };
+export { ROUTER_CLEANUP_ERROR, createRouterCleanup, finishWithRouterCleanup, runWithRouterCleanupOnError };

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

@@ -43,6 +43,10 @@ function getMatchedRouteAssets(runtimeContext, routeManifest) {
     const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
     return matchedRouteIds.flatMap((routeId)=>routeAssets[routeId]?.assets ?? []);
 }
+function getMatchedRouteChunks(runtimeContext, routeManifest, routeAssetToChunk) {
+    if (!routeManifest) return [];
+    return getMatchedRouteAssets(runtimeContext, routeManifest).map(routeAssetToChunk);
+}
 const orderHydrationScriptChunks = ({ asyncEntryChunks, collectedChunks, matchedRouteChunks, entryName })=>{
     const asyncEntryScriptChunks = [];
     const asyncEntryDependencyChunks = [];
@@ -73,13 +77,12 @@ function createRouteHydrationScriptTags(runtimeContext, entryName, options = {})
     const { nonce, template } = options;
     const routeAssets = getRouteAssets(runtimeContext);
     if (void 0 === routeAssets) return '';
-    const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
-    const assetEntries = [
-        ...matchedRouteIds.map((routeId)=>routeAssets[routeId]),
-        routeAssets[`async-${entryName}`]
-    ].filter((entry)=>void 0 !== entry);
-    const jsAssets = Array.from(new Set(assetEntries.flatMap((entry)=>(entry.assets ?? []).filter((asset)=>asset.endsWith('.js')))));
+    const existingScriptSrcs = void 0 === template ? new Set() : new Set(getScriptTags(template).map(({ src })=>src));
+    const jsAssets = Array.from(new Set([
+        ...getMatchedRouteAssets(runtimeContext),
+        ...routeAssets[`async-${entryName}`]?.assets ?? []
+    ].filter((asset)=>asset.endsWith('.js'))));
     const nonceAttr = void 0 === nonce || '' === nonce ? '' : ` nonce="${nonce}"`;
-    return jsAssets.filter((asset)=>template?.includes(asset) !== true).map((asset)=>`<script src=${asset}${nonceAttr}></script>`).join(' ');
+    return jsAssets.filter((asset)=>!existingScriptSrcs.has(asset)).map((asset)=>`<script src=${asset}${nonceAttr}></script>`).join(' ');
 }
-export { createRouteHydrationScriptTags, getMatchedRouteAssets, injectBeforeHydrationEntryScript, orderHydrationScriptChunks, replaceChunkJsPlaceholder };
+export { createRouteHydrationScriptTags, getMatchedRouteChunks, injectBeforeHydrationEntryScript, orderHydrationScriptChunks, replaceChunkJsPlaceholder };

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

@@ -1,7 +1,7 @@
 import "node:module";
 import { ChunkExtractor } from "@loadable/server";
 import { createFederatedCssLinks } from "../federatedCss.mjs";
-import { getMatchedRouteAssets, orderHydrationScriptChunks } from "../scriptOrder.mjs";
+import { getMatchedRouteChunks, orderHydrationScriptChunks } from "../scriptOrder.mjs";
 import { attributesToString, checkIsNode, hasStylesheetLink } from "../utils.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
@@ -32,11 +32,6 @@ const readAsset = async (chunk)=>{
     return fs.readFile(filepath, 'utf-8');
 };
 class LoadableCollector {
-    getMatchedRouteChunks() {
-        const { routeManifest, runtimeContext } = this.options;
-        if (!routeManifest) return [];
-        return getMatchedRouteAssets(runtimeContext, routeManifest).map(routeAssetToChunk);
-    }
     collect(comopnent) {
         const { stats, entryName } = this.options;
         if (!stats) return comopnent;
@@ -58,7 +53,7 @@ class LoadableCollector {
             ]));
         } catch (e) {}
         const collectedChunks = extractor ? extractor.getChunkAssets(extractor.chunks) : [];
-        const matchedRouteChunks = this.getMatchedRouteChunks();
+        const matchedRouteChunks = getMatchedRouteChunks(options.runtimeContext, options.routeManifest, routeAssetToChunk);
         const orderedScriptChunks = orderHydrationScriptChunks({
             asyncEntryChunks: asyncChunks,
             collectedChunks,
@@ -136,4 +131,4 @@ class LoadableCollector {
         this.options = options;
     }
 }
-export { LoadableCollector, orderHydrationScriptChunks };
+export { LoadableCollector };

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

@@ -1,5 +1,5 @@
 import "node:module";
-import * as __rspack_external__loadable_component_0aaae075 from "@loadable/component";
+import * as __rspack_external__loadable_component_ee3b4254 from "@loadable/component";
 export * from "@loadable/component";
 function asLoadableNamespace(value) {
     return 'object' == typeof value && null !== value ? value : {};
@@ -16,8 +16,8 @@ function resolveLoadable(module) {
     if ('function' != typeof loadable) throw new TypeError('Modern.js runtime loadable export must resolve to a function');
     return loadable;
 }
-const loadable_loadable = resolveLoadable(__rspack_external__loadable_component_0aaae075);
-const loadableNamespace = asLoadableNamespace(__rspack_external__loadable_component_0aaae075);
+const loadable_loadable = resolveLoadable(__rspack_external__loadable_component_ee3b4254);
+const loadableNamespace = asLoadableNamespace(__rspack_external__loadable_component_ee3b4254);
 const loadableDefaultNamespace = asLoadableNamespace(loadableNamespace.default);
 const callableLoadableNamespace = asLoadableNamespace(loadable_loadable);
 const lazy = loadableNamespace.lazy ?? loadableDefaultNamespace.lazy ?? callableLoadableNamespace.lazy;

package/dist/esm-node/index.mjs

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