vinext 1.3.0 → 1.4.0

package/dist/server/pages-media-type.d.ts

@@ -9,6 +9,26 @@ export declare class PagesBodyParseError extends Error {
   readonly statusCode: number;
   constructor(message: string, statusCode: number);
 }
-export declare function getMediaType(contentType: string | null | undefined): string;
 export declare function isJsonMediaType(mediaType: string): boolean;
+/** A `TextDecoder`-shaped decoder for one request body. */
+export type PagesBodyDecoder = {
+  decode(input?: Uint8Array, options?: {
+    stream?: boolean;
+  }): string;
+};
+/**
+ * Resolve the media type and body decoder for a Pages API request, matching
+ * Next.js `parseBody()`: a malformed Content-Type is treated as `text/plain`,
+ * the body is decoded with its `charset` (UTF-8 by default), and a charset that
+ * can't be decoded is rejected with `400 Invalid body`.
+ *
+ * Next.js decodes through raw-body with iconv-lite 0.4, which vinext bundles
+ * at the same version. It is loaded only for non-UTF-8 charsets: `TextDecoder`
+ * decodes UTF-8 identically, BOM stripping included, and keeps iconv-lite's
+ * encoding tables out of the startup path.
+ */
+export declare function createPagesBodyDecoder(contentType: string | null | undefined): Promise<{
+  mediaType: string;
+  decoder: PagesBodyDecoder;
+}>;
 //#endregion

package/dist/server/pages-media-type.js

