vinext 0.0.29 → 0.0.30

package/dist/entries/pages-server-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pages-server-entry.d.ts","sourceRoot":"","sources":["../../src/entries/pages-server-entry.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAmBnE;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,EACtD,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,mBAAmB,EAAE,MAAM,GAAG,IAAI,GACjC,OAAO,CAAC,MAAM,CAAC,CA8kCjB"}
+{"version":3,"file":"pages-server-entry.d.ts","sourceRoot":"","sources":["../../src/entries/pages-server-entry.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAuBnE;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,EACtD,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,mBAAmB,EAAE,MAAM,GAAG,IAAI,GACjC,OAAO,CAAC,MAAM,CAAC,CAioCjB"}

package/dist/entries/pages-server-entry.js

@@ -16,6 +16,7 @@ import { findFileWithExts } from "./pages-entry-helpers.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const _requestContextShimPath = fileURLToPath(new URL("../shims/request-context.js", import.meta.url)).replace(/\\/g, "/");
 const _routeTriePath = fileURLToPath(new URL("../routing/route-trie.js", import.meta.url)).replace(/\\/g, "/");
+const _pagesI18nPath = fileURLToPath(new URL("../server/pages-i18n.js", import.meta.url)).replace(/\\/g, "/");
 /**
  * Generate the virtual SSR server entry module.
  * This is the entry point for `vite build --ssr`.
@@ -44,12 +45,10 @@ export async function generateServerEntry(pagesDir, nextConfig, fileMatcher, mid
     // Check for _app and _document
     const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
     const docFilePath = findFileWithExts(pagesDir, "_document", fileMatcher);
-    const hasApp = appFilePath !== null;
-    const hasDoc = docFilePath !== null;
-    const appImportCode = hasApp
+    const appImportCode = appFilePath !== null
         ? `import { default as AppComponent } from ${JSON.stringify(appFilePath.replace(/\\/g, "/"))};`
         : `const AppComponent = null;`;
-    const docImportCode = hasDoc
+    const docImportCode = docFilePath !== null
         ? `import { default as DocumentComponent } from ${JSON.stringify(docFilePath.replace(/\\/g, "/"))};`
         : `const DocumentComponent = null;`;
     // Serialize i18n config for embedding in the server entry
@@ -58,6 +57,7 @@ export async function generateServerEntry(pagesDir, nextConfig, fileMatcher, mid
             locales: nextConfig.i18n.locales,
             defaultLocale: nextConfig.i18n.defaultLocale,
             localeDetection: nextConfig.i18n.localeDetection,
+            domains: nextConfig.i18n.domains,
         })
         : "null";
     // Embed the resolved build ID at build time
@@ -223,12 +223,15 @@ import { renderToReadableStream } from "react-dom/server.edge";
 import { resetSSRHead, getSSRHeadHTML } from "next/head";
 import { flushPreloads } from "next/dynamic";
 import { setSSRContext, wrapWithRouterContext } from "next/router";
-import { getCacheHandler } from "next/cache";
-import { runWithFetchCache } from "vinext/fetch-cache";
-import { _runWithCacheState } from "next/cache";
+import { getCacheHandler, _runWithCacheState } from "next/cache";
 import { runWithPrivateCache } from "vinext/cache-runtime";
-import { runWithRouterState } from "vinext/router-state";
+import { ensureFetchPatch, runWithFetchCache } from "vinext/fetch-cache";
+import { runWithRequestContext as _runWithUnifiedCtx, createRequestContext as _createUnifiedCtx } from "vinext/unified-request-context";
+import "vinext/router-state";
+import { runWithServerInsertedHTMLState } from "vinext/navigation-state";
 import { runWithHeadState } from "vinext/head-state";
+import "vinext/i18n-state";
+import { setI18nContext } from "vinext/i18n-context";
 import { safeJsonStringify } from "vinext/html";
 import { decode as decodeQueryString } from "node:querystring";
 import { getSSRFontLinks as _getSSRFontLinks, getSSRFontStyles as _getSSRFontStylesGoogle, getSSRFontPreloads as _getSSRFontPreloadsGoogle } from "next/font/google";
@@ -237,6 +240,7 @@ import { parseCookies } from ${JSON.stringify(path.resolve(__dirname, "../config
 import { runWithExecutionContext as _runWithExecutionContext, getRequestExecutionContext as _getRequestExecutionContext } from ${JSON.stringify(_requestContextShimPath)};
 import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSON.stringify(_routeTriePath)};
 import { reportRequestError as _reportRequestError } from "vinext/instrumentation";
+import { resolvePagesI18nRequest } from ${JSON.stringify(_pagesI18nPath)};
 ${instrumentationImportCode}
 ${middlewareImportCode}
 
@@ -322,6 +326,21 @@ async function renderToStringAsync(element) {
   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))),
+      ),
+    ),
+  );
+}
+
 ${pageImports.join("\n")}
 ${apiImports.join("\n")}
 
@@ -651,23 +670,25 @@ export async function renderPage(request, url, manifest, ctx) {
 }
 
 async function _renderPage(request, url, manifest) {
-  const localeInfo = extractLocale(url);
+  const localeInfo = i18nConfig
+    ? resolvePagesI18nRequest(
+        url,
+        i18nConfig,
+        request.headers,
+        new URL(request.url).hostname,
+        vinextConfig.basePath,
+        vinextConfig.trailingSlash,
+      )
+    : { locale: undefined, url, hadPrefix: false, domainLocale: undefined, redirectUrl: undefined };
   const locale = localeInfo.locale;
   const routeUrl = localeInfo.url;
-  const cookieHeader = request.headers.get("cookie") || "";
+  const currentDefaultLocale = i18nConfig
+    ? (localeInfo.domainLocale ? localeInfo.domainLocale.defaultLocale : i18nConfig.defaultLocale)
+    : undefined;
+  const domainLocales = i18nConfig ? i18nConfig.domains : undefined;
 
-  // i18n redirect: check NEXT_LOCALE cookie first, then Accept-Language
-  if (i18nConfig && !localeInfo.hadPrefix) {
-    const cookieLocale = parseCookieLocaleFromHeader(cookieHeader);
-    if (cookieLocale && cookieLocale !== i18nConfig.defaultLocale) {
-      return new Response(null, { status: 307, headers: { Location: "/" + cookieLocale + routeUrl } });
-    }
-    if (!cookieLocale && i18nConfig.localeDetection !== false) {
-      const detected = detectLocaleFromHeaders(request.headers);
-      if (detected && detected !== i18nConfig.defaultLocale) {
-        return new Response(null, { status: 307, headers: { Location: "/" + detected + routeUrl } });
-      }
-    }
+  if (localeInfo.redirectUrl) {
+    return new Response(null, { status: 307, headers: { Location: localeInfo.redirectUrl } });
   }
 
   const match = matchRoute(routeUrl, pageRoutes);
@@ -677,12 +698,12 @@ async function _renderPage(request, url, manifest) {
   }
 
   const { route, params } = match;
-  return runWithRouterState(() =>
-    runWithHeadState(() =>
-      _runWithCacheState(() =>
-        runWithPrivateCache(() =>
-          runWithFetchCache(async () => {
-  try {
+  const __uCtx = _createUnifiedCtx({
+    executionContext: _getRequestExecutionContext(),
+  });
+  return _runWithUnifiedCtx(__uCtx, async () => {
+    ensureFetchPatch();
+    try {
     if (typeof setSSRContext === "function") {
       setSSRContext({
         pathname: patternToNextFormat(route.pattern),
@@ -690,14 +711,19 @@ async function _renderPage(request, url, manifest) {
         asPath: routeUrl,
         locale: locale,
         locales: i18nConfig ? i18nConfig.locales : undefined,
-        defaultLocale: i18nConfig ? i18nConfig.defaultLocale : undefined,
+        defaultLocale: currentDefaultLocale,
+        domainLocales: domainLocales,
       });
     }
 
     if (i18nConfig) {
-      globalThis.__VINEXT_LOCALE__ = locale;
-      globalThis.__VINEXT_LOCALES__ = i18nConfig.locales;
-      globalThis.__VINEXT_DEFAULT_LOCALE__ = i18nConfig.defaultLocale;
+      setI18nContext({
+        locale: locale,
+        locales: i18nConfig.locales,
+        defaultLocale: currentDefaultLocale,
+        domainLocales: domainLocales,
+        hostname: new URL(request.url).hostname,
+      });
     }
 
     const pageModule = route.module;
@@ -710,7 +736,7 @@ async function _renderPage(request, url, manifest) {
     if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
       const pathsResult = await pageModule.getStaticPaths({
         locales: i18nConfig ? i18nConfig.locales : [],
-        defaultLocale: i18nConfig ? i18nConfig.defaultLocale : "",
+        defaultLocale: currentDefaultLocale || "",
       });
       const fallback = pathsResult && pathsResult.fallback !== undefined ? pathsResult.fallback : false;
 
@@ -743,7 +769,7 @@ async function _renderPage(request, url, manifest) {
         resolvedUrl: routeUrl,
         locale: locale,
         locales: i18nConfig ? i18nConfig.locales : undefined,
-        defaultLocale: i18nConfig ? i18nConfig.defaultLocale : undefined,
+        defaultLocale: currentDefaultLocale,
       };
       const result = await pageModule.getServerSideProps(ctx);
       // If gSSP called res.end() directly (short-circuit), return that response.
@@ -792,61 +818,89 @@ async function _renderPage(request, url, manifest) {
 
       if (cached && cached.isStale && cached.value.value && cached.value.value.kind === "PAGES") {
         triggerBackgroundRegeneration(cacheKey, async function() {
-          var freshResult = await pageModule.getStaticProps({
-            params: params,
-            locale: locale,
-            locales: i18nConfig ? i18nConfig.locales : undefined,
-            defaultLocale: i18nConfig ? i18nConfig.defaultLocale : undefined,
+          var revalCtx = _createUnifiedCtx({
+            executionContext: _getRequestExecutionContext(),
           });
-          if (freshResult && freshResult.props && typeof freshResult.revalidate === "number" && freshResult.revalidate > 0) {
-            var _fp = freshResult.props;
-            // Re-render the page with fresh props
-            var _el = AppComponent
-              ? React.createElement(AppComponent, { Component: PageComponent, pageProps: _fp })
-              : React.createElement(PageComponent, _fp);
-            _el = wrapWithRouterContext(_el);
-            var _freshBody = await renderToStringAsync(_el);
-            // Rebuild __NEXT_DATA__ with fresh props
-            var _regenPayload = {
-              props: { pageProps: _fp }, page: patternToNextFormat(route.pattern),
-              query: params, buildId: buildId, isFallback: false,
-            };
-            if (i18nConfig) {
-              _regenPayload.locale = locale;
-              _regenPayload.locales = i18nConfig.locales;
-              _regenPayload.defaultLocale = i18nConfig.defaultLocale;
-            }
-            var _lGlobals = i18nConfig
-              ? ";window.__VINEXT_LOCALE__=" + safeJsonStringify(locale) +
-                ";window.__VINEXT_LOCALES__=" + safeJsonStringify(i18nConfig.locales) +
-                ";window.__VINEXT_DEFAULT_LOCALE__=" + safeJsonStringify(i18nConfig.defaultLocale)
-              : "";
-            var _freshNDS = "<script>window.__NEXT_DATA__ = " + safeJsonStringify(_regenPayload) + _lGlobals + "</script>";
-            // Reconstruct ISR HTML preserving the document shell from the
-            // cached entry (head, fonts, assets, custom _document markup).
-            var _cachedStr = cached.value.value.html;
-            var _btag = '<div id="__next">';
-            var _bstart = _cachedStr.indexOf(_btag);
-            var _bodyStart = _bstart >= 0 ? _bstart + _btag.length : -1;
-            // Locate __NEXT_DATA__ script to split body from suffix
-            var _ndMarker = '<script>window.__NEXT_DATA__';
-            var _ndStart = _cachedStr.indexOf(_ndMarker);
-            var _freshHtml;
-            if (_bodyStart >= 0 && _ndStart >= 0) {
-              // Region between body start and __NEXT_DATA__ contains:
-              // BODY_HTML + </div> + optional gap (custom _document content)
-              var _region = _cachedStr.slice(_bodyStart, _ndStart);
-              var _lastClose = _region.lastIndexOf('</div>');
-              var _gap = _lastClose >= 0 ? _region.slice(_lastClose + 6) : '';
-              // Tail: everything after the old __NEXT_DATA__ </script>
-              var _ndEnd = _cachedStr.indexOf('</script>', _ndStart) + 9;
-              var _tail = _cachedStr.slice(_ndEnd);
-              _freshHtml = _cachedStr.slice(0, _bodyStart) + _freshBody + '</div>' + _gap + _freshNDS + _tail;
-            } else {
-              _freshHtml = '<!DOCTYPE html>\\n<html>\\n<head>\\n</head>\\n<body>\\n  <div id="__next">' + _freshBody + '</div>\\n  ' + _freshNDS + '\\n</body>\\n</html>';
-            }
-            await isrSet(cacheKey, { kind: "PAGES", html: _freshHtml, pageData: _fp, headers: undefined, status: undefined }, freshResult.revalidate);
-          }
+          return _runWithUnifiedCtx(revalCtx, async () => {
+            ensureFetchPatch();
+              var freshResult = await pageModule.getStaticProps({
+                params: params,
+                locale: locale,
+                locales: i18nConfig ? i18nConfig.locales : undefined,
+                defaultLocale: currentDefaultLocale,
+              });
+              if (freshResult && freshResult.props && typeof freshResult.revalidate === "number" && freshResult.revalidate > 0) {
+                var _fp = freshResult.props;
+                if (typeof setSSRContext === "function") {
+                  setSSRContext({
+                    pathname: patternToNextFormat(route.pattern),
+                    query: { ...params, ...parseQuery(routeUrl) },
+                    asPath: routeUrl,
+                    locale: locale,
+                    locales: i18nConfig ? i18nConfig.locales : undefined,
+                    defaultLocale: currentDefaultLocale,
+                    domainLocales: domainLocales,
+                  });
+                }
+                if (i18nConfig) {
+                  setI18nContext({
+                    locale: locale,
+                    locales: i18nConfig.locales,
+                    defaultLocale: currentDefaultLocale,
+                    domainLocales: domainLocales,
+                    hostname: new URL(request.url).hostname,
+                  });
+                }
+                // Re-render the page with fresh props inside fresh render sub-scopes
+                // so head/cache state cannot leak across passes.
+                var _el = AppComponent
+                  ? React.createElement(AppComponent, { Component: PageComponent, pageProps: _fp })
+                  : React.createElement(PageComponent, _fp);
+                _el = wrapWithRouterContext(_el);
+                var _freshBody = await renderIsrPassToStringAsync(_el);
+                // Rebuild __NEXT_DATA__ with fresh props
+                var _regenPayload = {
+                  props: { pageProps: _fp }, page: patternToNextFormat(route.pattern),
+                  query: params, buildId: buildId, isFallback: false,
+                };
+                if (i18nConfig) {
+                  _regenPayload.locale = locale;
+                  _regenPayload.locales = i18nConfig.locales;
+                  _regenPayload.defaultLocale = currentDefaultLocale;
+                  _regenPayload.domainLocales = domainLocales;
+                }
+                var _lGlobals = i18nConfig
+                  ? ";window.__VINEXT_LOCALE__=" + safeJsonStringify(locale) +
+                    ";window.__VINEXT_LOCALES__=" + safeJsonStringify(i18nConfig.locales) +
+                    ";window.__VINEXT_DEFAULT_LOCALE__=" + safeJsonStringify(currentDefaultLocale)
+                  : "";
+                var _freshNDS = "<script>window.__NEXT_DATA__ = " + safeJsonStringify(_regenPayload) + _lGlobals + "</script>";
+                // Reconstruct ISR HTML preserving the document shell from the
+                // cached entry (head, fonts, assets, custom _document markup).
+                var _cachedStr = cached.value.value.html;
+                var _btag = '<div id="__next">';
+                var _bstart = _cachedStr.indexOf(_btag);
+                var _bodyStart = _bstart >= 0 ? _bstart + _btag.length : -1;
+                // Locate __NEXT_DATA__ script to split body from suffix
+                var _ndMarker = '<script>window.__NEXT_DATA__';
+                var _ndStart = _cachedStr.indexOf(_ndMarker);
+                var _freshHtml;
+                if (_bodyStart >= 0 && _ndStart >= 0) {
+                  // Region between body start and __NEXT_DATA__ contains:
+                  // BODY_HTML + </div> + optional gap (custom _document content)
+                  var _region = _cachedStr.slice(_bodyStart, _ndStart);
+                  var _lastClose = _region.lastIndexOf('</div>');
+                  var _gap = _lastClose >= 0 ? _region.slice(_lastClose + 6) : '';
+                  // Tail: everything after the old __NEXT_DATA__ </script>
+                  var _ndEnd = _cachedStr.indexOf('</script>', _ndStart) + 9;
+                  var _tail = _cachedStr.slice(_ndEnd);
+                  _freshHtml = _cachedStr.slice(0, _bodyStart) + _freshBody + '</div>' + _gap + _freshNDS + _tail;
+                } else {
+                  _freshHtml = '<!DOCTYPE html>\\n<html>\\n<head>\\n</head>\\n<body>\\n  <div id="__next">' + _freshBody + '</div>\\n  ' + _freshNDS + '\\n</body>\\n</html>';
+                }
+                await isrSet(cacheKey, { kind: "PAGES", html: _freshHtml, pageData: _fp, headers: undefined, status: undefined }, freshResult.revalidate);
+              }
+            });
         });
         var _staleHeaders = {
           "Content-Type": "text/html", "X-Vinext-Cache": "STALE",
@@ -860,7 +914,7 @@ async function _renderPage(request, url, manifest) {
         params,
         locale: locale,
         locales: i18nConfig ? i18nConfig.locales : undefined,
-        defaultLocale: i18nConfig ? i18nConfig.defaultLocale : undefined,
+        defaultLocale: currentDefaultLocale,
       };
       const result = await pageModule.getStaticProps(ctx);
       if (result && result.props) pageProps = result.props;
@@ -913,12 +967,13 @@ async function _renderPage(request, url, manifest) {
     if (i18nConfig) {
       nextDataPayload.locale = locale;
       nextDataPayload.locales = i18nConfig.locales;
-      nextDataPayload.defaultLocale = i18nConfig.defaultLocale;
+      nextDataPayload.defaultLocale = currentDefaultLocale;
+      nextDataPayload.domainLocales = domainLocales;
     }
     const localeGlobals = i18nConfig
       ? ";window.__VINEXT_LOCALE__=" + safeJsonStringify(locale) +
         ";window.__VINEXT_LOCALES__=" + safeJsonStringify(i18nConfig.locales) +
-        ";window.__VINEXT_DEFAULT_LOCALE__=" + safeJsonStringify(i18nConfig.defaultLocale)
+        ";window.__VINEXT_DEFAULT_LOCALE__=" + safeJsonStringify(currentDefaultLocale)
       : "";
     const nextDataScript = "<script>window.__NEXT_DATA__ = " + safeJsonStringify(nextDataPayload) + localeGlobals + "</script>";
 
@@ -981,7 +1036,7 @@ async function _renderPage(request, url, manifest) {
         isrElement = React.createElement(PageComponent, pageProps);
       }
       isrElement = wrapWithRouterContext(isrElement);
-      var isrHtml = await renderToStringAsync(isrElement);
+      var isrHtml = await renderIsrPassToStringAsync(isrElement);
       var fullHtml = shellPrefix + isrHtml + shellSuffix;
       var isrPathname = url.split("?")[0];
       var _cacheKey = isrCacheKey("pages", isrPathname);
@@ -1015,20 +1070,16 @@ async function _renderPage(request, url, manifest) {
       responseHeaders.set("Link", _fontLinkHeader);
     }
     return new Response(compositeStream, { status: finalStatus, headers: responseHeaders });
-  } catch (e) {
+    } catch (e) {
     console.error("[vinext] SSR error:", e);
     _reportRequestError(
       e instanceof Error ? e : new Error(String(e)),
       { path: url, method: request.method, headers: Object.fromEntries(request.headers.entries()) },
       { routerKind: "Pages Router", routePath: route.pattern, routeType: "render" },
-    );
+    ).catch(() => { /* ignore reporting errors */ });
     return new Response("Internal Server Error", { status: 500 });
-  }
-          }) // end runWithFetchCache
-        ) // end runWithPrivateCache
-      ) // end _runWithCacheState
-    ) // end runWithHeadState
-  ); // end runWithRouterState
+    }
+  });
 }
 
 export async function handleApiRoute(request, url) {