vinext 1.0.0-beta.9 → 1.0.1

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

@@ -1,13 +1,17 @@
+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 { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
-import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_CACHE_HEADER } from "./headers.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 { 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 { coalesceOnDemandRevalidation, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, triggerBackgroundRegeneration } from "./isr-cache.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";
@@ -20,28 +24,54 @@ import { hasUserDocumentGetInitialProps } from "./document-initial-head.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 { 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";
-import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, recordRouteCacheability } from "../shims/cacheability-classification.js";
+import { setFrameworkRequestRoute } from "./request-tracing.js";
 //#region src/server/pages-page-handler.ts
+async function renderTracedPagesPageResponse(options) {
+	let bodyStream;
+	try {
+		return await renderPagesPageResponse({
+			...options,
+			traceDocument: async (callback) => {
+				const result = await tracePagesDocumentStream(options.routePattern, callback);
+				bodyStream = result.bodyStream;
+				return result;
+			}
+		});
+	} catch (error) {
+		if (bodyStream && !bodyStream.locked) await bodyStream.cancel(error).catch(() => {});
+		throw error;
+	}
+}
+function preservePagesBodyMetadata(source, target) {
+	const result = preserveFullyBufferedBodyMetadata(source, target);
+	if (source.__vinextStreamedHtmlResponse === true) result.__vinextStreamedHtmlResponse = true;
+	return result;
+}
 function finalizePagesPreviewResponse(response, preview) {
 	if (preview.data === false && !preview.shouldClear) return response;
 	const headers = new Headers(response.headers);
-	if (preview.data !== false) applyCdnResponseHeaders(headers, { cacheControl: PAGES_PREVIEW_CACHE_CONTROL });
+	if (preview.data !== false || preview.shouldClear) applyCdnResponseHeaders(headers, { cacheControl: PAGES_PREVIEW_CACHE_CONTROL });
 	if (preview.shouldClear) appendPagesPreviewClearCookies(headers);
-	return new Response(response.body, {
+	return preservePagesBodyMetadata(response, new Response(response.body, {
 		headers,
 		status: response.status,
 		statusText: response.statusText
-	});
+	}));
 }
