vinext 0.0.28 → 0.0.30

package/dist/server/dev-server.js

@@ -1,12 +1,14 @@
 import { matchRoute, patternToNextFormat } from "../routing/pages-router.js";
 import { isrGet, isrSet, isrCacheKey, buildPagesCacheValue, triggerBackgroundRegeneration, setRevalidateDuration, getRevalidateDuration, } from "./isr-cache.js";
-import { runWithFetchCache } from "../shims/fetch-cache.js";
 import { _runWithCacheState } from "../shims/cache.js";
 import { runWithPrivateCache } from "../shims/cache-runtime.js";
+import { ensureFetchPatch, runWithFetchCache } from "../shims/fetch-cache.js";
+import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 // Import server-only state modules to register ALS-backed accessors.
 // These modules must be imported before any rendering occurs.
-import { runWithRouterState } from "../shims/router-state.js";
+import "../shims/router-state.js";
 import { runWithHeadState } from "../shims/head-state.js";
+import { runWithServerInsertedHTMLState } from "../shims/navigation-state.js";
 import { reportRequestError } from "./instrumentation.js";
 import { safeJsonStringify } from "./html.js";
 import { parseQueryString as parseQuery } from "../utils/query.js";
@@ -16,6 +18,7 @@ import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
 import { logRequest, now } from "./request-log.js";
 import { createValidFileMatcher } from "../routing/file-matcher.js";
+import { extractLocaleFromUrl as extractLocaleFromUrlShared, detectLocaleFromAcceptLanguage, parseCookieLocaleFromHeader, resolvePagesI18nRequest, } from "./pages-i18n.js";
 /**
  * Render a React element to a string using renderToReadableStream.
  *
@@ -28,6 +31,14 @@ async function renderToStringAsync(element) {
     await stream.allReady;
     return new Response(stream).text();
 }
+async function renderIsrPassToStringAsync(element) {
+    // The cache-fill render is a second render pass for the same request.
+    // Reset render-scoped state so it cannot leak from the streamed response
+    // render or affect async work that is still draining from that stream.
+    // Keep request identity state (pathname/query/locale/executionContext)
+    // intact: this second pass still belongs to the same request.
+    return await runWithServerInsertedHTMLState(() => runWithHeadState(() => _runWithCacheState(() => runWithPrivateCache(() => runWithFetchCache(async () => renderToStringAsync(element))))));
+}
 /** Body placeholder used to split the document shell for streaming. */
 const STREAM_BODY_MARKER = "<!--VINEXT_STREAM_BODY-->";
 /**
@@ -136,69 +147,21 @@ function findFileWithExtensions(basePath, matcher) {
  *      /about    -> { locale: "en", url: "/about", hadPrefix: false } (defaultLocale)
  */
 export function extractLocaleFromUrl(url, i18nConfig) {
-    const pathname = url.split("?")[0];
-    const parts = pathname.split("/").filter(Boolean);
-    const query = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-    if (parts.length > 0 && i18nConfig.locales.includes(parts[0])) {
-        const locale = parts[0];
-        const rest = "/" + parts.slice(1).join("/");
-        return { locale, url: (rest || "/") + query, hadPrefix: true };
-    }
-    return { locale: i18nConfig.defaultLocale, url, hadPrefix: false };
+    return extractLocaleFromUrlShared(url, i18nConfig);
 }
 /**
  * Detect the preferred locale from the Accept-Language header.
  * Returns the best matching locale or null.
  */
 export function detectLocaleFromHeaders(req, i18nConfig) {
-    const acceptLang = req.headers["accept-language"];
-    if (!acceptLang)
-        return null;
-    // Parse Accept-Language: en-US,en;q=0.9,fr;q=0.8
-    const langs = acceptLang
-        .split(",")
-        .map((part) => {
-        const [lang, qPart] = part.trim().split(";");
-        const q = qPart ? parseFloat(qPart.replace("q=", "")) : 1;
-        return { lang: lang.trim().toLowerCase(), q };
-    })
-        .sort((a, b) => b.q - a.q);
-    for (const { lang } of langs) {
-        // Exact match
-        const exactMatch = i18nConfig.locales.find((l) => l.toLowerCase() === lang);
-        if (exactMatch)
-            return exactMatch;
-        // Prefix match (e.g. "en-US" matches "en")
-        const prefix = lang.split("-")[0];
-        const prefixMatch = i18nConfig.locales.find((l) => l.toLowerCase() === prefix || l.toLowerCase().startsWith(prefix + "-"));
-        if (prefixMatch)
-            return prefixMatch;
-    }
-    return null;
+    return detectLocaleFromAcceptLanguage(req.headers["accept-language"], i18nConfig);
 }
 /**
  * Parse the NEXT_LOCALE cookie from a request.
  * Returns the cookie value if it matches a configured locale, otherwise null.
  */
 export function parseCookieLocale(req, i18nConfig) {
-    const cookieHeader = req.headers.cookie;
-    if (!cookieHeader)
-        return null;
-    // Simple cookie parsing — find NEXT_LOCALE=value
-    const match = cookieHeader.match(/(?:^|;\s*)NEXT_LOCALE=([^;]*)/);
-    if (!match)
-        return null;
-    let value;
-    try {
-        value = decodeURIComponent(match[1].trim());
-    }
-    catch {
-        return null;
-    }
-    // Only return if it's a valid configured locale
-    if (i18nConfig.locales.includes(value))
-        return value;
-    return null;
+    return parseCookieLocaleFromHeader(req.headers.cookie, i18nConfig);
 }
 /**
  * Create an SSR request handler for the Pages Router.
@@ -210,7 +173,7 @@ export function parseCookieLocale(req, i18nConfig) {
  * 4. Render the component to HTML
  * 5. Wrap in _document shell and send response
  */
