vinext 0.0.9 → 0.0.11

package/dist/server/dev-server.js

@@ -1,12 +1,12 @@
 import { matchRoute, patternToNextFormat } from "../routing/pages-router.js";
 import { isrGet, isrSet, isrCacheKey, buildPagesCacheValue, triggerBackgroundRegeneration, setRevalidateDuration, getRevalidateDuration, } from "./isr-cache.js";
-import { withFetchCache } from "../shims/fetch-cache.js";
-import { _initRequestScopedCacheState } from "../shims/cache.js";
-import { clearPrivateCache } from "../shims/cache-runtime.js";
+import { runWithFetchCache } from "../shims/fetch-cache.js";
+import { _runWithCacheState } from "../shims/cache.js";
+import { runWithPrivateCache } from "../shims/cache-runtime.js";
 // Import server-only state modules to register ALS-backed accessors.
 // These modules must be imported before any rendering occurs.
-import "../shims/router-state.js";
-import "../shims/head-state.js";
+import { runWithRouterState } from "../shims/router-state.js";
+import { runWithHeadState } from "../shims/head-state.js";
 import { reportRequestError } from "./instrumentation.js";
 import { safeJsonStringify } from "./html.js";
 import { parseQueryString as parseQuery } from "../utils/query.js";
@@ -237,302 +237,312 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig) {
             return;
         }
         const { route, params } = match;
