vinext 1.4.1 → 1.4.3

package/dist/server/app-rsc-handler.js

@@ -4,23 +4,24 @@ import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROU
 import { buildRequestHeadersFromMiddlewareResponse, hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
 import { requestContextFromRequest } from "../config/request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
+import { hasBasePath, restoreBasePath, stripBasePath } from "../utils/base-path.js";
 import "./app-rsc-vary.js";
 import { ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_REWRITTEN_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
 import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute, stripRequestUrlFragment } from "./request-pipeline.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, hasUrlParserDotSegment, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute, stripRequestUrlFragment } from "./request-pipeline.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js";
-import { normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
+import { isLocaleRedirect, normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
 import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.js";
 import { markRouteCacheabilityDynamic, preserveRouteCacheabilityResponsePolicy } from "../shims/cacheability-classification.js";
-import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders, captureCdnResponsePolicyOverrides, isCdnResponsePolicyHeader, reconcileCdnResponseHeadersAfterOuterPolicy } from "./cache-control.js";
+import { NEVER_CACHE_CONTROL, SERVER_ACTION_CACHE_CONTROL, applyCdnResponseHeaders, captureCdnResponsePolicyOverrides, isCdnResponsePolicyHeader, reconcileCdnResponseHeadersAfterOuterPolicy } from "./cache-control.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
 import { getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersContext, hasEffectiveRequestCookieChanges, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, runWithHeadersContext } from "../shims/headers.js";
+import { normalizePathTrailingSlash } from "../shims/url-utils.js";
 import { mergeRewriteQuery } from "../utils/query.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
 import { traceFindPageComponents } from "./pages-execution-tracing.js";
@@ -31,13 +32,15 @@ import { openForwardedMiddlewareContext } from "./forwarded-middleware-context.j
 import { consumeResponseStageLinkProvenance, copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
 import { setFrameworkRequestRoute, traceFrameworkRequest } from "./request-tracing.js";
 import { mergeMiddlewareResponseHeaders, mergeMiddlewareResponseHeadersOntoResponse, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
-import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeDynamicShellRscRequestHeaders, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { applyAppRscConfigHeaders, finalizeAppRscResponse, isStreamedActionRedirectResponse, markAppRscApplicationResponse, markAppRscResponseConfigHeadersApplied, markAppRscRouteHandlerResponse, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import "./app-page-response.js";
 import { parseNextHttpErrorDigest } from "./next-error-digest.js";
 import { isAppRouteHandlerRoute } from "./app-rsc-route-matching.js";
+import { resolveAppPageNavigationParams } from "./app-page-navigation-params.js";
 import { traceAppPageRender } from "./app-page-tracing.js";
 import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
@@ -46,7 +49,6 @@ import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { createRouteTreePrefetchResponse, isRouteTreePrefetchRequest } from "./app-route-tree-prefetch.js";
 import { createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedAppRouteCacheIdentity, createSharedHybridPagesCacheIdentity, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery } from "./app-worker-stages.js";
 import { flattenErrorCauses } from "../utils/error-cause.js";
-import { applyAppRscConfigHeaders, finalizeAppRscResponse, markAppRscResponseConfigHeadersApplied } from "./app-rsc-response-finalizer.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { hasPagesPreviewCookie } from "./pages-response-stage.js";
 import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";
@@ -132,11 +134,8 @@ function readCacheabilityRequestProjection(options) {
 	};
 	return parsedCacheabilityRequestProjection.manifest;
 }
-function hasUrlParserDotSegment(pathname) {
-	return pathname.split("/").some((segment) => {
-		const decodedDots = segment.replaceAll(/%2e/gi, ".");
-		return decodedDots === "." || decodedDots === "..";
-	});
+function isSameInterceptionSource(a, b) {
+	return b != null && (a.authorizationRoute ?? a.route) === b.route && haveSamePageParams(a.authorizationParams ?? a.params, b.params);
 }
 function applyMiddlewareContextToResponse(response, middlewareContext, appendToPostConfigLink = false) {
 	if (!middlewareContext.headers && middlewareContext.status == null) return response;
@@ -152,6 +151,27 @@ function applyMiddlewareContextToResponse(response, middlewareContext, appendToP
 	}));
 }
 /**
+* These headers describe the current routed request, not the shared RSC
+* bytes, so they are composed above a transported response stage: a cache HIT
+* cannot replay another query/path and never loses dynamic params. An
+* intercepted response's params include its target's, which this match lacks,
+* so the response stage keeps them under an interception context, in its
+* cache identity.
+*/
+function withRoutedRscHeaders(response, navigationParams, resolvedUrl, keepsRenderedParams) {
+	const headers = new Headers(response.headers);
+	if (!keepsRenderedParams || !headers.has("X-Vinext-Params")) {
+		if (Object.keys(navigationParams).length > 0) headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(navigationParams)));
+		else headers.delete(VINEXT_PARAMS_HEADER);
+	}
+	headers.set(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, encodeURIComponent(resolvedUrl));
+	return preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
+		headers,
+		status: response.status,
+		statusText: response.statusText
+	}));
+}
+/**
 * Next.js answers a Link's segment prefetch of a page whose notFound(),
 * forbidden() or unauthorized() it stored with a 200, so its router renders
 * the page's fallback without loading the document. A shared response stage
@@ -257,10 +277,10 @@ function requestWithoutRscCacheBustingSearchParam(request) {
 	stripRscCacheBustingSearchParam(url);
 	return cloneRequestWithUrl(request, url.toString());
 }
-/** Send a response with the never-cache policy, rebuilding immutable headers. */
-function withNeverCacheControl(response) {
+/** Send a response with a never-cache policy, rebuilding immutable headers. */
+function withNeverCacheControl(response, cacheControl = NEVER_CACHE_CONTROL) {
 	const applyNoStore = (headers) => {
-		applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
+		applyCdnResponseHeaders(headers, { cacheControl });
 	};
 	let markedResponse = response;
 	try {
@@ -283,6 +303,19 @@ function withUnmatchedRouteCacheControl(response) {
 	unmatchedRouteResponses.add(markedResponse);
 	return markedResponse;
 }
+const serverActionResponses = /* @__PURE__ */ new WeakSet();
+function markServerActionResponse(response) {
+	serverActionResponses.add(response);
+	return response;
+}
+/**
+* A fetch action's redirect that streams its target's render keeps the
+* target's policy, as in Next.js. Every other action response is never cached.
+*/
+function withServerActionCacheControl(response) {
+	if (isStreamedActionRedirectResponse(response)) return response;
+	return withNeverCacheControl(response, SERVER_ACTION_CACHE_CONTROL);
+}
 async function handleAppRscRequest(options, request, preMiddlewareRequestContext, middlewareContext, isDataRequest, isMiddlewareDataRequest, pagesDataRequest, dispatchInternalRequest, allowInternalRscDocumentFallback, dispatchResponseStage, responseStageProbeMode = null, setInterceptionResponseUncacheable = () => {}) {
 	const handlerStart = process.env.NODE_ENV !== "production" ? performance.now() : 0;
 	if (process.env.NODE_ENV !== "production") {
@@ -339,7 +372,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const provesConcreteInterceptionSource = (sourceMatch, sourceContext = interceptionContextHeader) => {
 		if (sourceMatch === null) return false;
 		if (sourceMatch.interceptionSourceIsConcrete !== void 0) return sourceMatch.interceptionSourceIsConcrete;
-		return sourceContext !== null && (options.matchRequestRoute ?? options.matchRoute)(sourceContext)?.route === sourceMatch.route;
+		return sourceContext !== null && (options.matchRequestRoute ?? options.matchRoute)(sourceContext)?.route === (sourceMatch.authorizationRoute ?? sourceMatch.route);
 	};
 	if (provesConcreteInterceptionSource(hadBasePath && hasRawInterceptionContext && interceptionContextHeader !== null ? options.matchInterceptRoute?.(requestPathname, interceptionContextHeader, interceptionIdHeader) ?? null : null)) setInterceptionResponseUncacheable(false);
 	if (pathname === "/__vinext/prerender/static-params" || pathname === "/__vinext/prerender/pages-static-paths" || pathname === "/__vinext/prerender/metadata-routes") {
@@ -410,6 +443,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			isDataRequest: isMiddlewareDataRequest,
 			middlewareRequest: isolatedMiddlewareRequest,
 			request: userlandRequest,
+			restoreLocaleRootTrailingSlash,
 			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 		});
 		if (!dispatchResponseStage && middlewareResult.pathnameEligible) markRouteCacheabilityDynamic(middlewareResult.matched ? "middleware matched this request" : "middleware is eligible for this pathname");
@@ -467,19 +501,28 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const responseStagePolicy = await loadResponseStagePolicy();
 		const cache = responseStageProbeMode || isOnDemandRevalidate || (props.kind === "app-page" || props.kind === "app-route-handler") && (props.bypassInterceptionContextCache || props.forceDynamic === true && responseStagePolicy === null) ? "bypass" : canUseSharedWorkerResponseStage ? "shared" : "bypass";
 		let dispatchRequest = props.kind === "app-page" ? prepareSharedAppPageDispatch(stageRequest, cache) : stageRequest;
+		let dispatchProps = props;
 		let canonicalRsc = null;
 		if (cache === "shared" && props.kind === "app-page" && props.isRscRequest && (props.matchKind === "request" || props.matchKind === "resolved") && props.interceptionContext === null && props.interceptionId === null && props.mountedSlotsHeader === null) {
 			const headers = new Headers(dispatchRequest.headers);
-			if (props.renderMode === "navigation" ? canonicalizePrewarmableRscRequestHeaders(headers) : props.renderMode === "prefetch-loading-shell" && props.canUseCanonicalLoadingShell ? canonicalizeLoadingShellRscRequestHeaders(headers) : false) {
+			if (props.renderMode === "navigation" ? canonicalizePrewarmableRscRequestHeaders(headers) : props.renderMode === "prefetch-loading-shell" && props.canUseCanonicalLoadingShell ? canonicalizeLoadingShellRscRequestHeaders(headers) : props.renderMode === "prefetch-dynamic-shell" ? canonicalizeDynamicShellRscRequestHeaders(headers) : false) {
 				canonicalRsc = {
 					headers,
-					navigation: props.renderMode === "navigation"
+					navigation: props.renderMode !== "prefetch-loading-shell"
 				};
 				dispatchRequest = cloneRequestWithHeaders(dispatchRequest, headers);
+				if (props.renderMode === "prefetch-dynamic-shell") {
+					const queryFree = withoutAppPageDispatchQuery(dispatchRequest.url, {
+						...props,
+						renderMode: "navigation"
+					});
+					dispatchRequest = cloneRequestWithUrl(dispatchRequest, queryFree.url);
+					dispatchProps = queryFree.props;
+				}
 			}
 		}
 		let stageProps = {
-			...props,
+			...dispatchProps,
 			cacheability: {
 				...props.cacheability,
 				policyHeaders: responseStagePolicy
@@ -510,16 +553,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				statusText: response.statusText
 			});
 		}
-		if (props.kind !== "app-page" || !props.isRscRequest) return response;
-		const headers = new Headers(response.headers);
-		if (Object.keys(props.params).length > 0) headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(props.params)));
-		else headers.delete(VINEXT_PARAMS_HEADER);
-		headers.set(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, encodeURIComponent(props.resolvedUrl));
-		return preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
-			headers,
-			status: response.status,
-			statusText: response.statusText
-		}));
+		return response;
 	} : void 0;
 	const responseStageRequest = (stageRequest = request) => {
 		const activeHeaders = getHeadersContext()?.headers;
@@ -556,7 +590,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		}
 		return options.handleMetadataRouteRequest?.(cleanPathname, metadataRoutePathname) ?? null;
 	};
