vinext 1.0.0 → 1.1.0

package/dist/server/pages-asset-tags.js

@@ -13,12 +13,73 @@ import { getPagesClientAssets } from "./pages-client-assets.js";
 * unit-testable and lives in a normal typed module rather than a codegen
 * template string.
 */
+const nonEmptyManifests = /* @__PURE__ */ new WeakMap();
+const moduleKeyOrder = /* @__PURE__ */ new WeakMap();
+const sharedChunkFiles = /* @__PURE__ */ new WeakMap();
+const lazyChunkSets = /* @__PURE__ */ new WeakMap();
+function findModuleKey(manifest, moduleId) {
+	if (manifest[moduleId]) return moduleId;
+	let uniqueKey = null;
+	let candidate = moduleId;
+	while (true) {
+		if (Object.prototype.propertyIsEnumerable.call(manifest, candidate)) {
+			if (uniqueKey !== null) {
+				uniqueKey = null;
+				break;
+			}
+			uniqueKey = candidate;
+		}
+		const slash = candidate.indexOf("/");
+		if (slash === -1) break;
+		candidate = candidate.slice(slash + 1);
+	}
+	if (uniqueKey !== null) return uniqueKey;
+	let keyOrder = moduleKeyOrder.get(manifest);
+	if (!keyOrder) {
+		keyOrder = /* @__PURE__ */ new Map();
+		for (const key in manifest) keyOrder.set(key, keyOrder.size);
+		moduleKeyOrder.set(manifest, keyOrder);
+	}
+	let matchedKey = null;
+	let matchedOrder = Infinity;
+	let suffix = moduleId;
+	while (true) {
+		const order = keyOrder.get(suffix);
+		if (order !== void 0 && order < matchedOrder) {
+			matchedKey = suffix;
+			matchedOrder = order;
+		}
+		const slash = suffix.indexOf("/");
+		if (slash === -1) break;
+		suffix = suffix.slice(slash + 1);
+	}
+	return matchedKey;
+}
+function getSharedChunkFiles(manifest) {
+	const cached = sharedChunkFiles.get(manifest);
+	if (cached) return cached;
+	const files = /* @__PURE__ */ new Set();
+	for (const key in manifest) for (const file of manifest[key] ?? []) {
+		const basename = file.slice(file.lastIndexOf("/") + 1);
+		if (basename.startsWith("framework-") || basename.startsWith("vinext-") || basename.includes("vinext-client-entry") || basename.includes("vinext-app-browser-entry")) files.add(file);
+	}
+	const result = [...files];
+	sharedChunkFiles.set(manifest, result);
+	return result;
+}
 /**
 * Resolve the effective SSR manifest: prefer the caller-supplied object and
 * fall back to the registered client build metadata.
 */
 function resolveSsrManifest(manifest) {
-	if (manifest && Object.keys(manifest).length > 0) return manifest;
+	if (manifest) {
+		let nonEmpty = nonEmptyManifests.get(manifest);
+		if (nonEmpty === void 0) {
+			nonEmpty = Object.keys(manifest).length > 0;
+			nonEmptyManifests.set(manifest, nonEmpty);
+		}
+		if (nonEmpty) return manifest;
+	}
 	return getPagesClientAssets().ssrManifest ?? null;
 }
 /**
@@ -29,20 +90,13 @@ function resolveSsrManifest(manifest) {
 */
 function getManifestFilesForModule(manifest, moduleId) {
 	if (!manifest || !moduleId) return null;
-	const files = manifest[moduleId];
-	if (files) return files;
-	for (const key in manifest) if (moduleId.endsWith("/" + key) || moduleId === key) return manifest[key];
-	return null;
+	const key = findModuleKey(manifest, moduleId);
+	return key === null ? null : manifest[key];
 }
 function collectGraphOrderedCss(graph, moduleIds) {
 	const ordered = [];
 	const emitted = /* @__PURE__ */ new Set();
 	const visited = /* @__PURE__ */ new Set();
-	function findKey(moduleId) {
-		if (!moduleId) return void 0;
-		if (graph[moduleId]) return moduleId;
-		for (const key in graph) if (moduleId === key || moduleId.endsWith("/" + key)) return key;
-	}
 	function visit(key) {
 		if (!key || visited.has(key)) return;
 		visited.add(key);
@@ -55,7 +109,7 @@ function collectGraphOrderedCss(graph, moduleIds) {
 			ordered.push(file);
 		}
 	}
-	for (const moduleId of moduleIds) visit(findKey(moduleId));
+	for (const moduleId of moduleIds) if (moduleId) visit(findModuleKey(graph, moduleId));
 	return ordered;
 }
 /**
@@ -104,7 +158,11 @@ function collectAssetTags(options) {
 	};
 	const runtimeAssets = getPagesClientAssets();
 	const lazyChunks = runtimeAssets.lazyChunks ?? null;
-	const lazySet = lazyChunks && lazyChunks.length > 0 ? new Set(lazyChunks) : null;
+	let lazySet = lazyChunks ? lazyChunkSets.get(lazyChunks) : void 0;
+	if (lazyChunks && !lazySet) {
+		lazySet = new Set(lazyChunks);
+		lazyChunkSets.set(lazyChunks, lazySet);
+	}
 	const clientEntry = runtimeAssets.clientEntry;
 	if (clientEntry) {
 		seen.add(clientEntry);
@@ -128,15 +186,8 @@ function collectAssetTags(options) {
 				const files = getManifestFilesForModule(m, id);
 				if (files) for (let fi = 0; fi < files.length; fi++) allFiles.push(files[fi]);
 			}
-			for (const key in m) {
-				const vals = m[key];
-				if (!vals) continue;
-				for (let vi = 0; vi < vals.length; vi++) {
-					const file = vals[vi];
-					const basename = file.split("/").pop() || "";
-					if (basename.startsWith("framework-") || basename.startsWith("vinext-") || basename.includes("vinext-client-entry") || basename.includes("vinext-app-browser-entry")) allFiles.push(file);
-				}
-			}
+			const sharedFiles = m === runtimeAssets.ssrManifest && runtimeAssets.sharedChunks ? runtimeAssets.sharedChunks : getSharedChunkFiles(m);
+			for (const file of sharedFiles) allFiles.push(file);
 		} else for (const akey in m) {
 			const avals = m[akey];
 			if (avals) for (let ai = 0; ai < avals.length; ai++) allFiles.push(avals[ai]);
@@ -160,4 +211,4 @@ function collectAssetTags(options) {
 	return tags.join("\n  ");
 }
 //#endregion
-export { collectAssetTags, getManifestFilesForModule, resolveClientModuleUrl, resolveSsrManifest };
+export { collectAssetTags, getManifestFilesForModule, getSharedChunkFiles, resolveClientModuleUrl, resolveSsrManifest };

package/dist/server/pages-client-assets.d.ts

@@ -4,6 +4,8 @@ export type PagesClientAssets = {
   clientEntry?: string;
   appBootstrapPreinitModules?: string[];
   ssrManifest?: Record<string, string[]>;
+  /** Build-time shared file list, valid only for this ssrManifest object. */
+  sharedChunks?: string[];
   cssGraph?: Record<string, {
     imports?: string[];
     css?: string[];

package/dist/server/pages-page-data.d.ts

@@ -149,8 +149,11 @@ export type ResolvePagesPageDataOptions = {
   createPageElement: (props: Record<string, unknown>) => ReactNode;
   fontLinkHeader: string;
   i18n: PagesI18nRenderContext;
+  /** Build-time default locale, which can differ from a domain's render default. */
+  staticPathsDefaultLocale?: string;
   isrCacheKey: (router: string, pathname: string) => string;
   isrGet: (key: string) => Promise<ISRCacheEntry | null>;
+  hasPrerenderedPages?: boolean;
   isrSet: (key: string, data: CachedPagesValue | CachedRedirectValue | null, policy: IsrWritePolicy) => Promise<void>;
   expireSeconds?: number;
   /**
@@ -216,6 +219,8 @@ export type ResolvePagesPageDataOptions = {
   sanitizeDestination: (destination: string) => string;
   scriptNonce?: string;
   statusCode?: number;
+  /** Request-local headers inherited when rendering a source page's notFound result. */
+  notFoundSourceHeaders?: Record<string, string | number | boolean | string[]>;
   triggerBackgroundRegeneration: (key: string, renderFn: () => Promise<void>, errorContext?: {
     routerKind: "Pages Router";
     routePath: string;
@@ -314,7 +319,7 @@ export type PagesRouteParam = {
   optional: boolean;
 };
 export declare function getPagesRouteParams(routePattern: string): PagesRouteParam[];
-export declare function matchesPagesStaticPath(pathEntry: PagesStaticPathsEntry, params: Record<string, unknown>, routeParams: PagesRouteParam[], routeUrl: string): boolean;
+export declare function matchesPagesStaticPath(pathEntry: PagesStaticPathsEntry, params: Record<string, unknown>, routeParams: PagesRouteParam[], routeUrl: string, i18n?: Pick<PagesI18nRenderContext, "locale" | "locales" | "defaultLocale">): boolean;
 export declare function renderPagesIsrHtml(options: RenderPagesIsrHtmlOptions): Promise<string>;
 export declare function resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
 //#endregion

package/dist/server/pages-page-data.js

@@ -3,6 +3,8 @@ import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
+import { extractLocaleFromUrl } from "./pages-i18n.js";
+import { recordRouteCacheability } from "../shims/cacheability-classification.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
 import { buildPagesCacheValue, isrCacheControl } from "./isr-cache.js";
@@ -102,6 +104,10 @@ function mergePagesNotFoundSourceHeaders(response, sourceHeaders) {
 }
 function applyPagesTerminalMissHeaders(response, revalidateSeconds, isrCachePathname, expireSeconds) {
 	const stem = isrCachePathname.endsWith("/") ? isrCachePathname.slice(0, -1) : isrCachePathname;
+	recordRouteCacheability({
+		cacheable: revalidateSeconds !== 0,
+		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds)
+	});
 	applyCdnResponseHeaders(response.headers, {
 		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds),
 		tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
@@ -117,16 +123,17 @@ function applyCachedPagesRepresentationHeaders(response, cacheState, entry, opti
 		expireSeconds: entry.cacheControl?.expire === void 0 ? void 0 : options.expireSeconds,
 		cacheControlMeta: entry.cacheControl
 	});
+	recordRouteCacheability({
+		cacheable: true,
+		cacheControl
+	});
 	applyCdnResponseHeaders(response.headers, { cacheControl });
 	for (const [name, value] of Object.entries(buildCacheStateHeaders(cacheState))) response.headers.set(name, value);
 	return response;
 }
 function buildCachedPagesNotFoundResult(options, entry, cacheState) {
 	const result = buildPagesNotFoundResult(options, entry.cacheControl?.revalidate ?? 60, cacheState, entry.cacheControl?.expire);
-	if (result.kind === "response") return {
-		kind: "response",
-		response: applyCachedPagesRepresentationHeaders(result.response, cacheState, entry, options)
-	};
+	if (result.kind === "response") return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(result.response, cacheState, entry, options), options);
 	return result;
 }
 function resolvePagesRedirectStatus(redirect) {
@@ -270,7 +277,8 @@ function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }
 	const headers = new Headers(responseHeaders);
 	headers.set("Location", location);
 	if (resolved.statusCode === 308) headers.set("Refresh", `0;url=${location}`);
-	return new Response(location, {
+	if (options.isBuildTimePrerendering) headers.set("Content-Type", "application/json");
+	return new Response(options.isBuildTimePrerendering ? options.safeJsonStringify(redirectProps) : location, {
 		status: resolved.statusCode,
 		headers
 	});
@@ -333,7 +341,19 @@ function getPagesRouteParams(routePattern) {
 		return null;
 	}).filter((param) => param !== null);
 }
-function matchesPagesStaticPath(pathEntry, params, routeParams, routeUrl) {
+function matchesPagesStaticPath(pathEntry, params, routeParams, routeUrl, i18n) {
+	if (i18n?.locales && i18n.defaultLocale) {
+		let entryLocale = i18n.defaultLocale;
+		if (typeof pathEntry === "string") {
+			const localized = extractLocaleFromUrl(pathEntry, {
+				locales: i18n.locales,
+				defaultLocale: i18n.defaultLocale
+			});
+			pathEntry = localized.url;
+			entryLocale = localized.locale;
+		} else entryLocale = pathEntry.locale ?? entryLocale;
+		if (entryLocale !== (i18n.locale ?? i18n.defaultLocale)) return false;
+	}
 	if (typeof pathEntry === "string") return normalizePathnameForRouteMatch(normalizeStaticPathname(pathEntry)) === normalizePathnameForRouteMatch(normalizeStaticPathname(routeUrl));
 	const entryParams = pathEntry.params;
 	if (entryParams === void 0 || entryParams === null) return false;
@@ -364,6 +384,10 @@ function buildPagesCacheResponse(html, cacheState, fontLinkHeader, revalidateSec
 		"Content-Type": "text/html; charset=utf-8",
 		...buildCacheStateHeaders(cacheState)
 	});
+	recordRouteCacheability({
+		cacheable: true,
+		cacheControl: cacheControlHeader
+	});
 	applyCdnResponseHeaders(headers, { cacheControl: cacheControlHeader });
 	if (fontLinkHeader) headers.set("Link", fontLinkHeader);
 	if (cachedHeaders) for (const [name, value] of Object.entries(cachedHeaders)) {
@@ -378,28 +402,21 @@ function buildPagesCacheResponse(html, cacheState, fontLinkHeader, revalidateSec
 		headers
 	});
 }
-/**
-* For bot / crawler UAs, attach an ETag to a cached ISR response (HIT or
-* STALE) so it is consistent with the fresh-MISS path, then check for a
-* matching `If-None-Match`. When the check passes — and the request did NOT
-* carry `Cache-Control: no-cache` — returns a 304 response; otherwise returns
-* `null` so the caller can return the full response.
-*
-* Extracted to avoid duplicating the same three-line block across the HIT and
-* STALE branches.
-*/
-function applyBotETagAndCheck(cachedResponse, html, options) {
-	if (!options.userAgent || !isPagesStreamingBot(options.userAgent)) return null;
-	const etag = generatePagesETag(html);
-	cachedResponse.headers.set("ETag", etag);
-	if (!requestsNoCache(options.requestCacheControl) && options.ifNoneMatch && matchesIfNoneMatch(options.ifNoneMatch, etag)) return {
-		kind: "response",
-		response: new Response(null, {
+/** Merge source headers before the cached HTML's bot ETag and freshness check. */
+function finalizeCachedPagesResponse(response, options, html) {
+	response = mergePagesNotFoundSourceHeaders(response, options.notFoundSourceHeaders);
+	if (html !== void 0 && options.userAgent && isPagesStreamingBot(options.userAgent)) {
+		const etag = generatePagesETag(html);
+		response.headers.set("ETag", etag);
+		if (!requestsNoCache(options.requestCacheControl) && options.ifNoneMatch && matchesIfNoneMatch(options.ifNoneMatch, etag)) response = new Response(null, {
 			status: 304,
-			headers: cachedResponse.headers
-		})
+			headers: response.headers
+		});
+	}
+	return {
+		kind: "response",
+		response
 	};
-	return null;
 }
 /**
 * Matches one serialized `next/head` tag. `getSSRHeadHTML()` stamps every tag
@@ -491,17 +508,32 @@ async function resolvePagesPageData(options) {
 	const userFacingParams = options.route.isDynamic ? options.params : null;
 	let isFallback = false;
 	let shouldPersistFallbackData = false;
-	let onDemandPreviousCacheEntry;
+	let previousCacheEntry;
 	const previewData = options.isOnDemandRevalidate ? false : options.previewData ?? false;
-	if (typeof options.pageModule.getStaticPaths === "function" && options.route.isDynamic) {
+	if (options.hasPrerenderedPages && options.nextData?.autoExport && !options.scriptNonce && !options.isOnDemandRevalidate && previewData === false) {
+		const cached = await options.isrGet(options.isrCacheKey("pages", options.isrCachePathname ?? options.routeUrl.split("?")[0]));
+		const value = cached?.value.value;
+		if (cached && !cached.isStale && !cached.isExpired && value?.kind === "PAGES") return finalizeCachedPagesResponse(options.isDataReq ? applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(value.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options) : buildPagesCacheResponse(value.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, options.statusCode ?? value.status, value.headers), options, options.isDataReq ? void 0 : value.html);
+	}
+	let hasFreshPrerenderedEntry = false;
+	if (options.hasPrerenderedPages && options.route.isDynamic && typeof options.pageModule.getStaticProps === "function" && typeof options.pageModule.getServerSideProps !== "function" && !options.isOnDemandRevalidate && previewData === false) {
+		previousCacheEntry = await options.isrGet(options.isrCacheKey("pages", options.isrCachePathname ?? options.routeUrl.split("?")[0]));
+		const value = previousCacheEntry?.value.value;
+		hasFreshPrerenderedEntry = !!previousCacheEntry && !previousCacheEntry.isStale && !previousCacheEntry.isExpired && (value === null || value?.kind === "PAGES" || value?.kind === "REDIRECT");
+	}
+	if (!hasFreshPrerenderedEntry && typeof options.pageModule.getStaticPaths === "function" && options.route.isDynamic) {
+		const staticPathsI18n = {
+			...options.i18n,
+			defaultLocale: options.staticPathsDefaultLocale ?? options.i18n.defaultLocale
+		};
 		const pathsResult = await options.pageModule.getStaticPaths({
 			locales: options.i18n.locales ?? [],
-			defaultLocale: options.i18n.defaultLocale ?? ""
+			defaultLocale: staticPathsI18n.defaultLocale ?? ""
 		});
 		const fallback = pathsResult?.fallback ?? false;
 		const paths = pathsResult?.paths ?? [];
 		const routeParams = getPagesRouteParams(options.routePattern);
-		const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, options.params, routeParams, options.routeUrl));
+		const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, options.params, routeParams, options.routeUrl, staticPathsI18n));
 		if (fallback === false && !isValidPath && previewData === false) {
 			if (options.isOnDemandRevalidate && !options.revalidateOnlyGenerated) return {
 				kind: "response",
@@ -516,8 +548,8 @@ async function resolvePagesPageData(options) {
 	}
 	if (typeof options.pageModule.getStaticProps === "function" && options.isOnDemandRevalidate && options.revalidateOnlyGenerated) {
 		const pathname = options.isrCachePathname ?? options.routeUrl.split("?")[0];
-		onDemandPreviousCacheEntry = await options.isrGet(options.isrCacheKey("pages", pathname));
-		if (!onDemandPreviousCacheEntry) return {
+		previousCacheEntry = await options.isrGet(options.isrCacheKey("pages", pathname));
+		if (!previousCacheEntry) return {
 			kind: "response",
 			response: new Response("This page could not be found", {
 				status: 404,
@@ -616,7 +648,7 @@ async function resolvePagesPageData(options) {
 	if (typeof options.pageModule.getStaticProps === "function") {
 		const pathname = options.isrCachePathname ?? options.routeUrl.split("?")[0];
 		const cacheKey = options.isrCacheKey("pages", pathname);
-		const cached = onDemandPreviousCacheEntry !== void 0 ? onDemandPreviousCacheEntry : await options.isrGet(cacheKey);
+		const cached = previousCacheEntry !== void 0 ? previousCacheEntry : await options.isrGet(cacheKey);
 		const cachedValue = cached?.value.value;
 		const isLegacyCachedNotFound = cachedValue?.kind === "PAGES" && cachedValue.status === 404 && options.routePattern !== "/404" && options.routePattern !== "/_error";
 		const cachedRedirect = getCachedPagesRedirect(cachedValue);
@@ -700,46 +732,20 @@ async function resolvePagesPageData(options) {
 		if (!options.isOnDemandRevalidate && cached && !cached.isStale && !cached.isExpired && previewData === false) {
 			if (cachedValue === null) return buildCachedPagesNotFoundResult(options, cached.value, "HIT");
 			if (isLegacyCachedNotFound) return buildCachedPagesNotFoundResult(options, cached.value, "HIT");
-			if (cachedRedirect) return {
-				kind: "response",
-				response: applyCachedPagesRepresentationHeaders(buildCachedPagesRedirectResponse(cachedRedirect, options), "HIT", cached.value, options)
-			};
-			if (options.isDataReq && cachedValue?.kind === "PAGES") return {
-				kind: "response",
-				response: applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(cachedValue.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options)
-			};
-		}
-		if (!options.isOnDemandRevalidate && cached?.isStale === false && !cached.isExpired && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) {
-			const hitResponse = buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status, cachedValue.headers);
-			const hitBotResult = applyBotETagAndCheck(hitResponse, cachedValue.html, options);
-			if (hitBotResult) return hitBotResult;
-			return {
-				kind: "response",
-				response: hitResponse
-			};
+			if (cachedRedirect) return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildCachedPagesRedirectResponse(cachedRedirect, options), "HIT", cached.value, options), options);
+			if (options.isDataReq && cachedValue?.kind === "PAGES") return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(cachedValue.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options), options);
 		}
+		if (!options.isOnDemandRevalidate && cached?.isStale === false && !cached.isExpired && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) return finalizeCachedPagesResponse(buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status, cachedValue.headers), options, cachedValue.html);
 		if (!options.isOnDemandRevalidate && cached && cached.isStale && !cached.isExpired && !options.scriptNonce && previewData === false && (cachedValue === null || cachedRedirect !== null || isLegacyCachedNotFound || options.isDataReq)) {
 			scheduleStaleRegeneration();
 			if (cachedValue === null) return buildCachedPagesNotFoundResult(options, cached.value, "STALE");
 			if (isLegacyCachedNotFound) return buildCachedPagesNotFoundResult(options, cached.value, "STALE");
-			if (cachedRedirect) return {
-				kind: "response",
-				response: applyCachedPagesRepresentationHeaders(buildCachedPagesRedirectResponse(cachedRedirect, options), "STALE", cached.value, options)
-			};
-			if (cachedValue?.kind === "PAGES") return {
-				kind: "response",
-				response: applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(cachedValue.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "STALE", cached.value, options)
-			};
+			if (cachedRedirect) return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildCachedPagesRedirectResponse(cachedRedirect, options), "STALE", cached.value, options), options);
+			if (cachedValue?.kind === "PAGES") return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(cachedValue.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "STALE", cached.value, options), options);
 		}
 		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !cached.isExpired && !options.scriptNonce && !options.isDataReq && previewData === false) {
 			scheduleStaleRegeneration();
-			const staleResponse = buildPagesCacheResponse(cachedValue.html, "STALE", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status, cachedValue.headers);
-			const staleBotResult = applyBotETagAndCheck(staleResponse, cachedValue.html, options);
-			if (staleBotResult) return staleBotResult;
-			return {
-				kind: "response",
-				response: staleResponse
-			};
+			return finalizeCachedPagesResponse(buildPagesCacheResponse(cachedValue.html, "STALE", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status, cachedValue.headers), options, cachedValue.html);
 		}
 		const generatedPageData = !options.isOnDemandRevalidate && previewData === false && cached?.isStale === false && !cached.isExpired && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
 		if (!generatedPageData) {

package/dist/server/pages-page-handler.js

@@ -1,16 +1,18 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { extractLocaleFromUrl, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { reportRequestError } from "./instrumentation.js";
-import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, recordRouteCacheability } from "../shims/cacheability-classification.js";
-import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, hasExplicitNonCacheableResponsePolicy, shouldUseNextDeployCacheControl } from "./cache-control.js";
+import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
+import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, recordRouteCacheability } from "../shims/cacheability-classification.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy, shouldUseNextDeployCacheControl } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
-import { coalesceOnDemandRevalidation, isrCacheKey, isrGet, isrSet, triggerBackgroundRegeneration } from "./isr-cache.js";
+import { coalesceOnDemandRevalidation, isrGet, isrSet, pagesIsrCacheKey, triggerBackgroundRegeneration } from "./isr-cache.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
@@ -91,6 +93,10 @@ function stripPagesNotFoundFramingHeaders(response) {
 }
 function applyPagesErrorCachePolicy(response, revalidateSeconds, expireSeconds, cacheTagPathname) {
 	const headers = new Headers(response.headers);
+	recordRouteCacheability(revalidateSeconds === void 0 ? { cacheable: false } : {
+		cacheable: revalidateSeconds !== 0,
+		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds)
+	});
 	if (hasExplicitNonCacheableResponsePolicy(headers)) return response;
 	if (revalidateSeconds === void 0) applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
 	else {
@@ -135,8 +141,7 @@ function createPagesPageHandler(opts) {
 		return errorPageRoute;
 	}
 	function isrCacheKeyForRequest(i18nCacheVariant) {
-		if (!i18nCacheVariant) return (router, pathname) => isrCacheKey(router, pathname, buildId ?? void 0);
-		return (router, pathname) => isrCacheKey(router, pathname + "::i18n=" + encodeURIComponent(i18nCacheVariant), buildId ?? void 0);
+		return (_router, pathname) => pagesIsrCacheKey(pathname, buildId ?? void 0, i18nCacheVariant);
 	}
 	async function renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders) {
 		let isDataReq = !!(options && options.isDataReq);
@@ -183,10 +188,10 @@ function createPagesPageHandler(opts) {
 			redirectUrl: void 0
 		};
 		const locale = localeInfo.locale;
-		const routeUrl = localeInfo.url;
+		let routeUrl = localeInfo.url;
 		const currentDefaultLocale = i18nConfig ? localeInfo.domainLocale ? localeInfo.domainLocale.defaultLocale : i18nConfig.defaultLocale : void 0;
 		const domainLocales = i18nConfig ? i18nConfig.domains : void 0;
-		const pageIsrCacheKey = isrCacheKeyForRequest(i18nConfig ? localeInfo.domainLocale ? "domain:" + String(localeInfo.domainLocale.domain).toLowerCase() : "locale:" + String(locale) : null);
+		const pageIsrCacheKey = isrCacheKeyForRequest(i18nConfig ? localeInfo.domainLocale ? JSON.stringify([String(localeInfo.domainLocale.domain).toLowerCase(), locale]) : "locale:" + String(locale) : null);
 		if (localeInfo.redirectUrl) return new Response(null, {
 			status: 307,
 			headers: { Location: localeInfo.redirectUrl }
@@ -212,6 +217,22 @@ function createPagesPageHandler(opts) {
 				renderAsPath = routeUrl;
 			} else return buildDefaultPagesNotFoundResponse();
 		}
+		const routePathname = routeUrl.split("?")[0];
+		const cachePathname = normalizePathnameForRouteMatch(routePathname);
+		let cacheIdentityDiverges = false;
+		if (!isRouteMissErrorRender && options?.__forcedRoute === void 0 && cachePathname !== routePathname) {
+			const cachePathRoute = matchRoute(cachePathname, pageRoutes)?.route;
+			if (cachePathRoute !== match.route) {
+				const cachePathModule = cachePathRoute?.module;
+				if (match.route.isDynamic && typeof match.route.module.getStaticProps === "function" && cachePathRoute && !cachePathRoute.isDynamic && typeof cachePathModule?.getStaticProps === "function" && typeof cachePathModule.getServerSideProps !== "function" && getPagesPreviewState(request.headers.get("cookie"), { isOnDemandRevalidate: isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) }).data === false) {
+					match = {
+						route: cachePathRoute,
+						params: {}
+					};
+					routeUrl = cachePathname + routeUrl.slice(routePathname.length);
+				} else cacheIdentityDiverges = true;
+			}
+		}
 		const { route, params } = match;
 		const pageModule = traceFindPageComponents(route.pattern, () => route.module);
 		const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
@@ -228,11 +249,12 @@ function createPagesPageHandler(opts) {
 				cacheable: true,
 				cacheControl: STATIC_CACHE_CONTROL
 			});
+			else recordRouteCacheability({ cacheable: false });
 		}
-		const routeIsrGet = isCacheabilityProbe ? async () => null : isrGet;
-		const routeIsrSet = isCacheabilityProbe ? async () => {} : isrSet;
+		const routeIsrGet = isCacheabilityProbe || cacheIdentityDiverges ? async () => null : isrGet;
+		const routeIsrSet = isCacheabilityProbe || cacheIdentityDiverges ? async () => {} : isrSet;
 		const isStaticPropsRender = isStaticPropsRoute && typeof pageModule.getServerSideProps !== "function";
-		if (!options?.__skipOnDemandCoalesce && !options?.__forcedRoute && isStaticPropsRoute && isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate"))) {
+		if (!options?.__skipOnDemandCoalesce && !options?.__forcedRoute && !cacheIdentityDiverges && isStaticPropsRoute && isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate"))) {
 			const cacheKey = pageIsrCacheKey("pages", routeUrl.split("?")[0]);
 			const snapshot = await coalesceOnDemandRevalidation(cacheKey, async () => {
 				const response = await renderPage(request, url, manifest, middlewareHeaders, {
@@ -262,7 +284,7 @@ function createPagesPageHandler(opts) {
 				const routePattern = patternToNextFormat(route.pattern);
 				setFrameworkRequestRoute(routePattern);
 				const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
-				const isrCachePathname = isStaticPropsRender && (routePattern === "/404" || routePattern === "/500" || routePattern === "/_error") ? routePattern : renderRouteUrl.split("?")[0];
+				const isrCachePathname = (isStaticPropsRender || pagesReadiness.autoExport) && (routePattern === "/404" || routePattern === "/500" || routePattern === "/_error") ? routePattern === "/_error" && renderStatusCode === 404 ? "/404" : routePattern : renderRouteUrl.split("?")[0];
 				const isNotFoundErrorRender = routePattern === "/404" || routePattern === "/_error" && renderStatusCode === 404;
 				const isStatusErrorRender = isNotFoundErrorRender || routePattern === "/500" || routePattern === "/_error" && renderStatusCode === 500;
 				const errorPageRevalidateSeconds = isNotFoundErrorRender ? options?.__notFoundRevalidateSeconds : void 0;
@@ -327,6 +349,11 @@ function createPagesPageHandler(opts) {
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
+				const browserCacheControl = isStaticPropsRoute && !scriptNonce ? (initialResponseHeaders ?? middlewareHeaders)?.get("Cache-Control") : null;
+				const withBrowserPolicy = (response) => {
+					if (browserCacheControl) response.headers.set("Cache-Control", browserCacheControl);
+					return response;
+				};
 				const shouldApplyErrorResponsePolicy = previewData === false && !scriptNonce && isStatusErrorRender && (isStaticPropsRoute || isRouteMissErrorRender || options?.__forcedRoute !== void 0);
 				let fontLinkHeader = "";
 				let allFontPreloads = [];
@@ -366,8 +393,10 @@ function createPagesPageHandler(opts) {
 					},
 					fontLinkHeader,
 					i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
+					staticPathsDefaultLocale: i18nConfig?.defaultLocale,
 					isrCacheKey: pageIsrCacheKey,
 					isrGet: routeIsrGet,
+					hasPrerenderedPages: getCdnCacheAdapter().hasPrerenderedPages,
 					isrSet: routeIsrSet,
 					expireSeconds: vinextConfig.expireTime,
 					isBuildTimePrerendering: typeof process !== "undefined" && process.env && process.env.VINEXT_PRERENDER === "1",
@@ -403,6 +432,7 @@ function createPagesPageHandler(opts) {
 					sanitizeDestination,
 					scriptNonce,
 					statusCode: renderStatusCode,
+					notFoundSourceHeaders: options?.__notFoundSourceHeaders,
 					triggerBackgroundRegeneration,
 					vinext: serializedPagesNextData.__vinext,
 					nextData: serializedPagesNextData,
@@ -427,12 +457,12 @@ function createPagesPageHandler(opts) {
 					notFoundResponse = stripPagesNotFoundFramingHeaders(notFoundResponse);
 					if (isOnDemandRevalidate) notFoundResponse = withPagesCacheState(notFoundResponse, "REVALIDATED", isrCachePathname);
 					else if (pageDataResult.cacheState) notFoundResponse = withPagesCacheState(notFoundResponse, pageDataResult.cacheState);
-					return finalizePagesPreviewResponse(notFoundResponse, preview);
+					return finalizePagesPreviewResponse(withBrowserPolicy(notFoundResponse), preview);
 				}
 				if (pageDataResult.kind === "response") {
 					let response = isOnDemandRevalidate && pageDataResult.onDemandRevalidateSuccess !== false ? withPagesCacheState(pageDataResult.response, "REVALIDATED", isrCachePathname) : pageDataResult.response;
 					if (shouldApplyErrorResponsePolicy) response = applyPagesErrorCachePolicy(response, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
-					return finalizePagesPreviewResponse(response, preview);
+					return finalizePagesPreviewResponse(withBrowserPolicy(response), preview);
 				}
 				let pageProps = pageDataResult.pageProps;
 				let renderProps = pageDataResult.props;
@@ -453,6 +483,10 @@ function createPagesPageHandler(opts) {
 				const gsspRes = pageDataResult.gsspRes;
 				const documentReqRes = serializedPagesNextData.autoExport === true && !options?.__notFoundSourceHeaders ? null : pageDataResult.documentReqRes ?? createPageReqRes();
 				const isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds;
+				if (isStaticPropsRoute && preview.data === false && !preview.shouldClear && isrRevalidateSeconds !== null) recordRouteCacheability({
+					cacheable: isrRevalidateSeconds !== 0,
+					cacheControl: buildMissIsrCacheControl(isrRevalidateSeconds, vinextConfig.expireTime)
+				});
 				const isrExpireSeconds = pageDataResult.isrExpireSeconds;
 				const isFallbackRender = pageDataResult.isFallback === true;
 				if (isFallbackRender) applySSRContext({
@@ -472,6 +506,7 @@ function createPagesPageHandler(opts) {
 							else headers.set(k, Array.isArray(v) ? v.join(", ") : String(v));
 						}
 					}
+					if (hasCdnResponsePolicy(headers)) markRouteCacheabilityExplicitResponsePolicy();
 					if (gsspRes) {
 						if (!headers.has("Cache-Control")) headers.set("Cache-Control", NEVER_CACHE_CONTROL);
 					} else if (isStaticPropsRoute) {
@@ -487,7 +522,7 @@ function createPagesPageHandler(opts) {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 						if (deploymentId) headers.set(NEXTJS_DEPLOYMENT_ID_HEADER, deploymentId);
 					}
-					return finalizePagesPreviewResponse(buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, { headers }), preview);
+					return finalizePagesPreviewResponse(withBrowserPolicy(buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, { headers })), preview);
 				}
 				const pageModuleIds = [];
 				if (appAssetPath) pageModuleIds.push(appAssetPath);
@@ -561,7 +596,7 @@ function createPagesPageHandler(opts) {
 					requestCacheControl: request.headers.get("cache-control") ?? void 0
 				});
 				if (shouldApplyErrorResponsePolicy) pageResponse = applyPagesErrorCachePolicy(pageResponse, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
-				return finalizePagesPreviewResponse(pageResponse, preview);
+				return finalizePagesPreviewResponse(withBrowserPolicy(pageResponse), preview);
 			} catch (e) {
 				console.error("[vinext] SSR error:", e);
 				await reportRequestError(e, {

package/dist/server/pages-page-response.js

@@ -2,7 +2,8 @@ import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { NEXTJS_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { reportRequestError } from "./instrumentation.js";
-import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, shouldUseNextDeployCacheControl } from "./cache-control.js";
+import { markRouteCacheabilityExplicitResponsePolicy } from "../shims/cacheability-classification.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, shouldUseNextDeployCacheControl } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { fnv1a52 } from "../utils/hash.js";
 import { isrCacheControl } from "./isr-cache.js";
@@ -271,6 +272,7 @@ async function renderPagesPageResponse(options) {
 	}
 	const compositeStream = await buildPagesCompositeStream(responseBodyStream, shellPrefix, shellSuffix);
 	const userSetCacheControl = responseHeaders.has("Cache-Control");
+	if (hasCdnResponsePolicy(responseHeaders)) markRouteCacheabilityExplicitResponsePolicy();
 	if (options.scriptNonce) responseHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
 	else if (options.isrRevalidateSeconds !== null) {
 		const isrPathname = options.isrCachePathname ?? options.routeUrl.split("?")[0];

package/dist/server/pages-request-pipeline.d.ts

@@ -15,7 +15,7 @@ type PageRouteMatch = {
     dataKind?: PagesRouteDataKind;
   };
 };
-export declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>, publicFiles?: ReadonlySet<string>, isDirectBuildAsset?: boolean): Promise<Response | false>;
+export declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>, publicFiles: ReadonlySet<string>, basePath?: string, assetPathPrefix?: string): Promise<Response | false>;
 export type MiddlewareResult = {
   continue: boolean;
   /** The pathname matches middleware, irrespective of request `has`/`missing` conditions. */
@@ -30,6 +30,7 @@ export type MiddlewareResult = {
   waitUntilPromises?: Promise<unknown>[];
 };
 export type PagesPipelineDeps = {
+  assetPrefix?: string;
   basePath: string;
   trailingSlash: boolean;
   i18nConfig: NextI18nConfig | null;