vinext 1.0.1 → 1.2.0

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

@@ -1,18 +1,19 @@
 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 { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
 import { reportRequestError } from "./instrumentation.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
-import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, recordRouteCacheability } from "../shims/cacheability-classification.js";
+import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, 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, 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";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
@@ -20,12 +21,11 @@ import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { hasUserDocumentGetInitialProps } from "./document-initial-head.js";
+import { pagesPathCacheTag } from "./pages-cache-tag.js";
 import { renderPagesPageResponse } from "./pages-page-response.js";
 import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
-import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
 import { traceFindPageComponents, tracePagesDocumentStream } from "./pages-execution-tracing.js";
-import { mergePagesNotFoundSourceHeaders, resolvePagesPageData } from "./pages-page-data.js";
+import { mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesStatusPageRenderPath } from "./pages-page-data.js";
 import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
 import { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, getPagesPreviewState } from "./pages-preview.js";
 import { createPagesReqRes } from "./pages-node-compat.js";
@@ -68,10 +68,7 @@ function withPagesCacheState(response, state, revalidatedPathname) {
 	if (state === "REVALIDATED") {
 		headers.set(NEXTJS_CACHE_HEADER, state);
 		headers.delete(VINEXT_CACHE_HEADER);
-		if (revalidatedPathname !== void 0) {
-			const stem = revalidatedPathname.length > 1 && revalidatedPathname.endsWith("/") ? revalidatedPathname.slice(0, -1) : revalidatedPathname;
-			headers.set(VINEXT_REVALIDATED_CACHE_TAG_HEADER, encodeCacheTag(`_N_T_${stem || "/"}`));
-		}
+		if (revalidatedPathname !== void 0) headers.set(VINEXT_REVALIDATED_CACHE_TAG_HEADER, encodeURIComponent(pagesPathCacheTag(revalidatedPathname)));
 	} else setCacheStateHeaders(headers, state);
 	return new Response(response.body, {
 		headers,
@@ -98,13 +95,10 @@ function applyPagesErrorCachePolicy(response, revalidateSeconds, expireSeconds,
 	});
 	if (hasExplicitNonCacheableResponsePolicy(headers)) return response;
 	if (revalidateSeconds === void 0) applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
-	else {
-		const stem = cacheTagPathname.endsWith("/") ? cacheTagPathname.slice(0, -1) : cacheTagPathname;
-		applyCdnResponseHeaders(headers, {
-			cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds),
-			tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
-		});
-	}
+	else applyCdnResponseHeaders(headers, {
+		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds),
+		tags: [pagesPathCacheTag(cacheTagPathname)]
+	});
 	return new Response(response.body, {
 		headers,
 		status: response.status,
@@ -131,7 +125,7 @@ function buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domain
 * accepts the same options shape the generated entry always passed inline.
 */
 function createPagesPageHandler(opts) {
-	const { pageRoutes, errorPageRoute, matchRoute, i18nConfig, vinextConfig, buildId, hasMiddleware, appAssetPath, hasRewrites, setSSRContext, getPagesNavigationIsReadyFromSerializedState, setI18nContext, wrapWithRouterContext, router, resetSSRHead, getSSRHeadHTML, setDocumentInitialHead, flushPreloads, getFontLinks, getFontStyles, getFontPreloads, renderToReadableStream, renderIsrPassToStringAsync, safeJsonStringify, sanitizeDestination, createPageElement, enhancePageElement, AppComponent, DocumentComponent } = opts;
+	const { pageRoutes, errorPageRoute, matchRoute, i18nConfig, vinextConfig, buildId, hasMiddleware, appAssetPath, hasRewrites, setSSRContext, getPagesNavigationIsReadyFromSerializedState, setI18nContext, wrapWithRouterContext, router, resetSSRHead, getSSRHeadHTML, setDocumentInitialHead, flushPreloads, getFontLinks, getFontStyles, getFontPreloads, renderToReadableStream, safeJsonStringify, sanitizeDestination, createPageElement, enhancePageElement, AppComponent, DocumentComponent } = opts;
 	function renderToStringAsync(element) {
 		return renderToReadableStream(element).then((stream) => new Response(stream).text());
 	}
@@ -187,7 +181,7 @@ 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 ? JSON.stringify([String(localeInfo.domainLocale.domain).toLowerCase(), locale]) : "locale:" + String(locale) : null);
@@ -216,6 +210,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";
@@ -234,10 +244,10 @@ function createPagesPageHandler(opts) {
 			});
 			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, {
@@ -257,17 +267,39 @@ function createPagesPageHandler(opts) {
 				statusText: snapshot.statusText
 			});
 		}