-	const applyConfigHeadersToResponseStage = async (response, preserveExistingPolicy = false) => {
+	const applyConfigHeadersToResponseStage = async (response, preserveExistingPolicy = false, routeHandlerRuntime) => {
 		const headers = new Headers(response.headers);
 		copyLinkHeaderProvenance(response.headers, headers);
 		await applyAppRscConfigHeaders(headers, request, {
@@ -567,7 +601,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			middlewareHeaders: middlewareContext.headers,
 			overwriteExisting: preserveExistingPolicy ? /* @__PURE__ */ new Set() : isCdnResponsePolicyHeader,
 			recordCacheability: dispatchResponseStage === void 0,
-			requestContext: preMiddlewareRequestContext
+			requestContext: preMiddlewareRequestContext,
+			routeHandlerRuntime
 		});
 		return preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
 			headers,
@@ -593,10 +628,10 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	})();
 	let outerResponsePolicyPromise;
 	const loadOuterResponsePolicy = () => outerResponsePolicyPromise ??= Promise.all([loadPreHandlerResponseHeaders(), loadResponseStagePolicy()]).then(([headers, responseStagePolicy]) => captureCdnResponsePolicyOverrides(headers, new Headers(responseStagePolicy ?? [])));
-	const composeResponseStageResponse = async (response) => {
+	const composeResponseStageResponse = async (response, routeHandlerRuntime) => {
 		const transportedLink = consumeResponseStageLinkProvenance(response);
 		response = transportedLink.response;
-		response = await applyConfigHeadersToResponseStage(response, Boolean(dispatchResponseStage || options.renderResponseStageLocally));
+		response = await applyConfigHeadersToResponseStage(response, Boolean(dispatchResponseStage || options.renderResponseStageLocally), routeHandlerRuntime);
 		response = applyMiddlewareContextToResponse(response, middlewareContext, transportedLink.appendToPostConfigLink);
 		reconcileCdnResponseHeadersAfterOuterPolicy(response.headers, await loadOuterResponsePolicy());
 		return markAppRscResponseConfigHeadersApplied(response);
@@ -629,10 +664,13 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const isPostRequest = request.method.toUpperCase() === "POST";
 	const contentType = request.headers.get("content-type") || "";
 	const isProgressiveActionRequest = isPostRequest && !actionId && contentType.startsWith("multipart/form-data");
-	const serveImageEndpointIfMatched = () => {
-		if (!filesystemRouteEligible || !resolvedPathnameHasBasePath || !isImageOptimizationPath(cleanPathname)) return null;
+	const serveImageEndpointIfMatched = async () => {
+		if (!filesystemRouteEligible || !resolvedPathnameHasBasePath || !isImageOptimizationPath(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname)) return null;
 		const imageUrl = new URL(resolvedUrl, url);
-		const imageRedirect = resolveDevImageRedirect(imageUrl, [...options.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...options.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], options.imageConfig?.qualities, { isDev: options.isDev });
+		const imageRedirect = resolveDevImageRedirect(imageUrl, [...options.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...options.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], options.imageConfig?.qualities, {
+			isDev: options.isDev,
+			localPatterns: options.imageConfig?.localPatterns
+		});
 		const middlewareHeaders = new Headers();
 		mergeMiddlewareResponseHeaders(middlewareHeaders, middlewareContext.headers);
 		if (!imageRedirect) return new Response("Invalid image optimization parameters", {
@@ -641,12 +679,12 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		});
 		const overrideHeaders = middlewareContext.requestHeaders ?? middlewareContext.headers;
 		return markImageOptimizationSignal(Response.redirect(new URL(imageRedirect, url.origin).href, 302), {
-			middlewareHeaders,
+			middlewareHeaders: new Headers(await loadPreHandlerResponseHeaders()),
 			requestHeaders: overrideHeaders ? buildRequestHeadersFromMiddlewareResponse(request.headers, overrideHeaders) : null,
 			search: imageUrl.search
 		});
 	};
-	const imageEndpointResponse = serveImageEndpointIfMatched();
+	const imageEndpointResponse = await serveImageEndpointIfMatched();
 	if (imageEndpointResponse) return imageEndpointResponse;
 	const metadataRouteResponse = await renderMetadataRouteIfMatched();
 	if (metadataRouteResponse) return composeResponseStageResponse(metadataRouteResponse);
@@ -689,7 +727,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		bypassInterceptionContextCache = true;
 		setInterceptionResponseUncacheable(true);
 	};
-	if (interceptionSourceMatch !== null && interceptionContextHeader !== null && interceptionSourcePathname !== null && !(interceptionSourceMatch.route === directPreActionMatch?.route && haveSamePageParams(interceptionSourceMatch.params, directPreActionMatch.params))) {
+	if (interceptionSourceMatch !== null && interceptionContextHeader !== null && interceptionSourcePathname !== null && !isSameInterceptionSource(interceptionSourceMatch, directPreActionMatch)) {
 		const sourceRequestPathname = options.skipTrailingSlashRedirect ? interceptionContextHeader : normalizeTrailingSlashPathname(interceptionContextHeader, options.trailingSlash) ?? interceptionContextHeader;
 		const decodedSourceRequestPathname = options.skipTrailingSlashRedirect ? interceptionSourcePathname : normalizeTrailingSlashPathname(interceptionSourcePathname, options.trailingSlash) ?? interceptionSourcePathname;
 		const adoptRewrittenInterceptionSource = (rewrittenPathname) => {
@@ -699,7 +737,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				interceptionSourceContext = rewrittenPathname;
 			}
 			const rewrittenSourceMatch = options.matchRoute(rewrittenPathname);
-			return interceptionSourceMatch !== null && rewrittenSourceMatch?.route === interceptionSourceMatch.route && haveSamePageParams(rewrittenSourceMatch.params, interceptionSourceMatch.params);
+			return interceptionSourceMatch !== null && isSameInterceptionSource(interceptionSourceMatch, rewrittenSourceMatch);
 		};
 		if (configMatchers?.matchRedirect(matchPathname(sourceRequestPathname), options.configRedirects, preMiddlewareRequestContext, currentBasePathState(), dispatchResponseStage ? void 0 : markConditionalRedirectCacheability)) {
 			options.clearRequestContext();
@@ -709,7 +747,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (runMiddleware) {
 			const sourceUrl = new URL(userlandRequest.url);
 			sourceUrl.search = new URL(resolvedUrl, url).search;
-			const sourceUrlPathname = resolvedPathnameHasBasePath && options.basePath ? sourceRequestPathname === "/" ? options.basePath : options.basePath + sourceRequestPathname : sourceRequestPathname;
+			const sourceUrlPathname = resolvedPathnameHasBasePath ? restoreBasePath(sourceRequestPathname, options.basePath) : sourceRequestPathname;
 			sourceUrl.pathname = sourceUrlPathname;
 			if (sourceUrl.pathname !== sourceUrlPathname) {
 				options.clearRequestContext();
@@ -744,6 +782,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 					hadBasePath: resolvedPathnameHasBasePath,
 					isDataRequest: isMiddlewareDataRequest,
 					request: sourceMiddlewareRequest,
+					restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(normalizePathTrailingSlash(sourceUrlPathname, options.trailingSlash ?? false), options),
 					validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 				}));
 			} finally {
@@ -752,6 +791,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			}
 			if (!dispatchResponseStage && sourceMiddlewareResult.pathnameEligible) markRouteCacheabilityDynamic(sourceMiddlewareResult.matched ? "middleware matched this request" : "middleware is eligible for this pathname");
 			if (sourceMiddlewareResult.kind === "response") {
+				if (request.body && !request.body.locked) request.body.cancel().catch(() => {});
 				options.clearRequestContext();
 				return sourceMiddlewareResult.response;
 			}
@@ -798,7 +838,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				}
 				return !didRewriteSource || adoptRewrittenInterceptionSource(sourceRulesPathname);
 			};