-export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher) {
+export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false) {
     const matcher = fileMatcher ?? createValidFileMatcher();
     return async (req, res, url, 
     /** Status code override — propagated from middleware rewrite status. */
@@ -238,30 +201,17 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
         // --- i18n: extract locale from URL prefix ---
         let locale;
         let localeStrippedUrl = url;
+        let currentDefaultLocale;
+        const domainLocales = i18nConfig?.domains;
         if (i18nConfig) {
-            const parsed = extractLocaleFromUrl(url, i18nConfig);
-            locale = parsed.locale;
-            localeStrippedUrl = parsed.url;
-            // If no locale prefix, check NEXT_LOCALE cookie first, then Accept-Language
-            if (!parsed.hadPrefix) {
-                const cookieLocale = parseCookieLocale(req, i18nConfig);
-                if (cookieLocale && cookieLocale !== i18nConfig.defaultLocale) {
-                    // NEXT_LOCALE cookie overrides Accept-Language — redirect to cookie locale
-                    const redirectUrl = `/${cookieLocale}${url === "/" ? "" : url}`;
-                    res.writeHead(307, { Location: redirectUrl });
-                    res.end();
-                    return;
-                }
-                // If no cookie or cookie matches default, fall through to Accept-Language detection
-                if (!cookieLocale && i18nConfig.localeDetection !== false) {
-                    const detectedLocale = detectLocaleFromHeaders(req, i18nConfig);
-                    if (detectedLocale && detectedLocale !== i18nConfig.defaultLocale) {
-                        const redirectUrl = `/${detectedLocale}${url === "/" ? "" : url}`;
-                        res.writeHead(307, { Location: redirectUrl });
-                        res.end();
-                        return;
-                    }
-                }
+            const resolved = resolvePagesI18nRequest(url, i18nConfig, req.headers, req.headers.host, basePath, trailingSlash);
+            locale = resolved.locale;
+            localeStrippedUrl = resolved.url;
+            currentDefaultLocale = resolved.domainLocale?.defaultLocale ?? i18nConfig.defaultLocale;
+            if (resolved.redirectUrl) {
+                res.writeHead(307, { Location: resolved.redirectUrl });
+                res.end();
+                return;
             }
         }
         const match = matchRoute(localeStrippedUrl, routes);
@@ -271,9 +221,10 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
             return;
         }
         const { route, params } = match;
-        // 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 () => {
+        // Wrap the entire request in a single unified AsyncLocalStorage scope.
+        const requestContext = createRequestContext();
+        return runWithRequestContext(requestContext, async () => {
+            ensureFetchPatch();
             try {
                 // Set SSR context for the router shim so useRouter() returns
                 // the correct URL and params during server-side rendering.
@@ -283,16 +234,30 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
                         pathname: patternToNextFormat(route.pattern),
                         query: { ...params, ...parseQuery(url) },
                         asPath: url,
-                        locale: locale ?? i18nConfig?.defaultLocale,
+                        locale: locale ?? currentDefaultLocale,
                         locales: i18nConfig?.locales,
-                        defaultLocale: i18nConfig?.defaultLocale,
+                        defaultLocale: currentDefaultLocale,
+                        domainLocales,
                     });
                 }
-                // Set globalThis locale info for Link component locale prop support during SSR
+                // Set per-request i18n context for Link component locale
+                // prop support during SSR.  Use ssrLoadModule to set it on
+                // the SSR environment's module instance (same pattern as
+                // setSSRContext above).
                 if (i18nConfig) {
-                    globalThis.__VINEXT_LOCALE__ = locale ?? i18nConfig.defaultLocale;
-                    globalThis.__VINEXT_LOCALES__ = i18nConfig.locales;
-                    globalThis.__VINEXT_DEFAULT_LOCALE__ = i18nConfig.defaultLocale;
+                    // Register ALS-backed i18n accessors in the SSR module graph so
+                    // next/link and other SSR imports read from the unified store.
+                    await server.ssrLoadModule("vinext/i18n-state");
+                    const i18nCtx = await server.ssrLoadModule("vinext/i18n-context");
+                    if (typeof i18nCtx.setI18nContext === "function") {
+                        i18nCtx.setI18nContext({
+                            locale: locale ?? currentDefaultLocale,
+                            locales: i18nConfig.locales,
+                            defaultLocale: currentDefaultLocale,
+                            domainLocales,
+                            hostname: req.headers.host?.split(":", 1)[0],
+                        });
+                    }
                 }
                 // Load the page module through Vite's SSR pipeline
                 // This gives us HMR and transform support for free
@@ -315,7 +280,7 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
                 if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
                     const pathsResult = await pageModule.getStaticPaths({
                         locales: i18nConfig?.locales ?? [],
-                        defaultLocale: i18nConfig?.defaultLocale ?? "",
+                        defaultLocale: currentDefaultLocale ?? "",
                     });
                     const fallback = pathsResult?.fallback ?? false;
                     if (fallback === false) {
@@ -325,7 +290,7 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
                             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 Array.isArray(actual) && val.join("/") === actual.join("/");
                                 }
                                 return String(val) === String(actual);
                             });