@@ -1,3 +1,5 @@
+import { __toESM } from "../_virtual/_rolldown/runtime.js";
+import { Buffer } from "node:buffer";
 //#region src/server/pages-media-type.ts
 /**
 * Shared media-type helpers and body-parse error for Pages API routes.
@@ -13,12 +15,74 @@ var PagesBodyParseError = class extends Error {
 		this.name = "PagesBodyParseError";
 	}
 };
-function getMediaType(contentType) {
-	const [type] = (contentType ?? "text/plain").split(";");
-	return type?.trim().toLowerCase() || "text/plain";
-}
 function isJsonMediaType(mediaType) {
 	return mediaType === "application/json" || mediaType === "application/ld+json";
 }
+const TYPE_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+\/[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
+const PARAM_REGEXP = /; *([!#$%&'*+.^_`|~0-9A-Za-z-]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'*+.^_`|~0-9A-Za-z-]+) */g;
+const QESC_REGEXP = /\\([\u000b\u0020-\u00ff])/g;
+function parseContentType(header) {
+	let index = header.indexOf(";");
+	const type = (index === -1 ? header : header.slice(0, index)).trim();
+	if (!TYPE_REGEXP.test(type)) return null;
+	let charset;
+	if (index !== -1) {
+		const paramRegexp = new RegExp(PARAM_REGEXP);
+		paramRegexp.lastIndex = index;
+		let match;
+		while (match = paramRegexp.exec(header)) {
+			if (match.index !== index) return null;
+			index += match[0].length;
+			if (match[1].toLowerCase() !== "charset") continue;
+			const value = match[2];
+			charset = value.startsWith("\"") ? value.slice(1, -1).replace(QESC_REGEXP, "$1") : value;
+		}
+		if (index !== header.length) return null;
+	}
+	return {
+		mediaType: type.toLowerCase(),
+		charset
+	};
+}
+function iconvBodyDecoder(decoder) {
+	return { decode(input, options) {
+		let text = input ? decoder.write(Buffer.from(input.buffer, input.byteOffset, input.byteLength)) : "";
+		if (!options?.stream) text += decoder.end() || "";
+		return text;
+	} };
+}
+/**
+* Resolve the media type and body decoder for a Pages API request, matching
+* Next.js `parseBody()`: a malformed Content-Type is treated as `text/plain`,
+* the body is decoded with its `charset` (UTF-8 by default), and a charset that
+* can't be decoded is rejected with `400 Invalid body`.
+*
+* Next.js decodes through raw-body with iconv-lite 0.4, which vinext bundles
+* at the same version. It is loaded only for non-UTF-8 charsets: `TextDecoder`
+* decodes UTF-8 identically, BOM stripping included, and keeps iconv-lite's
+* encoding tables out of the startup path.
+*/
+async function createPagesBodyDecoder(contentType) {
+	const parsed = contentType && parseContentType(contentType) || {
+		mediaType: "text/plain",
+		charset: void 0
+	};
+	const charset = parsed.charset || "utf-8";
+	if (charset.toLowerCase().replace(/:\d{4}$|[^0-9a-z]/g, "") === "utf8") return {
+		mediaType: parsed.mediaType,
+		decoder: new TextDecoder()
+	};
+	const iconv = (await import("../deps/.pnpm/iconv-lite@0.4.24/deps/iconv-lite/lib/index.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1))).default;
+	let decoder;
+	try {
+		decoder = iconv.getDecoder(charset);
+	} catch {
+		throw new PagesBodyParseError("Invalid body", 400);
+	}
+	return {
+		mediaType: parsed.mediaType,
+		decoder: iconvBodyDecoder(decoder)
+	};
+}
 //#endregion
-export { PagesBodyParseError, getMediaType, isJsonMediaType };
+export { PagesBodyParseError, createPagesBodyDecoder, isJsonMediaType };

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

@@ -2,11 +2,11 @@ import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT } from "./pages-body-parser-config.js";
-import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
+import { PagesBodyParseError, createPagesBodyDecoder, isJsonMediaType } from "./pages-media-type.js";
 import { performOnDemandRevalidate } from "./pages-revalidate.js";
 import { clearPagesPreviewData, getPagesPreviewState, setPagesDraftMode, setPagesPreviewData } from "./pages-preview.js";
 import { decode } from "node:querystring";
-import { Readable, Writable } from "node:stream";
+import { Readable, Stream, Writable } from "node:stream";
 //#region src/server/pages-node-compat.ts
 const MAX_PAGES_API_BODY_SIZE = DEFAULT_PAGES_API_BODY_SIZE_LIMIT;
 const NO_BODY_RESPONSE_STATUSES = /* @__PURE__ */ new Set([
@@ -26,11 +26,17 @@ function validateAppendedHeader(name, value) {
 		if (INVALID_HEADER_VALUE_CHAR_PATTERN.test(String(item))) throw createNodeTypeError("ERR_INVALID_CHAR", `Invalid character in header content ["${name}"]`);
 	}
 }
-async function readPagesRequestBodyWithLimit(request, maxBytes) {
-	if (!request.body) return "";
-	return readStreamAsTextWithLimit(request.body, maxBytes, () => {
+/** The decoded body, or undefined when the request carried no body bytes. */
+async function readPagesRequestBodyWithLimit(request, maxBytes, decoder) {
+	if (!request.body) return;
+	let byteLength = 0;
+	const text = await readStreamAsTextWithLimit(request.body, maxBytes, () => {
 		throw new PagesBodyParseError("Request body too large", 413);
-	});
+	}, { decode(input, options) {
+		byteLength += input?.byteLength ?? 0;
+		return decoder.decode(input, options);
+	} });
+	return byteLength > 0 ? text : void 0;
 }
 /**
 * Read and parse a Pages Router API request body for the Workers/prod path.
@@ -43,16 +49,16 @@ async function readPagesRequestBodyWithLimit(request, maxBytes) {
 * @see https://nextjs.org/docs/pages/building-your-application/routing/api-routes#custom-config
 */
 async function parsePagesApiBody(request, maxBytes = MAX_PAGES_API_BODY_SIZE) {
+	const { mediaType, decoder } = await createPagesBodyDecoder(request.headers.get("content-type"));
 	if (Number.parseInt(request.headers.get("content-length") || "0", 10) > maxBytes) throw new PagesBodyParseError("Request body too large", 413);
-	let rawBody = "";
+	let rawBody;
 	try {
-		rawBody = await readPagesRequestBodyWithLimit(request, maxBytes);
+		rawBody = await readPagesRequestBodyWithLimit(request, maxBytes, decoder);
 	} catch (err) {
 		if (err instanceof PagesBodyParseError) throw err;
 		throw new PagesBodyParseError("Request body too large", 413);
 	}
-	const mediaType = getMediaType(request.headers.get("content-type"));
-	if (!rawBody) return isJsonMediaType(mediaType) ? {} : mediaType === "application/x-www-form-urlencoded" ? decode(rawBody) : void 0;
+	if (!rawBody) return isJsonMediaType(mediaType) ? {} : mediaType === "application/x-www-form-urlencoded" ? decode("") : rawBody;
 	if (isJsonMediaType(mediaType)) try {
 		return JSON.parse(rawBody);
 	} catch {
@@ -61,24 +67,34 @@ async function parsePagesApiBody(request, maxBytes = MAX_PAGES_API_BODY_SIZE) {
 	if (mediaType === "application/x-www-form-urlencoded") return decode(rawBody);
 	return rawBody;
 }
-async function* requestBodyChunks(request) {
-	if (!request.body || request.bodyUsed) return;
-	const reader = request.body.getReader();
-	try {
-		for (;;) {
-			const { value, done } = await reader.read();
-			if (done) return;
-			yield Buffer.from(value.buffer, value.byteOffset, value.byteLength);
-		}
-	} finally {
-		try {
-			await reader.cancel();
-		} catch {}
-		reader.releaseLock();
-	}
-}
 function createRequestReadable(request) {
-	return Readable.from(requestBodyChunks(request), { objectMode: false });
+	const body = request.bodyUsed ? null : request.body;
+	let reader;
+	return new Readable({
+		read() {
+			if (!body) {
+				this.push(null);
+				return;
+			}
+			reader ??= body.getReader();
+			reader.read().then(({ value, done }) => {
+				if (this.destroyed) return;
+				if (done) {
+					this.push(null);
+					return;
+				}
+				this.push(Buffer.from(value.buffer, value.byteOffset, value.byteLength));
+			}, (error) => this.destroy(error));
+		},
+		destroy(error, callback) {
+			const cancelled = reader ? reader.cancel(error ?? void 0) : body?.cancel(error ?? void 0);
+			if (!cancelled) {
+				callback(error);
+				return;
+			}
+			cancelled.then(() => callback(error), () => callback(error));
+		}
+	});
 }
 function parsePagesRequestCookies(cookieHeader) {
 	return parseCookieHeader(Array.isArray(cookieHeader) ? cookieHeader.join("; ") : cookieHeader);
@@ -189,6 +205,15 @@ var PagesResponseStream = class extends Writable {
 		this.end(JSON.stringify(data));
 	}
 	send(data) {
+		if (NO_BODY_RESPONSE_STATUSES.has(this.resStatusCode)) {
+			this.end();
+			return;
+		}
+		if (data instanceof Stream) {
+			if (!this.resHeaders["content-type"]) this.resHeaders["content-type"] = "application/octet-stream";
+			data.pipe(this);
+			return;
+		}
 		if (Buffer.isBuffer(data)) {
 			if (!this.resHeaders["content-type"]) this.resHeaders["content-type"] = "application/octet-stream";
 			this.resHeaders["content-length"] = String(data.length);

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

@@ -298,6 +298,11 @@ type ResolvePagesPageDataNotFoundResult = {
   cacheState?: "MISS" | "HIT" | "STALE";
 };
 type ResolvePagesPageDataResult = ResolvePagesPageDataRenderResult | ResolvePagesPageDataResponseResult | ResolvePagesPageDataNotFoundResult;
+/**
+ * Write a Pages res header the way Node sends it: an array sends one header
+ * line per item, so `[]` sends none.
+ */
+export declare function setPagesResponseHeader(headers: Headers, name: string, value: string | number | boolean | string[]): void;
 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. */
 export declare function resolvePagesRedirect(redirect: PagesRedirectResult, options: {
@@ -330,4 +335,5 @@ export type PagesRouteParam = {
 export declare function getPagesRouteParams(routePattern: string): PagesRouteParam[];
 export declare function matchesPagesStaticPath(pathEntry: PagesStaticPathsEntry, params: Record<string, unknown>, routeParams: PagesRouteParam[], routeUrl: string, i18n?: Pick<PagesI18nRenderContext, "locale" | "locales" | "defaultLocale">): boolean;
 export declare function resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
-//#endregion
+//#endregion
+export {};

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

@@ -6,7 +6,7 @@ import { isDangerousScheme } from "../shims/url-safety.js";
 import { extractLocaleFromUrl } from "./pages-i18n.js";
 import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
 import { recordRouteCacheability } from "../shims/cacheability-classification.js";
-import { applyCdnResponseHeaders } from "./cache-control.js";
+import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
 import { isrCacheControl } from "./isr-cache.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
@@ -98,14 +98,22 @@ function buildPagesNotFoundResult(options, revalidateSeconds, cacheState, expire
 		responseHeaders
 	};
 }
+/**
+* Write a Pages res header the way Node sends it: an array sends one header
+* line per item, so `[]` sends none.
+*/
+function setPagesResponseHeader(headers, name, value) {
+	headers.delete(name);
+	if (!Array.isArray(value)) {
+		headers.set(name, String(value));
+		return;
+	}
+	for (const item of value) headers.append(name, String(item));
+}
 function mergePagesNotFoundSourceHeaders(response, sourceHeaders) {
 	if (!sourceHeaders) return response;
 	const headers = new Headers(response.headers);
-	for (const [name, value] of Object.entries(sourceHeaders)) if (name.toLowerCase() === "set-cookie") {
-		headers.delete("set-cookie");
-		const cookies = Array.isArray(value) ? value : [value];
-		for (const cookie of cookies) headers.append("set-cookie", String(cookie));
-	} else headers.set(name, Array.isArray(value) ? value.join(", ") : String(value));
+	for (const [name, value] of Object.entries(sourceHeaders)) setPagesResponseHeader(headers, name, value);
 	return new Response(response.body, {
 		headers,
 		status: response.status,
@@ -292,6 +300,15 @@ function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }
 		headers
 	});
 }
+/**
+* Next.js pages-handler.ts gives a getServerSideProps result `revalidate: 0`,
+* so its redirect and notFound exits are answered private/no-store unless the
+* handler set its own Cache-Control. Like Next's `!res.getHeader(...)`, this
+* reads the raw value, so `""` and `0` count as unset.
+*/
+function applyPagesGsspCacheControlDefault(headers, res) {
+	if (!res.getHeaders()["cache-control"]) headers.set("Cache-Control", NEVER_CACHE_CONTROL);
+}
 function getPagesGsspResponseHeaders(res) {
 	const headers = new Headers();
 	for (const [name, value] of Object.entries(res.getHeaders())) if (Array.isArray(value)) for (const item of value) headers.append(name, item);
@@ -566,13 +583,19 @@ async function resolvePagesPageData(options) {
 				pageProps
 			};
 		}
-		if (result?.redirect) return {
-			kind: "response",
-			response: buildPagesRedirectResponse(result.redirect, options, renderProps, "getServerSideProps", getPagesGsspResponseHeaders(res))
-		};
+		if (result?.redirect) {
+			const responseHeaders = getPagesGsspResponseHeaders(res);
+			applyPagesGsspCacheControlDefault(responseHeaders, res);
+			return {
+				kind: "response",
+				response: buildPagesRedirectResponse(result.redirect, options, renderProps, "getServerSideProps", responseHeaders)
+			};
+		}
 		if (result?.notFound) {
 			const responseHeaders = res.getHeaders();
-			return buildPagesNotFoundResult(options, void 0, void 0, void 0, Object.keys(responseHeaders).length > 0 ? responseHeaders : void 0);
+			const notFoundResult = buildPagesNotFoundResult(options, void 0, void 0, void 0, Object.keys(responseHeaders).length > 0 ? responseHeaders : void 0);
+			if (notFoundResult.kind === "response") applyPagesGsspCacheControlDefault(notFoundResult.response.headers, res);
+			return notFoundResult;
 		}
 		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
 		gsspRes = res;
@@ -796,4 +819,4 @@ async function resolvePagesPageData(options) {
 	};
 }
 //#endregion
-export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath };
+export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath, setPagesResponseHeader };

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

@@ -97,7 +97,7 @@ export type CreatePagesPageHandlerOptions = {
     href: string;
     type: string;
   }>;
-  /** `renderToReadableStream` from `react-dom/server.edge`. */
+  /** `renderToReadableStream` from `react-dom/server`. */
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
   /** `safeJsonStringify` from `vinext/html`. */
   safeJsonStringify: (value: unknown) => string;
@@ -139,4 +139,5 @@ type RenderPageOptions = {
  * accepts the same options shape the generated entry always passed inline.
  */
 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
+//#endregion
+export {};

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

@@ -10,11 +10,11 @@ import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normaliz
 import { reportRequestError } from "./instrumentation.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, recordRouteCacheability } from "../shims/cacheability-classification.js";
-import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy, shouldUseNextDeployCacheControl } from "./cache-control.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy, isCdnResponsePolicyHeader, shouldUseNextDeployCacheControl } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
-import { coalesceOnDemandRevalidation, isrGet, isrSet, pagesIsrCacheKey, triggerBackgroundRegeneration } from "./isr-cache.js";
-import { ensureFetchPatch } from "../shims/fetch-cache.js";
+import { coalesceOnDemandResponse, isrGet, isrSet, pagesIsrCacheKey, triggerBackgroundRegeneration } from "./isr-cache.js";
+import { ensureFetchPatch, setCurrentFetchDraftMode } from "../shims/fetch-cache.js";
 import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
@@ -25,7 +25,7 @@ import { pagesPathCacheTag } from "./pages-cache-tag.js";
 import { renderPagesPageResponse } from "./pages-page-response.js";
 import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { traceFindPageComponents, tracePagesDocumentStream } from "./pages-execution-tracing.js";
-import { mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesStatusPageRenderPath } from "./pages-page-data.js";
+import { mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesStatusPageRenderPath, setPagesResponseHeader } 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";
@@ -87,14 +87,23 @@ function stripPagesNotFoundFramingHeaders(response) {
 		statusText: response.statusText
 	});
 }
-function applyPagesErrorCachePolicy(response, revalidateSeconds, expireSeconds, cacheTagPathname) {
+/**
+* `notFoundResHeaders` is the getServerSideProps res as it stands after the
+* 404 render: the middleware and next.config headers, the handler's writes,
+* then any write from the 404 render's own user code.
+*/
+function applyPagesErrorCachePolicy(response, revalidateSeconds, expireSeconds, cacheTagPathname, notFoundResHeaders) {
 	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 });
+	if (revalidateSeconds === void 0 && notFoundResHeaders?.["cache-control"]) {
+		const policyHeaderNames = Array.from(headers.keys()).filter(isCdnResponsePolicyHeader);
+		for (const name of policyHeaderNames) headers.delete(name);
+		for (const [name, value] of Object.entries(notFoundResHeaders)) if (isCdnResponsePolicyHeader(name)) setPagesResponseHeader(headers, name, value);
+	} else if (revalidateSeconds === void 0) applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
 	else applyCdnResponseHeaders(headers, {
 		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds),
 		tags: [pagesPathCacheTag(cacheTagPathname)]
@@ -249,23 +258,10 @@ function createPagesPageHandler(opts) {
 		const isStaticPropsRender = isStaticPropsRoute && typeof pageModule.getServerSideProps !== "function";
 		if (!options?.__skipOnDemandCoalesce && !options?.__forcedRoute && !cacheIdentityDiverges && isStaticPropsRoute && isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate"))) {
 			const cacheKey = pageIsrCacheKey("pages", routeUrl.split("?")[0]);
-			const snapshot = await coalesceOnDemandRevalidation(cacheKey, async () => {
-				const response = await renderPage(request, url, manifest, middlewareHeaders, {
-					...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()],
-					status: response.status,
-					statusText: response.statusText
-				};
-			});
-			return new Response(snapshot.body?.slice() ?? null, {
-				headers: snapshot.headers,
-				status: snapshot.status,
-				statusText: snapshot.statusText
-			});
+			return coalesceOnDemandResponse(cacheKey, request.method, () => renderPage(request, url, manifest, middlewareHeaders, {
+				...options,
+				__skipOnDemandCoalesce: true
+			}, initialResponseHeaders));
 		}
 		const routePattern = patternToNextFormat(route.pattern);
 		const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
@@ -274,7 +270,10 @@ function createPagesPageHandler(opts) {
 		const renderRouteUrl = isStaticPropsRender && isStatusPageIdentity ? resolvePagesStatusPageRenderPath(statusPagePathname, vinextConfig.trailingSlash, originalRequestUrl.pathname) : isStaticPropsRender ? routeUrl.split("?")[0] : routeUrl;
 		const routerAsPathSource = isStaticPropsRender ? renderRouteUrl : renderAsPath ?? renderRouteUrl;
 		const routerAsPath = i18nConfig ? extractLocaleFromUrl(routerAsPathSource, i18nConfig, locale).url : routerAsPathSource;
-		const uCtx = createRequestContext({ executionContext: getRequestExecutionContext() });
+		const uCtx = createRequestContext({
+			executionContext: getRequestExecutionContext(),
+			isOnDemandRevalidate: isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER))
+		});
 		let pageReqRes = null;
 		const pageResponseSent = () => pageReqRes?.res.headersSent === true;
 		const sendsEarly = isStaticPropsRoute && !isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate"));
@@ -313,6 +312,7 @@ function createPagesPageHandler(opts) {
 					shouldClear: false
 				};
 				const previewData = preview.data;
+				setCurrentFetchDraftMode(previewData !== false);
 				const pagesNextData = {
 					...pagesReadiness,
 					...previewData === false ? {} : { isPreview: true }
@@ -364,7 +364,7 @@ function createPagesPageHandler(opts) {
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
-				const browserCacheControl = isStaticPropsRoute && !scriptNonce ? (initialResponseHeaders ?? middlewareHeaders)?.get("Cache-Control") : null;
+				const browserCacheControl = isStaticPropsRoute && !scriptNonce && !options?.__notFoundSourceHeaders ? (initialResponseHeaders ?? middlewareHeaders)?.get("Cache-Control") : null;
 				const withBrowserPolicy = (response) => {
 					if (browserCacheControl) response.headers.set("Cache-Control", browserCacheControl);
 					return response;
@@ -590,7 +590,7 @@ function createPagesPageHandler(opts) {
 				if (pageDataResult.kind === "response") {
 					if (sendsEarly && pageResponseSent()) return pageDataResult.response;
 					let response = isOnDemandRevalidate && pageDataResult.onDemandRevalidateSuccess !== false ? withPagesCacheState(pageDataResult.response, "REVALIDATED", isrCachePathname) : pageDataResult.response;
-					if (shouldApplyErrorResponsePolicy) response = applyPagesErrorCachePolicy(response, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
+					if (shouldApplyErrorResponsePolicy) response = applyPagesErrorCachePolicy(response, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname, options?.__notFoundSourceHeaders);
 					return finalizePagesPreviewResponse(withBrowserPolicy(response), preview);
 				}
 				const { pageProps, renderProps } = withErrorStatusCode(pageDataResult.pageProps, previewData !== false ? {
@@ -656,7 +656,7 @@ function createPagesPageHandler(opts) {
 					requestCacheControl: request.headers.get("cache-control") ?? void 0
 				});
 				if (sendsEarly && pageResponseSent()) return pageResponse;
-				if (shouldApplyErrorResponsePolicy) pageResponse = applyPagesErrorCachePolicy(pageResponse, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
+				if (shouldApplyErrorResponsePolicy) pageResponse = applyPagesErrorCachePolicy(pageResponse, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname, options?.__notFoundSourceHeaders ? documentReqRes?.res.getHeaders() ?? options.__notFoundSourceHeaders : void 0);
 				return finalizePagesPreviewResponse(withBrowserPolicy(pageResponse), preview);
 			} catch (e) {
 				await reportSsrError(e);

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

@@ -43,4 +43,5 @@ type PagesPageMethodOptions = {
  * static (no `getServerSideProps`) Pages Router page, otherwise `null`.
  */
 export declare function resolvePagesPageMethodResponse(options: PagesPageMethodOptions): Response | null;
-//#endregion
+//#endregion
+export {};

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

@@ -151,4 +151,5 @@ export declare function buildPagesNextDataScript(options: Pick<RenderPagesPageRe
   vinext?: VinextNextData["__vinext"];
 }): string;
 export declare function renderPagesPageResponse(options: RenderPagesPageResponseOptions): Promise<Response>;
-//#endregion
+//#endregion
+export {};

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

@@ -22,4 +22,5 @@ export declare function clearPagesPreviewData(response: PreviewResponse, options
   path?: string;
 }): void;
 export declare function appendPagesPreviewClearCookies(headers: Headers): void;
-//#endregion
+//#endregion
+export {};

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

@@ -32,4 +32,5 @@ export declare function buildPagesReadinessNextData(options: {
   } | null | undefined;
   hasRewrites: boolean;
 }): PagesReadinessNextData;
-//#endregion
+//#endregion
+export {};

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

@@ -84,6 +84,14 @@ export type PagesPipelineDeps = {
   dataNotFoundResponse?: Response | null;
   renderPage?: ((request: Request, resolvedUrl: string, options?: PagesRenderOptions, stagedHeaders?: Headers) => Promise<Response>) | null;
   handleApi?: ((request: Request, apiUrl: string, ctx: unknown, stagedHeaders: Headers) => Promise<Response>) | null;
+  /**
+   * `handleApi` installs the staged headers on the handler's `res` before user
+   * code runs, as Next.js does, so its response already reflects any header the
+   * handler replaced and only middleware's status is applied here.
+   * Workers leaves this unset: its response stage strips the inherited cookies
+   * so they are not stored, and this merge adds them back.
+   */
+  handleApiAppliesStagedHeaders?: boolean;
   /**
    * Optional override for proxying external rewrite destinations.
    * When supplied, the pipeline calls this instead of proxyExternalRequest(currentRequest, url).
@@ -157,4 +165,5 @@ export type PagesPipelineResult = {
  * runPagesRequest receives a "clean" request with basePath-stripped URL.
  */
 export declare function runPagesRequest(request: Request, deps: PagesPipelineDeps): Promise<PagesPipelineResult>;
-//#endregion
+//#endregion
+export {};

package/dist/server/pages-request-pipeline.js

@@ -1,11 +1,11 @@
 import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { requestContextFromRequest } from "../config/request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
-import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
+import { addBasePathToPathname } from "../utils/base-path.js";
 import { VINEXT_PRERENDER_REWRITTEN_HEADER } from "./headers.js";
 import { methodNotAllowedResponse, notFoundStaticAssetResponse, sanitizeMethodNotAllowedHeaders } from "./http-error-responses.js";
 import { cloneRequestWithUrl, normalizeTrailingSlash } from "./request-pipeline.js";
-import { applyMiddlewareRequestHeaders, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, sanitizeDestination } from "../config/config-matchers.js";
+import { applyMiddlewareRequestHeaders, encodeRedirectLocation, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest } from "../config/config-matchers.js";
 import { assetPrefixPathname, isAssetPrefixBuildAsset, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
@@ -14,8 +14,8 @@ import { buildMiddlewarePrefetchSkipResponse } from "./pages-data-route.js";
 import { markRouteCacheabilityDynamic } from "../shims/cacheability-classification.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
 import { mergeRewriteQuery } from "../utils/query.js";
-import { withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
 import { setFrameworkRequestRoute } from "./request-tracing.js";
+import { withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
 import { applyConfigHeadersToHeaderRecord } from "./config-headers.js";
 import { finalizeMissingStaticAssetResponse, mergeHeaders } from "./worker-utils.js";
 //#region src/server/pages-request-pipeline.ts
@@ -127,12 +127,11 @@ async function runPagesRequest(request, deps) {
 	if (configRedirects.length) {
 		const redirect = matchRedirect(requestConfigMatchPathname, configRedirects, reqCtx, basePathState, conditionalRedirectCacheability);
 		if (redirect) {
-			const dest = sanitizeDestination(basePath && hadBasePath && !isExternalUrl(redirect.destination) && !hasBasePath(redirect.destination, basePath) ? basePath + redirect.destination : redirect.destination);
-			const location = preserveRedirectDestinationQuery(dest, deps.rawSearch ?? search, redirect.destinationQuery);
+			const location = encodeRedirectLocation(preserveRedirectDestinationQuery(redirect.destination, deps.rawSearch ?? search, redirect.destinationQuery));
 			return {
 				type: "response",
 				response: new Response(null, {
-					status: redirect.permanent ? 308 : 307,
+					status: redirect.statusCode,
 					headers: { Location: location }
 				})
 			};
@@ -311,7 +310,7 @@ async function runPagesRequest(request, deps) {
 				apiRequest = cloneRequestWithUrl(request, apiRequestUrl.toString());
 			}
 			const response = await deps.handleApi(apiRequest, apiLookupUrl, deps.ctx ?? null, headersFromRecord(middlewareHeaders));
-			const merged = mergeHeaders(response, middlewareHeaders, middlewareStatus);
+			const merged = mergeHeaders(response, deps.handleApiAppliesStagedHeaders ? {} : middlewareHeaders, middlewareStatus);
 			if (merged !== response) merged.__vinextStreamedApiResponse = response.__vinextStreamedApiResponse;
 			return {
 				type: "response",

package/dist/server/pages-request-stage-entry.d.ts

@@ -26,4 +26,5 @@ export declare function isPagesClientBuildFileRequest(request: Request, env: Pag
 export declare function handleRequestStage(request: Request, env: PagesWorkerEnv | undefined, ctx: PagesWorkerExecutionContext | undefined, dispatchResponseStage: DispatchWorkerResponseStage): Promise<Response>;
 /** Preserve the direct single-entry Worker path without retaining it in request-only builds. */
 export declare function handleRequestStageLocally(request: Request, env: PagesWorkerEnv | undefined, ctx: PagesWorkerExecutionContext | undefined, dispatchResponseStage: PagesLocalResponseStage): Promise<Response>;
-//#endregion
+//#endregion
+export {};