-			if (!rewriteSource(options.configRewrites.beforeFiles, false) || interceptionSourceMatch.route.isDynamic && !rewriteSource(options.configRewrites.afterFiles, true)) {
+			if (!rewriteSource(options.configRewrites.beforeFiles, false) || (interceptionSourceMatch.authorizationRoute ?? interceptionSourceMatch.route).isDynamic && !rewriteSource(options.configRewrites.afterFiles, true)) {
 				options.clearRequestContext();
 				return notFoundResponse();
 			}
@@ -844,7 +884,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const handleServerAction = async (routeMatch, routePathname) => {
 		if (!filesystemRouteEligible || !isPostRequest || !actionId) return null;
 		if (routeMatch && isAppRouteHandlerRoute(routeMatch.route)) return null;
-		if (!options.handleServerActionRequest) return createMissingServerActionResponse(options, actionId);
+		if (!options.handleServerActionRequest) return markServerActionResponse(createMissingServerActionResponse(options, actionId));
 		const sourceConfigHeaders = new Headers();
 		await applyAppRscConfigHeaders(sourceConfigHeaders, request, {
 			basePath: options.basePath,
@@ -855,7 +895,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			recordCacheability: dispatchResponseStage === void 0,
 			requestContext: preMiddlewareRequestContext
 		});
-		return options.handleServerActionRequest({
+		const serverActionResponse = await options.handleServerActionRequest({
 			actionId,
 			cleanPathname,
 			contentType,
@@ -871,13 +911,14 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			sourceConfigHeaders,
 			searchParams: getResolvedSearchParams()
 		});
+		return serverActionResponse && markServerActionResponse(serverActionResponse);
 	};
 	let progressiveActionHandled = false;
 	let progressiveActionFormState = null;
 	const handleProgressiveAction = async (routeMatch, unrenderedRouteMatch) => {
 		if (!filesystemRouteEligible || !isProgressiveActionRequest) return null;
 		if (routeMatch && isAppRouteHandlerRoute(routeMatch.route)) return null;
-		if (!options.handleProgressiveActionRequest) return unrenderedRouteMatch?.route.__loadPage && !unrenderedRouteMatch.route.__loadRouteHandler ? createMissingServerActionResponse(options, null) : null;
+		if (!options.handleProgressiveActionRequest) return unrenderedRouteMatch?.route.__loadPage && !unrenderedRouteMatch.route.__loadRouteHandler ? markServerActionResponse(createMissingServerActionResponse(options, null)) : null;
 		const progressiveActionResult = await options.handleProgressiveActionRequest({
 			actionId,
 			cleanPathname,
@@ -886,7 +927,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			request,
 			routeMatch
 		});
-		if (progressiveActionResult instanceof Response) return progressiveActionResult;
+		if (progressiveActionResult instanceof Response) return markServerActionResponse(markAppRscApplicationResponse(progressiveActionResult));
 		if (progressiveActionResult?.kind !== "form-state") return null;
 		if ("actionError" in progressiveActionResult && middlewareContext.status === null && progressiveActionHttpFallbackStatus(progressiveActionResult.actionError) === null) middlewareContext.status = 500;
 		return progressiveActionResult;
@@ -971,23 +1012,24 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			pathname: pagesRouteUrl,
 			pagesDataRequest,
 			request,
+			requestBasePath: hadBasePath ? options.basePath : "",
 			url
 		})) ?? null : null;
 		if (response) preserveRouteCacheabilityResponsePolicy();
 		if (!response) return null;
 		if (sharedOuterPolicyNeedsReconciliation) reconcileCdnResponseHeadersAfterOuterPolicy(response.headers, await loadOuterResponsePolicy());
+		const markPagesResponse = (pagesResponse) => dispatchPagesResponseStage ? markAppRscResponseConfigHeadersApplied(pagesResponse) : isLocaleRedirect(response) ? pagesResponse : markAppRscApplicationResponse(pagesResponse);
 		const isRewritten = resolvedUrl !== originalResolvedUrl;
 		const isPrerender = typeof process !== "undefined" && process.env?.VINEXT_PRERENDER === "1";
-		if ((!pagesDataRequest || !isRewritten) && !isPrerender) return dispatchPagesResponseStage ? markAppRscResponseConfigHeadersApplied(response) : response;
+		if ((!pagesDataRequest || !isRewritten) && !isPrerender) return markPagesResponse(response);
 		const headers = new Headers(response.headers);
 		if (pagesDataRequest && isRewritten) headers.set("x-nextjs-rewrite", resolvedUrl);
 		if (isPrerender) headers.set(VINEXT_PRERENDER_REWRITTEN_HEADER, isRewritten ? "1" : "0");
-		const markedResponse = new Response(response.body, {
+		return markPagesResponse(new Response(response.body, {
 			headers,
 			status: response.status,
 			statusText: response.statusText
-		});
-		return dispatchPagesResponseStage ? markAppRscResponseConfigHeadersApplied(markedResponse) : markedResponse;
+		}));
 	};
 	const staticPagesFallbackResponse = await renderPagesForMatchKind("static");
 	if (staticPagesFallbackResponse) {
@@ -1018,7 +1060,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		filesystemRouteEligible = resolvedPathnameHasBasePath;
 		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
 		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
-		const rewrittenImageEndpointResponse = serveImageEndpointIfMatched();
+		const rewrittenImageEndpointResponse = await serveImageEndpointIfMatched();
 		if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
 		const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
 		if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
@@ -1066,7 +1108,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		filesystemRouteEligible = resolvedPathnameHasBasePath;
 		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
 		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
-		const rewrittenImageEndpointResponse = serveImageEndpointIfMatched();
+		const rewrittenImageEndpointResponse = await serveImageEndpointIfMatched();
 		if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
 		const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
 		if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
@@ -1088,7 +1130,10 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	if (interceptionCacheProofInvalidated && interceptionSourceContext !== null) {
 		const finalInterceptionTargetPathname = cleanPathnameIsRequestPathname ? requestPathname : cleanPathname;
 		const finalInterceptionSourceMatch = filesystemRouteEligible && match !== null ? options.matchInterceptRoute?.(finalInterceptionTargetPathname, interceptionSourceContext, interceptionIdHeader) ?? null : null;
-		const hasVerifiedFinalInterceptionSource = hasVerifiedInterceptionSource && interceptionSourceMatch !== null && provesConcreteInterceptionSource(finalInterceptionSourceMatch) && finalInterceptionSourceMatch?.route === interceptionSourceMatch.route && haveSamePageParams(finalInterceptionSourceMatch.params, interceptionSourceMatch.params);
+		const hasVerifiedFinalInterceptionSource = hasVerifiedInterceptionSource && interceptionSourceMatch !== null && provesConcreteInterceptionSource(finalInterceptionSourceMatch) && finalInterceptionSourceMatch !== null && finalInterceptionSourceMatch.route === interceptionSourceMatch.route && haveSamePageParams(finalInterceptionSourceMatch.params, interceptionSourceMatch.params) && isSameInterceptionSource(finalInterceptionSourceMatch, {
+			params: interceptionSourceMatch.authorizationParams ?? interceptionSourceMatch.params,
+			route: interceptionSourceMatch.authorizationRoute ?? interceptionSourceMatch.route
+		});
 		if (interceptionIdHeader !== null && !hasVerifiedFinalInterceptionSource) {
 			options.clearRequestContext();
 			setInterceptionResponseUncacheable(true);
@@ -1168,7 +1213,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			route: null,
 			scriptNonce
 		}));
