vinext 1.4.0 → 1.4.1

package/dist/server/app-rsc-cache-busting.js

@@ -22,8 +22,10 @@ function encodeBase64Url(bytes) {
 	for (const byte of bytes) binary += String.fromCharCode(byte);
 	return btoa(binary).replaceAll("+", "-").replaceAll("/", "_").replace(/=+$/, "");
 }
-function normalizeHeaderValue(value) {
-	return value ?? "0";
+function serializeHeaderValue(value) {
+	if (value === null) return "0";
+	if (value === "0") return "\\0";
+	return value.replaceAll("\\", "\\\\").replaceAll(",", "\\,");
 }
 function normalizeCompatibilityId(value) {
 	return value && value.length > 0 ? value : null;
@@ -57,9 +59,9 @@ function resolveHardNavigationTargetFromRscResponse(responseUrl, currentHref, or
 	const parsed = new URL(responseUrl, origin);
 	stripRscCacheBustingSearchParam(parsed);
 	const origUrl = new URL(currentHref, origin);
-	let pathname = stripRscSuffix(parsed.pathname);
+	let pathname = parsed.pathname;
 	if (origUrl.pathname.length > 1 && origUrl.pathname.endsWith("/") && !pathname.endsWith("/")) pathname += "/";
-	let hardNavigationTarget = pathname + parsed.search;
+	let hardNavigationTarget = toPathAbsolutePathname(pathname) + parsed.search;
 	if (origUrl.hash) hardNavigationTarget += origUrl.hash;
 	return hardNavigationTarget;
 }
@@ -74,21 +76,21 @@ function normalizeRenderModeHeaderValue(value) {
 	const renderMode = parseAppRscRenderMode(value);
 	return renderMode === "navigation" ? null : renderMode;
 }
-function createCacheBustingInput(headers, options = {}) {
+function createCacheBustingInput(headers) {
 	const values = [
 		headers.get(NEXT_ROUTER_PREFETCH_HEADER),
 		headers.get(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER),
 		headers.get(NEXT_ROUTER_STATE_TREE_HEADER),
 		headers.get(NEXT_URL_HEADER),
 		headers.get(VINEXT_INTERCEPTION_CONTEXT_HEADER),
-		...options.includeInterceptionIdHeader === false ? [] : [headers.get(VINEXT_INTERCEPTION_ID_HEADER)],
+		headers.get(VINEXT_INTERCEPTION_ID_HEADER),
 		headers.get(VINEXT_MOUNTED_SLOTS_HEADER),
-		...options.includeRenderModeHeader === false ? [] : [normalizeRenderModeHeaderValue(headers.get(VINEXT_RSC_RENDER_MODE_HEADER))]
+		normalizeRenderModeHeaderValue(headers.get(VINEXT_RSC_RENDER_MODE_HEADER))
 	];
 	const stateFingerprint = headers.get(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-	if (options.includeStateFingerprintHeader !== false && stateFingerprint !== null) values.push(stateFingerprint);
+	if (stateFingerprint !== null) values.push(stateFingerprint);
 	if (values.every((value) => value === null)) return null;
-	return values.map(normalizeHeaderValue).join(",");
+	return values.map(serializeHeaderValue).join(",");
 }
 async function sha256CacheBustingHash(input) {
 	const subtle = globalThis.crypto?.subtle;
@@ -147,13 +149,6 @@ function keepOnlyValidatedRscCacheBustingSearchParam(url, isRscRequest) {
 	url.search = "";
 	if (hash !== null) setRscCacheBustingSearchParam(url, hash);
 }
-/**
-* Remove a trailing `.rsc` suffix from a pathname. Returns the pathname
-* unchanged when the suffix is absent.
-*/
-function stripRscSuffix(pathname) {
-	return pathname.endsWith(".rsc") ? pathname.slice(0, -4) : pathname;
-}
 function createCanonicalRscRequestHeaders(deploymentId = getDeploymentId()) {
 	const headers = new Headers({
 		Accept: VINEXT_RSC_CONTENT_TYPE,
@@ -232,15 +227,22 @@ function parseRscRequestPath(href) {
 	return new URL(beforeHash, RSC_REQUEST_URL_BASE);
 }
 /**
+* A pathname as the start of a path-absolute reference. One that begins with
+* "//" would serialize as a protocol-relative URL naming another host, so it
+* keeps a "/." prefix, as the WHATWG URL serializer does. URL resolution drops
+* the dot segment, so the reference still targets the same pathname on the
+* origin it is resolved against.
+*/
+function toPathAbsolutePathname(pathname) {
+	return pathname.startsWith("//") ? `/.${pathname}` : pathname;
+}
+/**
 * Serialize the path-absolute reference callers fetch against the app origin.
-* A pathname that begins with "//" would serialize as a protocol-relative URL
-* and send the request to another host, so it keeps a "/." prefix, as the
-* WHATWG URL serializer does. URL resolution drops the dot segment, so the
-* request still targets the same pathname on the app origin, as Next.js's
-* full-URL fetch does.
+* A "//" pathname keeps its "/." prefix so the request still targets the same
+* pathname on the app origin, as Next.js's full-URL fetch does.
 */
 function formatRscRequestPath(url) {
-	return `${url.pathname.startsWith("//") ? `/.${url.pathname}` : url.pathname}${url.search}`;
+	return `${toPathAbsolutePathname(url.pathname)}${url.search}`;
 }
 async function createRscRequestUrl(href, headers) {
 	const url = parseRscRequestPath(href);
@@ -275,55 +277,12 @@ async function resolveInvalidRscCacheBustingRequest(options) {
 	const url = new URL(options.request.url);
 	const actualHash = url.searchParams.get(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 	const expectedHash = await computeRscCacheBustingSearchParam(options.request.headers);
-	if (actualHash === null && expectedHash === "" && url.pathname.endsWith(".rsc")) return null;
-	const acceptedHashes = /* @__PURE__ */ new Set([expectedHash]);
-	if (actualHash !== null && actualHash !== expectedHash) {
-		acceptedHashes.add(computeLegacyRscCacheBustingSearchParam(options.request.headers));
-		const compatibilityInputs = [];
-		const hasInterceptionId = options.request.headers.has(VINEXT_INTERCEPTION_ID_HEADER);
-		const hasStateFingerprint = options.request.headers.has(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-		const hasNormalRenderMode = normalizeRenderModeHeaderValue(options.request.headers.get(VINEXT_RSC_RENDER_MODE_HEADER)) === null;
-		if (!hasInterceptionId) compatibilityInputs.push({ includeInterceptionIdHeader: false });
-		if (hasStateFingerprint) {
-			compatibilityInputs.push({ includeStateFingerprintHeader: false });
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeStateFingerprintHeader: false
-			});
-		}
-		if (hasNormalRenderMode) {
-			compatibilityInputs.push({ includeRenderModeHeader: false });
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeRenderModeHeader: false
-			});
-		}
-		if (hasStateFingerprint && hasNormalRenderMode) {
-			compatibilityInputs.push({
-				includeRenderModeHeader: false,
-				includeStateFingerprintHeader: false
-			});
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeRenderModeHeader: false,
-				includeStateFingerprintHeader: false
-			});
-		}
-		for (const compatibilityOptions of compatibilityInputs) {
-			const input = createCacheBustingInput(options.request.headers, compatibilityOptions);
-			if (input === null) acceptedHashes.add("");
-			else {
-				acceptedHashes.add(await sha256CacheBustingHash(input));
-				acceptedHashes.add(fnv1a64(input));
-			}
-		}
-	}
-	if (actualHash !== null && acceptedHashes.has(actualHash)) return null;
+	if (actualHash !== null && (actualHash === expectedHash || actualHash === computeLegacyRscCacheBustingSearchParam(options.request.headers))) return null;
 	setRscCacheBustingSearchParam(url, expectedHash);
 	return new Response(null, {
 		status: 307,
-		headers: { Location: `${url.pathname}${url.search}` }
+		headers: { Location: formatRscRequestPath(url) }
 	});
 }
 //#endregion
-export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };
+export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, toPathAbsolutePathname };

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

@@ -23,7 +23,7 @@ function createAppRscOnErrorHandler(reportRequestError, request, pathname, route
 		routerKind: "App Router",
 		routePath: routePath || pathname,
 		routeType: overrides?.routeType ?? "render",
-		renderSource: overrides?.renderSource ?? (request.headers.get("RSC") === "1" || new URL(request.url).pathname.endsWith(".rsc") ? "react-server-components-payload" : "react-server-components"),
+		renderSource: overrides?.renderSource ?? (request.headers.get("RSC") === "1" ? "react-server-components-payload" : "react-server-components"),
 		revalidateReason: isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? "on-demand" : overrides?.revalidateReason
 	};
 	let loggedErrors = loggedErrorsByRequest.get(request);

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

@@ -1,4 +1,6 @@
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
+import { logRequestError } from "./request-error-log.js";
+import { rewriteClientHookError } from "../shims/client-hook-error.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 import { isAppRenderAbortError } from "./app-render-abort-error.js";
 import { getProperError } from "./proper-error.js";
@@ -87,6 +89,7 @@ function createRscOnErrorHandler(options) {
 		if (!hasDigest(properError) && (properError !== reportableError || options.attachDigest !== false)) try {
 			Object.assign(properError, { digest });
 		} catch {}
+		if (nodeEnv !== "production") rewriteClientHookError(properError);
 		if (options.requestInfo && options.errorContext) options.reportRequestError(properError, options.requestInfo, options.errorContext);
 		if (process.env.VINEXT_PRERENDER === "1" && error) {
 			if (!loggedPrerenderErrors?.has(reportableError)) {
@@ -94,7 +97,7 @@ function createRscOnErrorHandler(options) {
 				const route = options.requestInfo?.path ?? options.errorContext?.routePath ?? "<unknown>";
 				console.error(`[vinext] Error prerendering route ${JSON.stringify(route)}:`, reportableError);
 			}
-		} else if (!(reportableError !== error && thrownHasDigest) && !wasLogged(reportableError)) console.error("[vinext] Server render error:", properError);
+		} else if (!(reportableError !== error && thrownHasDigest) && !wasLogged(reportableError)) logRequestError("[vinext] Server render error:", properError);
 		return digest;
 	};
 }

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

@@ -8,7 +8,7 @@ import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base
 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 { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, 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";
@@ -31,7 +31,7 @@ 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, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
@@ -44,7 +44,7 @@ import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
 import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { createRouteTreePrefetchResponse, isRouteTreePrefetchRequest } from "./app-route-tree-prefetch.js";
-import { createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedHybridPagesCacheIdentity, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery } from "./app-worker-stages.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";
@@ -257,13 +257,6 @@ function requestWithoutRscCacheBustingSearchParam(request) {
 	stripRscCacheBustingSearchParam(url);
 	return cloneRequestWithUrl(request, url.toString());
 }
-function requestWithoutRscSuffix(request) {
-	const url = new URL(request.url);
-	const pathname = stripRscSuffix(url.pathname);
-	if (pathname === url.pathname) return request;
-	url.pathname = pathname;
-	return cloneRequestWithUrl(request, url.toString());
-}
 /** Send a response with the never-cache policy, rebuilding immutable headers. */
 function withNeverCacheControl(response) {
 	const applyNoStore = (headers) => {
@@ -320,8 +313,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		setInterceptionResponseUncacheable(true);
 		return badRequestResponse();
 	}
-	const { requestCleanPathname } = normalized;
-	let { pathname, cleanPathname } = normalized;
+	const { pathname, requestPathname } = normalized;
+	let cleanPathname = pathname;
 	let resolvedUrl = cleanPathname + url.search;
 	const originalResolvedUrl = serializeResolvedUrl(resolvedUrl, url);
 	const getResolvedSearchParams = () => new URL(resolvedUrl, url).searchParams;
@@ -331,7 +324,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		hadBasePath
 	};
 	let cleanPathnameIsRequestPathname = true;
-	const matchCleanPathname = () => cleanPathnameIsRequestPathname && options.matchRequestRoute ? options.matchRequestRoute(requestCleanPathname) : options.matchRoute(cleanPathname);
+	const matchCleanPathname = () => cleanPathnameIsRequestPathname && options.matchRequestRoute ? options.matchRequestRoute(requestPathname) : options.matchRoute(cleanPathname);
 	if (interceptionIdHeader !== null && (!isRscRequest || interceptionContextHeader === null || request.method !== "GET" && request.method !== "HEAD" || !options.hasInterceptionId(interceptionIdHeader))) {
 		setInterceptionResponseUncacheable(true);
 		return badRequestResponse();
@@ -348,7 +341,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (sourceMatch.interceptionSourceIsConcrete !== void 0) return sourceMatch.interceptionSourceIsConcrete;
 		return sourceContext !== null && (options.matchRequestRoute ?? options.matchRoute)(sourceContext)?.route === sourceMatch.route;
 	};
-	if (provesConcreteInterceptionSource(hadBasePath && hasRawInterceptionContext && interceptionContextHeader !== null ? options.matchInterceptRoute?.(requestCleanPathname, interceptionContextHeader, interceptionIdHeader) ?? null : null)) setInterceptionResponseUncacheable(false);
+	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") {
 		const { handleAppPrerenderEndpoint } = await import("./app-prerender-endpoints.js");
 		const prerenderEndpointResponse = await handleAppPrerenderEndpoint(request, {
@@ -364,16 +357,16 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (prerenderEndpointResponse) return prerenderEndpointResponse;
 	}
 	if (!isDataRequest && !options.skipTrailingSlashRedirect) {
-		const trailingSlashRedirect = options.trailingSlash && options.isMetadataRoutePath && await options.isMetadataRoutePath(cleanPathname) ? null : normalizeTrailingSlash(requestCleanPathname, hadBasePath ? options.basePath : "", options.trailingSlash, url.search);
+		const trailingSlashRedirect = options.trailingSlash && options.isMetadataRoutePath && await options.isMetadataRoutePath(cleanPathname) ? null : normalizeTrailingSlash(requestPathname, hadBasePath ? options.basePath : "", options.trailingSlash, url.search);
 		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, {
+	const restoreLocaleRootTrailingSlash = !pagesDataRequest && shouldRestoreLocaleRootTrailingSlash(url.pathname, options);
+	const headerMatchPathname = normalizeDefaultLocalePathname(requestPathname, options.i18nConfig, {
 		hostname: url.hostname,
 		restoreRootTrailingSlash: restoreLocaleRootTrailingSlash
 	});
-	const redirectPathname = matchPathname(requestCleanPathname);
+	const redirectPathname = matchPathname(requestPathname);
 	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;
 	if (configMatchers && redirect) {
@@ -399,9 +392,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	};
 	const runMiddleware = isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? void 0 : options.runMiddleware;
 	const isolatedMiddlewareSource = runMiddleware && request.body && !request.bodyUsed ? request.clone() : null;
-	const normalizedUserlandRequest = requestWithoutRscSuffix(request);
-	const userlandRequest = requestWithoutRscCacheBustingSearchParam(normalizedUserlandRequest);
-	const isolatedMiddlewareRequest = isolatedMiddlewareSource ? requestWithoutRscCacheBustingSearchParam(requestWithoutRscSuffix(isolatedMiddlewareSource)) : void 0;
+	const userlandRequest = requestWithoutRscCacheBustingSearchParam(request);
+	const isolatedMiddlewareRequest = isolatedMiddlewareSource ? requestWithoutRscCacheBustingSearchParam(isolatedMiddlewareSource) : void 0;
 	let didMiddlewareRewrite = false;
 	let didMiddlewareRewritePathname = false;
 	let resolvedPathnameHasBasePath = hadBasePath;
@@ -413,7 +405,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const middlewareResult = await runMiddleware({
 			cleanPathname,
 			context: middlewareContext,
-			externalRewriteRequest: normalizedUserlandRequest,
+			externalRewriteRequest: request,
 			hadBasePath,
 			isDataRequest: isMiddlewareDataRequest,
 			middlewareRequest: isolatedMiddlewareRequest,
@@ -448,8 +440,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		cleanPathname = middlewareResult.cleanPathname;
 		didMiddlewareRewrite = middlewareResult.rewritten;
 		if (didMiddlewareRewrite) resolvedPathnameHasBasePath = middlewareResult.rewriteHadBasePath ?? true;
-		if (didMiddlewareRewrite || cleanPathname !== normalized.cleanPathname) cleanPathnameIsRequestPathname = false;
-		didMiddlewareRewritePathname = cleanPathname !== normalized.cleanPathname;
+		if (didMiddlewareRewrite || cleanPathname !== pathname) cleanPathnameIsRequestPathname = false;
+		didMiddlewareRewritePathname = cleanPathname !== pathname;
 		if (middlewareResult.search !== null) url.search = middlewareResult.search;
 		resolvedUrl = cleanPathname + url.search;
 	}
@@ -505,7 +497,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			const rscPath = canonicalRsc.navigation ? createCanonicalRscRequestUrl(dispatchRequest.url) : await createRscRequestUrl(dispatchRequest.url, canonicalRsc.headers);
 			dispatchRequest = cloneRequestWithUrl(dispatchRequest, new URL(rscPath, dispatchRequest.url).toString());
 		}
-		const cacheIdentity = cache !== "shared" || stageProps.kind === "app-full-request" || stageProps.kind === "hybrid-pages" || !adapterUsesSharedCacheIdentity() ? void 0 : stageProps.kind === "app-page" && adapterSharedCacheIdentity() === "query-free" && responseStagePolicy === null && stageProps.matchKind !== "interception" && stageProps.interceptionContext === null && stageProps.interceptionId === null && stageProps.mountedSlotsHeader === null ? createSharedAppPageCacheIdentity(dispatchRequest, stageProps) : createSharedAppCacheIdentity(dispatchRequest, stageProps);
+		const cacheIdentity = cache !== "shared" || stageProps.kind === "app-full-request" || stageProps.kind === "hybrid-pages" || !adapterUsesSharedCacheIdentity() ? void 0 : adapterSharedCacheIdentity() !== "query-free" || responseStagePolicy !== null ? createSharedAppCacheIdentity(dispatchRequest, stageProps) : stageProps.kind === "app-page" && stageProps.matchKind !== "interception" && stageProps.interceptionContext === null && stageProps.interceptionId === null && stageProps.mountedSlotsHeader === null ? createSharedAppPageCacheIdentity(dispatchRequest, stageProps) : stageProps.kind === "app-metadata" || stageProps.kind === "app-route-handler" && stageProps.matchKind !== "interception" ? createSharedAppRouteCacheIdentity(dispatchRequest, stageProps) : createSharedAppCacheIdentity(dispatchRequest, stageProps);
 		let response = await dispatchResponseStage(dispatchRequest, stageProps, cacheIdentity ? {
 			cache,
 			cacheIdentity
@@ -536,7 +528,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	};
 	const renderMetadataRouteIfMatched = async () => {
 		if (!filesystemRouteEligible || (options.isMetadataRoute ? !options.isMetadataRoute(cleanPathname) : !options.handleMetadataRouteRequest)) return null;
-		const metadataRoutePathname = cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname;
+		const metadataRoutePathname = cleanPathnameIsRequestPathname ? requestPathname : cleanPathname;
 		const metadataResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
 		if (metadataResponseStage) {
 			const response = await metadataResponseStage(responseStageRequest(), {
@@ -616,9 +608,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
 			middlewareContext,
-			request: normalizedUserlandRequest,
+			request,
 			requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
+			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
 			rewrites: [rewrite],
 			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 		}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
@@ -663,7 +655,6 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const publicFileResponse = resolvePublicFileRoute({
 			cleanPathname: cleanPathnameIsRequestPathname ? cleanPathname : normalizePathnameForRouteMatch(cleanPathname),
 			middlewareContext,
-			pathname,
 			publicFiles: options.publicFiles,
 			request
 		});
@@ -680,7 +671,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		params: {}
 	});
 	const directPreActionMatch = filesystemRouteEligible ? matchCleanPathname() : null;
-	const preActionRoutePathname = cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname;
+	const preActionRoutePathname = cleanPathnameIsRequestPathname ? requestPathname : cleanPathname;
 	let interceptionSourceContext = interceptionSourcePathname !== null ? interceptionContextHeader : null;
 	let interceptionSourceMatch = filesystemRouteEligible && interceptionSourcePathname !== null && interceptionContextHeader !== null ? options.matchInterceptRoute?.(preActionRoutePathname, interceptionContextHeader, interceptionIdHeader) ?? null : null;
 	let hasVerifiedInterceptionSource = provesConcreteInterceptionSource(interceptionSourceMatch);
@@ -749,7 +740,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				sourceMiddlewareResult = await runWithHeadersContext(sourceHeadersContext, () => runMiddleware({
 					cleanPathname: decodedSourceRequestPathname,
 					context: sourceMiddlewareContext,
-					externalRewriteRequest: normalizedUserlandRequest,
+					externalRewriteRequest: request,
 					hadBasePath: resolvedPathnameHasBasePath,
 					isDataRequest: isMiddlewareDataRequest,
 					request: sourceMiddlewareRequest,
@@ -792,21 +783,22 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				sourceRulesPathname = sourceMiddlewareResult.cleanPathname;
 			}
 		}
-		if (HAS_CONFIG_REWRITES && options.configRewrites.beforeFiles.length) {
+		if (HAS_CONFIG_REWRITES && (options.configRewrites.beforeFiles.length || options.configRewrites.afterFiles.length)) {
 			const { matchRewrite } = await import("../config/config-matchers.js");
 			const sourceRewriteContext = requestContextForResolvedUrl(buildPostMwRequestContext(userlandRequest), resolvedUrl, url);
-			let didRewriteSource = false;
-			for (const rewrite of options.configRewrites.beforeFiles) {
-				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();
-					return notFoundResponse();
+			const rewriteSource = (rewrites, stopAtRoute) => {
+				let didRewriteSource = false;
+				for (const rewrite of rewrites) {
+					const destination = matchRewrite(matchPathname(sourceRulesPathname), [rewrite], sourceRewriteContext, currentBasePathState(), matchPathname(sourceRulesPathname), dispatchResponseStage === void 0 ? markConditionalRewriteCacheability : void 0);
+					if (!destination) continue;
+					if (isExternalUrl(destination) || destination.includes("?")) return false;
+					sourceRulesPathname = pathnameForResolvedUrl(destination);
+					didRewriteSource = true;
+					if (stopAtRoute && options.matchRoute(sourceRulesPathname)) break;
 				}
-				sourceRulesPathname = pathnameForResolvedUrl(destination);
-				didRewriteSource = true;
-			}
-			if (didRewriteSource && !adoptRewrittenInterceptionSource(sourceRulesPathname)) {
+				return !didRewriteSource || adoptRewrittenInterceptionSource(sourceRulesPathname);
+			};
+			if (!rewriteSource(options.configRewrites.beforeFiles, false) || interceptionSourceMatch.route.isDynamic && !rewriteSource(options.configRewrites.afterFiles, true)) {
 				options.clearRequestContext();
 				return notFoundResponse();
 			}
@@ -831,7 +823,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const isInterceptionMatch = interceptionPreActionMatch !== null;
 	const rendersRawRequestMatch = options.matchRawRequestRoute !== void 0 && (isPossibleAppRouteActionRequest(request) || isDraftModeRequest(request, options.draftModeSecret) || isDraftModeEnabled());
 	const usesRawRequestMatch = () => rendersRawRequestMatch && cleanPathnameIsRequestPathname && !isInterceptionMatch;
-	const renderedRouteMatch = (routeMatch) => routeMatch !== null && usesRawRequestMatch() ? options.matchRawRequestRoute(requestCleanPathname) ?? routeMatch : routeMatch;
+	const renderedRouteMatch = (routeMatch) => routeMatch !== null && usesRawRequestMatch() ? options.matchRawRequestRoute(requestPathname) ?? routeMatch : routeMatch;
 	const renderedPreActionMatch = renderedRouteMatch(preActionMatch);
 	if (renderedPreActionMatch) setRootParams(pickRootParams(renderedPreActionMatch.params, renderedPreActionMatch.route.rootParamNames));
 	if (pagesDataRequest && didMiddlewareRewritePathname && preActionMatch && !preActionMatch.route.isDynamic) {
@@ -854,9 +846,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		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()), {
+		await applyAppRscConfigHeaders(sourceConfigHeaders, request, {
 			basePath: options.basePath,
 			configHeaders: options.configHeaders,
 			i18nConfig: options.i18nConfig,
@@ -915,7 +905,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	let match = preActionMatch;
 	const renderPagesForMatchKind = async (matchKind) => {
 		if (!filesystemRouteEligible) return null;
-		const pagesRouteUrl = cleanPathnameIsRequestPathname ? requestCleanPathname + resolvedUrl.slice(pathnameForResolvedUrl(resolvedUrl).length) : resolvedUrl;
+		const pagesRouteUrl = cleanPathnameIsRequestPathname ? requestPathname + resolvedUrl.slice(pathnameForResolvedUrl(resolvedUrl).length) : resolvedUrl;
 		let sharedOuterPolicyNeedsReconciliation = false;
 		const dispatchPagesResponseStage = dispatchResponseStage ? async (stageRequest, resourceKind, dataKind, hasRequestAwareDocument, runsInitialProps) => {
 			const pagesOnDemandRevalidate = resourceKind === "page" && isOnDemandRevalidateRequest(stageRequest.headers.get("x-prerender-revalidate"));
@@ -1009,9 +999,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
 			middlewareContext,
-			request: normalizedUserlandRequest,
+			request,
 			requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
+			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
 			rewrites: [rewrite],
 			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 		}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
@@ -1057,9 +1047,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
 			middlewareContext,
-			request: normalizedUserlandRequest,
+			request,
 			requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
+			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
 			rewrites: [rewrite],
 			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 		}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
@@ -1096,7 +1086,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (match) break;
 	}
 	if (interceptionCacheProofInvalidated && interceptionSourceContext !== null) {
-		const finalInterceptionTargetPathname = cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname;
+		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);
 		if (interceptionIdHeader !== null && !hasVerifiedFinalInterceptionSource) {
@@ -1140,7 +1130,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const finalRouteMatch = renderedRouteMatch(match);
 		setRootParams(finalRouteMatch ? pickRootParams(finalRouteMatch.params, finalRouteMatch.route.rootParamNames) : null);
 		if (isServerActionRequest) {
-			const serverActionResponse = await handleServerAction(finalRouteMatch, cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname);
+			const serverActionResponse = await handleServerAction(finalRouteMatch, cleanPathnameIsRequestPathname ? requestPathname : cleanPathname);
 			if (serverActionResponse) return serverActionResponse;
 		} else {
 			const progressiveActionResult = await handleProgressiveAction(finalRouteMatch, match);
@@ -1186,7 +1176,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	}
 	match = renderedRouteMatch(match);
 	const { route, params } = match;
-	const requestPathnameDiffersFromCachePath = requestCleanPathname !== cleanPathname;
+	const requestPathnameDiffersFromCachePath = requestPathname !== cleanPathname;
 	const rawRequestPathnameIsObservable = isInterceptionMatch || route.routeHandler != null || typeof route.__loadRouteHandler === "function";
 	if ((!isInterceptionMatch || requestPathnameDiffersFromCachePath) && options.matchRequestRoute) {
 		const cachePathMatch = options.matchRoute(cleanPathname);
@@ -1213,7 +1203,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const isPrerenderFallbackShell = prerenderRouteParamsMatch?.kind === "fallback-shell";
 	const renderParams = prerenderRouteParams ?? params;
 	const responseStageMatchKind = isInterceptionMatch ? "interception" : cleanPathnameIsRequestPathname && options.matchRequestRoute ? usesRawRequestMatch() ? "raw-request" : "request" : "resolved";
-	const responseStageRoutePathname = isInterceptionMatch ? preActionRoutePathname : cleanPathnameIsRequestPathname ? requestCleanPathname || "/" : cleanPathname || "/";
+	const responseStageRoutePathname = isInterceptionMatch ? preActionRoutePathname : cleanPathnameIsRequestPathname ? requestPathname || "/" : cleanPathname || "/";
 	const matchedResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
 	let runtimeFallbackShells = [];
 	if (options.createPprFallbackShells && request.method === "GET" && !isRscRequest && !isPrerenderFallbackShell && route.params) runtimeFallbackShells = options.createPprFallbackShells({
@@ -1229,7 +1219,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const rootParams = pickRootParams(renderParams, route.rootParamNames);
 	setRootParams(rootParams);
 	if (route.routeHandler) {
-		const routeHandlerRequest = isEdgeRouteHandler(route.routeHandler) ? userlandRequest : normalizedUserlandRequest;
+		const routeHandlerRequest = isEdgeRouteHandler(route.routeHandler) ? userlandRequest : request;
 		const routeHandlerUrl = new URL(routeHandlerRequest.url);
 		const internalRscValues = isEdgeRouteHandler(route.routeHandler) ? [] : routeHandlerUrl.searchParams.getAll(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 		routeHandlerUrl.search = resolvedSearchParams.toString();
@@ -1312,7 +1302,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		handlerStart,
 		interceptionContext: interceptionSourceContext,
 		interceptionId: interceptionIdHeader,
-		interceptionPathname: cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname,
+		interceptionPathname: cleanPathnameIsRequestPathname ? requestPathname : cleanPathname,
 		isProgressiveActionRender: progressiveActionFormState !== null,
 		isRscRequest,
 		middlewareContext,
@@ -1375,8 +1365,9 @@ 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 handleAppRscRequestLifecycle = async (hostRequest, ctx, allowInternalRscDocumentFallback = false, dispatchResponseStage, responseStageProbeMode = null, transportedPrerenderState) => {
+		const rawRequestSignal = hostRequest.signal;
+		const rawRequest = stripRequestUrlFragment(hostRequest);
 		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);
@@ -1440,7 +1431,7 @@ function createAppRscRequestHandler(options) {
 				basePath: options.basePath,
 				configHeaders: options.configHeaders,
 				i18nConfig: options.i18nConfig,
-				restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(stripRscSuffix(new URL(rawRequest.url).pathname), options),
+				restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(new URL(rawRequest.url).pathname, options),
 				middlewareHeaders: middlewareContext.headers,
 				recordCacheability: dispatchResponseStage === void 0,
 				requestContext: preMiddlewareRequestContext
@@ -1468,7 +1459,7 @@ function createAppRscRequestHandler(options) {
 			detached: detachedTrace,
 			getStatus: (response) => response?.status,
 			headers: rawRequest.headers,
-			isRsc: traceUrl.pathname.endsWith(".rsc") || rawRequest.headers.get("RSC") === "1",
+			isRsc: rawRequest.headers.get("RSC") === "1",
 			method: rawRequest.method,
 			target: traceUrl.pathname + traceUrl.search
 		});

package/dist/server/app-rsc-request-normalization.d.ts

@@ -6,11 +6,9 @@ export type NormalizedRscRequest = {
   url: URL;
   /** Normalized pathname with basePath stripped. Used for all internal routing. */
   pathname: string;
-  /** Pathname with `.rsc` suffix removed. Used for route matching and navigation context. */
-  cleanPathname: string;
-  /** Original encoded request pathname with basePath and `.rsc` removed. */
-  requestCleanPathname: string;
-  /** True when the request targets a canonical `.rsc` payload URL. */
+  /** Original encoded request pathname with basePath stripped. */
+  requestPathname: string;
+  /** True when the request selects the RSC payload with `RSC: 1`. */
   isRscRequest: boolean;
   /** Sanitized X-Vinext-Interception-Context header (null bytes stripped). null when absent. */
   interceptionContextHeader: string | null;
@@ -42,13 +40,13 @@ export type NormalizedRscRequest = {
  *   4. Collapse double-slashes, resolve `.` and `..` segments (normalizePath)
  *   5. basePath check + strip — 404 when pathname lacks the basePath prefix.
  *      `/__vinext/` bypasses this for internal prerender endpoints.
- *   6. RSC detection: `.rsc` suffix or Next-style `RSC: 1`. The internal
- *      `_rsc` cache-busting query is validated separately so full-route Flight
- *      responses do not share the canonical HTML URL in caches that ignore Vary.
- *   7. cleanPathname — pathname with `.rsc` suffix stripped
- *   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
- *   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
- *   10. Read semantic render mode for refresh/action payload rendering
+ *   6. RSC detection: `RSC: 1`, as in Next.js. A `.rsc` suffix is an ordinary
+ *      part of the pathname. The internal `_rsc` cache-busting query is
+ *      validated separately so full-route Flight responses do not share the
+ *      canonical HTML URL in caches that ignore Vary.
+ *   7. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
+ *   8. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
+ *   9. Read semantic render mode for refresh/action payload rendering
  *
  * @returns A 400 or 404 Response for invalid or out-of-scope inputs,
  *          or a NormalizedRscRequest for valid requests.