@@ -355,9 +320,9 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
                         res,
                         query: parseQuery(url),
                         resolvedUrl: localeStrippedUrl,
-                        locale: locale ?? i18nConfig?.defaultLocale,
+                        locale: locale ?? currentDefaultLocale,
                         locales: i18nConfig?.locales,
-                        defaultLocale: i18nConfig?.defaultLocale,
+                        defaultLocale: currentDefaultLocale,
                     };
                     const result = await pageModule.getServerSideProps(context);
                     // If gSSP called res.end() directly (short-circuit pattern),
@@ -464,18 +429,109 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
                         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.
+                        // Trigger background regeneration: re-run getStaticProps,
+                        // re-render the page, and cache the fresh HTML.
                         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 regenContext = createRequestContext({
+                                // Dev never has a Workers ExecutionContext. Set it
+                                // explicitly so background regeneration cannot inherit
+                                // a standalone execution-context scope from the caller.
+                                executionContext: null,
+                            });
+                            return runWithRequestContext(regenContext, async () => {
+                                ensureFetchPatch();
+                                const freshResult = await pageModule.getStaticProps({
+                                    params,
+                                    locale: locale ?? currentDefaultLocale,
+                                    locales: i18nConfig?.locales,
+                                    defaultLocale: currentDefaultLocale,
+                                });
+                                if (freshResult && "props" in freshResult) {
+                                    const revalidate = typeof freshResult.revalidate === "number" ? freshResult.revalidate : 0;
+                                    if (revalidate > 0) {
+                                        const freshProps = freshResult.props;
+                                        if (typeof routerShim.setSSRContext === "function") {
+                                            routerShim.setSSRContext({
+                                                pathname: patternToNextFormat(route.pattern),
+                                                query: { ...params, ...parseQuery(url) },
+                                                asPath: url,
+                                                locale: locale ?? currentDefaultLocale,
+                                                locales: i18nConfig?.locales,
+                                                defaultLocale: currentDefaultLocale,
+                                                domainLocales,
+                                            });
+                                        }
+                                        if (i18nConfig) {
+                                            await server.ssrLoadModule("vinext/i18n-state");
+                                            const i18nCtx = await server.ssrLoadModule("vinext/i18n-context");
+                                            if (typeof i18nCtx.setI18nContext === "function") {
+                                                i18nCtx.setI18nContext({
+                                                    locale: locale ?? currentDefaultLocale,
+                                                    locales: i18nConfig.locales,
+                                                    defaultLocale: currentDefaultLocale,
+                                                    domainLocales,
+                                                    hostname: req.headers.host?.split(":", 1)[0],
+                                                });
+                                            }
+                                        }
+                                        // Re-render the page with fresh props inside fresh
+                                        // render sub-scopes so head/cache state cannot leak.
+                                        let RegenApp = null;
+                                        const appPath = path.join(pagesDir, "_app");
+                                        if (findFileWithExtensions(appPath, matcher)) {
+                                            try {
+                                                const appMod = await server.ssrLoadModule(appPath);
+                                                RegenApp = appMod.default ?? null;
+                                            }
+                                            catch {
+                                                // _app failed to load
+                                            }
+                                        }
+                                        let el = RegenApp
+                                            ? React.createElement(RegenApp, {
+                                                Component: pageModule.default,
+                                                pageProps: freshProps,
+                                            })
+                                            : React.createElement(pageModule.default, freshProps);
+                                        if (routerShim.wrapWithRouterContext) {
+                                            el = routerShim.wrapWithRouterContext(el);
+                                        }
+                                        const freshBody = await renderIsrPassToStringAsync(el);
+                                        // Rebuild __NEXT_DATA__ with fresh props. The hydration
+                                        // script (module URLs) is stable across regenerations —
+                                        // extract it from the cached HTML to avoid duplication.
+                                        const viteRoot = server.config?.root;
+                                        const regenPageUrl = viteRoot
+                                            ? "/" + path.relative(viteRoot, route.filePath)
+                                            : route.filePath;
+                                        const regenAppUrl = RegenApp
+                                            ? viteRoot
+                                                ? "/" + path.relative(viteRoot, path.join(pagesDir, "_app"))
+                                                : path.join(pagesDir, "_app")
+                                            : null;
+                                        const freshNextData = `<script>window.__NEXT_DATA__ = ${safeJsonStringify({
+                                            props: { pageProps: freshProps },
+                                            page: patternToNextFormat(route.pattern),
+                                            query: params,
+                                            buildId: process.env.__VINEXT_BUILD_ID,
+                                            isFallback: false,
+                                            locale: locale ?? currentDefaultLocale,
+                                            locales: i18nConfig?.locales,
+                                            defaultLocale: currentDefaultLocale,
+                                            domainLocales,
+                                            __vinext: {
+                                                pageModuleUrl: regenPageUrl,
+                                                appModuleUrl: regenAppUrl,
+                                            },
+                                        })}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}</script>`;
+                                        const hydrationMatch = cachedHtml.match(/<script type="module">[\s\S]*?<\/script>/);
+                                        const hydrationScript = hydrationMatch?.[0] ?? "";
+                                        const freshHtml = `<!DOCTYPE html><html><head></head><body><div id="__next">${freshBody}</div>${freshNextData}\n  ${hydrationScript}</body></html>`;
+                                        await isrSet(cacheKey, buildPagesCacheValue(freshHtml, freshProps), revalidate);
+                                        setRevalidateDuration(cacheKey, revalidate);
+                                    }
                                 }
-                            }
+                            });
                         });
                         const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
                         const staleHeaders = {
@@ -492,9 +548,9 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
                     // Cache miss — call getStaticProps normally
                     const context = {
                         params,
-                        locale: locale ?? i18nConfig?.defaultLocale,
+                        locale: locale ?? currentDefaultLocale,
                         locales: i18nConfig?.locales,
-                        defaultLocale: i18nConfig?.defaultLocale,
+                        defaultLocale: currentDefaultLocale,
                     };
                     const result = await pageModule.getStaticProps(context);
                     if (result && "props" in result) {
@@ -579,9 +635,7 @@ export function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatch
                     if (typeof fontGoogle.getSSRFontLinks === "function") {
                         const fontUrls = fontGoogle.getSSRFontLinks();
                         for (const fontUrl of fontUrls) {
-                            const safeFontUrl = fontUrl
-                                .replace(/&/g, "&amp;")
-                                .replace(/"/g, "&quot;");
+                            const safeFontUrl = fontUrl.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
                             fontHeadHTML += `<link rel="stylesheet" href="${safeFontUrl}" />\n  `;
                         }
                     }
@@ -663,15 +717,16 @@ hydrate();
                     query: params,
                     buildId: process.env.__VINEXT_BUILD_ID,
                     isFallback: false,
-                    locale: locale ?? i18nConfig?.defaultLocale,
+                    locale: locale ?? currentDefaultLocale,
                     locales: i18nConfig?.locales,
-                    defaultLocale: i18nConfig?.defaultLocale,
+                    defaultLocale: currentDefaultLocale,
+                    domainLocales,
                     // 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>`;
+                })}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}</script>`;
                 // Try to load custom _document.tsx
                 const docPath = path.join(pagesDir, "_document");
                 let DocumentComponent = null;
@@ -716,9 +771,7 @@ hydrate();
                     // 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()
-                        : "",
+                    getHeadHTML: () => typeof headShim.getSSRHeadHTML === "function" ? headShim.getSSRHeadHTML() : "",
                 });
                 _renderEnd = now();
                 // Clear SSR context after rendering
@@ -738,7 +791,7 @@ hydrate();
                     if (wrapWithRouterContext) {
                         isrElement = wrapWithRouterContext(isrElement);
                     }
-                    const isrBodyHtml = await renderToStringAsync(isrElement);
+                    const isrBodyHtml = await renderIsrPassToStringAsync(isrElement);
                     const isrHtml = `<!DOCTYPE html><html><head></head><body><div id="__next">${isrBodyHtml}</div>${allScripts}</body></html>`;
                     const cacheKey = isrCacheKey("pages", url.split("?")[0], 
                     // __VINEXT_BUILD_ID is a compile-time define — undefined in dev,
@@ -780,10 +833,9 @@ hydrate();
                 }
             }
             finally {
-                // Cleanup is handled by ALS scope unwinding —
-                // each runWith*() scope is automatically cleaned up when it exits.
+                // Cleanup is handled by unified ALS scope unwinding.
             }
-        }))))); // end runWithRouterState
+        });
     };
 }
 /**