vinext 1.2.1 → 1.3.1

package/dist/server/pages-node-compat.d.ts

@@ -15,15 +15,17 @@ export type PagesReqResRequest = Readable & {
   draftMode?: true;
   previewData: PagesPreviewData | false;
 };
+type PagesReqResHeaderValue = string | number | boolean | string[];
 type PagesReqResHeaders = {
-  [key: string]: string | number | boolean | string[];
+  [key: string]: PagesReqResHeaderValue;
 };
 export type PagesReqResResponse = Writable & {
   statusCode: number;
   readonly headersSent: boolean;
   writeHead: (code: number, headers?: PagesReqResHeaders) => PagesReqResResponse;
-  setHeader: (name: string, value: string | number | boolean | string[]) => PagesReqResResponse;
-  getHeader: (name: string) => string | number | boolean | string[] | undefined;
+  setHeader: (name: string, value: PagesReqResHeaderValue) => PagesReqResResponse;
+  appendHeader: (name: string, value: string | readonly string[]) => PagesReqResResponse;
+  getHeader: (name: string) => PagesReqResHeaderValue | undefined;
   status: (code: number) => PagesReqResResponse;
   json: (data: unknown) => void;
   send: (data: unknown) => void;

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

@@ -1,4 +1,5 @@
 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";
@@ -13,6 +14,18 @@ const NO_BODY_RESPONSE_STATUSES = /* @__PURE__ */ new Set([
 	205,
 	304
 ]);
+const HTTP_TOKEN_PATTERN = /^[\^_`a-zA-Z\-0-9!#$%&'*+.|~]+$/;
+const INVALID_HEADER_VALUE_CHAR_PATTERN = /[^\t\x20-\x7e\x80-\xff]/;
+function createNodeTypeError(code, message) {
+	return Object.assign(new TypeError(message), { code });
+}
+function validateAppendedHeader(name, value) {
+	if (typeof name !== "string" || !name || !HTTP_TOKEN_PATTERN.test(name)) throw createNodeTypeError("ERR_INVALID_HTTP_TOKEN", `Header name must be a valid HTTP token ["${String(name)}"]`);
+	for (const item of Array.isArray(value) ? value : [value]) {
+		if (item === void 0) throw createNodeTypeError("ERR_HTTP_INVALID_HEADER_VALUE", `Invalid value "undefined" for header "${name}"`);
+		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, () => {
@@ -120,9 +133,9 @@ var PagesResponseStream = class extends Writable {
 	resolveResponse;
 	rejectResponse;
 	resStatusCode = 200;
-	resHeaders = {};
-	setCookieHeaders = [];
+	resHeaders = Object.create(null);
 	resolved = false;
+	headWritten = false;
 	controller = null;
 	bufferedChunks = [];
 	streamEnded = false;
@@ -150,15 +163,21 @@ var PagesResponseStream = class extends Writable {
 	}
 	writeHead(code, headers) {
 		this.resStatusCode = code;
-		if (headers) for (const [key, value] of Object.entries(headers)) this.setHeaderValue(key, value, { replaceSetCookie: true });
+		if (headers) for (const [key, value] of Object.entries(headers)) this.setHeaderValue(key, value, { append: false });
+		this.headWritten = true;
 		return this;
 	}
 	setHeader(name, value) {
-		this.setHeaderValue(name, value, { replaceSetCookie: true });
+		this.setHeaderValue(name, value, { append: false });
+		return this;
+	}
+	appendHeader(name, value) {
+		if (this.headWritten || this.headersSent) throw Object.assign(/* @__PURE__ */ new Error("Cannot append headers after they are sent to the client"), { code: "ERR_HTTP_HEADERS_SENT" });
+		validateAppendedHeader(name, value);
+		this.setHeaderValue(name, value, { append: true });
 		return this;
 	}
 	getHeader(name) {
-		if (name.toLowerCase() === "set-cookie") return this.setCookieHeaders.length > 0 ? this.setCookieHeaders : void 0;
 		return this.resHeaders[name.toLowerCase()];
 	}
 	status(code) {
@@ -196,9 +215,7 @@ var PagesResponseStream = class extends Writable {
 		return this;
 	}
 	getHeaders() {
-		const headers = { ...this.resHeaders };
-		if (this.setCookieHeaders.length > 0) headers["set-cookie"] = this.setCookieHeaders;
-		return headers;
+		return { ...this.resHeaders };
 	}
 	setPreviewData(data, options = {}) {
 		setPagesPreviewData(this, data, options);
@@ -250,13 +267,15 @@ var PagesResponseStream = class extends Writable {
 		callback(error);
 	}
 	setHeaderValue(name, value, options) {
-		if (name.toLowerCase() === "set-cookie") {
-			const values = Array.isArray(value) ? value.map(String) : [String(value)];
-			if (options.replaceSetCookie) this.setCookieHeaders.length = 0;
-			this.setCookieHeaders.push(...values);
+		const key = name.toLowerCase();
+		const existing = this.resHeaders[key];
+		if (!options.append || existing === void 0) {
+			this.resHeaders[key] = value;
 			return;
 		}
-		this.resHeaders[name.toLowerCase()] = Array.isArray(value) ? value.join(", ") : value;
+		const values = Array.isArray(existing) ? existing : [existing];
+		values.push(...Array.isArray(value) ? value : [value]);
+		this.resHeaders[key] = values;
 	}
 	releasePendingWrite(error) {
 		const callback = this.pendingWrite;
@@ -267,8 +286,8 @@ var PagesResponseStream = class extends Writable {
 		if (this.resolved) return;
 		this.resolved = true;
 		const headers = new Headers();
-		for (const [key, value] of Object.entries(this.resHeaders)) headers.set(key, String(value));
-		for (const cookie of this.setCookieHeaders) headers.append("set-cookie", cookie);
+		for (const [key, value] of Object.entries(this.resHeaders)) if (Array.isArray(value)) for (const item of value) headers.append(key, String(item));
+		else headers.set(key, String(value));
 		if (NO_BODY_RESPONSE_STATUSES.has(this.resStatusCode)) {
 			this.discardBody = true;
 			this.bufferedChunks.length = 0;
@@ -359,10 +378,10 @@ function createPagesReqRes(options) {
 */
 function createPagesApiReqRes(options) {
 	const { req, res, responsePromise } = createPagesReqRes(options);
-	const trustedRevalidateOrigin = options.trustedRevalidateOrigin ?? new URL(options.request.url).origin;
 	return {
 		req,
 		res: Object.assign(res, { async revalidate(urlPath, opts) {
+			const trustedRevalidateOrigin = options.trustedRevalidateOrigin ?? (getRequestExecutionContext()?.dispatchPagesRevalidate ? new URL(options.request.url).origin : void 0);
 			await performOnDemandRevalidate(options.request.headers, urlPath, opts, trustedRevalidateOrigin, options.allowedRevalidateHeaderKeys);
 		} }),
 		responsePromise

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,7 +10,7 @@ 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";
@@ -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)]
@@ -364,7 +373,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 +599,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 +665,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

@@ -15,7 +15,7 @@ type PageRouteMatch = {
     dataKind?: PagesRouteDataKind;
   };
 };
-export declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>, publicFiles: ReadonlySet<string>, basePath?: string, assetPathPrefix?: string, hadBasePath?: boolean): Promise<Response | false>;
+export declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>, publicFiles: ReadonlySet<string>, basePath?: string, assetPathPrefix?: string, pathnameHasBasePath?: boolean): Promise<Response | false>;
 export type MiddlewareResult = {
   continue: boolean;
   /** The pathname matches middleware, irrespective of request `has`/`missing` conditions. */
@@ -54,6 +54,11 @@ export type PagesPipelineDeps = {
   recordCacheability?: boolean;
   rawSearch?: string;
   configMatchPathname?: string;
+  /**
+   * `shouldRestoreLocaleRootTrailingSlash` for the raw request pathname
+   * (basePath included), which the basePath-stripped request no longer shows.
+   */
+  restoreLocaleRootTrailingSlash?: boolean;
   /**
    * Validate an on-demand revalidation credential using the runtime's
    * authoritative build secret. Production adapters must inject the verifier
@@ -152,4 +157,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,12 +1,12 @@
 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 { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.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";
 import { detectPathnameLocale, normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./pages-i18n.js";
@@ -14,6 +14,7 @@ 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 { applyConfigHeadersToHeaderRecord } from "./config-headers.js";
 import { finalizeMissingStaticAssetResponse, mergeHeaders } from "./worker-utils.js";
@@ -33,7 +34,7 @@ function headersFromRecord(record) {
 	else headers.set(name, value);
 	return headers;
 }
-async function fetchWorkerFilesystemRoute(request, requestPathname, phase, fetchAsset, publicFiles, basePath = "", assetPathPrefix = "", hadBasePath = true) {
+async function fetchWorkerFilesystemRoute(request, requestPathname, phase, fetchAsset, publicFiles, basePath = "", assetPathPrefix = "", pathnameHasBasePath = true) {
 	const isRetrievalMethod = request.method === "GET" || request.method === "HEAD";
 	const assetUrl = new URL(request.url);
 	assetUrl.pathname = requestPathname;
@@ -46,7 +47,8 @@ async function fetchWorkerFilesystemRoute(request, requestPathname, phase, fetch
 	} catch {
 		return false;
 	}
-	const isPublicFile = (phase !== "direct" || hadBasePath) && publicFiles.has(publicFileKey);
+	if (!pathnameHasBasePath && !isAssetPrefixBuildAsset(decodedAssetUrl.pathname, assetPathPrefix)) return false;
+	const isPublicFile = pathnameHasBasePath && publicFiles.has(publicFileKey);
 	if (!isPublicFile && (requestPathname === "/api" || requestPathname.startsWith("/api/"))) return false;
 	if (phase === "direct" && isRetrievalMethod && !isPublicFile) return false;
 	if (!isPublicFile && !isNextStaticPath(decodedAssetUrl.pathname, basePath, assetPathPrefix)) return false;
@@ -118,15 +120,18 @@ async function runPagesRequest(request, deps) {
 	const reqCtx = requestContextFromRequest(request);
 	const requestHostname = i18nConfig ? url.hostname : "";
 	const requestConfigMatchPathname = i18nConfig ? normalizeDefaultLocalePathname(requestConfigPathname, i18nConfig, { hostname: requestHostname }) : requestConfigPathname;
+	const requestHeaderMatchPathname = i18nConfig ? normalizeDefaultLocalePathname(requestConfigPathname, i18nConfig, {
+		hostname: requestHostname,
+		restoreRootTrailingSlash: deps.restoreLocaleRootTrailingSlash
+	}) : requestConfigPathname;
 	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 }
 				})
 			};
@@ -141,14 +146,16 @@ async function runPagesRequest(request, deps) {
 		hadBasePath: resolvedPathnameHasBasePath
 	});
 	const middlewareHeaders = {};
+	let middlewareCookies = [];
 	const mergeConfigHeadersIntoEarlyResponse = (response) => {
 		if (configHeaders.length === 0) return response;
 		const matchedConfigHeaders = {};
 		applyConfigHeadersToHeaderRecord(matchedConfigHeaders, {
 			configHeaders,
-			pathname: requestConfigMatchPathname,
+			pathname: requestHeaderMatchPathname,
 			requestContext: reqCtx,
 			basePathState,
+			middlewareHeaders: response.headers,
 			recordCacheability: deps.recordCacheability
 		});
 		return mergeHeaders(response, matchedConfigHeaders);
@@ -210,6 +217,8 @@ async function runPagesRequest(request, deps) {
 			else if (existing) middlewareHeaders[key] = [existing, value];
 			else middlewareHeaders[key] = [value];
 		} else middlewareHeaders[key] = value;
+		const stagedCookies = middlewareHeaders["set-cookie"];
+		if (Array.isArray(stagedCookies)) middlewareCookies = [...stagedCookies];
 		if (result.rewriteUrl) {
 			resolvedUrl = result.rewriteUrl;
 			resolvedPathnameIsRequestPathname = false;
@@ -249,26 +258,24 @@ async function runPagesRequest(request, deps) {
 	};
 	if (configHeaders.length) applyConfigHeadersToHeaderRecord(middlewareHeaders, {
 		configHeaders,
-		pathname: requestConfigMatchPathname,
+		pathname: requestHeaderMatchPathname,
 		requestContext: reqCtx,
 		basePathState,
 		recordCacheability: deps.recordCacheability
 	});
-	if (isExternalUrl(resolvedUrl)) {
-		const proxyResponse = await proxyExternal(request, resolvedUrl);
-		return {
-			type: "response",
-			response: mergeHeaders(proxyResponse, middlewareHeaders, void 0)
-		};
-	}
+	const proxyConfigRewrite = async (destination) => ({
+		type: "response",
+		response: withExternalRewriteResponseHeaders(await proxyExternal(request, destination), new Headers(), middlewareCookies)
+	});
+	if (isExternalUrl(resolvedUrl)) return {
+		type: "response",
+		response: withExternalRewriteResponseHeaders(await proxyExternal(request, resolvedUrl), headersFromRecord(middlewareHeaders), middlewareCookies)
+	};
 	let configRewriteFired = false;
 	for (const rewrite of configRewrites.beforeFiles ?? []) {
 		const rewritten = matchRewrite(configSourcePathname(), [rewrite], rewriteRequestContext(), currentBasePathState(), configSourcePathname(), conditionalRewriteCacheability);
 		if (rewritten) {
-			if (isExternalUrl(rewritten)) return {
-				type: "response",
-				response: await proxyExternal(request, rewritten)
-			};
+			if (isExternalUrl(rewritten)) return proxyConfigRewrite(rewritten);
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 			resolvedPathnameIsRequestPathname = false;
@@ -279,13 +286,13 @@ async function runPagesRequest(request, deps) {
 	const initialFilesystemResult = await serveFilesystemRoute(resolvedPathname, resolvedPathnameIsRequestPathname ? "direct" : "beforeFiles");
 	if (initialFilesystemResult) return initialFilesystemResult;
 	const isMissingBuildAsset = () => isNextStaticPath(resolvedPathname, "", assetPrefixPathname(deps.assetPrefix ?? ""));
-	const isOutsideBasePathUnclaimed = () => basePath && !hadBasePath && !configRewriteFired;
+	const isOutsideBasePathUnclaimed = () => basePath && !resolvedPathnameHasBasePath;
 	const outOfBasePathNotFound = () => ({
 		type: "response",
-		response: isMissingBuildAsset() ? notFoundStaticAssetResponse(headersFromRecord(middlewareHeaders)) : new Response("This page could not be found", {
+		response: isMissingBuildAsset() ? notFoundStaticAssetResponse(headersFromRecord(middlewareHeaders)) : mergeHeaders(new Response("This page could not be found", {
 			status: 404,
 			headers: { "Content-Type": "text/html; charset=utf-8" }
-		})
+		}), middlewareHeaders)
 	});
 	const handleResolvedApiRoute = async () => {
 		if (isOutsideBasePathUnclaimed()) return null;
@@ -327,10 +334,7 @@ async function runPagesRequest(request, deps) {
 	if (!pageMatch || pageMatch.route.isDynamic) for (const rewrite of configRewrites.afterFiles ?? []) {
 		const rewritten = matchRewrite(configSourcePathname(), [rewrite], rewriteRequestContext(), currentBasePathState(), configSourcePathname(), conditionalRewriteCacheability);
 		if (rewritten) {
-			if (isExternalUrl(rewritten)) return {
-				type: "response",
-				response: await proxyExternal(request, rewritten)
-			};
+			if (isExternalUrl(rewritten)) return proxyConfigRewrite(rewritten);
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 			resolvedPathnameIsRequestPathname = false;
@@ -355,10 +359,7 @@ async function runPagesRequest(request, deps) {
 		if ((isOutsideBasePathUnclaimed() || isDataReq || isDataRequest) && !renderPageMatch && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
 			const fallbackRewrite = matchRewrite(configSourcePathname(), [rewrite], rewriteRequestContext(), currentBasePathState(), configSourcePathname(), conditionalRewriteCacheability);
 			if (!fallbackRewrite) continue;
-			if (isExternalUrl(fallbackRewrite)) return {
-				type: "response",
-				response: await proxyExternal(request, fallbackRewrite)
-			};
+			if (isExternalUrl(fallbackRewrite)) return proxyConfigRewrite(fallbackRewrite);
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 			resolvedPathnameIsRequestPathname = false;
@@ -384,10 +385,7 @@ async function runPagesRequest(request, deps) {
 		if (response.status === 404 && shouldDeferErrorPageOnMiss && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
 			const fallbackRewrite = matchRewrite(configSourcePathname(), [rewrite], rewriteRequestContext(), currentBasePathState(), configSourcePathname(), conditionalRewriteCacheability);
 			if (!fallbackRewrite) continue;
-			if (isExternalUrl(fallbackRewrite)) return {
-				type: "response",
-				response: await proxyExternal(request, fallbackRewrite)
-			};
+			if (isExternalUrl(fallbackRewrite)) return proxyConfigRewrite(fallbackRewrite);
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 			resolvedPathnameIsRequestPathname = false;
@@ -437,10 +435,7 @@ async function runPagesRequest(request, deps) {
 	if (!devPageMatch && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
 		const fallbackRewrite = matchRewrite(configSourcePathname(), [rewrite], rewriteRequestContext(), currentBasePathState(), configSourcePathname(), conditionalRewriteCacheability);
 		if (!fallbackRewrite) continue;
-		if (isExternalUrl(fallbackRewrite)) return {
-			type: "response",
-			response: await proxyExternal(request, fallbackRewrite)
-		};
+		if (isExternalUrl(fallbackRewrite)) return proxyConfigRewrite(fallbackRewrite);
 		resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 		resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 		resolvedPathnameIsRequestPathname = false;

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 {};