vinext 1.2.0 → 1.3.0

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

@@ -4,18 +4,18 @@ 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 "./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 } from "./request-pipeline.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.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 { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js";
-import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute } from "./request-pipeline.js";
-import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
+import { normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
 import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { markRouteCacheabilityDynamic, preserveRouteCacheabilityResponsePolicy } from "../shims/cacheability-classification.js";
@@ -29,7 +29,7 @@ import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, mar
 import { parseCacheabilityManifest } from "./cacheability-manifest.js";
 import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
 import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
-import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import { mergeMiddlewareResponseHeaders, mergeMiddlewareResponseHeadersOntoResponse, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
 import { consumeResponseStageLinkProvenance, copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
 import "./app-page-response.js";
 import { parseNextHttpErrorDigest } from "./next-error-digest.js";
@@ -40,6 +40,7 @@ import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, seri
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
+import { isAppRouteHandlerRoute } from "./app-rsc-route-matching.js";
 import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
 import { pickRootParams, setRootParams } from "../shims/root-params.js";
@@ -145,7 +146,7 @@ function applyMiddlewareContextToResponse(response, middlewareContext, appendToP
 	if (!middlewareContext.headers && middlewareContext.status == null) return response;
 	const headers = new Headers(response.headers);
 	const responseLink = appendToPostConfigLink ? headers.get("link") : null;
-	mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
+	mergeMiddlewareResponseHeadersOntoResponse(headers, middlewareContext.headers);
 	const middlewareLink = middlewareContext.headers?.get("link");
 	if (responseLink && middlewareLink) headers.set("link", `${middlewareLink}, ${responseLink}`);
 	return preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
@@ -210,7 +211,7 @@ async function applyRewrite(options, cleanPathname, recordCacheability = true) {
 		const { requestWithMiddlewareContextHeaders } = await import("./app-middleware.js");
 		const proxyRequest = requestWithMiddlewareContextHeaders(options.request, options.middlewareContext);
 		options.clearRequestContext();
-		return configMatchers.proxyExternalRequest(proxyRequest, rewritten);
+		return markAppRscResponseConfigHeadersApplied(withExternalRewriteResponseHeaders(await configMatchers.proxyExternalRequest(proxyRequest, rewritten), new Headers(), options.middlewareContext.headers?.getSetCookie() ?? []));
 	}
 	return rewritten;
 }
@@ -245,6 +246,7 @@ async function applyConfigHeadersToMiddlewareRedirect(response, options) {
 		pathname: options.pathname,
 		requestContext: options.requestContext,
 		basePathState: options.basePathState,
+		middlewareHeaders: response.headers,
 		recordCacheability: options.recordCacheability
 	});
 	if (!headers.entries().next().done) {
@@ -374,6 +376,11 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (trailingSlashRedirect) return trailingSlashRedirect;
 	}
 	const matchPathname = (p) => normalizeDefaultLocalePathname(p, options.i18nConfig, { hostname: url.hostname });
+	const restoreLocaleRootTrailingSlash = !pagesDataRequest && shouldRestoreLocaleRootTrailingSlash(stripRscSuffix(url.pathname), options);
+	const headerMatchPathname = normalizeDefaultLocalePathname(requestCleanPathname, options.i18nConfig, {
+		hostname: url.hostname,
+		restoreRootTrailingSlash: restoreLocaleRootTrailingSlash
+	});
 	const redirectPathname = matchPathname(requestCleanPathname);
 	const configMatchers = HAS_CONFIG_REDIRECTS && options.configRedirects.length ? await import("../config/config-matchers.js") : null;
 	const redirect = configMatchers ? configMatchers.matchRedirect(redirectPathname, options.configRedirects, preMiddlewareRequestContext, basePathState, dispatchResponseStage ? void 0 : markConditionalRedirectCacheability) : null;
@@ -424,10 +431,24 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (!dispatchResponseStage && middlewareResult.pathnameEligible) markRouteCacheabilityDynamic(middlewareResult.matched ? "middleware matched this request" : "middleware is eligible for this pathname");
 		if (middlewareResult.kind === "response") {
 			if (request.body && !request.body.locked) request.body.cancel().catch(() => {});
+			if (middlewareResult.externalRewrite) {
+				const headers = new Headers();
+				await applyAppRscConfigHeaders(headers, request, {
+					basePath: options.basePath,
+					configHeaders: options.configHeaders,
+					i18nConfig: options.i18nConfig,
+					restoreLocaleRootTrailingSlash,
+					middlewareHeaders: middlewareContext.headers,
+					recordCacheability: dispatchResponseStage === void 0,
+					requestContext: preMiddlewareRequestContext
+				});
+				return markAppRscResponseConfigHeadersApplied(withExternalRewriteResponseHeaders(middlewareResult.response, headers, []));
+			}
+			middlewareContext.headers ??= new Headers(middlewareResult.response.headers);
 			return applyConfigHeadersToMiddlewareRedirect(middlewareResult.response, {
 				basePathState,
 				configHeaders: options.configHeaders,
-				pathname: matchPathname(requestCleanPathname),
+				pathname: headerMatchPathname,
 				recordCacheability: dispatchResponseStage === void 0,
 				requestContext: preMiddlewareRequestContext
 			});
@@ -453,7 +474,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const loadResponseStagePolicy = () => responseStagePolicyPromise ??= options.configHeaders.length ? import("./config-headers.js").then(({ resolveResponseStageCachePolicy }) => withoutResponseStageVary(resolveResponseStageCachePolicy({
 		basePathState,
 		configHeaders: options.configHeaders,
-		pathname: matchPathname(requestCleanPathname),
+		pathname: headerMatchPathname,
 		requestContext: preMiddlewareRequestContext
 	}))) : Promise.resolve(null);
 	let canUseSharedWorkerResponseStage = draftModeCookie === null && !hasMiddlewareCookieOverlay && !hasMiddlewareRequestHeaderOverrides(middlewareContext.requestHeaders ?? middlewareContext.headers) && !requestOptsOutOfWorkerResponseStage(request, options, scriptNonce, allowInternalRscDocumentFallback);
@@ -558,6 +579,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePath: options.basePath,
 			configHeaders: options.configHeaders,
 			i18nConfig: options.i18nConfig,
+			restoreLocaleRootTrailingSlash,
 			middlewareHeaders: middlewareContext.headers,
 			overwriteExisting: preserveExistingPolicy ? /* @__PURE__ */ new Set() : isCdnResponsePolicyHeader,
 			recordCacheability: dispatchResponseStage === void 0,
@@ -576,6 +598,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePath: options.basePath,
 			configHeaders: options.configHeaders,
 			i18nConfig: options.i18nConfig,
+			restoreLocaleRootTrailingSlash,
+			middlewareHeaders: middlewareContext.headers,
 			overwriteExisting: isCdnResponsePolicyHeader,
 			recordCacheability: false,
 			requestContext: preMiddlewareRequestContext
@@ -594,7 +618,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		return markAppRscResponseConfigHeadersApplied(response);
 	};
 	const postMiddlewareRequestContext = buildPostMwRequestContext(userlandRequest);
-	filesystemRouteEligible ||= didMiddlewareRewrite;
+	if (didMiddlewareRewrite) filesystemRouteEligible = resolvedPathnameHasBasePath;
 	for (const rewrite of options.configRewrites.beforeFiles) {
 		const beforeFilesRewrite = await applyRewrite({
 			basePathState: currentBasePathState(),
@@ -611,8 +635,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, beforeFilesRewrite);
 			cleanPathname = pathnameForResolvedUrl(resolvedUrl);
 			cleanPathnameIsRequestPathname = false;
-			filesystemRouteEligible = true;
 			resolvedPathnameHasBasePath = !options.basePath || rewrite.basePath !== false;
+			filesystemRouteEligible = resolvedPathnameHasBasePath;
 		}
 	}
 	const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
@@ -621,55 +645,6 @@ 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");
-	let resolvedLateRewritesForAction = false;
-	if (!filesystemRouteEligible && (actionId || isProgressiveActionRequest)) {
-		let actionMatch = null;
-		for (const rewrite of options.configRewrites.afterFiles) {
-			const rewritten = await applyRewrite({
-				basePathState: currentBasePathState(),
-				clearRequestContext: options.clearRequestContext,
-				middlewareContext,
-				request: normalizedUserlandRequest,
-				requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-				paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
-				rewrites: [rewrite],
-				validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
-			}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
-			if (rewritten instanceof Response) return rewritten;
-			if (!rewritten) continue;
-			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-			cleanPathname = pathnameForResolvedUrl(resolvedUrl);
-			cleanPathnameIsRequestPathname = false;
-			filesystemRouteEligible = true;
-			resolvedPathnameHasBasePath = !options.basePath || rewrite.basePath !== false;
-			actionMatch = matchCleanPathname();
-			if (actionMatch) break;
-		}
-		if (!actionMatch) for (const rewrite of options.configRewrites.fallback) {
-			const rewritten = await applyRewrite({
-				basePathState: currentBasePathState(),
-				clearRequestContext: options.clearRequestContext,
-				middlewareContext,
-				request: normalizedUserlandRequest,
-				requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-				paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
-				rewrites: [rewrite],
-				validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
-			}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
-			if (rewritten instanceof Response) return rewritten;
-			if (!rewritten) continue;
-			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-			cleanPathname = pathnameForResolvedUrl(resolvedUrl);
-			cleanPathnameIsRequestPathname = false;
-			filesystemRouteEligible = true;
-			resolvedPathnameHasBasePath = !options.basePath || rewrite.basePath !== false;
-			actionMatch = matchCleanPathname();
-			if (actionMatch) break;
-		}
-		resolvedLateRewritesForAction = filesystemRouteEligible;
-	}
-	const lateActionRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
-	if (lateActionRscCacheBustingRedirect) return lateActionRscCacheBustingRedirect;
 	const serveImageEndpointIfMatched = () => {
 		if (!filesystemRouteEligible || !resolvedPathnameHasBasePath || !isImageOptimizationPath(cleanPathname)) return null;
 		const imageUrl = new URL(resolvedUrl, url);
@@ -691,17 +666,20 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	if (imageEndpointResponse) return imageEndpointResponse;
 	const metadataRouteResponse = await renderMetadataRouteIfMatched();
 	if (metadataRouteResponse) return composeResponseStageResponse(metadataRouteResponse);
-	const publicFileResponse = filesystemRouteEligible ? resolvePublicFileRoute({
-		cleanPathname: cleanPathnameIsRequestPathname ? cleanPathname : normalizePathnameForRouteMatch(cleanPathname),
-		middlewareContext,
-		pathname,
-		publicFiles: options.publicFiles,
-		request
-	}) : null;
-	if (publicFileResponse) {
-		options.clearRequestContext();
+	const servePublicFileIfMatched = () => {
+		if (!filesystemRouteEligible) return null;
+		const publicFileResponse = resolvePublicFileRoute({
+			cleanPathname: cleanPathnameIsRequestPathname ? cleanPathname : normalizePathnameForRouteMatch(cleanPathname),
+			middlewareContext,
+			pathname,
+			publicFiles: options.publicFiles,
+			request
+		});
+		if (publicFileResponse) options.clearRequestContext();
 		return publicFileResponse;
-	}
+	};
+	const publicFileResponse = servePublicFileIfMatched();
+	if (publicFileResponse) return publicFileResponse;
 	stripRscCacheBustingSearchParam(url);
 	resolvedUrl = serializeResolvedUrl(resolvedUrl, url);
 	options.setNavigationContext({
@@ -740,7 +718,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			const rewrittenSourceMatch = options.matchRoute(rewrittenPathname);
 			return interceptionSourceMatch !== null && rewrittenSourceMatch?.route === interceptionSourceMatch.route && haveSamePageParams(rewrittenSourceMatch.params, interceptionSourceMatch.params);
 		};
-		if (configMatchers?.matchRedirect(matchPathname(sourceRequestPathname), options.configRedirects, preMiddlewareRequestContext, basePathState, dispatchResponseStage ? void 0 : markConditionalRedirectCacheability)) {
+		if (configMatchers?.matchRedirect(matchPathname(sourceRequestPathname), options.configRedirects, preMiddlewareRequestContext, currentBasePathState(), dispatchResponseStage ? void 0 : markConditionalRedirectCacheability)) {
 			options.clearRequestContext();
 			return notFoundResponse();
 		}
@@ -748,7 +726,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (runMiddleware) {
 			const sourceUrl = new URL(userlandRequest.url);
 			sourceUrl.search = new URL(resolvedUrl, url).search;
-			const sourceUrlPathname = hadBasePath && options.basePath ? sourceRequestPathname === "/" ? options.basePath : options.basePath + sourceRequestPathname : sourceRequestPathname;
+			const sourceUrlPathname = resolvedPathnameHasBasePath && options.basePath ? sourceRequestPathname === "/" ? options.basePath : options.basePath + sourceRequestPathname : sourceRequestPathname;
 			sourceUrl.pathname = sourceUrlPathname;
 			if (sourceUrl.pathname !== sourceUrlPathname) {
 				options.clearRequestContext();
@@ -780,7 +758,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 					cleanPathname: decodedSourceRequestPathname,
 					context: sourceMiddlewareContext,
 					externalRewriteRequest: normalizedUserlandRequest,
-					hadBasePath,
+					hadBasePath: resolvedPathnameHasBasePath,
 					isDataRequest: isMiddlewareDataRequest,
 					request: sourceMiddlewareRequest,
 					validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
@@ -815,7 +793,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				canUseSharedWorkerResponseStage = false;
 			}
 			if (sourceMiddlewareResult.rewritten) {
-				if (sourceMiddlewareResult.search !== sourceUrl.search || !adoptRewrittenInterceptionSource(sourceMiddlewareResult.cleanPathname)) {
+				if (options.basePath && sourceMiddlewareResult.rewriteHadBasePath === false || sourceMiddlewareResult.search !== sourceUrl.search || !adoptRewrittenInterceptionSource(sourceMiddlewareResult.cleanPathname)) {
 					options.clearRequestContext();
 					return notFoundResponse();
 				}
@@ -827,7 +805,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			const sourceRewriteContext = requestContextForResolvedUrl(buildPostMwRequestContext(userlandRequest), resolvedUrl, url);
 			let didRewriteSource = false;
 			for (const rewrite of options.configRewrites.beforeFiles) {
-				const destination = matchRewrite(matchPathname(sourceRulesPathname), [rewrite], sourceRewriteContext, basePathState, matchPathname(sourceRulesPathname), dispatchResponseStage === void 0 ? markConditionalRewriteCacheability : void 0);
+				const destination = matchRewrite(matchPathname(sourceRulesPathname), [rewrite], sourceRewriteContext, currentBasePathState(), matchPathname(sourceRulesPathname), dispatchResponseStage === void 0 ? markConditionalRewriteCacheability : void 0);
 				if (!destination) continue;
 				if (isExternalUrl(destination) || destination.includes("?")) {
 					options.clearRequestContext();
@@ -872,64 +850,76 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		options.clearRequestContext();
 		return new Response("{}", { headers });
 	}
-	if (!filesystemRouteEligible && isPostRequest && actionId) {
-		options.clearRequestContext();
-		return notFoundResponse();
-	}
-	let progressiveActionResult = null;
-	if (filesystemRouteEligible && isPostRequest && contentType.startsWith("multipart/form-data") && !actionId) {
-		if (options.handleProgressiveActionRequest) progressiveActionResult = await options.handleProgressiveActionRequest({
-			actionId,
-			cleanPathname,
-			contentType,
-			middlewareContext,
-			request,
-			routeMatch: renderedPreActionMatch
-		});
-		else if (preActionMatch?.route.__loadPage && !preActionMatch.route.__loadRouteHandler) return createMissingServerActionResponse(options, null);
-	}
-	if (progressiveActionResult instanceof Response) return progressiveActionResult;
-	const progressiveActionFormState = progressiveActionResult?.kind === "form-state" ? progressiveActionResult : null;
-	const isProgressiveActionRender = progressiveActionFormState !== null;
-	const formState = progressiveActionFormState?.formState ?? null;
-	const failedProgressiveActionResult = progressiveActionFormState && "actionError" in progressiveActionFormState ? progressiveActionFormState : null;
-	const actionFailed = failedProgressiveActionResult !== null;
-	const actionError = failedProgressiveActionResult?.actionError;
-	const actionErrorDigest = actionError && typeof actionError === "object" && "digest" in actionError ? String(actionError.digest) : null;
-	const actionHttpFallbackStatus = actionErrorDigest ? parseNextHttpErrorDigest(actionErrorDigest)?.status ?? null : null;
-	const normalizedProgressiveActionError = actionHttpFallbackStatus === null || actionHttpFallbackStatus === 404 ? actionError : { digest: "NEXT_NOT_FOUND" };
-	if (actionFailed && middlewareContext.status === null && actionHttpFallbackStatus === null) middlewareContext.status = 500;
-	let sourceConfigHeaders = null;
-	if (filesystemRouteEligible && isPostRequest && actionId && options.handleServerActionRequest) {
-		sourceConfigHeaders = new Headers();
+	const literalRoutePattern = preActionMatch !== null && !isAppRouteHandlerRoute(preActionMatch.route) ? patternToNextFormat(preActionMatch.route.pattern) : null;
+	const routeMatchPathname = cleanPathnameIsRequestPathname ? cleanPathname : normalizePathnameForRouteMatch(cleanPathname);
+	const isServerActionRequest = isPostRequest && Boolean(actionId);
+	const requestsLiteralRoutePattern = (isProgressiveActionRequest || isServerActionRequest) && literalRoutePattern !== null && literalRoutePattern === (routeMatchPathname.length > 1 && routeMatchPathname.endsWith("/") ? routeMatchPathname.slice(0, -1) : routeMatchPathname);
+	const isFinalRouteMatch = isInterceptionMatch || requestsLiteralRoutePattern;
+	const preActionMatchIsFinal = preActionMatch !== null && (isFinalRouteMatch || !preActionMatch.route.isDynamic);
+	let serverActionHandled = false;
+	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);
+		const sourceConfigHeaders = new Headers();
 		const sourceConfigUrl = new URL(request.url);
 		sourceConfigUrl.pathname = hadBasePath ? addBasePathToPathname(requestCleanPathname, options.basePath) : requestCleanPathname;
 		await applyAppRscConfigHeaders(sourceConfigHeaders, cloneRequestWithUrl(request, sourceConfigUrl.toString()), {
 			basePath: options.basePath,
 			configHeaders: options.configHeaders,
 			i18nConfig: options.i18nConfig,
+			restoreLocaleRootTrailingSlash,
+			middlewareHeaders: middlewareContext.headers,
 			recordCacheability: dispatchResponseStage === void 0,
 			requestContext: preMiddlewareRequestContext
 		});
+		return options.handleServerActionRequest({
+			actionId,
+			cleanPathname,
+			contentType,
+			interceptionContext: interceptionSourceContext,
+			isRscRequest,
+			middlewareContext,
+			mountedSlotsHeader,
+			request,
+			scriptNonce,
+			routeMatch,
+			routePathname,
+			dispatchRedirectTargetRequest: dispatchInternalRequest,
+			sourceConfigHeaders,
+			searchParams: getResolvedSearchParams()
+		});
+	};
+	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;
+		const progressiveActionResult = await options.handleProgressiveActionRequest({
+			actionId,
+			cleanPathname,
+			contentType,
+			middlewareContext,
+			request,
+			routeMatch
+		});
+		if (progressiveActionResult instanceof Response) return progressiveActionResult;
+		if (progressiveActionResult?.kind !== "form-state") return null;
+		if ("actionError" in progressiveActionResult && middlewareContext.status === null && progressiveActionHttpFallbackStatus(progressiveActionResult.actionError) === null) middlewareContext.status = 500;
+		return progressiveActionResult;
+	};
+	if (preActionMatchIsFinal) {
+		progressiveActionHandled = true;
+		const progressiveActionResult = await handleProgressiveAction(renderedPreActionMatch, preActionMatch);
+		if (progressiveActionResult instanceof Response) return progressiveActionResult;
+		progressiveActionFormState = progressiveActionResult;
+	}
+	if (isServerActionRequest && preActionMatchIsFinal) {
+		serverActionHandled = true;
+		const serverActionResponse = await handleServerAction(renderedPreActionMatch, preActionRoutePathname);
+		if (serverActionResponse) return serverActionResponse;
 	}
-	const serverActionResponse = filesystemRouteEligible && isPostRequest && actionId && options.handleServerActionRequest ? await options.handleServerActionRequest({
-		actionId,
-		cleanPathname,
-		contentType,
-		interceptionContext: interceptionSourceContext,
-		isRscRequest,
-		middlewareContext,
-		mountedSlotsHeader,
-		request,
-		scriptNonce,
-		routeMatch: renderedPreActionMatch,
-		routePathname: preActionRoutePathname,
-		dispatchRedirectTargetRequest: dispatchInternalRequest,
-		sourceConfigHeaders,
-		searchParams: getResolvedSearchParams()
-	}) : null;
-	if (serverActionResponse) return serverActionResponse;
-	if (filesystemRouteEligible && isPostRequest && actionId && !options.handleServerActionRequest) return createMissingServerActionResponse(options, actionId);
 	let match = preActionMatch;
 	const renderPagesForMatchKind = async (matchKind) => {
 		if (!filesystemRouteEligible) return null;
@@ -978,7 +968,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			if (!responseStageHasContentLength) response.headers.delete("Content-Length");
 			return response;
 		} : void 0;
-		const response = !isInterceptionMatch && (match === null || match.route.isDynamic) ? await runOutsideWorkStoreScope(() => options.renderPagesFallback?.({
+		const response = !isFinalRouteMatch && (match === null || match.route.isDynamic) ? await runOutsideWorkStoreScope(() => options.renderPagesFallback?.({
 			appRouteMatch: match ?? null,
 			allowRscDocumentFallback: didMiddlewareRewritePathname || allowInternalRscDocumentFallback,
 			dispatchPagesResponseStage,
@@ -1012,7 +1002,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		options.clearRequestContext();
 		return staticPagesFallbackResponse;
 	}
-	if (!isInterceptionMatch && !resolvedLateRewritesForAction && (!match || match.route.isDynamic)) for (const rewrite of options.configRewrites.afterFiles) {
+	if (!isFinalRouteMatch && (!match || match.route.isDynamic)) for (const rewrite of options.configRewrites.afterFiles) {
 		const afterFilesRewrite = await applyRewrite({
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
@@ -1032,14 +1022,16 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		cleanPathname = pathnameForResolvedUrl(resolvedUrl);
 		cleanPathnameIsRequestPathname = false;
 		invalidateInterceptionCacheProof();
-		filesystemRouteEligible = true;
 		resolvedPathnameHasBasePath = !options.basePath || rewrite.basePath !== false;
+		filesystemRouteEligible = resolvedPathnameHasBasePath;
 		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
 		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
 		const rewrittenImageEndpointResponse = serveImageEndpointIfMatched();
 		if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
 		const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
 		if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
+		const rewrittenPublicFileResponse = servePublicFileIfMatched();
+		if (rewrittenPublicFileResponse) return rewrittenPublicFileResponse;
 		match = matchCleanPathname();
 		const rewrittenStaticPagesResponse = await renderPagesForMatchKind("static");
 		if (rewrittenStaticPagesResponse) {
@@ -1058,7 +1050,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		options.clearRequestContext();
 		return dynamicPagesFallbackResponse;
 	}
-	if (!resolvedLateRewritesForAction && !match) for (const rewrite of options.configRewrites.fallback) {
+	if (!match) for (const rewrite of options.configRewrites.fallback) {
 		const fallbackRewrite = await applyRewrite({
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
@@ -1078,14 +1070,16 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		cleanPathname = pathnameForResolvedUrl(resolvedUrl);
 		cleanPathnameIsRequestPathname = false;
 		invalidateInterceptionCacheProof();
-		filesystemRouteEligible = true;
 		resolvedPathnameHasBasePath = !options.basePath || rewrite.basePath !== false;
+		filesystemRouteEligible = resolvedPathnameHasBasePath;
 		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
 		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
 		const rewrittenImageEndpointResponse = serveImageEndpointIfMatched();
 		if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
 		const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
 		if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
+		const rewrittenPublicFileResponse = servePublicFileIfMatched();
+		if (rewrittenPublicFileResponse) return rewrittenPublicFileResponse;
 		match = matchCleanPathname();
 		const rewrittenStaticPagesResponse = await renderPagesForMatchKind("static");
 		if (rewrittenStaticPagesResponse) {
@@ -1140,6 +1134,18 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		}
 		return buildNextDataNotFoundResponse();
 	}
+	if (isProgressiveActionRequest && !progressiveActionHandled || isServerActionRequest && !serverActionHandled) {
+		const finalRouteMatch = renderedRouteMatch(match);
+		setRootParams(finalRouteMatch ? pickRootParams(finalRouteMatch.params, finalRouteMatch.route.rootParamNames) : null);
+		if (isServerActionRequest) {
+			const serverActionResponse = await handleServerAction(finalRouteMatch, cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname);
+			if (serverActionResponse) return serverActionResponse;
+		} else {
+			const progressiveActionResult = await handleProgressiveAction(finalRouteMatch, match);
+			if (progressiveActionResult instanceof Response) return progressiveActionResult;
+			progressiveActionFormState = progressiveActionResult;
+		}
+	}
 	if (!match) {
 		if (process.env.NODE_ENV !== "production" && canonicalPathname === "/favicon.ico") {
 			options.clearRequestContext();
@@ -1265,6 +1271,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			searchParams: resolvedSearchParams
 		});
 	}
+	const failedProgressiveActionResult = progressiveActionFormState && "actionError" in progressiveActionFormState ? progressiveActionFormState : null;
+	const actionHttpFallbackStatus = failedProgressiveActionResult ? progressiveActionHttpFallbackStatus(failedProgressiveActionResult.actionError) : null;
+	const normalizedProgressiveActionError = actionHttpFallbackStatus === null || actionHttpFallbackStatus === 404 ? failedProgressiveActionResult?.actionError : { digest: "NEXT_NOT_FOUND" };
 	const pageResponse = withStoredSpecialErrorStatus(matchedResponseStage ? await matchedResponseStage(responseStageRequest(), {
 		kind: "app-page",
 		buildId: options.buildId,
@@ -1296,14 +1305,14 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		clientReuseManifest,
 		cleanPathname,
 		displayPathname: canonicalPathname,
-		formState,
+		formState: progressiveActionFormState?.formState ?? null,
 		actionError: normalizedProgressiveActionError,
-		actionFailed,
+		actionFailed: failedProgressiveActionResult !== null,
 		handlerStart,
 		interceptionContext: interceptionSourceContext,
 		interceptionId: interceptionIdHeader,
 		interceptionPathname: cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname,
-		isProgressiveActionRender,
+		isProgressiveActionRender: progressiveActionFormState !== null,
 		isRscRequest,
 		middlewareContext,
 		mountedSlotsHeader,
@@ -1324,9 +1333,13 @@ 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 (isProgressiveActionRender) return applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState);
+	if (progressiveActionFormState) return applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState);
 	return pageResponse;
 }
+function progressiveActionHttpFallbackStatus(actionError) {
+	const actionErrorDigest = actionError && typeof actionError === "object" && "digest" in actionError ? String(actionError.digest) : null;
+	return actionErrorDigest ? parseNextHttpErrorDigest(actionErrorDigest)?.status ?? null : null;
+}
 /**
 * Append `Set-Cookie` headers and the `x-action-revalidated` marker captured
 * during progressive (no-JS) server action execution to the page render
@@ -1362,6 +1375,7 @@ function applyProgressiveActionSideEffects(response, sideEffects) {
 /** Build the request-only handler without retaining the response renderer graph. */
 function createAppRscRequestHandler(options) {
 	const handleAppRscRequestLifecycle = async (rawRequest, ctx, allowInternalRscDocumentFallback = false, dispatchResponseStage, responseStageProbeMode = null, transportedPrerenderState) => {
+		const rawRequestSignal = rawRequest.signal;
 		const mwCtx = openForwardedMiddlewareContext(rawRequest.headers.get(VINEXT_MW_CTX_HEADER), options.devForwardedMiddlewareContextKey);
 		const pagesDataUrl = new URL(rawRequest.url);
 		const pagesDataInScope = !options.basePath || hasBasePath(pagesDataUrl.pathname, options.basePath);
@@ -1396,6 +1410,7 @@ function createAppRscRequestHandler(options) {
 		const requestContext = createRequestContext({
 			headersContext,
 			executionContext,
+			requestSignal: executionContext?.requestSignal ?? rawRequestSignal,
 			unstableCacheRevalidation: "background"
 		});
 		let interceptionResponseUncacheable = false;
@@ -1423,6 +1438,7 @@ function createAppRscRequestHandler(options) {
 				basePath: options.basePath,
 				configHeaders: options.configHeaders,
 				i18nConfig: options.i18nConfig,
+				restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(stripRscSuffix(new URL(rawRequest.url).pathname), options),
 				middlewareHeaders: middlewareContext.headers,
 				recordCacheability: dispatchResponseStage === void 0,
 				requestContext: preMiddlewareRequestContext
@@ -1443,7 +1459,7 @@ function createAppRscRequestHandler(options) {
 	};
 	const appRscHandler = async function appRscHandler(rawRequest, ctx, allowInternalRscDocumentFallback = false, dispatchResponseStage, responseStageProbeMode = null, transportedPrerenderState, detachedTrace = false) {
 		options.registerCacheAdapters();
-		await options.ensureInstrumentation?.();
+		await options.ensureInstrumentation?.(isExecutionContextLike(ctx) ? ctx : null);
 		const traceUrl = new URL(rawRequest.url);
 		return traceFrameworkRequest({
 			callback: () => handleAppRscRequestLifecycle(rawRequest, ctx, allowInternalRscDocumentFallback, dispatchResponseStage, responseStageProbeMode, transportedPrerenderState),

package/dist/server/app-rsc-request-normalization.js

@@ -1,11 +1,11 @@
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
-import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERCEPTION_ID_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "./app-rsc-vary.js";
 import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER } from "./headers.js";
-import { normalizePath } from "./normalize-path.js";
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
 import { guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
+import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
+import { normalizePath } from "./normalize-path.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
 import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, stripRscSuffix } from "./app-rsc-cache-busting.js";

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

@@ -11,6 +11,11 @@ type FinalizeAppRscResponseOptions = {
    * default-locale URLs (issue #1336, item 4).
    */
   i18nConfig: NextI18nConfig | null;
+  /**
+   * Whether the root keeps its trailing slash when the default locale is
+   * spliced in (`shouldRestoreLocaleRootTrailingSlash` on the raw request).
+   */
+  restoreLocaleRootTrailingSlash?: boolean;
   /**
    * Original pre-middleware request context.
    * Next.js evaluates config header has/missing conditions against the

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

@@ -32,7 +32,10 @@ async function applyAppRscConfigHeaders(headers, request, options) {
 	let pathname = url.pathname;
 	const hadBasePath = !options.basePath || hasBasePath(pathname, options.basePath);
 	pathname = stripBasePath(pathname, options.basePath);
-	const matchPathname = options.i18nConfig ? normalizeDefaultLocalePathname(pathname, options.i18nConfig, { hostname: url.hostname }) : pathname;
+	const matchPathname = options.i18nConfig ? normalizeDefaultLocalePathname(pathname, options.i18nConfig, {
+		hostname: url.hostname,
+		restoreRootTrailingSlash: options.restoreLocaleRootTrailingSlash
+	}) : pathname;
 	const { applyConfigHeadersToResponse } = await import("./config-headers.js");
 	applyConfigHeadersToResponse(headers, {
 		configHeaders: options.configHeaders,

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

@@ -1,10 +1,10 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import "./headers.js";
-import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders } from "./request-pipeline.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
+import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { applyEffectiveRequestCookieHeader, getDraftModeCookieHeader, headersContextFromRequest, restoreDraftModeTransition } from "../shims/headers.js";
 import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { traceFindPageComponents } from "./pages-execution-tracing.js";
@@ -71,9 +71,10 @@ function rematchAppWorkerResponseStageRoute(options, normalized, props) {
 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 });
+	const rawRequestSignal = rawRequest.signal;
 	options.registerCacheAdapters();
-	await options.ensureInstrumentation?.();
 	const executionContext = isExecutionContextLike(ctx) ? ctx : getRequestExecutionContext() ?? null;
+	await options.ensureInstrumentation?.(executionContext);
 	const filteredHeaders = executionContext?.isInternalPagesRevalidation ? new Headers(rawRequest.headers) : filterInternalHeaders(rawRequest.headers);
 	filteredHeaders.delete(VINEXT_REVALIDATE_HOST_HEADER);
 	const request = cloneRequestWithHeaders(rawRequest, filteredHeaders);
@@ -103,6 +104,7 @@ async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, sta
 	const requestContext = createRequestContext({
 		headersContext,
 		executionContext,
+		requestSignal: executionContext?.requestSignal ?? rawRequestSignal,
 		unstableCacheRevalidation: "background"
 	});
 	const middlewareContext = {

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

@@ -120,6 +120,7 @@ type AppRscInterceptLookupEntry = {
   slotId: string | null;
   targetRouteGraphId: string | null;
 };
+export declare function isAppRouteHandlerRoute(route: Pick<AppRscRouteForMatching, "__loadRouteHandler" | "routeHandler">): boolean;
 /**
  * @param decodedPathnamePatterns Static page patterns that answer their
  *   segment-decoded pathname (built by `buildAppDecodedPathnamePatterns`).