vinext 1.0.0-beta.9 → 1.0.0

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

@@ -7,18 +7,18 @@ import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";
 //#region src/server/pages-page-data.d.ts
-type PagesRedirectResult = {
+export type PagesRedirectResult = {
   destination: string;
   permanent?: boolean;
   statusCode?: number;
   basePath?: boolean;
 };
-type ResolvedPagesRedirect = {
+export type ResolvedPagesRedirect = {
   destination: string;
   statusCode: number;
   basePath?: boolean;
 };
-type PagesStaticPathsEntry = string | {
+export type PagesStaticPathsEntry = string | {
   params?: Record<string, unknown>;
   locale?: string;
 };
@@ -32,7 +32,7 @@ type PagesPagePropsResult = {
   notFound?: boolean;
   revalidate?: unknown;
 };
-declare function assertPages404DoesNotReturnNotFound(routePattern: string, result: Pick<PagesPagePropsResult, "notFound"> | null | undefined): void;
+export declare function assertPages404DoesNotReturnNotFound(routePattern: string, result: Pick<PagesPagePropsResult, "notFound"> | null | undefined): void;
 /**
  * Next.js preserves an omitted/false Pages `revalidate` result as an indefinite
  * cache lifetime. The one-year sentinel is only an HTTP Cache-Control detail;
@@ -43,7 +43,7 @@ declare function assertPages404DoesNotReturnNotFound(routePattern: string, resul
  * - packages/next/src/server/render.tsx (`metadata.cacheControl`)
  * - packages/next/src/server/route-modules/pages/pages-handler.ts
  */
-declare function resolvePagesRevalidateSeconds(result: PagesPagePropsResult, routeUrl?: string): number | false;
+export declare function resolvePagesRevalidateSeconds(result: PagesPagePropsResult, routeUrl?: string): number | false;
 type PagesMutableGsspResponse = {
   headersSent: boolean;
 } & PagesGsspResponse;
@@ -62,8 +62,8 @@ type PagesRenderProps = Record<string, unknown> & {
  * enumerable keys from arrays and primitive wrapper objects are retained.
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/render.tsx
  */
-declare function mergePagesDataProps(appPageProps: unknown, dataProps: unknown): Record<string, unknown>;
-type PagesPageModule = {
+export declare function mergePagesDataProps(appPageProps: unknown, dataProps: unknown): Record<string, unknown>;
+export type PagesPageModule = {
   default?: unknown;
   getStaticPaths?: (context: {
     locales: string[];
@@ -130,7 +130,7 @@ type RenderPagesIsrHtmlOptions = {
   vinext?: VinextNextData["__vinext"];
   nextData?: PagesNextDataExtras;
 };
-type ResolvePagesPageDataOptions = {
+export type ResolvePagesPageDataOptions = {
   applyRequestContexts: () => void;
   basePath?: string;
   buildId: string | null;
@@ -284,15 +284,15 @@ type ResolvePagesPageDataNotFoundResult = {
   cacheState?: "MISS" | "HIT" | "STALE";
 };
 type ResolvePagesPageDataResult = ResolvePagesPageDataRenderResult | ResolvePagesPageDataResponseResult | ResolvePagesPageDataNotFoundResult;
-declare function mergePagesNotFoundSourceHeaders(response: Response, sourceHeaders: Record<string, string | number | boolean | string[]> | undefined): Response;
+export declare function mergePagesNotFoundSourceHeaders(response: Response, sourceHeaders: Record<string, string | number | boolean | string[]> | undefined): Response;
 /** Validate and normalize the redirect metadata returned by gSP/gSSP. */
-declare function resolvePagesRedirect(redirect: PagesRedirectResult, options: {
+export declare function resolvePagesRedirect(redirect: PagesRedirectResult, options: {
   method: "getStaticProps" | "getServerSideProps";
   routeUrl: string;
   sanitizeDestination: (destination: string) => string;
 }): ResolvedPagesRedirect;
-declare function resolvePagesRedirectLocation(redirect: ResolvedPagesRedirect, configuredBasePath?: string): string;
-declare function buildPagesRedirectProps(redirect: ResolvedPagesRedirect, props: PagesRenderProps): PagesRenderProps;
+export declare function resolvePagesRedirectLocation(redirect: ResolvedPagesRedirect, configuredBasePath?: string): string;
+export declare function buildPagesRedirectProps(redirect: ResolvedPagesRedirect, props: PagesRenderProps): PagesRenderProps;
 /**
  * Compare a `getStaticPaths` entry against the actual request params.
  *
@@ -308,14 +308,13 @@ declare function buildPagesRedirectProps(redirect: ResolvedPagesRedirect, props:
  * entry with a missing `params` key, return false rather than throwing — the
  * caller will respond with a 404 just like Next.js does for unlisted paths.
  */
-type PagesRouteParam = {
+export type PagesRouteParam = {
   key: string;
   repeat: boolean;
   optional: boolean;
 };
-declare function getPagesRouteParams(routePattern: string): PagesRouteParam[];
-declare function matchesPagesStaticPath(pathEntry: PagesStaticPathsEntry, params: Record<string, unknown>, routeParams: PagesRouteParam[], routeUrl: string): boolean;
-declare function renderPagesIsrHtml(options: RenderPagesIsrHtmlOptions): Promise<string>;
-declare function resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
-//#endregion
-export { PagesPageModule, PagesRedirectResult, PagesRouteParam, PagesStaticPathsEntry, ResolvePagesPageDataOptions, ResolvedPagesRedirect, assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, renderPagesIsrHtml, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds };
+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 renderPagesIsrHtml(options: RenderPagesIsrHtmlOptions): Promise<string>;
+export declare function resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
+//#endregion

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

@@ -1,19 +1,20 @@
+import { isUnknownRecord } from "../utils/record.js";
+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 { isUnknownRecord } from "../utils/record.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
 import { buildPagesCacheValue, isrCacheControl } from "./isr-cache.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { matchesIfNoneMatch } from "./http-conditional.js";
 import { buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
 import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
+import { tracePagesData, tracePagesDocument } from "./pages-execution-tracing.js";
 //#region src/server/pages-page-data.ts
 const ALLOWED_PAGES_REDIRECT_STATUS_CODES = /* @__PURE__ */ new Set([
 	301,
@@ -577,7 +578,7 @@ async function resolvePagesPageData(options) {
 			__N_SSP: true
 		};
 		const { req, res, responsePromise } = getSharedReqRes();
-		const result = await options.pageModule.getServerSideProps({
+		const result = await tracePagesData("getServerSideProps", options.routePattern, () => options.pageModule.getServerSideProps({
 			params: userFacingParams,
 			req,
 			res,
@@ -587,7 +588,7 @@ async function resolvePagesPageData(options) {
 			locales: options.i18n.locales,
 			defaultLocale: options.i18n.defaultLocale,
 			...previewContext
-		});
+		}));
 		if (isResponseSent(res)) return {
 			kind: "response",
 			response: await responsePromise
@@ -627,13 +628,13 @@ async function resolvePagesPageData(options) {
 					if (freshAppResult.kind === "response") return;
 					let freshPageProps = freshAppResult.pageProps;
 					let freshRenderProps = freshAppResult.renderProps;
-					const freshResult = await options.pageModule.getStaticProps?.({
+					const freshResult = await tracePagesData("getStaticProps", options.routePattern, () => options.pageModule.getStaticProps?.({
 						params: userFacingParams,
 						locale: options.i18n.locale,
 						locales: options.i18n.locales,
 						defaultLocale: options.i18n.defaultLocale,
 						revalidateReason: "stale"
-					});
+					}));
 					if (!freshResult) return;
 					assertPages404DoesNotReturnNotFound(options.routePattern, freshResult);
 					const revalidateSeconds = resolvePagesRevalidateSeconds(freshResult, options.routeUrl);
@@ -663,7 +664,7 @@ async function resolvePagesPageData(options) {
 					};
 					if (options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getStaticProps", freshPageProps);
 					if (cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest) {
-						const freshHtml = await renderPagesIsrHtml({
+						const freshHtml = await tracePagesDocument(options.routePattern, () => renderPagesIsrHtml({
 							buildId: options.buildId,
 							cachedHtml: cachedValue.html,
 							createPageElement: options.createPageElement,
@@ -677,7 +678,7 @@ async function resolvePagesPageData(options) {
 							safeJsonStringify: options.safeJsonStringify,
 							nextData: options.nextData,
 							vinext: options.vinext
-						});
+						}));
 						await options.isrSet(cacheKey, buildPagesCacheValue(freshHtml, freshRenderProps, options.statusCode), { cacheControl: isrCacheControl(revalidateSeconds, { expireSeconds }) });
 						return;
 					}
@@ -745,14 +746,14 @@ async function resolvePagesPageData(options) {
 			const shortCircuit = await loadForegroundAppInitialRenderProps();
 			if (shortCircuit) return shortCircuit;
 		}
-		const result = generatedPageData ? null : await options.pageModule.getStaticProps({
+		const result = generatedPageData ? null : await tracePagesData("getStaticProps", options.routePattern, () => options.pageModule.getStaticProps({
 			params: userFacingParams,
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
 			defaultLocale: options.i18n.defaultLocale,
 			...previewContext,
 			revalidateReason: options.isOnDemandRevalidate ? "on-demand" : options.isBuildTimePrerendering ? "build" : "stale"
-		});
+		}));
 		assertPages404DoesNotReturnNotFound(options.routePattern, result);
 		if (generatedPageData) {
 			renderProps = normalizePagesRenderProps(generatedPageData);

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

@@ -1,10 +1,12 @@
 import { PagesPreviewState } from "./pages-preview.js";
 import { RenderPageEnhancers } from "./pages-document-initial-props.js";
 import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
+import { renderPagesPageResponse } from "./pages-page-response.js";
 import { PagesPageModule } from "./pages-page-data.js";
 import { ComponentType, ReactNode } from "react";
 //#region src/server/pages-page-handler.d.ts
-declare function finalizePagesPreviewResponse(response: Response, preview: PagesPreviewState): Response;
+export declare function renderTracedPagesPageResponse(options: Parameters<typeof renderPagesPageResponse>[0]): Promise<Response>;
+export declare function finalizePagesPreviewResponse(response: Response, preview: PagesPreviewState): Response;
 type PageRoute = {
   pattern: string;
   patternParts: string[];
@@ -38,14 +40,14 @@ type VinextConfigSubset = {
   disableOptimizedLoading: boolean;
   crossOrigin?: string;
 };
-declare function shouldEmitPagesClientTraceMetadata(pageModule: PagesPageModule, appComponent: unknown): boolean;
+export declare function shouldEmitPagesClientTraceMetadata(pageModule: PagesPageModule, appComponent: unknown): boolean;
 /**
  * Options accepted by `createPagesPageHandler`.
  *
  * All `next/*`-derived functions are passed as closures from the generated
  * entry so this module avoids `next/*` imports and stays unit-testable.
  */
-type CreatePagesPageHandlerOptions = {
+export type CreatePagesPageHandlerOptions = {
   /** Full page route table (built by the generated entry). */
   pageRoutes: PageRoute[];
   /** The `_error` route when present; null otherwise. */
@@ -142,6 +144,5 @@ type RenderPageOptions = {
  * The returned function is self-recursive for 404/500 fallback renders and
  * accepts the same options shape the generated entry always passed inline.
  */
-declare function createPagesPageHandler(opts: CreatePagesPageHandlerOptions): (request: Request, url: string, manifest: Record<string, string[]> | null | undefined, middlewareHeaders: Headers | null | undefined, options: RenderPageOptions | null | undefined) => Promise<Response>;
-//#endregion
-export { CreatePagesPageHandlerOptions, createPagesPageHandler, finalizePagesPreviewResponse, shouldEmitPagesClientTraceMetadata };
+export declare function createPagesPageHandler(opts: CreatePagesPageHandlerOptions): (request: Request, url: string, manifest: Record<string, string[]> | null | undefined, middlewareHeaders: Headers | null | undefined, options: RenderPageOptions | null | undefined, initialResponseHeaders?: Headers) => Promise<Response>;
+//#endregion

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

@@ -1,13 +1,16 @@
+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 { 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 { buildMissIsrCacheControl } from "./isr-decision.js";
-import { coalesceOnDemandRevalidation, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, triggerBackgroundRegeneration } from "./isr-cache.js";
+import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
+import { coalesceOnDemandRevalidation, isrCacheKey, isrGet, isrSet, 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 +23,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,
@@ -109,7 +138,7 @@ function createPagesPageHandler(opts) {
 		if (!i18nCacheVariant) return (router, pathname) => isrCacheKey(router, pathname, buildId ?? void 0);
 		return (router, pathname) => isrCacheKey(router, pathname + "::i18n=" + encodeURIComponent(i18nCacheVariant), buildId ?? void 0);
 	}
-	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;
@@ -184,7 +213,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,
@@ -204,11 +233,12 @@ function createPagesPageHandler(opts) {
 		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,10 +256,11 @@ 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 isNotFoundErrorRender = routePattern === "/404" || routePattern === "/_error" && renderStatusCode === 404;
@@ -307,6 +338,7 @@ function createPagesPageHandler(opts) {
 				const createPageReqRes = () => {
 					const reqRes = createPagesReqRes({
 						body: void 0,
+						initialResponseHeaders,
 						query,
 						request,
 						url: originalRequestPathAndSearch
@@ -390,15 +422,15 @@ 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);
 				}
 				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);
 				}
@@ -430,39 +462,38 @@ 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 (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(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 +502,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 +551,7 @@ function createPagesPageHandler(opts) {
 					routeUrl: renderRouteUrl,
 					safeJsonStringify,
 					scriptNonce,
+					initialStylesheetHrefs,
 					crossOrigin: vinextConfig.crossOrigin,
 					disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
 					statusCode: renderStatusCode,
@@ -531,22 +564,26 @@ function createPagesPageHandler(opts) {
 				return finalizePagesPreviewResponse(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 +592,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