-function withPagesCacheState(response, state) {
+function withPagesCacheState(response, state, revalidatedPathname) {
 	const headers = new Headers(response.headers);
 	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 || "/"}`));
+		}
 	} else setCacheStateHeaders(headers, state);
 	return new Response(response.body, {
 		headers,
@@ -62,6 +92,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 {
@@ -106,10 +140,9 @@ 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) {
+	async function renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders) {
 		let isDataReq = !!(options && options.isDataReq);
 		const requestUrl = new URL(request.url);
 		const rawOriginalUrl = options && typeof options.originalUrl === "string" ? options.originalUrl : requestUrl.pathname + requestUrl.search;
@@ -157,7 +190,7 @@ function createPagesPageHandler(opts) {
 		const 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 }
@@ -184,7 +217,7 @@ function createPagesPageHandler(opts) {
 			} else return buildDefaultPagesNotFoundResponse();
 		}
 		const { route, params } = match;
-		const pageModule = route.module;
+		const pageModule = traceFindPageComponents(route.pattern, () => route.module);
 		const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
 		const pagesReadiness = buildPagesReadinessNextData({
 			pageModule,
@@ -199,16 +232,18 @@ 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 isStaticPropsRender = isStaticPropsRoute && typeof pageModule.getServerSideProps !== "function";
 		if (!options?.__skipOnDemandCoalesce && !options?.__forcedRoute && isStaticPropsRoute && isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate"))) {
-			const snapshot = await coalesceOnDemandRevalidation(pageIsrCacheKey("pages", routeUrl.split("?")[0]), async () => {
+			const cacheKey = pageIsrCacheKey("pages", routeUrl.split("?")[0]);
+			const snapshot = await coalesceOnDemandRevalidation(cacheKey, async () => {
 				const response = await renderPage(request, url, manifest, middlewareHeaders, {
 					...options,
 					__skipOnDemandCoalesce: true
-				});
+				}, initialResponseHeaders);
 				return {
 					body: request.method === "HEAD" || response.status === 204 || response.status === 304 ? null : new Uint8Array(await response.arrayBuffer()),
 					headers: [...response.headers.entries()],
@@ -226,12 +261,13 @@ function createPagesPageHandler(opts) {
 		const routerAsPathSource = isStaticPropsRender ? renderRouteUrl : renderAsPath ?? renderRouteUrl;
 		const routerAsPath = i18nConfig ? extractLocaleFromUrl(routerAsPathSource, i18nConfig, locale).url : routerAsPathSource;
 		const uCtx = createRequestContext({ executionContext: getRequestExecutionContext() });
-		return closeAfterResponseWithBody(await runWithRequestContext(uCtx, async () => {
+		const response = await runWithRequestContext(uCtx, async () => {
 			ensureFetchPatch();
 			try {
 				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;
@@ -296,6 +332,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 = [];
@@ -307,6 +348,7 @@ function createPagesPageHandler(opts) {
 				const createPageReqRes = () => {
 					const reqRes = createPagesReqRes({
 						body: void 0,
+						initialResponseHeaders,
 						query,
 						request,
 						url: originalRequestPathAndSearch
@@ -334,8 +376,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",
@@ -371,6 +415,7 @@ function createPagesPageHandler(opts) {
 					sanitizeDestination,
 					scriptNonce,
 					statusCode: renderStatusCode,
+					notFoundSourceHeaders: options?.__notFoundSourceHeaders,
 					triggerBackgroundRegeneration,
 					vinext: serializedPagesNextData.__vinext,
 					nextData: serializedPagesNextData,
@@ -390,17 +435,17 @@ function createPagesPageHandler(opts) {
 						__notFoundExpireSeconds: pageDataResult.expireSeconds,
 						__notFoundCachePathname: isrCachePathname,
 						__notFoundSourceHeaders: pageDataResult.responseHeaders
-					});
+					}, initialResponseHeaders);
 					else notFoundResponse = mergePagesNotFoundSourceHeaders(buildDefaultPagesNotFoundResponse(), pageDataResult.responseHeaders);
 					notFoundResponse = stripPagesNotFoundFramingHeaders(notFoundResponse);
-					if (isOnDemandRevalidate) notFoundResponse = withPagesCacheState(notFoundResponse, "REVALIDATED");
+					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") : 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(response, preview);
+					return finalizePagesPreviewResponse(withBrowserPolicy(response), preview);
 				}
 				let pageProps = pageDataResult.pageProps;
 				let renderProps = pageDataResult.props;
@@ -421,6 +466,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({
@@ -430,39 +479,39 @@ function createPagesPageHandler(opts) {
 					isFallback: true
 				});
 				if (isDataReq) {
-					const init = { headers: {} };
+					const headers = new Headers();
 					if (gsspRes && typeof gsspRes.getHeaders === "function") {
 						const gsspHeaders = gsspRes.getHeaders();
 						for (const k of Object.keys(gsspHeaders)) {
 							const v = gsspHeaders[k];
 							if (v === void 0 || v === null) continue;
-							init.headers[k] = Array.isArray(v) ? v.join(", ") : String(v);
+							if (k.toLowerCase() === "set-cookie" && Array.isArray(v)) for (const cookie of v) headers.append(k, String(cookie));
+							else headers.set(k, Array.isArray(v) ? v.join(", ") : String(v));
 						}
 					}
+					if (hasCdnResponsePolicy(headers)) markRouteCacheabilityExplicitResponsePolicy();
 					if (gsspRes) {
-						let hasUserCacheControl = false;
-						for (const headerKey of Object.keys(init.headers)) if (headerKey.toLowerCase() === "cache-control") {
-							hasUserCacheControl = true;
-							break;
-						}
-						if (!hasUserCacheControl) init.headers["Cache-Control"] = NEVER_CACHE_CONTROL;
+						if (!headers.has("Cache-Control")) headers.set("Cache-Control", NEVER_CACHE_CONTROL);
 					} else if (isStaticPropsRoute) {
 						if (isrRevalidateSeconds !== null) {
-							const headers = new Headers(init.headers);
-							applyCdnResponseHeaders(headers, { cacheControl: buildMissIsrCacheControl(isrRevalidateSeconds, vinextConfig.expireTime) });
-							for (const [key, value] of headers) init.headers[key] = value;
-						} else if (shouldUseNextDeployCacheControl()) init.headers["Cache-Control"] = BROWSER_REVALIDATE_CACHE_CONTROL;
+							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 (routePattern !== "/_error" && routePattern !== "/500") {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
-						if (deploymentId) init.headers[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
+						if (deploymentId) headers.set(NEXTJS_DEPLOYMENT_ID_HEADER, deploymentId);
 					}
-					return finalizePagesPreviewResponse(buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, init), preview);
+					return finalizePagesPreviewResponse(withBrowserPolicy(buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, { headers })), preview);
 				}
 				const pageModuleIds = [];
 				if (appAssetPath) pageModuleIds.push(appAssetPath);
 				if (route.filePath) pageModuleIds.push(route.filePath);
-				let pageResponse = await renderPagesPageResponse({
+				const initialStylesheetHrefs = /* @__PURE__ */ new Set();
+				let pageResponse = await renderTracedPagesPageResponse({
 					assetTags: collectAssetTags({
 						manifest,
 						moduleIds: pageModuleIds,
@@ -471,7 +520,8 @@ function createPagesPageHandler(opts) {
 						basePath: vinextConfig.basePath,
 						assetPrefix: vinextConfig.assetPrefix,
 						deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
-						crossOrigin: vinextConfig.crossOrigin
+						crossOrigin: vinextConfig.crossOrigin,
+						initialStylesheetHrefs
 					}),
 					buildId,
 					clearSsrContext() {
@@ -519,6 +569,7 @@ function createPagesPageHandler(opts) {
 					routeUrl: renderRouteUrl,
 					safeJsonStringify,
 					scriptNonce,
+					initialStylesheetHrefs,
 					crossOrigin: vinextConfig.crossOrigin,
 					disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
 					statusCode: renderStatusCode,
@@ -528,25 +579,29 @@ 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);
-				reportRequestError(e instanceof Error ? e : new Error(String(e)), {
+				await reportRequestError(e, {
 					path: url,
 					method: request.method,
 					headers: Object.fromEntries(request.headers.entries())
 				}, {
 					routerKind: "Pages Router",
 					routePath: route.pattern,
-					routeType: "render"
-				}).catch(() => {});
+					routeType: "render",
+					revalidateReason: isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? "on-demand" : typeof pageModule.getStaticProps === "function" ? "stale" : void 0
+				});
 				if (!isInternalErrorRender && !isDataReq) {
 					let errorRoute = null;
 					for (let i = 0; i < pageRoutes.length; i++) if (pageRoutes[i].pattern === "/500") {
 						errorRoute = pageRoutes[i];
 						break;
 					}
-					if (!errorRoute && errorPageRoute) errorRoute = errorPageRoute;
+					if (!errorRoute && errorPageRoute) {
+						traceFindPageComponents("/500", () => void 0);
+						errorRoute = errorPageRoute;
+					}
 					if (errorRoute) try {
 						return await renderPage(request, url, manifest, middlewareHeaders, {
 							statusCode: 500,
@@ -555,16 +610,17 @@ function createPagesPageHandler(opts) {
 							__isInternalErrorRender: true,
 							__forcedRoute: errorRoute,
 							err: e instanceof Error ? e : new Error(String(e))
-						});
+						}, initialResponseHeaders);
 					} catch (errorPageErr) {
 						console.error("[vinext] Error page render failed:", errorPageErr);
 					}
 				}
 				return new Response("Internal Server Error", { status: 500 });
 			}
-		}), uCtx);
+		});
+		return closeAfterResponseWithBody(response, uCtx);
 	}
 	return renderPage;
 }
 //#endregion
-export { createPagesPageHandler, finalizePagesPreviewResponse, shouldEmitPagesClientTraceMetadata };
+export { createPagesPageHandler, finalizePagesPreviewResponse, renderTracedPagesPageResponse, shouldEmitPagesClientTraceMetadata };

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

@@ -42,6 +42,5 @@ type PagesPageMethodOptions = {
  * Returns a 405 `Response` when the request method is not allowed for a
  * static (no `getServerSideProps`) Pages Router page, otherwise `null`.
  */
-declare function resolvePagesPageMethodResponse(options: PagesPageMethodOptions): Response | null;
-//#endregion
-export { resolvePagesPageMethodResponse };
+export declare function resolvePagesPageMethodResponse(options: PagesPageMethodOptions): Response | null;
+//#endregion

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

@@ -8,8 +8,8 @@ import { ComponentType, ReactNode } from "react";
  * Returns true when the User-Agent belongs to a bot or crawler that cannot
  * reliably consume a streamed HTML response.
  */
-declare function isPagesStreamingBot(userAgent: string): boolean;
-declare function generatePagesETag(payload: string): string;
+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
@@ -17,7 +17,7 @@ declare function generatePagesETag(payload: string): string;
  * fresh-MISS bot path here and the ISR HIT/STALE paths in
  * `pages-page-data.ts` so the two cannot drift.
  */
-declare function requestsNoCache(cacheControl: string | undefined): boolean;
+export declare function requestsNoCache(cacheControl: string | undefined): boolean;
 type PagesFontPreload = {
   href: string;
   type: string;
@@ -29,14 +29,14 @@ type PagesFontPreload = {
  * recompute the initial `router.isReady`. Shared by every render path
  * (initial, ISR regeneration) so they emit identical readiness state.
  */
-type PagesNextDataExtras = Pick<VinextNextData, "__vinext" | "appGip" | "autoExport" | "gip" | "gsp" | "gssp" | "isExperimentalCompile" | "nextExport">;
-type PagesI18nRenderContext = {
+export type PagesNextDataExtras = Pick<VinextNextData, "__vinext" | "appGip" | "autoExport" | "gip" | "gsp" | "gssp" | "isExperimentalCompile" | "nextExport">;
+export type PagesI18nRenderContext = {
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
   domainLocales?: unknown;
 };
-type PagesGsspResponse = {
+export type PagesGsspResponse = {
   headersSent?: boolean;
   statusCode: number;
   getHeaders(): Record<string, string | number | boolean | string[]>;
@@ -103,11 +103,16 @@ type RenderPagesPageResponseOptions = {
   query?: Record<string, unknown>;
   renderDocumentToString: (element: ReactNode) => Promise<string>;
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
+  traceDocument?: <T extends {
+    bodyStream?: ReadableStream<Uint8Array>;
+    waitForBody?: boolean;
+  }>(callback: () => Promise<T>) => Promise<T>;
   resetSSRHead?: (() => void) | undefined;
   routePattern: string;
   routeUrl: string;
   safeJsonStringify: (value: unknown) => string;
   scriptNonce?: string;
+  initialStylesheetHrefs?: ReadonlySet<string>;
   crossOrigin?: string;
   disableOptimizedLoading: boolean;
   statusCode?: number;
@@ -136,9 +141,8 @@ type RenderPagesPageResponseOptions = {
    */
   requestCacheControl?: string;
 };
-declare function buildPagesNextDataScript(options: Pick<RenderPagesPageResponseOptions, "buildId" | "i18n" | "isFallback" | "pageProps" | "props" | "params" | "routePattern" | "safeJsonStringify" | "scriptNonce" | "nextData"> & {
+export declare function buildPagesNextDataScript(options: Pick<RenderPagesPageResponseOptions, "buildId" | "i18n" | "isFallback" | "pageProps" | "props" | "params" | "routePattern" | "safeJsonStringify" | "scriptNonce" | "nextData"> & {
   vinext?: VinextNextData["__vinext"];
 }): string;
-declare function renderPagesPageResponse(options: RenderPagesPageResponseOptions): Promise<Response>;
-//#endregion
-export { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras, buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, renderPagesPageResponse, requestsNoCache };
+export declare function renderPagesPageResponse(options: RenderPagesPageResponseOptions): Promise<Response>;
+//#endregion

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

@@ -1,7 +1,9 @@
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { NEXTJS_CACHE_HEADER } from "./headers.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";
@@ -15,7 +17,6 @@ import { setCacheStateHeaders } from "./cache-headers.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { matchesIfNoneMatch } from "./http-conditional.js";
 import React from "react";
 //#region src/server/pages-page-response.ts
@@ -119,14 +120,15 @@ async function buildPagesCompositeStream(bodyStream, shellPrefix, shellSuffix) {
 async function reportPagesIsrCacheWriteError(error, cacheKey, routePattern) {
 	console.error(`[vinext] Pages ISR cache write failed for ${cacheKey}:`, error);
 	try {
-		await reportRequestError(error instanceof Error ? error : new Error(String(error)), {
+		await reportRequestError(error, {
 			path: cacheKey,
 			method: "GET",
 			headers: {}
 		}, {
 			routerKind: "Pages Router",
 			routePath: routePattern,
-			routeType: "render"
+			routeType: "render",
+			revalidateReason: void 0
 		});
 	} catch {}
 }
@@ -181,33 +183,48 @@ async function renderPagesPageResponse(options) {
 		vinext: options.vinext
 	});
 	const bodyMarker = "<!--VINEXT_STREAM_BODY-->";
-	const documentRenderPage = await runDocumentRenderPage({
-		DocumentComponent: options.DocumentComponent,
-		enhancePageElement: options.enhancePageElement,
-		renderToReadableStream: options.renderToReadableStream,
-		renderStylesToString: async (element) => readStreamAsText(await options.renderToReadableStream(element)),
-		scriptNonce: options.scriptNonce,
-		context: {
-			err: options.err,
-			req: options.documentReqRes?.req,
-			res: options.documentReqRes?.res,
-			pathname: options.routePattern,
-			query: options.query ?? options.params,
-			asPath: options.routeUrl
+	const documentResult = await (options.traceDocument ?? ((callback) => callback()))(async () => {
+		const documentRenderPage = await runDocumentRenderPage({
+			DocumentComponent: options.DocumentComponent,
+			enhancePageElement: options.enhancePageElement,
+			renderToReadableStream: options.renderToReadableStream,
+			renderStylesToString: async (element) => readStreamAsText(await options.renderToReadableStream(element)),
+			scriptNonce: options.scriptNonce,
+			initialStylesheetHrefs: options.initialStylesheetHrefs,
+			context: {
+				err: options.err,
+				req: options.documentReqRes?.req,
+				res: options.documentReqRes?.res,
+				pathname: options.routePattern,
+				query: options.query ?? options.params,
+				asPath: options.routeUrl
+			}
+		});
+		if (options.documentReqRes?.res.headersSent && options.documentReqRes.responsePromise) return {
+			documentRenderPage,
+			responseSent: true
+		};
+		let bodyStream;
+		if (documentRenderPage.status === "rendered") bodyStream = new ReadableStream({ start(controller) {
+			controller.enqueue(new TextEncoder().encode(documentRenderPage.bodyHtml));
+			controller.close();
+		} });
+		else {
+			const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(renderProps)), options.scriptNonce, options.initialStylesheetHrefs);
+			bodyStream = await options.renderToReadableStream(pageElement);
 		}
+		if (documentRenderPage.status === "skipped") await callDocumentGetInitialProps(options.DocumentComponent, options.setDocumentInitialHead);
+		else options.setDocumentInitialHead?.(documentRenderPage.head);
+		return {
+			bodyStream,
+			documentRenderPage,
+			responseSent: false,
+			waitForBody: documentRenderPage.status === "skipped"
+		};
 	});
-	if (options.documentReqRes?.res.headersSent && options.documentReqRes.responsePromise) return options.documentReqRes.responsePromise;
-	let bodyStream;
-	if (documentRenderPage.status === "rendered") bodyStream = new ReadableStream({ start(controller) {
-		controller.enqueue(new TextEncoder().encode(documentRenderPage.bodyHtml));
-		controller.close();
-	} });
-	else {
-		const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(renderProps)), options.scriptNonce);
-		bodyStream = await options.renderToReadableStream(pageElement);
-	}
-	if (documentRenderPage.status === "skipped") await callDocumentGetInitialProps(options.DocumentComponent, options.setDocumentInitialHead);
-	else options.setDocumentInitialHead?.(documentRenderPage.head);
+	if (documentResult.responseSent && options.documentReqRes?.responsePromise) return options.documentReqRes.responsePromise;
+	const { bodyStream, documentRenderPage } = documentResult;
+	if (!bodyStream) throw new Error("Pages document render did not produce a body stream");
 	const headFromShim = options.getSSRHeadHTML?.() ?? "";
 	const traceMetaHTML = getClientTraceMetadataHTML(options.clientTraceMetadata);
 	const ssrHeadHTML = headFromShim;
@@ -255,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];
@@ -263,8 +281,10 @@ async function renderPagesPageResponse(options) {
 			cacheControl: buildMissIsrCacheControl(options.isrRevalidateSeconds, options.expireSeconds),
 			tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
 		});
-		if (options.isOnDemandRevalidate) responseHeaders.set(NEXTJS_CACHE_HEADER, "REVALIDATED");
-		else setCacheStateHeaders(responseHeaders, "MISS");
+		if (options.isOnDemandRevalidate) {
+			responseHeaders.set(NEXTJS_CACHE_HEADER, "REVALIDATED");
+			responseHeaders.set(VINEXT_REVALIDATED_CACHE_TAG_HEADER, encodeCacheTag(`_N_T_${stem || "/"}`));
+		} else setCacheStateHeaders(responseHeaders, "MISS");
 	} else if (options.isStaticPropsRoute && shouldUseNextDeployCacheControl()) responseHeaders.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
 	else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
 	if (options.fontLinkHeader) responseHeaders.set("Link", options.fontLinkHeader);

package/dist/server/pages-preview.d.ts

@@ -1,7 +1,7 @@
 //#region src/server/pages-preview.d.ts
-declare const PAGES_PREVIEW_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
-type PagesPreviewData = object | string;
-type PagesPreviewState = {
+export declare const PAGES_PREVIEW_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
+export type PagesPreviewData = object | string;
+export type PagesPreviewState = {
   data: PagesPreviewData | false;
   shouldClear: boolean;
 };
@@ -9,18 +9,17 @@ type PreviewResponse = {
   getHeader(name: string): string | number | boolean | string[] | undefined;
   setHeader(name: string, value: string | number | boolean | string[]): unknown;
 };
-declare function getPagesPreviewModeId(): string;
-declare function getPagesPreviewState(cookieHeader: string | string[] | null | undefined, options?: {
+export declare function getPagesPreviewModeId(): string;
+export declare function getPagesPreviewState(cookieHeader: string | string[] | null | undefined, options?: {
   isOnDemandRevalidate?: boolean;
 }): PagesPreviewState;
-declare function setPagesDraftMode(response: PreviewResponse, enabled: boolean): void;
-declare function setPagesPreviewData(response: PreviewResponse, data: PagesPreviewData, options?: {
+export declare function setPagesDraftMode(response: PreviewResponse, enabled: boolean): void;
+export declare function setPagesPreviewData(response: PreviewResponse, data: PagesPreviewData, options?: {
   maxAge?: number;
   path?: string;
 }): void;
-declare function clearPagesPreviewData(response: PreviewResponse, options?: {
+export declare function clearPagesPreviewData(response: PreviewResponse, options?: {
   path?: string;
 }): void;
-declare function appendPagesPreviewClearCookies(headers: Headers): void;
-//#endregion
-export { PAGES_PREVIEW_CACHE_CONTROL, PagesPreviewData, PagesPreviewState, appendPagesPreviewClearCookies, clearPagesPreviewData, getPagesPreviewModeId, getPagesPreviewState, setPagesDraftMode, setPagesPreviewData };
+export declare function appendPagesPreviewClearCookies(headers: Headers): void;
+//#endregion

package/dist/server/pages-readiness.d.ts

@@ -24,7 +24,7 @@ type PagesReadinessNextData = Pick<VinextNextData, "gssp" | "gsp" | "gip" | "app
  * Build the readiness flags for a Pages Router render. Shared by the dev and
  * production Pages render paths.
  */
-declare function buildPagesReadinessNextData(options: {
+export declare function buildPagesReadinessNextData(options: {
   pageModule: PagesPageModule;
   appComponent: {
     getInitialProps?: unknown;
@@ -32,5 +32,4 @@ declare function buildPagesReadinessNextData(options: {
   } | null | undefined;
   hasRewrites: boolean;
 }): PagesReadinessNextData;
-//#endregion
-export { buildPagesReadinessNextData };
+//#endregion