-		if (renderedNotFoundResponse) return withUnmatchedRouteCacheControl(renderedNotFoundResponse);
+		if (renderedNotFoundResponse) return markAppRscApplicationResponse(withUnmatchedRouteCacheControl(renderedNotFoundResponse));
 		options.clearRequestContext();
 		const headers = new Headers();
 		mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
@@ -1219,9 +1264,10 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const rootParams = pickRootParams(renderParams, route.rootParamNames);
 	setRootParams(rootParams);
 	if (route.routeHandler) {
-		const routeHandlerRequest = isEdgeRouteHandler(route.routeHandler) ? userlandRequest : request;
+		const routeHandlerRuntime = isEdgeRouteHandler(route.routeHandler) ? "edge" : "node";
+		const routeHandlerRequest = routeHandlerRuntime === "edge" ? userlandRequest : request;
 		const routeHandlerUrl = new URL(routeHandlerRequest.url);
-		const internalRscValues = isEdgeRouteHandler(route.routeHandler) ? [] : routeHandlerUrl.searchParams.getAll(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
+		const internalRscValues = routeHandlerRuntime === "edge" ? [] : routeHandlerUrl.searchParams.getAll(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 		routeHandlerUrl.search = resolvedSearchParams.toString();
 		for (const internalRscValue of internalRscValues) routeHandlerUrl.searchParams.append(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, internalRscValue);
 		if (matchedResponseStage) return composeResponseStageResponse(await matchedResponseStage(responseStageRequest(), {
@@ -1249,10 +1295,10 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			routePattern: route.pattern,
 			routePathname: responseStageRoutePathname,
 			scriptNonce: scriptNonce ?? null
-		}));
+		}), routeHandlerRuntime);
 		const { setCurrentFetchSoftTags } = await import("../shims/fetch-cache.js");
 		setCurrentFetchSoftTags(buildPageCacheTags(cleanPathname, [], [...route.routeSegments], "route"));
