vinext 0.1.8 → 0.2.1

package/dist/server/pages-node-compat.js

@@ -1,7 +1,8 @@
 import { parseCookieHeader } from "../utils/parse-cookie.js";
+import { getRevalidateSecret, isRevalidateSecret } from "./isr-cache.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
-import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT } from "./pages-body-parser-config.js";
+import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
 import { performOnDemandRevalidate } from "./pages-revalidate.js";
 import { decode } from "node:querystring";
 import { Readable, Writable } from "node:stream";
@@ -61,6 +62,72 @@ async function* requestBodyChunks(request) {
 function createRequestReadable(request) {
 	return Readable.from(requestBodyChunks(request), { objectMode: false });
 }
+function parsePagesRequestCookies(cookieHeader) {
+	return parseCookieHeader(Array.isArray(cookieHeader) ? cookieHeader.join("; ") : cookieHeader);
+}
+function serializePreviewCookie(name, value, options = {}) {
+	const parts = [
+		`${name}=${encodeURIComponent(value)}`,
+		"HttpOnly",
+		`Path=${options.path ?? "/"}`,
+		process.env.NODE_ENV !== "development" ? "SameSite=None" : "SameSite=Lax"
+	];
+	if (process.env.NODE_ENV !== "development") parts.push("Secure");
+	if (options.maxAge !== void 0) parts.push(`Max-Age=${Math.trunc(options.maxAge)}`);
+	return parts.join("; ");
+}
+function decodePagesPreviewPayload(payload) {
+	try {
+		const decoded = Buffer.from(payload, "base64url").toString("utf8");
+		const value = JSON.parse(decoded);
+		return typeof value === "object" && value !== null ? value : String(value);
+	} catch {
+		return false;
+	}
+}
+function getPagesPreviewDataFromCookieHeader(cookieHeader, options = {}) {
+	if (options.isOnDemandRevalidate) return false;
+	const cookies = parsePagesRequestCookies(cookieHeader);
+	const bypass = cookies.__prerender_bypass;
+	const payload = cookies.__next_preview_data;
+	if (!bypass && !payload) return false;
+	if (!isRevalidateSecret(bypass)) return false;
+	if (!payload) return {};
+	return decodePagesPreviewPayload(payload);
+}
+function getPagesPreviewData(request, options = {}) {
+	return getPagesPreviewDataFromCookieHeader(request.headers.get("cookie"), options);
+}
+function normalizeSetCookieHeader(value) {
+	if (value === void 0) return [];
+	if (Array.isArray(value)) return value.map(String);
+	return [String(value)];
+}
+function attachPagesRequestCookies(req) {
+	if (Object.hasOwn(req, "cookies")) return;
+	Object.defineProperty(req, "cookies", {
+		configurable: true,
+		enumerable: true,
+		get() {
+			const cookies = parsePagesRequestCookies(req.headers.cookie);
+			Object.defineProperty(req, "cookies", {
+				configurable: true,
+				enumerable: true,
+				value: cookies,
+				writable: true
+			});
+			return cookies;
+		},
+		set(value) {
+			Object.defineProperty(req, "cookies", {
+				configurable: true,
+				enumerable: true,
+				value,
+				writable: true
+			});
+		}
+	});
+}
 var PagesResponseStream = class extends Writable {
 	resolveResponse;
 	rejectResponse;
@@ -142,6 +209,16 @@ var PagesResponseStream = class extends Writable {
 	async revalidate(urlPath, opts) {
 		await performOnDemandRevalidate(this.requestHeaders, urlPath, opts);
 	}
+	setPreviewData(data, options = {}) {
+		const payload = Buffer.from(JSON.stringify(data)).toString("base64url");
+		if (payload.length > 2048) throw new Error("Preview data is limited to 2KB currently, reduce how much data you are storing as preview data to continue");
+		this.setHeader("Set-Cookie", [
+			...normalizeSetCookieHeader(this.getHeader("Set-Cookie")),
+			serializePreviewCookie("__prerender_bypass", getRevalidateSecret(), options),
+			serializePreviewCookie("__next_preview_data", payload, options)
+		]);
+		return this;
+	}
 	_write(chunk, encoding, callback) {
 		const buffer = typeof chunk === "string" ? Buffer.from(chunk, encoding) : Buffer.from(chunk);
 		if (this.controller && !this.streamEnded) try {
@@ -216,9 +293,9 @@ function createPagesReqRes(options) {
 		url: options.url,
 		headers: headersObj,
 		query: options.query,
-		body: options.body,
-		cookies: parseCookieHeader(options.request.headers.get("cookie"))
+		body: options.body
 	});
+	attachPagesRequestCookies(req);
 	let resolveResponse;
 	let rejectResponse;
 	const responsePromise = new Promise((resolve, reject) => {
@@ -232,4 +309,4 @@ function createPagesReqRes(options) {
 	};
 }
 //#endregion
-export { PagesBodyParseError as PagesApiBodyParseError, createPagesReqRes, parsePagesApiBody };
+export { PagesBodyParseError as PagesApiBodyParseError, attachPagesRequestCookies, createPagesReqRes, getPagesPreviewData, getPagesPreviewDataFromCookieHeader, parsePagesApiBody };

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

@@ -2,6 +2,7 @@ import { Route } from "../routing/pages-router.js";
 import { VinextNextData } from "../client/vinext-next-data.js";
 import { CachedPagesValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry } from "./isr-cache.js";
+import { PagesPreviewData } from "./pages-node-compat.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";
 
@@ -62,12 +63,18 @@ type PagesPageModule = {
     locale?: string;
     locales?: string[];
     defaultLocale?: string;
+    draftMode?: true;
+    preview?: true;
+    previewData?: PagesPreviewData;
   }) => Promise<PagesPagePropsResult> | PagesPagePropsResult;
   getStaticProps?: (context: {
     params: Record<string, unknown> | null;
     locale?: string;
     locales?: string[];
     defaultLocale?: string;
+    draftMode?: true;
+    preview?: true;
+    previewData?: PagesPreviewData;
     /**
      * Indicates why `getStaticProps` was invoked.
      *
@@ -127,6 +134,7 @@ type ResolvePagesPageDataOptions = {
    * `.nextjs-ref/packages/next/src/server/render.tsx`.
    */
   isBuildTimePrerendering?: boolean;
+  validatePropsSerialization?: boolean;
   /**
    * When true, this dispatch was triggered by an on-demand revalidation
    * request (e.g. `res.revalidate()` in a Pages Router API route, or an
@@ -143,6 +151,7 @@ type ResolvePagesPageDataOptions = {
    * presence — see the security note in `isr-cache.ts`.
    */
   isOnDemandRevalidate?: boolean;
+  previewData?: PagesPreviewData | false;
   /**
    * The deployment ID used for deployment-skew protection. When set, it is
    * included as `x-nextjs-deployment-id` on all `_next/data` responses
@@ -197,6 +206,7 @@ type ResolvePagesPageDataOptions = {
 };
 type ResolvePagesPageDataRenderResult = {
   kind: "render";
+  documentReqRes: PagesGsspContextResponse | null;
   gsspRes: PagesGsspResponse | null;
   isrRevalidateSeconds: number | null;
   pageProps: Record<string, unknown>;
@@ -217,7 +227,29 @@ type ResolvePagesPageDataNotFoundResult = {
   kind: "notFound";
 };
 type ResolvePagesPageDataResult = ResolvePagesPageDataRenderResult | ResolvePagesPageDataResponseResult | ResolvePagesPageDataNotFoundResult;
+/**
+ * Compare a `getStaticPaths` entry against the actual request params.
+ *
+ * Handles both shapes Next.js allows:
+ *   - { params: { ... } }
+ *   - "string-path"
+ *
+ * For a string entry, compare the entry against the current request URL using
+ * the shared `normalizeStaticPathname` helper from
+ * `../routing/route-pattern.ts` (which mirrors the Next.js
+ * `removeTrailingSlash` behaviour in
+ * `.nextjs-ref/packages/next/src/build/static-paths/pages.ts`). For an object
+ * 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 = {
+  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, ResolvePagesPageDataOptions, renderPagesIsrHtml, resolvePagesPageData };
+export { PagesPageModule, PagesRouteParam, PagesStaticPathsEntry, ResolvePagesPageDataOptions, getPagesRouteParams, matchesPagesStaticPath, renderPagesIsrHtml, resolvePagesPageData };

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

@@ -1,15 +1,15 @@
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
-import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { decideIsr } from "./isr-decision.js";
 import { buildPagesCacheValue } from "./isr-cache.js";
-import { isSerializableProps } from "./pages-serializable-props.js";
+import { normalizeStaticPathname } from "../routing/route-pattern.js";
+import { buildPagesNextDataScript, etagMatches, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
 import { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
-import { buildPagesNextDataScript, etagMatches, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
+import { isSerializableProps } from "./pages-serializable-props.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 //#region src/server/pages-page-data.ts
 function buildPagesDataNotFoundResponse(deploymentId) {
 	const headers = { "Content-Type": "application/json" };
@@ -128,28 +128,45 @@ function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }
 		headers: { Location: destination }
 	});
 }
-/**
-* Compare a `getStaticPaths` entry against the actual request params.
-*
-* Handles both shapes Next.js allows:
-*   - { params: { ... } }
-*   - "string-path"
-*
-* For a string entry, compare the entry against the current request URL using
-* the shared `normalizeStaticPathname` helper from
-* `../routing/route-pattern.ts` (which mirrors the Next.js
-* `removeTrailingSlash` behaviour in
-* `.nextjs-ref/packages/next/src/build/static-paths/pages.ts`). For an object
-* 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.
-*/
-function matchesPagesStaticPath(pathEntry, params, routeUrl) {
+function getPagesRouteParams(routePattern) {
+	return routePattern.split("/").map((segment) => {
+		const optionalCatchAll = segment.match(/^\[\[\.\.\.(.+)\]\]$/);
+		if (optionalCatchAll) return {
+			key: optionalCatchAll[1],
+			repeat: true,
+			optional: true
+		};
+		const requiredCatchAll = segment.match(/^\[\.\.\.(.+)\]$/);
+		if (requiredCatchAll) return {
+			key: requiredCatchAll[1],
+			repeat: true,
+			optional: false
+		};
+		const dynamic = segment.match(/^\[(.+)\]$/);
+		if (dynamic) return {
+			key: dynamic[1],
+			repeat: false,
+			optional: false
+		};
+		return null;
+	}).filter((param) => param !== null);
+}
+function matchesPagesStaticPath(pathEntry, params, routeParams, routeUrl) {
 	if (typeof pathEntry === "string") return normalizeStaticPathname(pathEntry) === normalizeStaticPathname(routeUrl);
 	const entryParams = pathEntry.params;
 	if (entryParams === void 0 || entryParams === null) return false;
-	return Object.entries(entryParams).every(([key, value]) => {
+	return routeParams.every(({ key, repeat, optional }) => {
+		if (!Object.hasOwn(entryParams, key)) return false;
+		let value = entryParams[key];
+		if (optional && (value === null || value === void 0 || value === false)) value = [];
+		if (repeat) {
+			if (!Array.isArray(value) || !optional && value.length === 0) return false;
+		} else if (typeof value !== "string") return false;
 		const actual = params[key];
-		if (Array.isArray(value)) return Array.isArray(actual) && value.join("/") === actual.join("/");
+		if (Array.isArray(value)) {
+			if (optional && value.length === 0 && actual === void 0) return true;
+			return Array.isArray(actual) && value.join("/") === actual.join("/");
+		}
 		return String(value) === String(actual);
 	});
 }
@@ -237,7 +254,9 @@ async function resolvePagesPageData(options) {
 			defaultLocale: options.i18n.defaultLocale ?? ""
 		});
 		const fallback = pathsResult?.fallback ?? false;
-		const isValidPath = (pathsResult?.paths ?? []).some((pathEntry) => matchesPagesStaticPath(pathEntry, options.params, options.routeUrl));
+		const paths = pathsResult?.paths ?? [];
+		const routeParams = getPagesRouteParams(options.routePattern);
+		const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, options.params, routeParams, options.routeUrl));
 		if (fallback === false && !isValidPath) return buildPagesNotFoundResult(options);
 		const isBotRequest = !!options.userAgent && isBotUserAgent(options.userAgent, options.htmlLimitedBots);
 		if (fallback === true && !isValidPath && !options.isDataReq && !isBotRequest) isFallback = true;
@@ -245,6 +264,12 @@ async function resolvePagesPageData(options) {
 	}
 	let pageProps = {};
 	let gsspRes = null;
+	const previewData = options.isOnDemandRevalidate ? false : options.previewData ?? false;
+	const previewContext = previewData === false ? {} : {
+		draftMode: true,
+		preview: true,
+		previewData
+	};
 	let sharedReqRes = null;
 	function getSharedReqRes() {
 		sharedReqRes ??= options.createGsspReqRes();
@@ -273,6 +298,7 @@ async function resolvePagesPageData(options) {
 			};
 			return {
 				kind: "render",
+				documentReqRes: sharedReqRes,
 				gsspRes: null,
 				isrRevalidateSeconds: null,
 				pageProps,
@@ -297,7 +323,8 @@ async function resolvePagesPageData(options) {
 			resolvedUrl: options.resolvedUrl ?? options.routeUrl,
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
-			defaultLocale: options.i18n.defaultLocale
+			defaultLocale: options.i18n.defaultLocale,
+			...previewContext
 		});
 		if (isResponseSent(res)) return {
 			kind: "response",
@@ -318,7 +345,7 @@ async function resolvePagesPageData(options) {
 			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
-		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
+		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
 		gsspRes = res;
 	}
 	let isrRevalidateSeconds = null;
@@ -327,7 +354,7 @@ async function resolvePagesPageData(options) {
 		const cacheKey = options.isrCacheKey("pages", pathname);
 		const cached = await options.isrGet(cacheKey);
 		const cachedValue = cached?.value.value;
-		if (!options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) {
 			const hitResponse = buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status);
 			const hitBotResult = applyBotETagAndCheck(hitResponse, cachedValue.html, options);
 			if (hitBotResult) return hitBotResult;
@@ -336,7 +363,7 @@ async function resolvePagesPageData(options) {
 				response: hitResponse
 			};
 		}
-		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) {
 			options.triggerBackgroundRegeneration(cacheKey, async function() {
 				return options.runInFreshUnifiedContext(async () => {
 					options.applyRequestContexts();
@@ -393,7 +420,7 @@ async function resolvePagesPageData(options) {
 				response: staleResponse
 			};
 		}
-		const generatedPageData = !options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
+		const generatedPageData = !options.isOnDemandRevalidate && previewData === false && cached?.isStale === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
 		if (!generatedPageData) {
 			const shortCircuit = await loadForegroundAppInitialRenderProps();
 			if (shortCircuit) return shortCircuit;
@@ -403,6 +430,7 @@ async function resolvePagesPageData(options) {
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
 			defaultLocale: options.i18n.defaultLocale,
+			...previewContext,
 			revalidateReason: options.isOnDemandRevalidate ? "on-demand" : options.isBuildTimePrerendering ? "build" : "stale"
 		});
 		if (generatedPageData) {
@@ -424,10 +452,10 @@ async function resolvePagesPageData(options) {
 			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
-		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
-		if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
-		else if (cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest) isrRevalidateSeconds = cached?.value.cacheControl?.revalidate ?? 31536e3;
-		if (shouldPersistFallbackData) {
+		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
+		if (previewData === false && typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
+		else if (previewData === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest) isrRevalidateSeconds = cached?.value.cacheControl?.revalidate ?? 31536e3;
+		if (shouldPersistFallbackData && previewData === false) {
 			const revalidateSeconds = isrRevalidateSeconds ?? 31536e3;
 			await options.isrSet(cacheKey, {
 				kind: "PAGES",
@@ -473,6 +501,7 @@ async function resolvePagesPageData(options) {
 	}
 	return {
 		kind: "render",
+		documentReqRes: sharedReqRes,
 		gsspRes,
 		isrRevalidateSeconds,
 		pageProps,
@@ -481,4 +510,4 @@ async function resolvePagesPageData(options) {
 	};
 }
 //#endregion
-export { renderPagesIsrHtml, resolvePagesPageData };
+export { getPagesRouteParams, matchesPagesStaticPath, renderPagesIsrHtml, resolvePagesPageData };

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

@@ -35,6 +35,7 @@ type VinextConfigSubset = {
   clientTraceMetadata?: readonly string[];
   disableOptimizedLoading: boolean;
 };
+declare function shouldEmitPagesClientTraceMetadata(pageModule: PagesPageModule, appComponent: unknown): boolean;
 /**
  * Options accepted by `createPagesPageHandler`.
  *
@@ -97,4 +98,4 @@ type RenderPageOptions = {
  */
 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 };
+export { CreatePagesPageHandlerOptions, createPagesPageHandler, shouldEmitPagesClientTraceMetadata };

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

@@ -3,8 +3,8 @@ import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { reportRequestError } from "./instrumentation.js";
-import { NEVER_CACHE_CONTROL } from "./cache-control.js";
-import "./isr-decision.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, applyCdnResponseHeaders, shouldUseNextDeployCacheControl } from "./cache-control.js";
+import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { PRERENDER_REVALIDATE_HEADER, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, triggerBackgroundRegeneration } from "./isr-cache.js";
 import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
@@ -14,12 +14,18 @@ import { resolvePagesI18nRequest } from "./pages-i18n.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
-import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
-import { createPagesReqRes } from "./pages-node-compat.js";
-import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.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 { resolvePagesPageData } from "./pages-page-data.js";
+import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
+import { createPagesReqRes, getPagesPreviewData } from "./pages-node-compat.js";
 //#region src/server/pages-page-handler.ts
+function shouldEmitPagesClientTraceMetadata(pageModule, appComponent) {
+	if (typeof pageModule.getServerSideProps === "function") return true;
+	if (typeof pageModule.getStaticProps === "function") return false;
+	return hasPagesGetInitialProps(pageModule.default) || hasPagesGetInitialProps(appComponent);
+}
 function buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales) {
 	return {
 		locale,
@@ -55,7 +61,7 @@ function createPagesPageHandler(opts) {
 		const originalRequestPathAndSearch = originalRequestUrl.pathname + originalRequestUrl.search;
 		let dataRequestPathname = null;
 		let dataRequestSearch = "";
-		const initialDataNorm = normalizePagesDataRequest(request, buildId);
+		const initialDataNorm = normalizePagesDataRequest(request, buildId, vinextConfig.basePath, hasMiddleware && vinextConfig.trailingSlash);
 		if (!isDataReq) {
 			if (initialDataNorm.notFoundResponse) return initialDataNorm.notFoundResponse;
 			if (initialDataNorm.isDataReq) {
@@ -127,6 +133,7 @@ function createPagesPageHandler(opts) {
 				const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
 				const query = mergeRouteParamsIntoQuery(parseQueryString(routeUrl), params);
 				const pageModule = route.module;
+				const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
 				const pagesNextData = buildPagesReadinessNextData({
 					pageModule,
 					appComponent: AppComponent,
@@ -171,7 +178,8 @@ function createPagesPageHandler(opts) {
 						...pagesNextData.__vinext,
 						pageModuleUrl,
 						appModuleUrl,
-						hasMiddleware
+						hasMiddleware,
+						routeUrl
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
@@ -182,6 +190,13 @@ function createPagesPageHandler(opts) {
 					if (allFontPreloads.length > 0) fontLinkHeader = allFontPreloads.map((p) => "<" + appendAssetDeploymentIdQuery(p.href) + ">; rel=preload; as=font; type=" + p.type + "; crossorigin").join(", ");
 				} catch {}
 				const pagesResolvedUrl = (new URL(routeUrl, originalRequestUrl).pathname || "/") + originalRequestUrl.search;
+				const createPageReqRes = () => createPagesReqRes({
+					body: void 0,
+					query,
+					request,
+					url: originalRequestPathAndSearch
+				});
+				const isOnDemandRevalidate = isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER));
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
 					err: err instanceof Error ? err : void 0,
@@ -189,14 +204,7 @@ function createPagesPageHandler(opts) {
 					buildId,
 					deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
 					htmlLimitedBots: vinextConfig.htmlLimitedBots,
-					createGsspReqRes() {
-						return createPagesReqRes({
-							body: void 0,
-							query,
-							request,
-							url: originalRequestPathAndSearch
-						});
-					},
+					createGsspReqRes: createPageReqRes,
 					createAppTree(appTreeProps) {
 						const el = createPageElement(PageComponent, AppComponent, appTreeProps);
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
@@ -212,7 +220,9 @@ function createPagesPageHandler(opts) {
 					isrSet,
 					expireSeconds: vinextConfig.expireTime,
 					isBuildTimePrerendering: typeof process !== "undefined" && process.env && process.env.VINEXT_PRERENDER === "1",
-					isOnDemandRevalidate: isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER)),
+					validatePropsSerialization: process.env.NODE_ENV !== "production" || process.env.VINEXT_PRERENDER === "1",
+					isOnDemandRevalidate,
+					previewData: getPagesPreviewData(request, { isOnDemandRevalidate }),
 					pageModule,
 					AppComponent,
 					params,
@@ -264,6 +274,7 @@ function createPagesPageHandler(opts) {
 					};
 				}
 				const gsspRes = pageDataResult.gsspRes;
+				const documentReqRes = serializedPagesNextData.autoExport === true ? null : pageDataResult.documentReqRes ?? createPageReqRes();
 				const isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds;
 				const isFallbackRender = pageDataResult.isFallback === true;
 				if (isFallbackRender && typeof setSSRContext === "function") setSSRContext({
@@ -294,6 +305,12 @@ function createPagesPageHandler(opts) {
 							break;
 						}
 						if (!hasUserCacheControl) init.headers["Cache-Control"] = NEVER_CACHE_CONTROL;
+					} else if (isStaticPropsRoute) {
+						if (isrRevalidateSeconds) {
+							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;
 					}
 					if (routePattern !== "/_error" && routePattern !== "/500") {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -302,8 +319,8 @@ function createPagesPageHandler(opts) {
 					return buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, init);
 				}
 				const pageModuleIds = [];
-				if (route.filePath) pageModuleIds.push(route.filePath);
 				if (appAssetPath) pageModuleIds.push(appAssetPath);
+				if (route.filePath) pageModuleIds.push(route.filePath);
 				return await renderPagesPageResponse({
 					assetTags: collectAssetTags({
 						manifest,
@@ -334,11 +351,13 @@ function createPagesPageHandler(opts) {
 					getFontLinks,
 					getFontStyles,
 					getSSRHeadHTML: typeof getSSRHeadHTML === "function" ? getSSRHeadHTML : void 0,
-					clientTraceMetadata: vinextConfig.clientTraceMetadata,
+					clientTraceMetadata: shouldEmitPagesClientTraceMetadata(pageModule, AppComponent) ? vinextConfig.clientTraceMetadata : void 0,
+					documentReqRes,
 					gsspRes,
 					isrCacheKey: pageIsrCacheKey,
 					expireSeconds: vinextConfig.expireTime,
 					isrRevalidateSeconds,
+					isStaticPropsRoute,
 					isrSet,
 					i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
 					isFallback: isFallbackRender,
@@ -400,4 +419,4 @@ function createPagesPageHandler(opts) {
 	return renderPage;
 }
 //#endregion
-export { createPagesPageHandler };
+export { createPagesPageHandler, shouldEmitPagesClientTraceMetadata };

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

@@ -45,9 +45,15 @@ type PagesI18nRenderContext = {
   domainLocales?: unknown;
 };
 type PagesGsspResponse = {
+  headersSent?: boolean;
   statusCode: number;
   getHeaders(): Record<string, string | number | boolean | string[]>;
 };
+type PagesDocumentReqRes = {
+  req: unknown;
+  res: PagesGsspResponse;
+  responsePromise?: Promise<Response>;
+};
 type RenderPagesPageResponseOptions = {
   assetTags: string;
   buildId: string | null;
@@ -80,10 +86,12 @@ type RenderPagesPageResponseOptions = {
    */
   clientTraceMetadata?: readonly string[] | undefined;
   setDocumentInitialHead?: ((head: ReactNode[]) => void) | undefined;
+  documentReqRes?: PagesDocumentReqRes | null;
   gsspRes: PagesGsspResponse | null;
   isrCacheKey: (router: string, pathname: string) => string;
   expireSeconds?: number;
   isrRevalidateSeconds: number | null;
+  isStaticPropsRoute?: boolean;
   isrSet: (key: string, data: CachedPagesValue, revalidateSeconds: number, tags?: string[], expireSeconds?: number) => Promise<void>;
   i18n: PagesI18nRenderContext;
   /**

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

@@ -1,7 +1,7 @@
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, shouldUseNextDeployCacheControl } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { fnv1a52 } from "../utils/hash.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
@@ -197,11 +197,14 @@ async function renderPagesPageResponse(options) {
 		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
 		}
 	});
+	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));
@@ -230,7 +233,7 @@ async function renderPagesPageResponse(options) {
 	const shellPrefix = shellHtml.slice(0, markerIndex);
 	const shellSuffix = shellHtml.slice(markerIndex + 25);
 	const responseHeaders = new Headers({ "Content-Type": "text/html" });
-	const finalStatus = applyGsspHeaders(responseHeaders, options.gsspRes, options.statusCode);
+	const finalStatus = applyGsspHeaders(responseHeaders, options.gsspRes ?? options.documentReqRes?.res ?? null, options.statusCode);
 	let responseBodyStream = bodyStream;
 	if (!options.scriptNonce && options.isrRevalidateSeconds !== null && options.isrRevalidateSeconds > 0) {
 		const cacheBodyStreamPair = bodyStream.tee();
@@ -261,7 +264,8 @@ async function renderPagesPageResponse(options) {
 			tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
 		});
 		setCacheStateHeaders(responseHeaders, "MISS");
-	} else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
+	} 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);
 	if (options.userAgent && isPagesStreamingBot(options.userAgent)) {
 		const fullHtml = await readStreamAsText(compositeStream);

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

@@ -8,6 +8,13 @@ type PagesRenderOptions = {
   originalUrl?: string;
 };
 type FilesystemRoutePhase = "direct" | "beforeFiles" | "afterFiles" | "fallback";
+type PageRouteMatch = {
+  route: {
+    isDynamic: boolean;
+    pattern?: string;
+    dataKind?: "static" | "server" | "none";
+  };
+};
 declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>): Promise<Response | false>;
 type MiddlewareResult = {
   continue: boolean;
@@ -34,13 +41,10 @@ type PagesPipelineDeps = {
   hadBasePath: boolean;
   isDataReq: boolean;
   isDataRequest: boolean;
+  hasMiddleware: boolean;
   ctx?: unknown;
   rawSearch?: string;
-  matchPageRoute?: ((pathname: string, request: Request) => {
-    route: {
-      isDynamic: boolean;
-    };
-  } | null) | null;
+  matchPageRoute?: ((pathname: string, request: Request) => PageRouteMatch | null) | null;
   runMiddleware?: ((request: Request, ctx: unknown, opts: {
     isDataRequest: boolean;
   }) => Promise<MiddlewareResult>) | null;