-		const renderRouteUrl = isStaticPropsRender ? routeUrl.split("?")[0] : routeUrl;
+		const routePattern = patternToNextFormat(route.pattern);
+		const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
+		const isStatusPageIdentity = (isStaticPropsRender || pagesReadiness.autoExport) && (routePattern === "/404" || routePattern === "/500" || routePattern === "/_error");
+		const statusPagePathname = routePattern === "/_error" && renderStatusCode === 404 ? "/404" : routePattern;
+		const renderRouteUrl = isStaticPropsRender && isStatusPageIdentity ? resolvePagesStatusPageRenderPath(statusPagePathname, vinextConfig.trailingSlash, originalRequestUrl.pathname) : isStaticPropsRender ? routeUrl.split("?")[0] : routeUrl;
 		const routerAsPathSource = isStaticPropsRender ? renderRouteUrl : renderAsPath ?? renderRouteUrl;
 		const routerAsPath = i18nConfig ? extractLocaleFromUrl(routerAsPathSource, i18nConfig, locale).url : routerAsPathSource;
 		const uCtx = createRequestContext({ executionContext: getRequestExecutionContext() });
-		const response = await runWithRequestContext(uCtx, async () => {
+		let pageReqRes = null;
+		const pageResponseSent = () => pageReqRes?.res.headersSent === true;
+		const sendsEarly = isStaticPropsRoute && !isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate"));
+		let resolveSentResponse = () => {};
+		const sentResponse = new Promise((resolve) => {
+			resolveSentResponse = resolve;
+		});
+		const reportSsrError = async (e) => {
+			console.error("[vinext] SSR error:", e);
+			await reportRequestError(e, {
+				path: url,
+				method: request.method,
+				headers: Object.fromEntries(request.headers.entries())
+			}, {
+				routerKind: "Pages Router",
+				routePath: route.pattern,
+				routeType: "render",
+				revalidateReason: isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? "on-demand" : typeof pageModule.getStaticProps === "function" ? "stale" : void 0
+			});
+		};
+		const rendering = runWithRequestContext(uCtx, async () => {
 			ensureFetchPatch();
 			try {
-				const routePattern = patternToNextFormat(route.pattern);
 				setFrameworkRequestRoute(routePattern);
-				const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
-				const isrCachePathname = (isStaticPropsRender || pagesReadiness.autoExport) && (routePattern === "/404" || routePattern === "/500" || routePattern === "/_error") ? routePattern === "/_error" && renderStatusCode === 404 ? "/404" : routePattern : renderRouteUrl.split("?")[0];
+				const isrCachePathname = isStatusPageIdentity ? statusPagePathname : 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;
@@ -357,15 +389,109 @@ function createPagesPageHandler(opts) {
 					if (options?.__notFoundSourceHeaders) for (const [name, value] of Object.entries(options.__notFoundSourceHeaders)) reqRes.res.setHeader(name, value);
 					return reqRes;
 				};
+				const createForegroundReqRes = () => {
+					const reqRes = createPageReqRes();
+					pageReqRes = reqRes;
+					if (sendsEarly) reqRes.responsePromise.then(resolveSentResponse);
+					return reqRes;
+				};
+				const buildPageResponseOptions = (render) => {
+					const pageModuleIds = [];
+					if (appAssetPath) pageModuleIds.push(appAssetPath);
+					if (route.filePath) pageModuleIds.push(route.filePath);
+					const initialStylesheetHrefs = /* @__PURE__ */ new Set();
+					return {
+						assetTags: collectAssetTags({
+							manifest,
+							moduleIds: pageModuleIds,
+							scriptNonce,
+							disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
+							basePath: vinextConfig.basePath,
+							assetPrefix: vinextConfig.assetPrefix,
+							deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
+							crossOrigin: vinextConfig.crossOrigin,
+							initialStylesheetHrefs
+						}),
+						buildId,
+						clearSsrContext() {
+							if (typeof setSSRContext === "function") setSSRContext(null);
+						},
+						createPageElement(currentProps) {
+							const el = createPageElement(PageComponent, AppComponent, currentProps);
+							return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
+						},
+						enhancePageElement(renderPageOpts) {
+							const el = enhancePageElement(PageComponent, AppComponent, render.renderProps, renderPageOpts);
+							return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
+						},
+						DocumentComponent,
+						err: err instanceof Error ? err : void 0,
+						flushPreloads: typeof flushPreloads === "function" ? flushPreloads : void 0,
+						fontLinkHeader,
+						fontPreloads: allFontPreloads,
+						getFontLinks,
+						getFontStyles,
+						getSSRHeadHTML: typeof getSSRHeadHTML === "function" ? getSSRHeadHTML : void 0,
+						clientTraceMetadata: shouldEmitPagesClientTraceMetadata(pageModule, AppComponent) ? vinextConfig.clientTraceMetadata : void 0,
+						documentReqRes: render.documentReqRes,
+						gsspRes: render.gsspRes,
+						isrCacheKey: pageIsrCacheKey,
+						isrCachePathname,
+						expireSeconds: render.expireSeconds,
+						isrRevalidateSeconds: render.isrRevalidateSeconds,
+						isStaticPropsRoute,
+						isrSet: routeIsrSet,
+						i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
+						isFallback: render.isFallback,
+						pageProps: render.pageProps,
+						props: render.renderProps,
+						params,
+						query,
+						renderDocumentToString(element) {
+							return renderToStringAsync(element);
+						},
+						renderToReadableStream,
+						resetSSRHead: typeof resetSSRHead === "function" ? resetSSRHead : void 0,
+						setDocumentInitialHead: typeof setDocumentInitialHead === "function" ? setDocumentInitialHead : void 0,
+						routePattern,
+						routeUrl: renderRouteUrl,
+						safeJsonStringify,
+						scriptNonce,
+						initialStylesheetHrefs,
+						crossOrigin: vinextConfig.crossOrigin,
+						disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
+						statusCode: renderStatusCode,
+						nextData: serializedPagesNextData
+					};
+				};
+				const withErrorStatusCode = (pageProps, renderProps) => {
+					if (routePattern === "/_error" && typeof renderStatusCode === "number" && renderProps.pageProps !== void 0) {
+						const statusPageProps = {
+							...pageProps,
+							statusCode: renderStatusCode
+						};
+						return {
+							pageProps: statusPageProps,
+							renderProps: {
+								...renderProps,
+								pageProps: statusPageProps
+							}
+						};
+					}
+					return {
+						pageProps,
+						renderProps
+					};
+				};
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
 					err: err instanceof Error ? err : void 0,
 					applyRequestContexts: applySSRContext,
 					basePath: vinextConfig.basePath,
-					buildId,
 					deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
 					htmlLimitedBots: vinextConfig.htmlLimitedBots,
-					createGsspReqRes: createPageReqRes,
+					createGsspReqRes: createForegroundReqRes,
+					createRegenerationReqRes: createPageReqRes,
 					createAppTree(appTreeProps) {
 						const el = createPageElement(PageComponent, AppComponent, appTreeProps);
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
@@ -386,6 +512,7 @@ function createPagesPageHandler(opts) {
 					validatePropsSerialization: process.env.NODE_ENV !== "production" || process.env.VINEXT_PRERENDER === "1",
 					isOnDemandRevalidate,
 					revalidateOnlyGenerated,
+					regeneratesStoredEntry: getRequestExecutionContext()?.isStoredEntryRegeneration === true,
 					previewData,
 					pageModule,
 					AppComponent,
@@ -394,8 +521,26 @@ function createPagesPageHandler(opts) {
 					query,
 					asPath: routerAsPath,
 					resolvedUrl: pagesResolvedUrl,
-					renderIsrPassToStringAsync,
-					collectIsrHeadHTML: getSSRHeadHTML && !hasUserDocumentGetInitialProps(DocumentComponent) ? getSSRHeadHTML : void 0,
+					async renderIsrDocument(regeneration) {
+						const renderAllReady = async (element) => {
+							const stream = await renderToReadableStream(element);
+							await stream.allReady;
+							return stream;
+						};
+						await (await renderPagesPageResponse({
+							...buildPageResponseOptions({
+								documentReqRes: regeneration.documentReqRes,
+								expireSeconds: regeneration.expireSeconds,
+								gsspRes: null,
+								isFallback: false,
+								isrRevalidateSeconds: regeneration.revalidateSeconds,
+								...withErrorStatusCode(regeneration.pageProps, regeneration.props)
+							}),
+							isStaleRegeneration: true,
+							renderDocumentToString: (element) => renderAllReady(element).then((stream) => new Response(stream).text()),
+							renderToReadableStream: renderAllReady
+						})).body?.cancel();
+					},
 					route: { isDynamic: route.isDynamic },
 					routePattern,
 					routeUrl: renderRouteUrl,
@@ -417,10 +562,10 @@ function createPagesPageHandler(opts) {
 					statusCode: renderStatusCode,
 					notFoundSourceHeaders: options?.__notFoundSourceHeaders,
 					triggerBackgroundRegeneration,
-					vinext: serializedPagesNextData.__vinext,
 					nextData: serializedPagesNextData,
 					userAgent: request.headers.get("user-agent") ?? void 0,
 					ifNoneMatch: request.headers.get("if-none-match") ?? void 0,
+					ifModifiedSince: request.headers.get("if-modified-since") ?? void 0,
 					requestCacheControl: request.headers.get("cache-control") ?? void 0
 				});
 				if (pageDataResult.kind === "notFound") {
@@ -443,28 +588,17 @@ function createPagesPageHandler(opts) {
 					return finalizePagesPreviewResponse(withBrowserPolicy(notFoundResponse), preview);
 				}
 				if (pageDataResult.kind === "response") {
+					if (sendsEarly && pageResponseSent()) return pageDataResult.response;
 					let response = isOnDemandRevalidate && pageDataResult.onDemandRevalidateSuccess !== false ? withPagesCacheState(pageDataResult.response, "REVALIDATED", isrCachePathname) : pageDataResult.response;
 					if (shouldApplyErrorResponsePolicy) response = applyPagesErrorCachePolicy(response, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
 					return finalizePagesPreviewResponse(withBrowserPolicy(response), preview);
 				}
-				let pageProps = pageDataResult.pageProps;
-				let renderProps = pageDataResult.props;
-				if (previewData !== false) renderProps = {
-					...renderProps,
+				const { pageProps, renderProps } = withErrorStatusCode(pageDataResult.pageProps, previewData !== false ? {
+					...pageDataResult.props,
 					__N_PREVIEW: true
-				};
-				if (routePattern === "/_error" && typeof renderStatusCode === "number" && renderProps.pageProps !== void 0) {
-					pageProps = {
-						...pageProps,
-						statusCode: renderStatusCode
-					};
-					renderProps = {
-						...renderProps,
-						pageProps
-					};
-				}
+				} : pageDataResult.props);
 				const gsspRes = pageDataResult.gsspRes;
-				const documentReqRes = serializedPagesNextData.autoExport === true && !options?.__notFoundSourceHeaders ? null : pageDataResult.documentReqRes ?? createPageReqRes();
+				const documentReqRes = serializedPagesNextData.autoExport === true && !options?.__notFoundSourceHeaders ? null : pageDataResult.documentReqRes ?? createForegroundReqRes();
 				const isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds;
 				if (isStaticPropsRoute && preview.data === false && !preview.shouldClear && isrRevalidateSeconds !== null) recordRouteCacheability({
 					cacheable: isrRevalidateSeconds !== 0,
@@ -493,13 +627,11 @@ function createPagesPageHandler(opts) {
 					if (gsspRes) {
 						if (!headers.has("Cache-Control")) headers.set("Cache-Control", NEVER_CACHE_CONTROL);
 					} else if (isStaticPropsRoute) {
-						if (isrRevalidateSeconds !== null) {
-							const stem = isrCachePathname.endsWith("/") ? isrCachePathname.slice(0, -1) : isrCachePathname;
-							applyCdnResponseHeaders(headers, {
-								cacheControl: buildMissIsrCacheControl(isrRevalidateSeconds, vinextConfig.expireTime),
-								tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
-							});
-						} else if (shouldUseNextDeployCacheControl()) headers.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
+						if (isrRevalidateSeconds !== null) applyCdnResponseHeaders(headers, {
+							cacheControl: buildMissIsrCacheControl(isrRevalidateSeconds, vinextConfig.expireTime),
+							tags: [pagesPathCacheTag(isrCachePathname)]
+						});
+						else if (shouldUseNextDeployCacheControl()) headers.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
 					}
 					if (routePattern !== "/_error" && routePattern !== "/500") {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -507,91 +639,28 @@ function createPagesPageHandler(opts) {
 					}
 					return finalizePagesPreviewResponse(withBrowserPolicy(buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, { headers })), preview);
 				}
-				const pageModuleIds = [];
-				if (appAssetPath) pageModuleIds.push(appAssetPath);
-				if (route.filePath) pageModuleIds.push(route.filePath);
-				const initialStylesheetHrefs = /* @__PURE__ */ new Set();
 				let pageResponse = await renderTracedPagesPageResponse({
-					assetTags: collectAssetTags({
-						manifest,
-						moduleIds: pageModuleIds,
-						scriptNonce,
-						disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
-						basePath: vinextConfig.basePath,
-						assetPrefix: vinextConfig.assetPrefix,
-						deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
-						crossOrigin: vinextConfig.crossOrigin,
-						initialStylesheetHrefs
+					...buildPageResponseOptions({
+						documentReqRes,
+						expireSeconds: isrExpireSeconds,
+						gsspRes,
+						isFallback: isFallbackRender,
+						isrRevalidateSeconds,
+						pageProps,
+						renderProps
 					}),
-					buildId,
-					clearSsrContext() {
-						if (typeof setSSRContext === "function") setSSRContext(null);
-					},
-					createPageElement(currentProps) {
-						const el = createPageElement(PageComponent, AppComponent, currentProps);
-						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
-					},
-					enhancePageElement(renderPageOpts) {
-						const el = enhancePageElement(PageComponent, AppComponent, renderProps, renderPageOpts);
-						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
-					},
-					DocumentComponent,
-					err: err instanceof Error ? err : void 0,
-					flushPreloads: typeof flushPreloads === "function" ? flushPreloads : void 0,
-					fontLinkHeader,
-					fontPreloads: allFontPreloads,
-					getFontLinks,
-					getFontStyles,
-					getSSRHeadHTML: typeof getSSRHeadHTML === "function" ? getSSRHeadHTML : void 0,
-					clientTraceMetadata: shouldEmitPagesClientTraceMetadata(pageModule, AppComponent) ? vinextConfig.clientTraceMetadata : void 0,
-					documentReqRes,
-					gsspRes,
-					isrCacheKey: pageIsrCacheKey,
-					isrCachePathname,
-					expireSeconds: isrExpireSeconds,
-					isrRevalidateSeconds,
 					isOnDemandRevalidate,
-					isStaticPropsRoute,
-					isrSet: routeIsrSet,
-					i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
-					isFallback: isFallbackRender,
-					pageProps,
-					props: renderProps,
-					params,
-					query,
-					renderDocumentToString(element) {
-						return renderToStringAsync(element);
-					},
-					renderToReadableStream,
-					resetSSRHead: typeof resetSSRHead === "function" ? resetSSRHead : void 0,
-					setDocumentInitialHead: typeof setDocumentInitialHead === "function" ? setDocumentInitialHead : void 0,
-					routePattern,
-					routeUrl: renderRouteUrl,
-					safeJsonStringify,
-					scriptNonce,
-					initialStylesheetHrefs,
-					crossOrigin: vinextConfig.crossOrigin,
-					disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
-					statusCode: renderStatusCode,
-					nextData: serializedPagesNextData,
 					userAgent: request.headers.get("user-agent") ?? void 0,
 					ifNoneMatch: request.headers.get("if-none-match") ?? void 0,
+					ifModifiedSince: request.headers.get("if-modified-since") ?? void 0,
 					requestCacheControl: request.headers.get("cache-control") ?? void 0
 				});
+				if (sendsEarly && pageResponseSent()) return pageResponse;
 				if (shouldApplyErrorResponsePolicy) pageResponse = applyPagesErrorCachePolicy(pageResponse, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
 				return finalizePagesPreviewResponse(withBrowserPolicy(pageResponse), preview);
 			} catch (e) {
-				console.error("[vinext] SSR error:", e);
-				await reportRequestError(e, {
-					path: url,
-					method: request.method,
-					headers: Object.fromEntries(request.headers.entries())
-				}, {
-					routerKind: "Pages Router",
-					routePath: route.pattern,
-					routeType: "render",
-					revalidateReason: isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? "on-demand" : typeof pageModule.getStaticProps === "function" ? "stale" : void 0
-				});
+				await reportSsrError(e);
+				if (sendsEarly && pageResponseSent()) return sentResponse;
 				if (!isInternalErrorRender && !isDataReq) {
 					let errorRoute = null;
 					for (let i = 0; i < pageRoutes.length; i++) if (pageRoutes[i].pattern === "/500") {
@@ -618,7 +687,17 @@ function createPagesPageHandler(opts) {
 				return new Response("Internal Server Error", { status: 500 });
 			}
 		});
-		return closeAfterResponseWithBody(response, uCtx);
+		if (!sendsEarly) return closeAfterResponseWithBody(await rendering, uCtx);
+		const settled = await Promise.race([rendering.then((response) => ({
+			response,
+			rendered: true
+		})), sentResponse.then((response) => ({
+			response,
+			rendered: false
+		}))]);
+		if (pageResponseSent()) markRouteCacheabilityFinalResponseUncacheable("_app or _document sent the response of a getStaticProps page");
+		if (!settled.rendered) getRequestExecutionContext()?.waitUntil(rendering.then(() => void 0, () => void 0));
+		return closeAfterResponseWithBody(settled.response, uCtx);
 	}
 	return renderPage;
 }

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

@@ -11,13 +11,12 @@ import { ComponentType, ReactNode } from "react";
 export declare function isPagesStreamingBot(userAgent: string): boolean;
 export declare function generatePagesETag(payload: string): string;
 /**
- * Returns true when a request `Cache-Control` header asks to bypass the 304
- * short-circuit. Mirrors the `fresh` package's check used by Next.js's
- * `sendEtagResponse` (`/(?:^|,)\s*?no-cache\s*?(?:,|$)/`). Shared by the
- * fresh-MISS bot path here and the ISR HIT/STALE paths in
- * `pages-page-data.ts` so the two cannot drift.
+ * Whether a render answers a matching If-None-Match with a 304. Next.js stores
+ * the page before it evaluates the ETag, so when the CDN adapter stores the
+ * completed response, the render returns the page and the adapter sends the 304.
+ * A page whose status carries no body has nothing to store.
  */
-export declare function requestsNoCache(cacheControl: string | undefined): boolean;
+export declare function rendersPagesNotModified(status: number): boolean;
 type PagesFontPreload = {
   href: string;
   type: string;
@@ -87,6 +86,8 @@ type RenderPagesPageResponseOptions = {
   isrRevalidateSeconds: number | false | null;
   /** Synchronous `res.revalidate()` render; cache persistence must finish before returning. */
   isOnDemandRevalidate?: boolean;
+  /** Background ISR regeneration; the cache write must finish before returning. */
+  isStaleRegeneration?: boolean;
   isStaticPropsRoute?: boolean;
   isrSet: (key: string, data: CachedPagesValue, policy: IsrWritePolicy) => Promise<void>;
   i18n: PagesI18nRenderContext;
@@ -133,6 +134,11 @@ type RenderPagesPageResponseOptions = {
    * Only evaluated on bot/buffered responses that carry an ETag.
    */
   ifNoneMatch?: string;
+  /**
+   * The incoming request's `If-Modified-Since` header value. As in Next.js,
+   * which gives a page no Last-Modified, a request with it gets the page.
+   */
+  ifModifiedSince?: string;
   /**
    * The incoming request's `Cache-Control` header value. When the value
    * contains `no-cache`, the 304 short-circuit is skipped and a full 200