-		return options.dispatchMatchedRouteHandler({
+		const routeHandlerResponse = await options.dispatchMatchedRouteHandler({
 			bypassInterceptionContextCache,
 			cachePathname,
 			cleanPathname,
@@ -1262,6 +1308,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			route,
 			searchParams: resolvedSearchParams
 		});
+		return markAppRscRouteHandlerResponse(routeHandlerResponse, routeHandlerRuntime);
 	}
 	const failedProgressiveActionResult = progressiveActionFormState && "actionError" in progressiveActionFormState ? progressiveActionFormState : null;
 	const actionHttpFallbackStatus = failedProgressiveActionResult ? progressiveActionHttpFallbackStatus(failedProgressiveActionResult.actionError) : null;
@@ -1291,7 +1338,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		routePattern: route.pattern,
 		routePathname: responseStageRoutePathname,
 		scriptNonce: scriptNonce ?? null
-	}).then(composeResponseStageResponse) : await options.dispatchMatchedPage({
+	}).then((response) => transportedResponseStage && isRscRequest ? withRoutedRscHeaders(response, resolveAppPageNavigationParams(route, params, cleanPathname), resolvedUrl, interceptionSourceContext !== null) : response).then(composeResponseStageResponse) : await options.dispatchMatchedPage({
 		bypassInterceptionContextCache,
 		cachePathname,
 		cleanPathname,
@@ -1324,8 +1371,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		searchParams: resolvedSearchParams,
 		renderMode
 	}), isRscRequest && request.headers.get("Next-Router-Prefetch") === "1" && request.headers.has("Next-Router-Segment-Prefetch"));
