vinext 1.0.0 → 1.1.0

package/dist/server/app-rsc-response-stage.d.ts

@@ -2,5 +2,5 @@ import { VinextResponseStageDispatchOptions } from "./multi-stage.js";
 import { AppWorkerResponseStageProps } from "./app-worker-stages.js";
 import { AppRscHandlerRoute, CreateAppRscHandlerOptions } from "./app-rsc-handler.js";
 //#region src/server/app-rsc-response-stage.d.ts
-export declare function renderAppWorkerResponseStage<TRoute extends AppRscHandlerRoute>(options: CreateAppRscHandlerOptions<TRoute>, rawRequest: Request, ctx: unknown, props: AppWorkerResponseStageProps, _stageOptions?: VinextResponseStageDispatchOptions): Promise<Response>;
+export declare function renderAppWorkerResponseStage<TRoute extends AppRscHandlerRoute>(options: CreateAppRscHandlerOptions<TRoute>, rawRequest: Request, ctx: unknown, props: AppWorkerResponseStageProps, stageOptions?: VinextResponseStageDispatchOptions): Promise<Response>;
 //#endregion

package/dist/server/app-rsc-response-stage.js

@@ -60,14 +60,15 @@ function rematchAppWorkerResponseStageRoute(options, normalized, props) {
 	let match = null;
 	if (props.matchKind === "interception") {
 		if (normalized.interceptionContextHeader !== null) match = options.matchInterceptRoute?.(props.routePathname, normalized.interceptionContextHeader, props.interceptionId) ?? null;
-	} else if (props.matchKind === "request") match = options.matchRequestRoute?.(props.routePathname) ?? null;
+	} else if (props.matchKind === "raw-request") match = options.matchRawRequestRoute?.(props.routePathname) ?? null;
+	else if (props.matchKind === "request") match = options.matchRequestRoute?.(props.routePathname) ?? null;
 	else match = options.matchRoute(props.routePathname);
 	if (!match) return null;
 	if (match.route.pattern !== props.routePattern || !haveSamePageParams(match.params, props.params)) return null;
 	return match;
 }
-async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, _stageOptions) {
-	if (props.protocolVersion !== 10 || props.buildId !== options.buildId) return new Response("Incompatible vinext App response stage", { status: 409 });
+async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, stageOptions) {
+	if (props.protocolVersion !== 11 || props.buildId !== options.buildId) return new Response("Incompatible vinext App response stage", { status: 409 });
 	if (props.kind === "app-full-request") return new Response("Invalid vinext App response stage", { status: 400 });
 	options.registerCacheAdapters();
 	await options.ensureInstrumentation?.();
@@ -232,7 +233,8 @@ async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, _st
 			route,
 			searchParams,
 			scriptNonce: props.scriptNonce ?? void 0,
-			renderMode: normalized.renderMode
+			renderMode: normalized.renderMode,
+			renderWholeDocument: stageOptions?.renderWholeDocument === true
 		});
 	}, {
 		cacheComponents: options.createPprFallbackShells !== void 0,

package/dist/server/app-rsc-route-matching.d.ts

@@ -120,7 +120,11 @@ type AppRscInterceptLookupEntry = {
   slotId: string | null;
   targetRouteGraphId: string | null;
 };
-export declare function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(routes: Route[]): {
+/**
+ * @param decodedPathnamePatterns Static page patterns that answer their
+ *   segment-decoded pathname (built by `buildAppDecodedPathnamePatterns`).
+ */
+export declare function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(routes: Route[], decodedPathnamePatterns?: readonly string[]): {
   hasInterceptionId(interceptionId: string): boolean;
   matchRoute(url: string): {
     route: Route;
@@ -130,6 +134,10 @@ export declare function createAppRscRouteMatcher<Route extends AppRscRouteForMat
     route: Route;
     params: AppRscRouteParams;
   } | null;
+  matchRawRequestRoute(url: string): {
+    route: Route;
+    params: AppRscRouteParams;
+  } | null;
   findIntercept(pathname: string, sourcePathname?: string | null, interceptionId?: string | null): AppRscInterceptMatch | null;
 };
 //#endregion

package/dist/server/app-rsc-route-matching.js

@@ -1,5 +1,5 @@
-import { decodeMatchedParams, splitPathSegments, splitPathnameForRouteMatch } from "../routing/utils.js";
-import { createAppRouteGraphInterceptionId } from "../routing/app-route-graph.js";
+import { decodeMatchedParams, decodeRouteSegment, splitPathSegments, splitPathnameForRouteMatch } from "../routing/utils.js";
+import { createAppRouteGraphInterceptionId } from "../routing/app-route-ids.js";
 import { buildRouteTrie, trieMatchRaw } from "../routing/route-trie.js";
 import { extractRawRoutePatternParams, matchRoutePatternPrefix, matchRoutePatternRaw } from "../routing/route-pattern.js";
 import { canonicalizeAppPageParams } from "./app-page-segment-state.js";
@@ -18,17 +18,6 @@ function appRscPathnameParts(pathname, isNormalized = false) {
 	const normalizedPathname = pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, "");
 	return isNormalized ? splitPathSegments(normalizedPathname) : splitPathnameForRouteMatch(normalizedPathname);
 }
-function appRscInterceptionSourcePathnameParts(pathname) {
-	const pathOnly = pathname.split("?")[0];
-	const normalizedPathname = pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, "");
-	return splitPathSegments(normalizedPathname).map((segment) => {
-		try {
-			return decodeURIComponent(segment);
-		} catch {
-			return segment;
-		}
-	});
-}
 function isAppRouteHandlerRoute(route) {
 	return route.routeHandler != null || typeof route.__loadRouteHandler === "function";
 }