-        // Initialize per-request state for cache isolation
-        _initRequestScopedCacheState();
-        clearPrivateCache();
-        // Install patched fetch with Next.js caching semantics for this request
-        const cleanupFetchCache = withFetchCache();
-        try {
-            // Set SSR context for the router shim so useRouter() returns
-            // the correct URL and params during server-side rendering.
-            const routerShim = await server.ssrLoadModule("next/router");
-            if (typeof routerShim.setSSRContext === "function") {
-                routerShim.setSSRContext({
-                    pathname: localeStrippedUrl.split("?")[0],
-                    query: { ...params, ...parseQuery(url) },
-                    asPath: url,
-                    locale: locale ?? i18nConfig?.defaultLocale,
-                    locales: i18nConfig?.locales,
-                    defaultLocale: i18nConfig?.defaultLocale,
-                });
-            }
-            // Set globalThis locale info for Link component locale prop support during SSR
-            if (i18nConfig) {
-                globalThis.__VINEXT_LOCALE__ = locale ?? i18nConfig.defaultLocale;
-                globalThis.__VINEXT_LOCALES__ = i18nConfig.locales;
-                globalThis.__VINEXT_DEFAULT_LOCALE__ = i18nConfig.defaultLocale;
-            }
-            // Load the page module through Vite's SSR pipeline
-            // This gives us HMR and transform support for free
-            const pageModule = await server.ssrLoadModule(route.filePath);
-            // Get the page component (default export)
-            const PageComponent = pageModule.default;
-            if (!PageComponent) {
-                res.statusCode = 500;
-                res.end(`Page ${route.filePath} has no default export`);
-                return;
-            }
-            // Collect page props via data fetching methods
-            let pageProps = {};
-            let isrRevalidateSeconds = null;
-            // Handle getStaticPaths for dynamic routes: validate the path
-            // and respect fallback: false (return 404 for unlisted paths).
-            if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
-                const pathsResult = await pageModule.getStaticPaths({
-                    locales: i18nConfig?.locales ?? [],
-                    defaultLocale: i18nConfig?.defaultLocale ?? "",
-                });
-                const fallback = pathsResult?.fallback ?? false;
-                if (fallback === false) {
-                    // Only allow paths explicitly listed in getStaticPaths
-                    const paths = pathsResult?.paths ?? [];
-                    const isValidPath = paths.some((p) => {
-                        return Object.entries(p.params).every(([key, val]) => {
-                            const actual = params[key];
-                            if (Array.isArray(val)) {
-                                return Array.isArray(actual) && val.join("/") === actual.join("/");
-                            }
-                            return String(val) === String(actual);
-                        });
+        // Wrap the entire request in nested AsyncLocalStorage.run() scopes to
+        // ensure per-request isolation for all state modules.
+        return runWithRouterState(() => runWithHeadState(() => _runWithCacheState(() => runWithPrivateCache(() => runWithFetchCache(async () => {
+            try {
+                // Set SSR context for the router shim so useRouter() returns
+                // the correct URL and params during server-side rendering.
+                const routerShim = await server.ssrLoadModule("next/router");
+                if (typeof routerShim.setSSRContext === "function") {
+                    routerShim.setSSRContext({
+                        pathname: localeStrippedUrl.split("?")[0],
+                        query: { ...params, ...parseQuery(url) },
+                        asPath: url,
+                        locale: locale ?? i18nConfig?.defaultLocale,
+                        locales: i18nConfig?.locales,
+                        defaultLocale: i18nConfig?.defaultLocale,
                     });
-                    if (!isValidPath) {
-                        await renderErrorPage(server, req, res, url, pagesDir, 404);
-                        return;
-                    }
                 }
-                // fallback: true or "blocking" — always SSR on-demand.
-                // In dev mode, Next.js does the same (no fallback shell).
-                // In production, both modes SSR on-demand with caching.
-                // The difference is that fallback:true could serve a shell first,
-                // but since we always have data available via SSR, we render fully.
-            }
-            if (typeof pageModule.getServerSideProps === "function") {
-                const context = {
-                    params,
-                    req,
-                    res,
-                    query: parseQuery(url),
-                    resolvedUrl: localeStrippedUrl,
-                    locale: locale ?? i18nConfig?.defaultLocale,
-                    locales: i18nConfig?.locales,
-                    defaultLocale: i18nConfig?.defaultLocale,
-                };
-                const result = await pageModule.getServerSideProps(context);
-                if (result && "props" in result) {
-                    pageProps = result.props;
-                }
-                if (result && "redirect" in result) {
-                    const { redirect } = result;
-                    const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
-                    res.writeHead(status, {
-                        Location: redirect.destination,
-                    });
-                    res.end();
-                    return;
+                // Set globalThis locale info for Link component locale prop support during SSR
+                if (i18nConfig) {
+                    globalThis.__VINEXT_LOCALE__ = locale ?? i18nConfig.defaultLocale;
+                    globalThis.__VINEXT_LOCALES__ = i18nConfig.locales;
+                    globalThis.__VINEXT_DEFAULT_LOCALE__ = i18nConfig.defaultLocale;
                 }
-                if (result && "notFound" in result && result.notFound) {
-                    await renderErrorPage(server, req, res, url, pagesDir, 404);
+                // Load the page module through Vite's SSR pipeline
+                // This gives us HMR and transform support for free
+                const pageModule = await server.ssrLoadModule(route.filePath);
+                // Get the page component (default export)
+                const PageComponent = pageModule.default;
+                if (!PageComponent) {
+                    console.error(`[vinext] Page ${route.filePath} has no default export`);
+                    res.statusCode = 500;
+                    res.end("Page has no default export");
                     return;
                 }
-            }
-            // Collect font preloads early so ISR cached responses can include
-            // the Link header (font preloads are module-level state that persists
-            // across requests after the font modules are first loaded).
-            let earlyFontLinkHeader = "";
-            try {
-                const earlyPreloads = [];
-                const fontGoogleEarly = await server.ssrLoadModule("next/font/google");
-                if (typeof fontGoogleEarly.getSSRFontPreloads === "function") {
-                    earlyPreloads.push(...fontGoogleEarly.getSSRFontPreloads());
+                // Collect page props via data fetching methods
+                let pageProps = {};
+                let isrRevalidateSeconds = null;
+                // Handle getStaticPaths for dynamic routes: validate the path
+                // and respect fallback: false (return 404 for unlisted paths).
+                if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
+                    const pathsResult = await pageModule.getStaticPaths({
+                        locales: i18nConfig?.locales ?? [],
+                        defaultLocale: i18nConfig?.defaultLocale ?? "",
+                    });
+                    const fallback = pathsResult?.fallback ?? false;
+                    if (fallback === false) {
+                        // Only allow paths explicitly listed in getStaticPaths
+                        const paths = pathsResult?.paths ?? [];
+                        const isValidPath = paths.some((p) => {
+                            return Object.entries(p.params).every(([key, val]) => {
+                                const actual = params[key];
+                                if (Array.isArray(val)) {
+                                    return Array.isArray(actual) && val.join("/") === actual.join("/");
+                                }
+                                return String(val) === String(actual);
+                            });
+                        });
+                        if (!isValidPath) {
+                            await renderErrorPage(server, req, res, url, pagesDir, 404);
+                            return;
+                        }
+                    }
+                    // fallback: true or "blocking" — always SSR on-demand.
+                    // In dev mode, Next.js does the same (no fallback shell).
+                    // In production, both modes SSR on-demand with caching.
+                    // The difference is that fallback:true could serve a shell first,
+                    // but since we always have data available via SSR, we render fully.
                 }
-                const fontLocalEarly = await server.ssrLoadModule("next/font/local");
-                if (typeof fontLocalEarly.getSSRFontPreloads === "function") {
-                    earlyPreloads.push(...fontLocalEarly.getSSRFontPreloads());
+                if (typeof pageModule.getServerSideProps === "function") {
+                    const context = {
+                        params,
+                        req,
+                        res,
+                        query: parseQuery(url),
+                        resolvedUrl: localeStrippedUrl,
+                        locale: locale ?? i18nConfig?.defaultLocale,
+                        locales: i18nConfig?.locales,
+                        defaultLocale: i18nConfig?.defaultLocale,
+                    };
+                    const result = await pageModule.getServerSideProps(context);
+                    if (result && "props" in result) {
+                        pageProps = result.props;
+                    }
+                    if (result && "redirect" in result) {
+                        const { redirect } = result;
+                        const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
+                        // Sanitize destination to prevent open redirect via protocol-relative URLs.
+                        // Also normalize backslashes — browsers treat \ as / in URL contexts.
+                        let dest = redirect.destination;
+                        if (!dest.startsWith("http://") && !dest.startsWith("https://")) {
+                            dest = dest.replace(/^[\\/]+/, "/");
+                        }
+                        res.writeHead(status, {
+                            Location: dest,
+                        });
+                        res.end();
+                        return;
+                    }
+                    if (result && "notFound" in result && result.notFound) {
+                        await renderErrorPage(server, req, res, url, pagesDir, 404);
+                        return;
+                    }
                 }
-                if (earlyPreloads.length > 0) {
-                    earlyFontLinkHeader = earlyPreloads
-                        .map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`)
-                        .join(", ");
+                // Collect font preloads early so ISR cached responses can include
+                // the Link header (font preloads are module-level state that persists
+                // across requests after the font modules are first loaded).
+                let earlyFontLinkHeader = "";
+                try {
+                    const earlyPreloads = [];
+                    const fontGoogleEarly = await server.ssrLoadModule("next/font/google");
+                    if (typeof fontGoogleEarly.getSSRFontPreloads === "function") {
+                        earlyPreloads.push(...fontGoogleEarly.getSSRFontPreloads());
+                    }
+                    const fontLocalEarly = await server.ssrLoadModule("next/font/local");
+                    if (typeof fontLocalEarly.getSSRFontPreloads === "function") {
+                        earlyPreloads.push(...fontLocalEarly.getSSRFontPreloads());
+                    }
+                    if (earlyPreloads.length > 0) {
+                        earlyFontLinkHeader = earlyPreloads
+                            .map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`)
+                            .join(", ");
+                    }
                 }
-            }
-            catch {
-                // Font modules not loaded yet — skip
-            }
-            if (typeof pageModule.getStaticProps === "function") {
-                // Check ISR cache before calling getStaticProps
-                const cacheKey = isrCacheKey("pages", url.split("?")[0]);
-                const cached = await isrGet(cacheKey);
-                if (cached && !cached.isStale && cached.value.value?.kind === "PAGES") {
-                    // Fresh cache hit — serve directly
-                    const cachedPage = cached.value.value;
-                    const cachedHtml = cachedPage.html;
-                    const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
-                    const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
-                    const hitHeaders = {
-                        "Content-Type": "text/html",
-                        "X-Vinext-Cache": "HIT",
-                        "Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`,
-                    };
-                    if (earlyFontLinkHeader)
-                        hitHeaders["Link"] = earlyFontLinkHeader;
-                    res.writeHead(200, hitHeaders);
-                    res.end(transformedHtml);
-                    return;
+                catch {
+                    // Font modules not loaded yet — skip
                 }
-                if (cached && cached.isStale && cached.value.value?.kind === "PAGES") {
-                    // Stale hit — serve stale immediately, trigger background regen
-                    const cachedPage = cached.value.value;
-                    const cachedHtml = cachedPage.html;
-                    const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
-                    // Trigger background regeneration: re-run getStaticProps and
-                    // update the cache so the next request is a HIT with fresh data.
-                    triggerBackgroundRegeneration(cacheKey, async () => {
-                        const freshResult = await pageModule.getStaticProps({ params });
-                        if (freshResult && "props" in freshResult) {
-                            const revalidate = typeof freshResult.revalidate === "number" ? freshResult.revalidate : 0;
-                            if (revalidate > 0) {
-                                await isrSet(cacheKey, buildPagesCacheValue(cachedHtml, freshResult.props), revalidate);
+                if (typeof pageModule.getStaticProps === "function") {
+                    // Check ISR cache before calling getStaticProps
+                    const cacheKey = isrCacheKey("pages", url.split("?")[0]);
+                    const cached = await isrGet(cacheKey);
+                    if (cached && !cached.isStale && cached.value.value?.kind === "PAGES") {
+                        // Fresh cache hit — serve directly
+                        const cachedPage = cached.value.value;
+                        const cachedHtml = cachedPage.html;
+                        const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
+                        const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
+                        const hitHeaders = {
+                            "Content-Type": "text/html",
+                            "X-Vinext-Cache": "HIT",
+                            "Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`,
+                        };
+                        if (earlyFontLinkHeader)
+                            hitHeaders["Link"] = earlyFontLinkHeader;
+                        res.writeHead(200, hitHeaders);
+                        res.end(transformedHtml);
+                        return;
+                    }
+                    if (cached && cached.isStale && cached.value.value?.kind === "PAGES") {
+                        // Stale hit — serve stale immediately, trigger background regen
+                        const cachedPage = cached.value.value;
+                        const cachedHtml = cachedPage.html;
+                        const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
+                        // Trigger background regeneration: re-run getStaticProps and
+                        // update the cache so the next request is a HIT with fresh data.
+                        triggerBackgroundRegeneration(cacheKey, async () => {
+                            const freshResult = await pageModule.getStaticProps({ params });
+                            if (freshResult && "props" in freshResult) {
+                                const revalidate = typeof freshResult.revalidate === "number" ? freshResult.revalidate : 0;
+                                if (revalidate > 0) {
+                                    await isrSet(cacheKey, buildPagesCacheValue(cachedHtml, freshResult.props), revalidate);
+                                }
                             }
-                        }
-                    });
-                    const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
-                    const staleHeaders = {
-                        "Content-Type": "text/html",
-                        "X-Vinext-Cache": "STALE",
-                        "Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`,
+                        });
+                        const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
+                        const staleHeaders = {
+                            "Content-Type": "text/html",
+                            "X-Vinext-Cache": "STALE",
+                            "Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`,
+                        };
+                        if (earlyFontLinkHeader)
+                            staleHeaders["Link"] = earlyFontLinkHeader;
+                        res.writeHead(200, staleHeaders);
+                        res.end(transformedHtml);
+                        return;
+                    }
+                    // Cache miss — call getStaticProps normally
+                    const context = {
+                        params,
+                        locale: locale ?? i18nConfig?.defaultLocale,
+                        locales: i18nConfig?.locales,
+                        defaultLocale: i18nConfig?.defaultLocale,
                     };
-                    if (earlyFontLinkHeader)
-                        staleHeaders["Link"] = earlyFontLinkHeader;
-                    res.writeHead(200, staleHeaders);
-                    res.end(transformedHtml);
-                    return;
+                    const result = await pageModule.getStaticProps(context);
+                    if (result && "props" in result) {
+                        pageProps = result.props;
+                    }
+                    if (result && "redirect" in result) {
+                        const { redirect } = result;
+                        const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
+                        // Sanitize destination to prevent open redirect via protocol-relative URLs
+                        let dest = redirect.destination;
+                        if (!dest.startsWith("http://") && !dest.startsWith("https://") && dest.startsWith("//")) {
+                            dest = dest.replace(/^\/\/+/, "/");
+                        }
+                        res.writeHead(status, {
+                            Location: dest,
+                        });
+                        res.end();
+                        return;
+                    }
+                    if (result && "notFound" in result && result.notFound) {
+                        await renderErrorPage(server, req, res, url, pagesDir, 404);
+                        return;
+                    }
+                    // Extract revalidate period for ISR caching after render
+                    if (typeof result?.revalidate === "number" && result.revalidate > 0) {
+                        isrRevalidateSeconds = result.revalidate;
+                    }
                 }
-                // Cache miss — call getStaticProps normally
-                const context = {
-                    params,
-                    locale: locale ?? i18nConfig?.defaultLocale,
-                    locales: i18nConfig?.locales,
-                    defaultLocale: i18nConfig?.defaultLocale,
-                };
-                const result = await pageModule.getStaticProps(context);
-                if (result && "props" in result) {
-                    pageProps = result.props;
-                }
-                if (result && "redirect" in result) {
-                    const { redirect } = result;
-                    const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
-                    res.writeHead(status, {
-                        Location: redirect.destination,
+                // Try to load _app.tsx if it exists
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                let AppComponent = null;
+                const appPath = path.join(pagesDir, "_app");
+                if (findFileWithExtensions(appPath)) {
+                    try {
+                        const appModule = await server.ssrLoadModule(appPath);
+                        AppComponent = appModule.default ?? null;
+                    }
+                    catch {
+                        // _app exists but failed to load
+                    }
+                }
+                // React and ReactDOMServer are imported at the top level as native Node
+                // modules. They must NOT go through Vite's SSR module runner because
+                // React is CJS and the ESModulesEvaluator doesn't define `module`.
+                const createElement = React.createElement;
+                let element;
+                if (AppComponent) {
+                    element = createElement(AppComponent, {
+                        Component: PageComponent,
+                        pageProps,
                     });
-                    res.end();
-                    return;
                 }
-                if (result && "notFound" in result && result.notFound) {
-                    await renderErrorPage(server, req, res, url, pagesDir, 404);
-                    return;
+                else {
+                    element = createElement(PageComponent, pageProps);
                 }
-                // Extract revalidate period for ISR caching after render
-                if (typeof result?.revalidate === "number" && result.revalidate > 0) {
-                    isrRevalidateSeconds = result.revalidate;
+                // Reset SSR head collector before rendering so <Head> tags are captured
+                const headShim = await server.ssrLoadModule("next/head");
+                if (typeof headShim.resetSSRHead === "function") {
+                    headShim.resetSSRHead();
                 }
-            }
-            // Try to load _app.tsx if it exists
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            let AppComponent = null;
-            const appPath = path.join(pagesDir, "_app");
-            if (findFileWithExtensions(appPath)) {
+                // Flush any pending dynamic() preloads so components are ready
+                const dynamicShim = await server.ssrLoadModule("next/dynamic");
+                if (typeof dynamicShim.flushPreloads === "function") {
+                    await dynamicShim.flushPreloads();
+                }
+                // Collect any <Head> tags that were rendered during data fetching
+                // (shell head tags — Suspense children's head tags arrive late,
+                // matching Next.js behavior)
+                // Collect SSR font links (Google Fonts <link> tags) and font class styles
+                let fontHeadHTML = "";
+                const allFontStyles = [];
+                const allFontPreloads = [];
                 try {
-                    const appModule = await server.ssrLoadModule(appPath);
-                    AppComponent = appModule.default ?? null;
+                    const fontGoogle = await server.ssrLoadModule("next/font/google");
+                    if (typeof fontGoogle.getSSRFontLinks === "function") {
+                        const fontUrls = fontGoogle.getSSRFontLinks();
+                        for (const fontUrl of fontUrls) {
+                            const safeFontUrl = fontUrl.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
+                            fontHeadHTML += `<link rel="stylesheet" href="${safeFontUrl}" />\n  `;
+                        }
+                    }
+                    if (typeof fontGoogle.getSSRFontStyles === "function") {
+                        allFontStyles.push(...fontGoogle.getSSRFontStyles());
+                    }
+                    // Collect preloads from self-hosted Google fonts
+                    if (typeof fontGoogle.getSSRFontPreloads === "function") {
+                        allFontPreloads.push(...fontGoogle.getSSRFontPreloads());
+                    }
                 }
                 catch {
-                    // _app exists but failed to load
+                    // next/font/google not used — skip
                 }
-            }
-            // React and ReactDOMServer are imported at the top level as native Node
-            // modules. They must NOT go through Vite's SSR module runner because
-            // React is CJS and the ESModulesEvaluator doesn't define `module`.
-            const createElement = React.createElement;
-            let element;
-            if (AppComponent) {
-                element = createElement(AppComponent, {
-                    Component: PageComponent,
-                    pageProps,
-                });
-            }
-            else {
-                element = createElement(PageComponent, pageProps);
-            }
-            // Reset SSR head collector before rendering so <Head> tags are captured
-            const headShim = await server.ssrLoadModule("next/head");
-            if (typeof headShim.resetSSRHead === "function") {
-                headShim.resetSSRHead();
-            }
-            // Flush any pending dynamic() preloads so components are ready
-            const dynamicShim = await server.ssrLoadModule("next/dynamic");
-            if (typeof dynamicShim.flushPreloads === "function") {
-                await dynamicShim.flushPreloads();
-            }
-            // Collect any <Head> tags that were rendered during data fetching
-            // (shell head tags — Suspense children's head tags arrive late,
-            // matching Next.js behavior)
-            // Collect SSR font links (Google Fonts <link> tags) and font class styles
-            let fontHeadHTML = "";
-            const allFontStyles = [];
-            const allFontPreloads = [];
-            try {
-                const fontGoogle = await server.ssrLoadModule("next/font/google");
-                if (typeof fontGoogle.getSSRFontLinks === "function") {
-                    const fontUrls = fontGoogle.getSSRFontLinks();
-                    for (const fontUrl of fontUrls) {
-                        const safeFontUrl = fontUrl.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
-                        fontHeadHTML += `<link rel="stylesheet" href="${safeFontUrl}" />\n  `;
+                try {
+                    const fontLocal = await server.ssrLoadModule("next/font/local");
+                    if (typeof fontLocal.getSSRFontStyles === "function") {
+                        allFontStyles.push(...fontLocal.getSSRFontStyles());
+                    }
+                    // Collect preloads from local font files
+                    if (typeof fontLocal.getSSRFontPreloads === "function") {
+                        allFontPreloads.push(...fontLocal.getSSRFontPreloads());
                     }
                 }
-                if (typeof fontGoogle.getSSRFontStyles === "function") {
-                    allFontStyles.push(...fontGoogle.getSSRFontStyles());
+                catch {
+                    // next/font/local not used — skip
                 }
-                // Collect preloads from self-hosted Google fonts
-                if (typeof fontGoogle.getSSRFontPreloads === "function") {
-                    allFontPreloads.push(...fontGoogle.getSSRFontPreloads());
+                // Emit <link rel="preload"> for all collected font files (Google + local)
+                for (const { href, type } of allFontPreloads) {
+                    // Escape href/type to prevent HTML attribute injection (defense-in-depth;
+                    // Vite-resolved asset paths should never contain special chars).
+                    const safeHref = href.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
+                    const safeType = type.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
+                    fontHeadHTML += `<link rel="preload" href="${safeHref}" as="font" type="${safeType}" crossorigin />\n  `;
                 }
-            }
-            catch {
-                // next/font/google not used — skip
-            }
-            try {
-                const fontLocal = await server.ssrLoadModule("next/font/local");
-                if (typeof fontLocal.getSSRFontStyles === "function") {
-                    allFontStyles.push(...fontLocal.getSSRFontStyles());
-                }
-                // Collect preloads from local font files
-                if (typeof fontLocal.getSSRFontPreloads === "function") {
-                    allFontPreloads.push(...fontLocal.getSSRFontPreloads());
+                if (allFontStyles.length > 0) {
+                    fontHeadHTML += `<style data-vinext-fonts>${allFontStyles.join("\n")}</style>\n  `;
                 }
-            }
-            catch {
-                // next/font/local not used — skip
-            }
-            // Emit <link rel="preload"> for all collected font files (Google + local)
-            for (const { href, type } of allFontPreloads) {
-                // Escape href/type to prevent HTML attribute injection (defense-in-depth;
-                // Vite-resolved asset paths should never contain special chars).
-                const safeHref = href.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
-                const safeType = type.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
-                fontHeadHTML += `<link rel="preload" href="${safeHref}" as="font" type="${safeType}" crossorigin />\n  `;
-            }
-            if (allFontStyles.length > 0) {
-                fontHeadHTML += `<style data-vinext-fonts>${allFontStyles.join("\n")}</style>\n  `;
-            }
-            // Convert absolute file paths to Vite-servable URLs (relative to root)
-            const viteRoot = server.config.root;
-            const pageModuleUrl = "/" + path.relative(viteRoot, route.filePath);
-            const appModuleUrl = AppComponent
-                ? "/" + path.relative(viteRoot, path.join(pagesDir, "_app"))
-                : null;
-            // Hydration entry: inline script that imports the page and hydrates.
-            // Stores the React root and page loader for client-side navigation.
-            const hydrationScript = `
+                // Convert absolute file paths to Vite-servable URLs (relative to root)
+                const viteRoot = server.config.root;
+                const pageModuleUrl = "/" + path.relative(viteRoot, route.filePath);
+                const appModuleUrl = AppComponent
+                    ? "/" + path.relative(viteRoot, path.join(pagesDir, "_app"))
+                    : null;
+                // Hydration entry: inline script that imports the page and hydrates.
+                // Stores the React root and page loader for client-side navigation.
+                const hydrationScript = `
 <script type="module">
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
@@ -545,13 +555,13 @@ async function hydrate() {
   const PageComponent = pageModule.default;
   let element;
   ${appModuleUrl
-                ? `
+                    ? `
   const appModule = await import("${appModuleUrl}");
   const AppComponent = appModule.default;
   window.__VINEXT_APP__ = AppComponent;
   element = React.createElement(AppComponent, { Component: PageComponent, pageProps });
   `
-                : `
+                    : `
   element = React.createElement(PageComponent, pageProps);
   `}
   const root = hydrateRoot(document.getElementById("__next"), element);
@@ -559,105 +569,113 @@ async function hydrate() {
 }
 hydrate();
 </script>`;
-            const nextDataScript = `<script>window.__NEXT_DATA__ = ${safeJsonStringify({
-                props: { pageProps },
-                page: patternToNextFormat(route.pattern),
-                query: params,
-                isFallback: false,
-                locale: locale ?? i18nConfig?.defaultLocale,
-                locales: i18nConfig?.locales,
-                defaultLocale: i18nConfig?.defaultLocale,
-                // Include module URLs so client navigation can import pages directly
-                __vinext: {
-                    pageModuleUrl,
-                    appModuleUrl,
-                },
-            })}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? i18nConfig.defaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(i18nConfig.defaultLocale)}` : ""}</script>`;
-            // Try to load custom _document.tsx
-            const docPath = path.join(pagesDir, "_document");
-            let DocumentComponent = null;
-            if (findFileWithExtensions(docPath)) {
-                try {
-                    const docModule = await server.ssrLoadModule(docPath);
-                    DocumentComponent = docModule.default ?? null;
+                const nextDataScript = `<script>window.__NEXT_DATA__ = ${safeJsonStringify({
+                    props: { pageProps },
+                    page: patternToNextFormat(route.pattern),
+                    query: params,
+                    isFallback: false,
+                    locale: locale ?? i18nConfig?.defaultLocale,
+                    locales: i18nConfig?.locales,
+                    defaultLocale: i18nConfig?.defaultLocale,
+                    // Include module URLs so client navigation can import pages directly
+                    __vinext: {
+                        pageModuleUrl,
+                        appModuleUrl,
+                    },
+                })}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? i18nConfig.defaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(i18nConfig.defaultLocale)}` : ""}</script>`;
+                // Try to load custom _document.tsx
+                const docPath = path.join(pagesDir, "_document");
+                let DocumentComponent = null;
+                if (findFileWithExtensions(docPath)) {
+                    try {
+                        const docModule = await server.ssrLoadModule(docPath);
+                        DocumentComponent = docModule.default ?? null;
+                    }
+                    catch {
+                        // _document exists but failed to load
+                    }
                 }
-                catch {
-                    // _document exists but failed to load
+                const allScripts = `${nextDataScript}\n  ${hydrationScript}`;
+                // Build cache headers for ISR responses
+                const extraHeaders = {};
+                if (isrRevalidateSeconds) {
+                    extraHeaders["Cache-Control"] = `s-maxage=${isrRevalidateSeconds}, stale-while-revalidate`;
+                    extraHeaders["X-Vinext-Cache"] = "MISS";
+                }
+                // Set HTTP Link header for font preloading.
+                // This lets the browser (and CDN) start fetching font files before parsing HTML.
+                if (allFontPreloads.length > 0) {
+                    extraHeaders["Link"] = allFontPreloads
+                        .map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`)
+                        .join(", ");
+                }
+                // Stream the page using progressive SSR.
+                // The shell (layouts, non-suspended content) arrives immediately.
+                // Suspense content streams in as it resolves.
+                await streamPageToResponse(res, element, {
+                    url,
+                    server,
+                    fontHeadHTML,
+                    scripts: allScripts,
+                    DocumentComponent,
+                    statusCode,
+                    extraHeaders,
+                    // Collect head HTML AFTER the shell renders (inside streamPageToResponse,
+                    // after renderToReadableStream resolves). Head tags from Suspense
+                    // children arrive late — this matches Next.js behavior.
+                    getHeadHTML: () => typeof headShim.getSSRHeadHTML === "function"
+                        ? headShim.getSSRHeadHTML()
+                        : "",
+                });
+                // Clear SSR context after rendering
+                if (typeof routerShim.setSSRContext === "function") {
+                    routerShim.setSSRContext(null);
+                }
+                // If ISR is enabled, we need the full HTML for caching.
+                // For ISR, re-render synchronously to get the complete HTML string.
+                // This runs after the stream is already sent, so it doesn't affect TTFB.
+                if (isrRevalidateSeconds !== null && isrRevalidateSeconds > 0) {
+                    const isrElement = AppComponent
+                        ? createElement(AppComponent, { Component: pageModule.default, pageProps })
+                        : createElement(pageModule.default, pageProps);
+                    const isrBodyHtml = await renderToStringAsync(isrElement);
+                    const isrHtml = `<!DOCTYPE html><html><head></head><body><div id="__next">${isrBodyHtml}</div>${allScripts}</body></html>`;
+                    const cacheKey = isrCacheKey("pages", url.split("?")[0]);
+                    await isrSet(cacheKey, buildPagesCacheValue(isrHtml, pageProps), isrRevalidateSeconds);
+                    setRevalidateDuration(cacheKey, isrRevalidateSeconds);
                 }
             }
-            const allScripts = `${nextDataScript}\n  ${hydrationScript}`;
-            // Build cache headers for ISR responses
-            const extraHeaders = {};
-            if (isrRevalidateSeconds) {
-                extraHeaders["Cache-Control"] = `s-maxage=${isrRevalidateSeconds}, stale-while-revalidate`;
-                extraHeaders["X-Vinext-Cache"] = "MISS";
-            }
-            // Set HTTP Link header for font preloading.
-            // This lets the browser (and CDN) start fetching font files before parsing HTML.
-            if (allFontPreloads.length > 0) {
-                extraHeaders["Link"] = allFontPreloads
-                    .map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`)
-                    .join(", ");
-            }
-            // Stream the page using progressive SSR.
-            // The shell (layouts, non-suspended content) arrives immediately.
-            // Suspense content streams in as it resolves.
-            await streamPageToResponse(res, element, {
-                url,
-                server,
-                fontHeadHTML,
-                scripts: allScripts,
-                DocumentComponent,
-                statusCode,
-                extraHeaders,
-                // Collect head HTML AFTER the shell renders (inside streamPageToResponse,
-                // after renderToReadableStream resolves). Head tags from Suspense
-                // children arrive late — this matches Next.js behavior.
-                getHeadHTML: () => typeof headShim.getSSRHeadHTML === "function"
-                    ? headShim.getSSRHeadHTML()
-                    : "",
-            });
-            // Clear SSR context after rendering
-            if (typeof routerShim.setSSRContext === "function") {
-                routerShim.setSSRContext(null);
-            }
-            // If ISR is enabled, we need the full HTML for caching.
-            // For ISR, re-render synchronously to get the complete HTML string.
-            // This runs after the stream is already sent, so it doesn't affect TTFB.
-            if (isrRevalidateSeconds !== null && isrRevalidateSeconds > 0) {
-                const isrElement = AppComponent
-                    ? createElement(AppComponent, { Component: pageModule.default, pageProps })
-                    : createElement(pageModule.default, pageProps);
-                const isrBodyHtml = await renderToStringAsync(isrElement);
-                const isrHtml = `<!DOCTYPE html><html><head></head><body><div id="__next">${isrBodyHtml}</div>${allScripts}</body></html>`;
-                const cacheKey = isrCacheKey("pages", url.split("?")[0]);
-                await isrSet(cacheKey, buildPagesCacheValue(isrHtml, pageProps), isrRevalidateSeconds);
-                setRevalidateDuration(cacheKey, isrRevalidateSeconds);
-            }
-        }
-        catch (e) {
-            // Let Vite fix the stack trace for better dev experience
-            server.ssrFixStacktrace(e);
-            console.error(e);
-            // Report error via instrumentation hook if registered
-            reportRequestError(e instanceof Error ? e : new Error(String(e)), {
-                path: url,
-                method: req.method ?? "GET",
-                headers: Object.fromEntries(Object.entries(req.headers).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v ?? "")])),
-            }, { routerKind: "Pages Router", routePath: route.pattern, routeType: "render" }).catch(() => { });
-            // Try to render custom 500 error page
-            try {
-                await renderErrorPage(server, req, res, url, pagesDir, 500);
+            catch (e) {
+                // Let Vite fix the stack trace for better dev experience
+                server.ssrFixStacktrace(e);
+                console.error(e);
+                // Report error via instrumentation hook if registered
+                reportRequestError(e instanceof Error ? e : new Error(String(e)), {
+                    path: url,
+                    method: req.method ?? "GET",
+                    headers: Object.fromEntries(Object.entries(req.headers).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v ?? "")])),
+                }, { routerKind: "Pages Router", routePath: route.pattern, routeType: "render" }).catch(() => { });
+                // Try to render custom 500 error page
+                try {
+                    await renderErrorPage(server, req, res, url, pagesDir, 500);
+                }
+                catch (fallbackErr) {
+                    // If error page itself fails, fall back to plain text.
+                    // This is a dev-only code path (prod uses prod-server.ts), so
+                    // include the error message for debugging.
+                    res.statusCode = 500;
+                    res.end(`Internal Server Error: ${fallbackErr.message}`);
+                }
             }
-            catch {
-                // If error page itself fails, fall back to plain text
-                res.statusCode = 500;
-                res.end(`Internal Server Error: ${e.message}`);
+            finally {
+                // Cleanup is handled by ALS scope unwinding —
+                // each runWith*() scope is automatically cleaned up when it exits.
             }
-        }
-        finally {
-            cleanupFetchCache();
-        }
+        }) // end runWithFetchCache
+        ) // end runWithPrivateCache
+        ) // end _runWithCacheState
+        ) // end runWithHeadState
+        ); // end runWithRouterState
     };
 }
 /**