-	if (progressiveActionFormState) return applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState);
-	return pageResponse;
+	if (progressiveActionFormState) return markServerActionResponse(markAppRscApplicationResponse(applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState)));
+	return markAppRscApplicationResponse(pageResponse);
 }
 function progressiveActionHttpFallbackStatus(actionError) {
 	const actionErrorDigest = actionError && typeof actionError === "object" && "digest" in actionError ? String(actionError.digest) : null;
@@ -1393,7 +1440,7 @@ function createAppRscRequestHandler(options) {
 		let appRequest = rawRequest;
 		if (pagesDataNormalization?.isDataReq) {
 			const appRequestUrl = new URL(pagesDataNormalization.request.url);
-			appRequestUrl.pathname = addBasePathToPathname(appRequestUrl.pathname, options.basePath);
+			appRequestUrl.pathname = restoreBasePath(appRequestUrl.pathname, options.basePath);
 			appRequest = cloneRequestWithUrl(pagesDataCandidate, appRequestUrl.toString());
 		}
 		const request = cloneRequestWithHeaders(appRequest, filteredHeaders);
@@ -1436,6 +1483,7 @@ function createAppRscRequestHandler(options) {
 				recordCacheability: dispatchResponseStage === void 0,
 				requestContext: preMiddlewareRequestContext
 			});
+			if (serverActionResponses.has(response)) return withServerActionCacheControl(response);
 			return interceptionResponseUncacheable || unmatchedRouteResponses.has(response) ? withNeverCacheControl(response) : response;
 		}, {
 			cacheComponents: options.createPprFallbackShells !== void 0,
@@ -1448,7 +1496,8 @@ function createAppRscRequestHandler(options) {
 			await closeAfterResponse(requestContext);
 			throw error;
 		}
-		return closeAfterResponseWithBody(response, requestContext);
+		const closedResponse = closeAfterResponseWithBody(response, requestContext);
+		return isStreamedActionRedirectResponse(response) ? markStreamedActionRedirectResponse(closedResponse) : closedResponse;
 	};
 	const appRscHandler = async function appRscHandler(rawRequest, ctx, allowInternalRscDocumentFallback = false, dispatchResponseStage, responseStageProbeMode = null, transportedPrerenderState, detachedTrace = false) {
 		options.registerCacheAdapters();

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

@@ -1,5 +1,6 @@
 import { NextHeader, NextI18nConfig } from "../config/next-config.js";
 import { RequestContext } from "../config/request-context.js";
+import { RouteHandlerRuntime } from "./config-headers.js";
 //#region src/server/app-rsc-response-finalizer.d.ts
 type FinalizeAppRscResponseOptions = {
   basePath: string;
@@ -29,9 +30,23 @@ type FinalizeAppRscResponseOptions = {
   middlewareHeaders?: Headers | null;
   /** Whether config matching should update the active cacheability classification. */
   recordCacheability?: boolean;
+  /** The runtime of the Route Handler that produced the response, if one did. */
+  routeHandlerRuntime?: RouteHandlerRuntime;
 };
 /** Mark a response whose final target pipeline has already applied config headers. */
 export declare function markAppRscResponseConfigHeadersApplied(response: Response): Response;
+/** Mark a Server Action redirect that streams its target's render, and so keeps its policy. */
+export declare function markStreamedActionRedirectResponse(response: Response): Response;
+export declare function isStreamedActionRedirectResponse(response: Response): boolean;
+/**
+ * Mark a response that a page, Route Handler, Server Action or Pages route
+ * produced. Next.js stages next.config headers before application code runs,
+ * so the redirects these return carry them. Redirects that routing answers
+ * itself (next.config redirects, trailing slash, middleware) go out without.
+ */
+export declare function markAppRscApplicationResponse(response: Response): Response;
+/** Mark a response a Route Handler produced, so its own headers meet config as in Next.js. */
+export declare function markAppRscRouteHandlerResponse(response: Response, runtime: RouteHandlerRuntime): Response;
 /** Apply only the matching next.config headers for an App Router request. */
 export declare function applyAppRscConfigHeaders(headers: Headers, request: Request, options: FinalizeAppRscResponseOptions): Promise<void>;
 /**
@@ -42,9 +57,9 @@ export declare function applyAppRscConfigHeaders(headers: Headers, request: Requ
  * handling, so that every response path (page, route handler, server action,
  * metadata, not-found) gets headers applied consistently.
  *
- * Skips 3xx redirect responses. Response.redirect() creates immutable
- * headers that throw on mutation, and Next.js does not apply config headers
- * to redirects regardless.
+ * Skips 3xx responses that routing answered itself, as Next.js does not
+ * apply config headers to those. A 3xx that application code returned is
+ * finalized like any other response.
  */
 export declare function finalizeAppRscResponse(response: Response, request: Request, options: FinalizeAppRscResponseOptions): Promise<Response>;
 //#endregion