vinext 1.2.1 → 1.3.0

package/dist/server/pages-asset-tags.js

@@ -1,6 +1,6 @@
 import { appendDeploymentIdQuery } from "../utils/deployment-id.js";
 import { createNonceAttribute } from "./html.js";
-import { assetServingUrlFromBaseAnchored } from "../utils/manifest-paths.js";
+import { SSR_MANIFEST_SHARED_CHUNKS_KEY, assetServingUrlFromBaseAnchored } from "../utils/manifest-paths.js";
 import { getPagesClientAssets } from "./pages-client-assets.js";
 //#region src/server/pages-asset-tags.ts
 /**
@@ -55,7 +55,14 @@ function findModuleKey(manifest, moduleId) {
 	}
 	return matchedKey;
 }
+/**
+* Fallback for when no build-time `sharedChunks` list is registered. Prefers
+* the chunk-name based list the build writes into the SSR manifest; the file
+* name scan only matches `[name]-[hash]` names, not hash-only ones.
+*/
 function getSharedChunkFiles(manifest) {
+	const recorded = manifest[SSR_MANIFEST_SHARED_CHUNKS_KEY];
+	if (recorded) return recorded;
 	const cached = sharedChunkFiles.get(manifest);
 	if (cached) return cached;
 	const files = /* @__PURE__ */ new Set();
@@ -186,7 +193,7 @@ function collectAssetTags(options) {
 				const files = getManifestFilesForModule(m, id);
 				if (files) for (let fi = 0; fi < files.length; fi++) allFiles.push(files[fi]);
 			}
-			const sharedFiles = m === runtimeAssets.ssrManifest && runtimeAssets.sharedChunks ? runtimeAssets.sharedChunks : getSharedChunkFiles(m);
+			const sharedFiles = runtimeAssets.sharedChunks ?? getSharedChunkFiles(m);
 			for (const file of sharedFiles) allFiles.push(file);
 		} else for (const akey in m) {
 			const avals = m[akey];

package/dist/server/pages-client-assets.d.ts

@@ -4,7 +4,10 @@ export type PagesClientAssets = {
   clientEntry?: string;
   appBootstrapPreinitModules?: string[];
   ssrManifest?: Record<string, string[]>;
-  /** Build-time shared file list, valid only for this ssrManifest object. */
+  /**
+   * Shared Pages chunk files (framework, vinext runtime, client entry) keyed on
+   * chunk names from this client build, in the SSR-manifest key-space.
+   */
   sharedChunks?: string[];
   cssGraph?: Record<string, {
     imports?: string[];

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

@@ -63,12 +63,30 @@ export declare function detectPathnameLocale(pathname: string, locales: readonly
  * `:locale`. After normalisation the request looks like `/en/to-sv` and
  * the rule matches with `:locale=en`.
  *
+ * `restoreRootTrailingSlash` makes the root `/en/` rather than `/en`; header
+ * callers compute it with `shouldRestoreLocaleRootTrailingSlash`. Redirect
+ * and rewrite callers do not pass it yet.
+ *
  * Ported from Next.js: packages/next/src/server/lib/router-utils/resolve-routes.ts
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/lib/router-utils/resolve-routes.ts
  */
 export declare function normalizeDefaultLocalePathname(pathname: string, i18n: NextI18nConfig | null | undefined, options?: {
   hostname?: string | null;
+  restoreRootTrailingSlash?: boolean;
 }): string;
+/**
+ * Whether Next.js re-adds the root's trailing slash after splicing in the
+ * default locale: the raw request pathname (basePath included, so `/docs`
+ * stays `/docs/en` while `/docs/` becomes `/docs/en/`) ends with `/`, and
+ * `trailingSlash` is on without `skipProxyUrlNormalize`.
+ *
+ * Ported from Next.js: packages/next/src/server/lib/router-utils/resolve-routes.ts
+ * (`hadTrailingSlash` + `maybeAddTrailingSlash`).
+ */
+export declare function shouldRestoreLocaleRootTrailingSlash(rawPathname: string, config: {
+  trailingSlash?: boolean;
+  skipProxyUrlNormalize?: boolean;
+}): boolean;
 /**
  * Extract locale prefix from a URL path.
  * e.g. /fr/about -> { locale: "fr", url: "/about", hadPrefix: true }

package/dist/server/pages-i18n.js

@@ -51,6 +51,10 @@ function detectPathnameLocale(pathname, locales) {
 * `:locale`. After normalisation the request looks like `/en/to-sv` and
 * the rule matches with `:locale=en`.
 *
+* `restoreRootTrailingSlash` makes the root `/en/` rather than `/en`; header
+* callers compute it with `shouldRestoreLocaleRootTrailingSlash`. Redirect
+* and rewrite callers do not pass it yet.
+*
 * Ported from Next.js: packages/next/src/server/lib/router-utils/resolve-routes.ts
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/lib/router-utils/resolve-routes.ts
 */
@@ -59,10 +63,22 @@ function normalizeDefaultLocalePathname(pathname, i18n, options = {}) {
 	if (pathname.startsWith("/_next/") || pathname.startsWith("/__vinext/")) return pathname;
 	if (detectPathnameLocale(pathname, i18n.locales)) return pathname;
 	const defaultLocale = detectDomainLocale(i18n.domains, options.hostname ?? void 0)?.defaultLocale ?? i18n.defaultLocale;
-	if (pathname === "/") return `/${defaultLocale}`;
+	if (pathname === "/") return options.restoreRootTrailingSlash ? `/${defaultLocale}/` : `/${defaultLocale}`;
 	return `/${defaultLocale}${pathname}`;
 }
 /**
+* Whether Next.js re-adds the root's trailing slash after splicing in the
+* default locale: the raw request pathname (basePath included, so `/docs`
+* stays `/docs/en` while `/docs/` becomes `/docs/en/`) ends with `/`, and
+* `trailingSlash` is on without `skipProxyUrlNormalize`.
+*
+* Ported from Next.js: packages/next/src/server/lib/router-utils/resolve-routes.ts
+* (`hadTrailingSlash` + `maybeAddTrailingSlash`).
+*/
+function shouldRestoreLocaleRootTrailingSlash(rawPathname, config) {
+	return Boolean(config.trailingSlash && !config.skipProxyUrlNormalize && rawPathname.endsWith("/"));
+}
+/**
 * Extract locale prefix from a URL path.
 * e.g. /fr/about -> { locale: "fr", url: "/about", hadPrefix: true }
 *      /about    -> { locale: defaultLocale, url: "/about", hadPrefix: false }
@@ -243,4 +259,4 @@ function resolvePagesI18nRequest(url, i18nConfig, headers, hostname, basePath =
 	};
 }
 //#endregion
-export { detectDomainLocale, detectLocaleFromAcceptLanguage, detectPathnameLocale, extractLocaleFromUrl, getLocaleRedirect, normalizeDefaultLocalePathname, parseCookieLocaleFromHeader, resolvePagesI18nRequest, stripI18nLocaleForApiRoute };
+export { detectDomainLocale, detectLocaleFromAcceptLanguage, detectPathnameLocale, extractLocaleFromUrl, getLocaleRedirect, normalizeDefaultLocalePathname, parseCookieLocaleFromHeader, resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash, stripI18nLocaleForApiRoute };

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-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

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

@@ -6,7 +6,7 @@ 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 { 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,6 +120,10 @@ 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) {
@@ -141,14 +147,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 +218,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 +259,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 +287,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 +335,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 +360,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 +386,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 +436,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.js

@@ -7,7 +7,7 @@ import { attachRequestCfMetadata, cloneRequestWithHeaders, cloneRequestWithUrl,
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
-import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
+import { normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
 import { isNextDataPathname } from "./pages-data-route.js";
 import { getExplicitCdnCacheAdapter } from "../shims/cdn-cache-state.js";
 import { CACHEABILITY_REQUEST_STATE } from "../shims/cacheability-classification.js";
@@ -48,6 +48,10 @@ const pagesRequestStagePrerenderSecret = pagesEntry.prerenderSecret ?? null;
 const basePath = vinextConfig?.basePath ?? "";
 const assetPathPrefix = assetPrefixPathname(vinextConfig?.assetPrefix ?? "");
 const trailingSlash = vinextConfig?.trailingSlash ?? false;
+const localeRootTrailingSlashConfig = {
+	trailingSlash,
+	skipProxyUrlNormalize: vinextConfig?.skipProxyUrlNormalize
+};
 const skipTrailingSlashRedirect = vinextConfig?.skipTrailingSlashRedirect ?? false;
 const i18nConfig = vinextConfig?.i18n ?? null;
 const configRedirects = vinextConfig?.redirects ?? [];
@@ -88,7 +92,7 @@ function handleRequestStageLocally(request, env, ctx, dispatchResponseStage) {
 function handleRequest(request, env, platformCtx, dispatchResponseStage, forceCacheBypass, defaultHostRuntime, assets) {
 	const url = new URL(request.url);
 	const trace = async () => {
-		await pagesEntry.__ensureInstrumentation?.();
+		await pagesEntry.__ensureInstrumentation?.(platformCtx);
 		return traceFrameworkRequest({
 			callback: () => handleRequestImpl(request, env, platformCtx, dispatchResponseStage, forceCacheBypass, defaultHostRuntime, assets),
 			getStatus: (response) => response?.status,
@@ -175,6 +179,7 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 		}
 		const missingBuildAsset = isNextStaticPath(pathname, basePath, assetPathPrefix);
 		const hadBasePath = !basePath || hasBasePath(pathname, basePath);
+		const restoreLocaleRootTrailingSlash = shouldRestoreLocaleRootTrailingSlash(pathname, localeRootTrailingSlashConfig);
 		{
 			const stripped = stripBasePath(pathname, basePath);
 			if (stripped !== pathname) {
@@ -193,7 +198,10 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 			request = dataNorm.request;
 			pathname = dataNorm.normalizedPathname;
 		}
-		const responseStagePolicyPathname = i18nConfig ? normalizeDefaultLocalePathname(pathname, i18nConfig, { hostname: url.hostname }) : pathname;
+		const responseStagePolicyPathname = i18nConfig ? normalizeDefaultLocalePathname(pathname, i18nConfig, {
+			hostname: url.hostname,
+			restoreRootTrailingSlash: restoreLocaleRootTrailingSlash
+		}) : pathname;
 		const responseStagePolicyHeaders = resolveResponseStageCachePolicy({
 			basePathState: {
 				basePath,
@@ -219,6 +227,7 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 			hasMiddleware,
 			ctx,
 			recordCacheability: forceCacheBypass,
+			restoreLocaleRootTrailingSlash,
 			middlewareRequest: isDataReq && vinextConfig?.skipProxyUrlNormalize ? middlewareRequest : void 0,
 			dataNotFoundResponse: vinextConfig?.skipProxyUrlNormalize ? dataNorm.notFoundResponse : null,
 			authorizeOnDemandRevalidate: typeof authorizeOnDemandRevalidate === "function" ? authorizeOnDemandRevalidate : void 0,
@@ -320,7 +329,7 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 						fetchPublicFile: (sourceRequest) => resolvePublicImageSource(sourceRequest, assets)
 					}), allowedWidths, imageConfig);
 				}
-				return fetchWorkerFilesystemRoute(filesystemRequest, requestPathname, phase, (assetRequest) => Promise.resolve(assets.fetch(assetRequest)), publicFiles, basePath, assetPathPrefix, hadBasePath);
+				return fetchWorkerFilesystemRoute(filesystemRequest, requestPathname, phase, (assetRequest) => Promise.resolve(assets.fetch(assetRequest)), publicFiles, basePath, assetPathPrefix, resolvedPathnameHasBasePath);
 			}
 		};
 		const resolvePublicImageSource = async (sourceRequest, sourceAssets) => {
@@ -333,6 +342,7 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 			const sourceResult = await runPagesRequest(attachRequestCfMetadata(new Request(new URL(sourcePathname + sourceUrl.search, sourceUrl), { signal: sourceRequest.signal }), sourceRequest), {
 				...deps,
 				hadBasePath: sourceHadBasePath,
+				restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(sourceUrl.pathname, localeRootTrailingSlashConfig),
 				isDataReq: false,
 				isDataRequest: false,
 				middlewareRequest: void 0,
@@ -341,9 +351,9 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 				runMiddleware: typeof runMiddleware === "function" ? wrapMiddlewareWithBasePath(runMiddleware, basePath, sourceHadBasePath) : null,
 				renderPage: null,
 				handleApi: null,
-				serveFilesystemRoute: async (candidate, _stagedHeaders, phase, _resolvedUrl, filesystemRequest) => {
+				serveFilesystemRoute: async (candidate, _stagedHeaders, phase, _resolvedUrl, filesystemRequest, candidateHasBasePath) => {
 					if (isImageOptimizationPath(candidate)) return false;
-					const asset = await fetchWorkerFilesystemRoute(filesystemRequest, candidate, phase, (assetRequest) => Promise.resolve(sourceAssets.fetch(assetRequest)), publicFiles, basePath, assetPathPrefix, sourceHadBasePath);
+					const asset = await fetchWorkerFilesystemRoute(filesystemRequest, candidate, phase, (assetRequest) => Promise.resolve(sourceAssets.fetch(assetRequest)), publicFiles, basePath, assetPathPrefix, candidateHasBasePath);
 					if (asset === false) return false;
 					sourceAsset = asset;
 					return new Response(null);

package/dist/server/pages-response-stage-entry.js

@@ -36,7 +36,7 @@ async function renderPagesResponse(request, env, platformCtx, props, stagedHeade
 	if (!isPagesResponseStageProps(props)) return new Response("Invalid vinext Pages response stage", { status: 400 });
 	if (props.buildId !== pagesEntry.buildId) return new Response("Vinext Pages response stage deployment mismatch", { status: 409 });
 	if (props.requestHost !== new URL(request.url).host) return new Response("Invalid vinext Pages response stage", { status: 400 });
-	await pagesEntry.__ensureInstrumentation?.();
+	await pagesEntry.__ensureInstrumentation?.(platformCtx);
 	registerConfiguredImageOptimizer(env);
 	const renderHeaders = new Headers(stagedHeaders ?? props.stagedHeaders ?? []);
 	renderHeaders.delete("Content-Length");

package/dist/server/pages-revalidate.js

@@ -12,6 +12,7 @@ async function performOnDemandRevalidate(source, urlPath, opts = {}, trustedOrig
 	if (isSourceRevalidationRequest(source)) throw new Error(`Cannot revalidate ${urlPath} from an internal revalidation request`);
 	const executionContext = getRequestExecutionContext();
 	const dispatchRevalidate = executionContext?.dispatchPagesRevalidate;
+	if (!dispatchRevalidate && !trustedOrigin) throw new Error(`Cannot revalidate ${urlPath}: no in-process dispatcher or server-owned origin is available`);
 	const target = createRevalidateTarget(source, urlPath, trustedOrigin);
 	const headers = { [PRERENDER_REVALIDATE_HEADER]: getRevalidateSecret() };
 	if (trustedOrigin && !dispatchRevalidate) {

package/dist/server/pages-router-entry.js

@@ -20,7 +20,7 @@ async function handleSingleStageRequest(request, env, platformCtx) {
 	let ctx = createWorkerPrerenderDiscoveryContext(ctxWithRevalidation, request, pagesRequestStagePrerenderSecret);
 	const readinessResponse = createWorkerPrerenderReadinessResponse(ctx, request);
 	if (readinessResponse) {
-		if (readinessResponse.status === 204) await Promise.all([__ensureInstrumentation(), __ensureInstrumentation$1()]);
+		if (readinessResponse.status === 204) await Promise.all([__ensureInstrumentation(ctx), __ensureInstrumentation$1(ctx)]);
 		return await validateCdnRequest(request) ?? readinessResponse;
 	}
 	const isClientBuildFile = isPagesClientBuildFileRequest(request, env, ctx);

package/dist/server/prod-server.d.ts

@@ -3,7 +3,7 @@ import { negotiateEncoding } from "./accept-encoding.js";
 import { StaticFileCache } from "./static-file-cache.js";
 import { resolveRequestHost, trustProxy, trustedHosts } from "./proxy-trust.js";
 import { COMPRESS_THRESHOLD, isCompressibleContentType } from "./response-compression.js";
-import { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, Server, ServerResponse } from "node:http";
 //#region src/server/prod-server.d.ts
 /**
  * Import a built server entry module (App Router RSC entry or Pages Router
@@ -127,7 +127,7 @@ declare function waitForNodeResponseCompletion(res: ServerResponse): Promise<voi
  * Pages Router (dist/server/entry.js) and configures the appropriate handler.
  */
 export declare function startProdServer(options?: ProdServerOptions): Promise<{
-  server: import("node:http").Server<typeof IncomingMessage, typeof ServerResponse>;
+  server: Server<typeof IncomingMessage, typeof ServerResponse>;
   port: number;
 }>;
 type AppRouterPrerenderSeeder = (serverDir: string) => Promise<number>;