@@ -36,11 +25,38 @@ function normalizeMatchedParamsForRoute(result) {
 	if (isAppRouteHandlerRoute(result.route)) decodeMatchedParams(result.params);
 	else canonicalizeAppPageParams(result.params);
 }
-function createAppRscRouteMatcher(routes) {
+/**
+* @param decodedPathnamePatterns Static page patterns that answer their
+*   segment-decoded pathname (built by `buildAppDecodedPathnamePatterns`).
+*/
+function createAppRscRouteMatcher(routes, decodedPathnamePatterns = []) {
 	const routeTrie = buildRouteTrie(routes);
 	const interceptLookup = createInterceptLookup(routes);
 	const interceptionIds = new Set(interceptLookup.flatMap((entry) => entry.interceptionId === null ? [] : [entry.interceptionId]));
 	const routeIndexes = new Map(routes.map((route, index) => [route, index]));
+	const decodedPathnamePatternSet = new Set(decodedPathnamePatterns);
+	const decodedPathnameRoutes = /* @__PURE__ */ new Map();
+	for (const route of routes) {
+		const key = route.patternParts.join("/");
+		if (decodedPathnamePatternSet.has(route.pattern) && !decodedPathnameRoutes.has(key)) decodedPathnameRoutes.set(key, route);
+	}
+	function matchRawRequestParts(rawParts) {
+		const result = trieMatchRaw(routeTrie, rawParts);
+		if (result) normalizeMatchedParamsForRoute(result);
+		return result;
+	}
+	function matchRequestParts(rawParts) {
+		const result = matchRawRequestParts(rawParts);
+		if (!result) return null;
+		if (decodedPathnameRoutes.size > 0 && result.route.patternParts.some((part) => part.startsWith(":")) && !isAppRouteHandlerRoute(result.route) && rawParts.some((part) => part.includes("%"))) {
+			const route = decodedPathnameRoutes.get(rawParts.map(decodeRouteSegment).join("/"));
+			if (route && route !== result.route) return {
+				route,
+				params: createRouteParams()
+			};
+		}
+		return result;
+	}
 	return {
 		hasInterceptionId(interceptionId) {
 			return interceptionIds.has(interceptionId);
@@ -54,16 +70,16 @@ function createAppRscRouteMatcher(routes) {
 			return result;
 		},
 		matchRequestRoute(url) {
-			const result = trieMatchRaw(routeTrie, appRscPathnameParts(url, true));
-			if (!result) return null;
-			normalizeMatchedParamsForRoute(result);
-			return result;
+			return matchRequestParts(appRscPathnameParts(url, true));
+		},
+		matchRawRequestRoute(url) {
+			return matchRawRequestParts(appRscPathnameParts(url, true));
 		},
 		findIntercept(pathname, sourcePathname = null, interceptionId = null) {
 			if (sourcePathname === null) return null;
 			const urlParts = appRscPathnameParts(pathname, true);
-			const sourceParts = appRscInterceptionSourcePathnameParts(sourcePathname);
-			const matchedSourceRoute = trieMatchRaw(routeTrie, sourceParts);
+			const sourceParts = appRscPathnameParts(sourcePathname, true);
+			const matchedSourceRoute = matchRawRequestParts(sourceParts);
 			for (const entry of interceptLookup) {
 				if (interceptionId !== null && entry.interceptionId !== interceptionId) continue;
 				if (!matchInterceptSource(sourceParts, entry)) continue;
@@ -75,6 +91,7 @@ function createAppRscRouteMatcher(routes) {
 				const sourceRoute = routes[concreteSourceRouteIndex];
 				if (sourceRoute && isAppRouteHandlerRoute(sourceRoute)) continue;
 				const matchedSourceParams = concreteSourceRoute ? concreteSourceRoute.params : sourceRoute ? matchSlotOwnerSourceParams(sourceParts, sourceRoute.patternParts, entry.sourceMatchPatternParts !== null) : null;
+				if (!concreteSourceRoute && matchedSourceParams) canonicalizeAppPageParams(matchedSourceParams);
 				if (matchedSourceParams === null && entry.sourceMatchPatternParts === null) continue;
 				const sourceParams = matchedSourceParams && entry.sourceMatchPatternParts !== null ? pickPatternParams(matchedSourceParams, entry.sourceMatchPatternParts) : matchedSourceParams ?? createRouteParams();
 				return {

package/dist/server/app-server-action-execution.d.ts

@@ -2,7 +2,8 @@ import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ActionRevalidationKind } from "../shims/cache-request-state.js";
 import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
 import { FetchCacheMode } from "../shims/fetch-cache.js";
-import { HeadersAccessPhase } from "../shims/headers.js";
+import { HeadersAccessPhase } from "../shims/internal/headers-state.js";
+import "../shims/headers.js";
 import { ReactFormState } from "react-dom/client";
 //#region src/server/app-server-action-execution.d.ts
 type AppPageParams = Record<string, string | string[]>;

package/dist/server/app-server-action-execution.js

@@ -19,10 +19,10 @@ import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { buildAppPageTags } from "./implicit-tags.js";
+import "./app-page-stream.js";
 import { getSetCookieName } from "./cookie-utils.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
-import "./app-page-stream.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 import { createRootParamsUsageController, runWithRootParamsUsage } from "../shims/root-params.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";

package/dist/server/app-ssr-entry.d.ts

@@ -46,8 +46,9 @@ export declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navCont
   initialDevServerError?: unknown;
   /** Report an SSR/Fizz render failure through instrumentation. */
   onSsrError?: (error: unknown) => unknown;
-  /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport. */
-  mirrorNextFlight?: boolean;
+  /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport, or start
+   *  mirroring once a function returns true. */
+  mirrorNextFlight?: boolean | (() => boolean);
   /** When true, wait for the full React tree (including Suspense boundaries)
    *  to resolve before returning the HTML stream. Used for static prerender
    *  and ISR cache writes to avoid caching fallback content. */

package/dist/server/app-ssr-entry.js

@@ -1,10 +1,8 @@
 import "./server-globals.js";
 import { notFoundResponse } from "./http-error-responses.js";
-import { isOpenRedirectShaped } from "./open-redirect.js";
-import { AppElementsWire } from "./app-elements-wire.js";
-import "./app-elements.js";
+import { isOpenRedirectShaped, repeatedSlashRedirectResponse } from "./open-redirect.js";
 import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
-import { onRenderDynamicLatched } from "../shims/headers.js";
+import { onRenderDynamicLatched } from "../shims/internal/headers-state.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
@@ -12,18 +10,20 @@ import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonSt
 import { getClientTraceMetadataHTML, markClientTraceMetadataBlock } from "./client-trace-metadata.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { setPagesClientAssets } from "./pages-client-assets.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation-server.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheIdentityMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { getNextErrorDigest } from "./next-error-digest.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
-import { createClientPageSsrSearchParamsSource } from "./app-page-search-params-observation.js";
-import { isAppRenderAbortError } from "./app-rsc-errors.js";
+import { isAppRenderAbortError } from "./app-render-abort-error.js";
+import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { createNavigationRuntimeRenderedSearchScript, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
-import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
+import { createClientPageSsrSearchParamsSource } from "./app-page-search-params-observation.js";
 import { runWithRootParamsScope } from "../shims/root-params.js";
 import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { startCandidateSearchParamsGate } from "./app-ssr-search-params-gate.js";
@@ -357,6 +357,8 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 }
 var app_ssr_entry_default = { async fetch(request) {
 	const url = new URL(request.url);
+	const slashRedirect = repeatedSlashRedirectResponse(url.pathname + url.search);
+	if (slashRedirect) return slashRedirect;
 	if (isOpenRedirectShaped(url.pathname)) return notFoundResponse();
 	const result = await (await import.meta.viteRsc.loadModule("rsc", "index")).default(request);
 	if (result instanceof Response) return result;

package/dist/server/app-ssr-search-params-gate.js

@@ -1,4 +1,4 @@
-import { isRenderDynamicLatched, markDynamicUsage, onRenderDynamicLatched } from "../shims/headers.js";
+import { isRenderDynamicLatched, markDynamicUsage, onRenderDynamicLatched } from "../shims/internal/headers-state.js";
 import { createSearchParamsGate } from "../shims/search-params-gate.js";
 //#region src/server/app-ssr-search-params-gate.ts
 /**

package/dist/server/app-ssr-stream.d.ts

@@ -6,7 +6,12 @@ type RscEmbedTransform = {
   getRawBuffer(): Promise<ArrayBuffer>;
 };
 type RscEmbedTransformOptions = {
-  mirrorNextFlight?: boolean;
+  /**
+   * Mirror inline Flight chunks into Next.js's `self.__next_f` transport. A
+   * function is checked at each flush; once it returns true, the chunks
+   * already embedded are mirrored first.
+   */
+  mirrorNextFlight?: boolean | (() => boolean);
   scriptNonce?: string;
   getInitialNavigationCacheMetadata?: () => InitialNavigationCacheMetadata;
 };

package/dist/server/app-ssr-stream.js

@@ -1,6 +1,6 @@
 import { createInlineScriptTag, escapeHtmlAttr, htmlTokenListContains, safeJsonStringify } from "./html.js";
 import { bytesToBase64, concatUint8Arrays } from "./app-rsc-embedded-chunks.js";
-import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "../client/navigation-runtime.js";
+import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "../client/browser-globals.js";
 //#region src/server/app-ssr-stream.ts
 const RSC_EMBED_TEXT_BATCH_MAX_LENGTH = 65536;
 function waitAtLeastOneReactRenderTask() {
@@ -49,12 +49,36 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 	const reader = embedStream.getReader();
 	let pendingChunks = [];
 	const rawChunks = [];
+	let embeddedRawChunkCount = 0;
+	let rawBufferTaken = false;
+	let finalized = false;
 	let reading = false;
 	let mirroredNextFlightBootstrap = false;
 	const textDecoder = new TextDecoder("utf-8", {
 		fatal: true,
 		ignoreBOM: true
 	});
+	function decodeChunk(bytes) {
+		try {
+			return textDecoder.decode(bytes);
+		} catch {
+			return [3, bytesToBase64(bytes)];
+		}
+	}
+	function releaseRawChunks() {
+		const mayStartMirror = typeof options.mirrorNextFlight === "function" && !mirroredNextFlightBootstrap && !finalized;
+		if (rawBufferTaken && !mayStartMirror) rawChunks.length = 0;
+	}
+	function startNextFlightMirror() {
+		if (mirroredNextFlightBootstrap) return "";
+		const mirror = options.mirrorNextFlight;
+		if (mirror !== true && (typeof mirror !== "function" || !mirror())) return "";
+		mirroredNextFlightBootstrap = true;
+		let scripts = createInlineScriptTag(createNextFlightBootstrapScript(), options.scriptNonce) + createInlineScriptTag(createNextFlightCleanupScript(), options.scriptNonce);
+		for (let index = 0; index < embeddedRawChunkCount; index++) scripts += createInlineScriptTag(createNextFlightChunkScript(decodeChunk(rawChunks[index])), options.scriptNonce);
+		releaseRawChunks();
+		return scripts;
+	}
 	async function pumpReader() {
 		if (reading) return;
 		reading = true;
@@ -63,11 +87,7 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 				const result = await reader.read();
 				if (result.done) break;
 				rawChunks.push(result.value);
-				try {
-					pendingChunks.push(textDecoder.decode(result.value));
-				} catch {
-					pendingChunks.push([3, bytesToBase64(result.value)]);
-				}
+				pendingChunks.push(decodeChunk(result.value));
 			}
 		} catch (error) {
 			if (process.env.NODE_ENV !== "production") console.warn("[vinext] RSC embed stream read error:", error);
@@ -80,8 +100,10 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 	return {
 		flush() {
 			if (pendingChunks.length === 0) return "";
+			const mirrorScripts = startNextFlightMirror();
 			const chunks = pendingChunks;
 			pendingChunks = [];
+			embeddedRawChunkCount += chunks.length;
 			const embeddedChunks = [];
 			let textChunks = [];
 			let textLength = 0;
@@ -100,30 +122,27 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 				embeddedChunks.push(chunk);
 			}
 			flushTextChunks();
-			let scripts = "";
+			let scripts = mirrorScripts;
 			for (const chunk of embeddedChunks) {
 				scripts += createInlineScriptTag(createNavigationRuntimeRscChunkScript(chunk), options.scriptNonce);
-				if (options.mirrorNextFlight) {
-					if (!mirroredNextFlightBootstrap) {
-						scripts += createInlineScriptTag(createNextFlightBootstrapScript(), options.scriptNonce);
-						scripts += createInlineScriptTag(createNextFlightCleanupScript(), options.scriptNonce);
-						mirroredNextFlightBootstrap = true;
-					}
-					scripts += createInlineScriptTag(createNextFlightChunkScript(chunk), options.scriptNonce);
-				}
+				if (mirroredNextFlightBootstrap) scripts += createInlineScriptTag(createNextFlightChunkScript(chunk), options.scriptNonce);
 			}
 			return scripts;
 		},
 		async finalize() {
 			await pumpPromise;
 			let scripts = this.flush();
+			scripts += startNextFlightMirror();
+			finalized = true;
+			releaseRawChunks();
 			scripts += createInlineScriptTag(createNavigationRuntimeRscDoneScript(options.getInitialNavigationCacheMetadata?.()), options.scriptNonce);
 			return scripts;
 		},
 		async getRawBuffer() {
 			await pumpPromise;
 			const buffer = concatUint8Arrays(rawChunks);
-			rawChunks.length = 0;
+			rawBufferTaken = true;
+			releaseRawChunks();
 			return buffer.buffer;
 		}
 	};

package/dist/server/app-worker-stages.d.ts

@@ -3,7 +3,7 @@ import { VinextResponseStageCacheability, VinextResponseStageDispatchOptions, Vi
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { TrustedPrerenderState } from "./prerender-route-params.js";
 //#region src/server/app-worker-stages.d.ts
-export declare const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 10;
+export declare const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 11;
 export declare const APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER = "x-vinext-app-metadata-stage-no-match";
 type AppPageParams = Record<string, string | string[]>;
 type AppWorkerResponseStageEnvelope = {
@@ -34,7 +34,7 @@ export type AppMatchedWorkerResponseStageProps = AppWorkerResponseStageEnvelope
   interceptionContext: string | null;
   interceptionId: string | null;
   isRscRequest: boolean;
-  matchKind: "interception" | "request" | "resolved";
+  matchKind: "interception" | "raw-request" | "request" | "resolved";
   mountedSlotsHeader: string | null;
   params: AppPageParams;
   resolvedUrl: string;

package/dist/server/app-worker-stages.js

@@ -3,7 +3,7 @@ import { cacheabilityManifestPageState, cacheabilityRequestIdentity, cacheabilit
 import { keepOnlyValidatedRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { isTrustedPrerenderState } from "./prerender-route-params.js";
 //#region src/server/app-worker-stages.ts
-const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 10;
+const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 11;
 const APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER = "x-vinext-app-metadata-stage-no-match";
 const STATIC_FILE_SIGNAL_TOKEN_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 /** Normalize a shared App page HEAD request onto its method-invariant GET representation. */
@@ -80,7 +80,7 @@ function isCanonicalHttpOrigin(value) {
 function isAppWorkerResponseStageProps(value) {
 	if (!value || typeof value !== "object") return false;
 	const props = value;
-	if (props.protocolVersion !== 10 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
+	if (props.protocolVersion !== 11 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
 	if (props.kind === "app-full-request") return typeof props.prerenderDiscovery === "boolean" && typeof props.staticFileSignalToken === "string" && STATIC_FILE_SIGNAL_TOKEN_RE.test(props.staticFileSignalToken) && (props.trustedPrerenderState === null || isTrustedPrerenderState(props.trustedPrerenderState));
 	if (props.kind === "hybrid-pages") {
 		const hybrid = props;
@@ -91,7 +91,7 @@ function isAppWorkerResponseStageProps(value) {
 		const special = props;
 		return typeof special.canonicalPathname === "string" && special.canonicalPathname.startsWith("/") && typeof special.cleanPathname === "string" && special.cleanPathname.startsWith("/") && typeof special.isRscRequest === "boolean" && (special.mountedSlotsHeader === null || typeof special.mountedSlotsHeader === "string") && typeof special.resolvedUrl === "string" && special.resolvedUrl.startsWith("/") && (props.kind !== "app-metadata" || typeof props.routePathname === "string" && props.routePathname.startsWith("/")) && (special.renderMode === "navigation" || special.renderMode === "prefetch-empty" || special.renderMode === "prefetch-dynamic-shell" || special.renderMode === "prefetch-loading-shell");
 	}
-	return (props.kind === "app-page" || props.kind === "app-route-handler") && typeof props.bypassInterceptionContextCache === "boolean" && typeof props.cachePathname === "string" && props.cachePathname.startsWith("/") && typeof props.canUseCanonicalLoadingShell === "boolean" && typeof props.canonicalPathname === "string" && props.canonicalPathname.startsWith("/") && typeof props.cleanPathname === "string" && props.cleanPathname.startsWith("/") && (props.forceDynamic === void 0 || typeof props.forceDynamic === "boolean") && (props.interceptionContext === null || typeof props.interceptionContext === "string") && (props.interceptionId === null || typeof props.interceptionId === "string") && typeof props.isRscRequest === "boolean" && (props.matchKind === "interception" || props.matchKind === "request" || props.matchKind === "resolved") && (props.mountedSlotsHeader === null || typeof props.mountedSlotsHeader === "string") && isAppPageParams(props.params) && typeof props.resolvedUrl === "string" && props.resolvedUrl.startsWith("/") && typeof props.routePattern === "string" && props.routePattern.startsWith("/") && typeof props.routePathname === "string" && props.routePathname.startsWith("/") && (props.renderMode === "navigation" || props.renderMode === "prefetch-empty" || props.renderMode === "prefetch-dynamic-shell" || props.renderMode === "prefetch-loading-shell");
+	return (props.kind === "app-page" || props.kind === "app-route-handler") && typeof props.bypassInterceptionContextCache === "boolean" && typeof props.cachePathname === "string" && props.cachePathname.startsWith("/") && typeof props.canUseCanonicalLoadingShell === "boolean" && typeof props.canonicalPathname === "string" && props.canonicalPathname.startsWith("/") && typeof props.cleanPathname === "string" && props.cleanPathname.startsWith("/") && (props.forceDynamic === void 0 || typeof props.forceDynamic === "boolean") && (props.interceptionContext === null || typeof props.interceptionContext === "string") && (props.interceptionId === null || typeof props.interceptionId === "string") && typeof props.isRscRequest === "boolean" && (props.matchKind === "interception" || props.matchKind === "raw-request" || props.matchKind === "request" || props.matchKind === "resolved") && (props.mountedSlotsHeader === null || typeof props.mountedSlotsHeader === "string") && isAppPageParams(props.params) && typeof props.resolvedUrl === "string" && props.resolvedUrl.startsWith("/") && typeof props.routePattern === "string" && props.routePattern.startsWith("/") && typeof props.routePathname === "string" && props.routePathname.startsWith("/") && (props.renderMode === "navigation" || props.renderMode === "prefetch-empty" || props.renderMode === "prefetch-dynamic-shell" || props.renderMode === "prefetch-loading-shell");
 }
 function isSerializedHeaders(value) {
 	return Array.isArray(value) && value.every((entry) => Array.isArray(entry) && entry.length === 2 && typeof entry[0] === "string" && typeof entry[1] === "string");

package/dist/server/cache-control.js

@@ -91,7 +91,7 @@ function applyCdnResponseHeaders(headers, input) {
 		if (value === "") continue;
 		headers.set(name, value);
 	}
-	if (useNextDeployPolicy) headers.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
+	if (useNextDeployPolicy) headers.set("Cache-Control", input.browserCacheControl ?? "public, max-age=0, must-revalidate");
 }
 /**
 * Reconcile request-stage policy composed above a reusable response artifact.
@@ -106,19 +106,11 @@ function reconcileCdnResponseHeadersAfterOuterPolicy(headers, outerPolicyHeaders
 		return;
 	}
 	const cacheControl = outerPolicyHeaders.get("cache-control");
-	if (cacheControl !== null) {
-		applyCdnResponseHeaders(headers, { cacheControl });
-		for (const [name, value] of outerPolicyHeaders) {
-			if (name === "cache-control") continue;
-			if (isCdnResponsePolicyHeader(name)) headers.set(name, value);
-		}
-		return;
-	}
-	for (const [name, value] of outerPolicyHeaders) if (isCdnResponsePolicyHeader(name) && isNonCacheableCdnResponsePolicy(name, value)) {
+	if (cacheControl !== null) headers.set("Cache-Control", cacheControl);
+	for (const [name, value] of outerPolicyHeaders) if (name !== "cache-control" && isCdnResponsePolicyHeader(name) && isNonCacheableCdnResponsePolicy(name, value)) {
 		applyCdnResponseHeaders(headers, { cacheControl: NO_STORE_CACHE_CONTROL });
 		return;
 	}
-	if (hasExplicitNonCacheableResponsePolicy(outerPolicyHeaders)) applyCdnResponseHeaders(headers, { cacheControl: NO_STORE_CACHE_CONTROL });
 }
 /** Apply adapter-owned build identity to an HTML or RSC page response. */
 function applyCdnResponseIdentityHeaders(response, request) {