vinext 1.0.0-beta.11 → 1.0.0-beta.13

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

@@ -1,6 +1,6 @@
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import "./headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { RequestCookies, ResponseCookies } from "../shims/server.js";
 import { attachRequestCfMetadata, processMiddlewareHeaders, validateCsrfOrigin } from "./request-pipeline.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";

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

@@ -848,6 +848,7 @@ function registerServerActionCallback() {
 			navigationPlanner,
 			performHardNavigation: (url, historyMode) => browserNavigationController.performHardNavigation(url, historyMode),
 			renderRedirectPayload(elements, target, actionInitiation, revalidation) {
+				if (browserNavigationController.isCurrentNavigation(actionInitiation.navigationId)) getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
 				const hashIdx = target.href.indexOf("#");
 				const hash = hashIdx !== -1 ? target.href.slice(hashIdx) : "";
 				const actionScrollIntent = beginAppRouterScrollIntent(hash || null);

package/dist/server/app-browser-error.js

@@ -1,5 +1,5 @@
-import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
 //#region src/server/app-browser-error.ts
 function isImplicitRootErrorBoundary(errorInfo) {
 	if (!isUnknownRecord(errorInfo.errorBoundary)) return false;

package/dist/server/app-elements-wire.js

@@ -1,7 +1,7 @@
-import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
+import { isUnknownRecord } from "../utils/record.js";
 import { compareStrings } from "../utils/compare.js";
+import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
 import { createAppElementsWireSlotId, isAppElementsWireSlotId, parseAppElementsWireElementKey } from "./app-elements-wire-key.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { createArtifactCompatibilityEnvelope, parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { releaseAppElementRenderDependency } from "./app-render-dependency.js";
 import { isValidElement } from "react";

package/dist/server/app-middleware.js

@@ -1,7 +1,7 @@
 import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
-import { FLIGHT_HEADERS } from "./headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { FLIGHT_HEADERS } from "./headers.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
 import { executeMiddleware } from "./middleware-runtime.js";

package/dist/server/app-optimistic-routing.js

@@ -1,6 +1,6 @@
+import { isUnknownRecord } from "../utils/record.js";
 import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { extractRawRoutePatternParams, matchRoutePattern } from "../routing/route-pattern.js";

package/dist/server/app-page-cache-finalizer.d.ts

@@ -24,6 +24,7 @@ type FinalizeAppPageCacheabilityEvaluationOptions = {
   revalidateSeconds: number | null;
 };
 type FinalizeAppPageHtmlCacheResponseOptions = {
+  bypassInterceptionContextCache?: boolean;
   capturedDynamicUsageBeforeContextCleanup?: () => boolean;
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;

package/dist/server/app-page-cache-finalizer.js

@@ -19,7 +19,7 @@ function applyPendingDynamicCdnHeaders(headers, tags, options = {}) {
 	});
 	finalizePendingCacheStateHeaders(headers, options);
 }
-function applyUncacheableRscVariantNoStoreHeaders(headers, options = {}) {
+function applyUncacheableVariantNoStoreHeaders(headers, options = {}) {
 	applyCdnResponseHeaders(headers, { cacheControl: NO_STORE_CACHE_CONTROL });
 	finalizePendingCacheStateHeaders(headers, {
 		...options,
@@ -114,6 +114,18 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 		}
 		return probeResponse;
 	}
+	if (options.bypassInterceptionContextCache === true) {
+		options.capturedRscDataPromise?.catch(() => {});
+		const headers = new Headers(response.headers);
+		applyUncacheableVariantNoStoreHeaders(headers, { omitCacheState: options.omitPendingDynamicCacheState === true });
+		const clientResponse = new Response(response.body, {
+			status: response.status,
+			statusText: response.statusText,
+			headers
+		});
+		markFrameworkLinkHeaders(clientResponse.headers, options.linkHeader);
+		return clientResponse;
+	}
 	if (!response.body) return response;
 	const [streamForClient, streamForCache] = response.body.tee();
 	const htmlKey = options.isrHtmlKey(options.cleanPathname);
@@ -184,7 +196,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 	const isUncacheableVariant = Boolean(options.mountedSlotsHeader) || options.bypassInterceptionContextCache === true;
 	if (options.preserveClientResponseHeaders === true && !isUncacheableVariant) return response;
 	const clientHeaders = new Headers(response.headers);
-	if (isUncacheableVariant) applyUncacheableRscVariantNoStoreHeaders(clientHeaders, { omitCacheState: options.omitPendingDynamicCacheState === true });
+	if (isUncacheableVariant) applyUncacheableVariantNoStoreHeaders(clientHeaders, { omitCacheState: options.omitPendingDynamicCacheState === true });
 	else applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags(), { omitCacheState: options.omitPendingDynamicCacheState === true });
 	return new Response(response.body, {
 		status: response.status,

package/dist/server/app-page-dispatch.js

@@ -1,6 +1,6 @@
 import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_INTERCEPTION_ID_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import "./headers.js";
 import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityPatternDynamic } from "../shims/cacheability-classification.js";

package/dist/server/app-page-element-builder.js

@@ -6,6 +6,7 @@ import "./app-elements.js";
 import { createAppPageRenderIdentity } from "./app-page-render-identity.js";
 import { matchRoutePattern } from "../routing/route-pattern.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
+import { withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 import { prepareAppPageHead, resolveActiveParallelRouteHeadInputs } from "./app-page-head.js";
@@ -230,13 +231,13 @@ async function buildPageElements(options) {
 		if (isReactOwnedAppComponent(PageComponent)) {
 			const invocationProps = { ...props };
 			if (searchParams) invocationProps.searchParams = observePageSearchParamsAccess ? makeObservedAppPageSearchParamsThenable(pageSearchParams, { markDynamic: hasRequestSearchParams }) : makeThenableParams(pageSearchParams);
-			return createElement(PageComponent, invocationProps);
+			return createElement(PageComponent, withUseCachePageMarker(PageComponent, invocationProps));
 		}
 		const PageInvoker = () => {
 			const invocationProps = { ...props };
 			if (searchParams) invocationProps.searchParams = observePageSearchParamsAccess ? makeObservedAppPageSearchParamsThenable(pageSearchParams) : makeThenableParams(pageSearchParams);
 			try {
-				const result = invokeAppComponent(PageComponent, invocationProps);
+				const result = invokeAppComponent(PageComponent, withUseCachePageMarker(PageComponent, invocationProps));
 				if (isPromiseLike(result)) {
 					if (renderDependency) Promise.resolve().then(() => renderDependency.release());
 					return Promise.resolve(result).then((resolvedResult) => renderDependency ? renderAfterAppDependencies(resolvedResult, renderDependency.resultDependencies) : resolvedResult);

package/dist/server/app-page-probe.js

@@ -1,7 +1,7 @@
 import { isPromiseLike } from "../utils/promise.js";
 import { isNextRouterError } from "../shims/navigation-errors.js";
 import "../shims/navigation-server.js";
-import { markAppPagePropsForUseCache } from "../shims/internal/app-page-props-cache-key.js";
+import { markAppPagePropsForUseCache, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { probeAppPageComponent, probeAppPageLayouts } from "./app-page-execution.js";
 import { collectAppPageSearchParams } from "./app-page-head.js";
 import { makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
@@ -153,10 +153,10 @@ function probeAppPage(options) {
 	if (typeof pageComponent !== "function") return null;
 	const { pageSearchParams } = collectAppPageSearchParams(searchParams);
 	const asyncSearchParams = makeObservedAppPageSearchParamsThenable(pageSearchParams, { observeReactPromiseStatus: true });
-	const result = pageComponent(markAppPagePropsForUseCache({
+	const result = pageComponent(markAppPagePropsForUseCache(withUseCachePageMarker(pageComponent, {
 		params: asyncRouteParams,
 		searchParams: asyncSearchParams
-	}));
+	})));
 	if (isPromiseLike(result)) return result.then(async (resolved) => {
 		await probeReactServerSubtreeForDynamicUsage(resolved);
 		return resolved;

package/dist/server/app-page-render.js

@@ -705,6 +705,7 @@ async function renderAppPageLifecycleImpl(options, renderSpan) {
 		});
 		if (options.isPrerender === true) return isrResponse;
 		return finalizeAppPageHtmlCacheResponse(isrResponse, {
+			bypassInterceptionContextCache: options.bypassInterceptionContextCache,
 			capturedDynamicUsageBeforeContextCleanup() {
 				return dynamicUsedBeforeContextCleanup;
 			},

package/dist/server/app-page-request.d.ts

@@ -35,7 +35,9 @@ export type ValidateAppPageDynamicParamsOptions = {
   enforceStaticParamsOnly: boolean;
   generateStaticParams?: GenerateStaticParams | GenerateStaticParamsSource | readonly (GenerateStaticParams | GenerateStaticParamsSource | null | undefined)[] | null;
   isDynamicRoute: boolean;
+  optionalCatchAllParamNames?: readonly string[];
   params: AppPageParams;
+  requiredParamNames?: readonly string[];
 };
 type ResolveAppPageGenerateStaticParamsSourcesOptions = {
   layouts?: readonly (GenerateStaticParamsModule | null | undefined)[];

package/dist/server/app-page-request.js

@@ -110,18 +110,21 @@ function resolveAppPageGenerateStaticParamsSources(options) {
 	}
 	return sources;
 }
-function areStaticParamsAllowed(params, staticParams, allowMissingValues = false) {
-	const paramKeys = Object.keys(params);
+function areStaticParamsAllowed(params, staticParams, allowMissingValues = false, paramKeys = Object.keys(params), optionalCatchAllParamNames = []) {
 	const stringParamMatches = (value, staticValue) => value === encodeURIComponent(staticValue);
-	return staticParams.some((staticParamSet) => paramKeys.every((key) => {
-		const value = params[key];
-		const staticValue = staticParamSet[key];
-		if (!Object.hasOwn(staticParamSet, key)) return allowMissingValues;
-		if (Array.isArray(value)) return Array.isArray(staticValue) && value.length === staticValue.length && value.every((part, index) => typeof staticValue[index] === "string" ? stringParamMatches(part, staticValue[index]) : part === staticValue[index]);
-		if (typeof staticValue === "string") return stringParamMatches(value, staticValue);
-		if (typeof staticValue === "number" || typeof staticValue === "boolean") return String(value) === String(staticValue);
-		return JSON.stringify(value) === JSON.stringify(staticValue);
-	}));
+	return staticParams.some((staticParamSet) => {
+		if (!staticParamSet || typeof staticParamSet !== "object" || Array.isArray(staticParamSet)) return false;
+		return paramKeys.every((key) => {
+			const value = params[key];
+			const staticValue = staticParamSet[key];
+			if (!Object.hasOwn(staticParamSet, key)) return allowMissingValues;
+			if (value === void 0) return optionalCatchAllParamNames.includes(key) && (staticValue === void 0 || staticValue === null || staticValue === false || Array.isArray(staticValue) && staticValue.length === 0);
+			if (Array.isArray(value)) return Array.isArray(staticValue) && value.length === staticValue.length && value.every((part, index) => typeof staticValue[index] === "string" ? stringParamMatches(part, staticValue[index]) : part === staticValue[index]);
+			if (typeof staticValue === "string") return stringParamMatches(value, staticValue);
+			if (typeof staticValue === "number" || typeof staticValue === "boolean") return String(value) === String(staticValue);
+			return JSON.stringify(value) === JSON.stringify(staticValue);
+		});
+	});
 }
 function remapStaticParamsToRouteParams(staticParams, source) {
 	if (!source.paramAliases) return [...staticParams];
@@ -227,9 +230,10 @@ async function validateAppPageDynamicParams(options) {
 		const result = await generateIndependentStaticParams(sources, chainedStaticParams, options.params);
 		if (result.validated) {
 			validatedIndependentResults = true;
-			if (!areStaticParamsAllowed(options.params, result.staticParams, true)) return notFoundResponse();
+			if (!areStaticParamsAllowed(options.params, result.staticParams, options.requiredParamNames === void 0, options.requiredParamNames, options.optionalCatchAllParamNames)) return notFoundResponse();
 		}
 	}
+	if (options.requiredParamNames && !validatedIndependentResults) return notFoundResponse();
 	if (chainedStaticParams && !validatedIndependentResults) {
 		if (!areStaticParamsAllowed(options.params, chainedStaticParams)) return notFoundResponse();
 	}

package/dist/server/app-request-stage-dispatch.js

@@ -40,7 +40,7 @@ async function dispatchAppRequestStage(request, ctx, dispatchResponseStage, opti
 			draftModeCookie: null,
 			middlewareCookieOverlay: null,
 			prerenderDiscovery: options.prerenderDiscovery,
-			protocolVersion: 8,
+			protocolVersion: 10,
 			requestOrigin: new URL(request.url).origin,
 			scriptNonce: null,
 			staticFileSignalToken,

package/dist/server/app-request-stage-independent-entry.js

@@ -1,6 +1,7 @@
+import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
-import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import "./app-rsc-vary.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./headers.js";
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
@@ -8,7 +9,6 @@ import { isOpenRedirectShaped } from "./open-redirect.js";
 import { cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { getImageOptimizer, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { consumeFrameworkRequestRoute, traceFrameworkRequest } from "./request-tracing.js";
 import { createStaticAssetRequest, finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";

package/dist/server/app-route-handler-dispatch.d.ts

@@ -18,6 +18,7 @@ type RouteHandlerBackgroundRegenerationErrorContext = {
 type RouteHandlerBackgroundRegenerator = (key: string, renderFn: () => Promise<void>, errorContext?: RouteHandlerBackgroundRegenerationErrorContext) => void;
 type DispatchAppRouteHandlerOptions = {
   basePath?: string;
+  bypassSharedCache?: boolean;
   cleanPathname: string;
   clearRequestContext: () => void;
   draftModeSecret: string;

package/dist/server/app-route-handler-dispatch.js

@@ -1,6 +1,6 @@
 import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { beginRouteCacheability, getRouteCacheabilityDynamicReason } from "../shims/cacheability-classification.js";
 import { applyCdnResponseBuildIdentityHeaders } from "./cache-control.js";
@@ -91,7 +91,7 @@ async function dispatchAppRouteHandlerImpl(options) {
 		headers: { Allow: allowHeaderForOptions }
 	}));
 	const resolvedHandlerFn = isAppRouteHandlerFunction(handlerFn) ? handlerFn : void 0;
-	const shouldReadRouteCache = revalidateSeconds !== null && !getRouteCacheabilityDynamicReason() && shouldReadAppRouteHandlerCache({
+	const shouldReadRouteCache = options.bypassSharedCache !== true && revalidateSeconds !== null && !getRouteCacheabilityDynamicReason() && shouldReadAppRouteHandlerCache({
 		dynamicConfig: handler.dynamic,
 		handlerFn: resolvedHandlerFn,
 		isAutoHead,
@@ -160,6 +160,7 @@ async function dispatchAppRouteHandlerImpl(options) {
 	if (resolvedHandlerFn) {
 		const response = await executeAppRouteHandler({
 			basePath: options.basePath,
+			bypassSharedCache: options.bypassSharedCache,
 			buildPageCacheTags(pathname, extraTags) {
 				return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);
 			},

package/dist/server/app-route-handler-execution.d.ts

@@ -65,6 +65,7 @@ type RunAppRouteHandlerResult = {
 export declare function applyDraftModeCachePolicy(response: Response, isDraftMode: boolean): Response;
 type ExecuteAppRouteHandlerOptions = {
   buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];
+  bypassSharedCache?: boolean;
   clearRequestContext: () => void;
   cleanPathname: string;
   executionContext: ExecutionContextLike | null;

package/dist/server/app-route-handler-execution.js

@@ -214,7 +214,7 @@ async function executeAppRouteHandlerImpl(options) {
 			dynamicUsedInHandler = handlerResult.didAccessDynamicRequest() || dynamicUsedDuringCompletion || dynamicUsedInHandler;
 		}
 		const requestCacheabilityVeto = getRouteCacheabilityDynamicReason();
-		const responseMustStayPrivate = Boolean(options.handler.dynamic === "force-dynamic" || dynamicUsedInHandler || requestCacheabilityVeto || cleanupDeferredToBody);
+		const responseMustStayPrivate = Boolean(options.bypassSharedCache === true || options.handler.dynamic === "force-dynamic" || dynamicUsedInHandler || requestCacheabilityVeto || cleanupDeferredToBody);
 		if (dynamicUsedInHandler) markKnownDynamicAppRoute(options.routePattern);
 		const pendingCookies = options.getAndClearPendingCookies();
 		const handlerDraftCookie = options.getDraftModeCookieHeader() ?? handlerDraftCookieBeforeCompletion;
@@ -269,7 +269,7 @@ async function executeAppRouteHandlerImpl(options) {
 			isHead: options.isAutoHead
 		}), options.middlewareContext, middlewareMergeOptions), shouldApplyDraftPolicy);
 		const preserveHandlerPolicy = isRouteCacheabilityEvaluation() ? hasExplicitCacheablePolicy : handlerSetCachePolicy;
-		if (responseMustStayPrivate && !preserveHandlerPolicy) {
+		if (options.bypassSharedCache === true || responseMustStayPrivate && !preserveHandlerPolicy) {
 			const headers = new Headers(finalized.headers);
 			applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
 			finalized = new Response(finalized.body, {

package/dist/server/app-route-handler-runtime.js

@@ -1,5 +1,5 @@
-import { addBasePathToPathname } from "../utils/base-path.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { addBasePathToPathname } from "../utils/base-path.js";
 import { NextRequest, RequestCookies, sealRequestCookies, sealRequestHeaders } from "../shims/server.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
 import { BUILT_IN_REQUEST_PROPERTIES } from "./app-route-request-built-ins.js";

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

@@ -1,6 +1,7 @@
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import "./app-rsc-vary.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM } from "./headers.js";
 import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
@@ -8,7 +9,6 @@ import { isOpenRedirectShaped } from "./open-redirect.js";
 import { cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { getImageOptimizer, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { traceFrameworkRequest } from "./request-tracing.js";
 import { createStaticAssetRequest, finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";

package/dist/server/app-rsc-handler.d.ts

@@ -1,5 +1,5 @@
-import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
 import { VinextCacheabilityProbeMode } from "./multi-stage.js";
+import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
 import { ImageConfig } from "./image-optimization.js";
 import { AppMiddlewareContext, ApplyAppMiddlewareResult } from "./app-middleware.js";
 import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
@@ -50,6 +50,7 @@ type AppRscRouteMatch<TRoute> = {
 };
 type DispatchMatchedPageOptions<TRoute> = {
   bypassInterceptionContextCache: boolean;
+  cachePathname: string;
   clientReuseManifest: ClientReuseManifestParseResult;
   cleanPathname: string;
   displayPathname: string;
@@ -86,6 +87,12 @@ type DispatchMatchedPageOptions<TRoute> = {
   renderMode: AppRscRenderMode;
 };
 type DispatchMatchedRouteHandlerOptions<TRoute> = {
+  /**
+   * Legacy transported cache-bypass bit. Also covers request/cache route-identity
+   * divergence so the response cannot be published under another route's key.
+   */
+  bypassInterceptionContextCache: boolean;
+  cachePathname: string;
   cleanPathname: string;
   middlewareContext: AppRscMiddlewareContext;
   /**
@@ -207,7 +214,7 @@ export type CreateAppRscHandlerOptions<TRoute extends AppRscHandlerRoute> = {
   /** Request-only entries dynamically load the response graph for local bypasses. */
   renderResponseStageLocally?: RenderAppWorkerResponseStageLocally;
   handleProgressiveActionRequest?: (options: HandleProgressiveActionRequestOptions<TRoute>) => Promise<Response | ProgressiveActionFormStateResult | null>;
-  handleMetadataRouteRequest?: (cleanPathname: string) => Promise<Response | null>;
+  handleMetadataRouteRequest?: (cleanPathname: string, routePathname: string) => Promise<Response | null>;
   isMetadataRoutePath?: (cleanPathname: string) => boolean | Promise<boolean>;
   getPrerenderMetadataRoutePaths?: () => Promise<unknown>;
   createPprFallbackShells?: (route: Pick<AppRscHandlerRoute, "params" | "pattern" | "rootParamNames">, params: AppPageParams) => AppPagePprFallbackCacheShell[];

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

@@ -1,16 +1,16 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
+import { requestContextFromRequest } from "../config/request-context.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { 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 { requestContextFromRequest } from "../config/request-context.js";
-import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import "./app-rsc-vary.js";
 import { ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
-import { hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
 import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js";
-import { isExternalUrl } from "../utils/external-url.js";
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute } from "./request-pipeline.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
@@ -75,6 +75,9 @@ function haveSamePageParams(first, second) {
 	}
 	return true;
 }
+function rewriteCachePathname(sourcePathname, resolvedPathname) {
+	return `${sourcePathname}?__vinext_rewrite=${encodeURIComponent(resolvedPathname)}`;
+}
 function requestOptsOutOfWorkerResponseStage(request, options, scriptNonce, allowInternalRscDocumentFallback) {
 	if (request.method !== "GET" && request.method !== "HEAD") return true;
 	if (allowInternalRscDocumentFallback || scriptNonce !== void 0) return true;
@@ -406,6 +409,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 metadataResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
 		if (metadataResponseStage) {
 			const response = await metadataResponseStage(responseStageRequest(), {
@@ -418,10 +422,11 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				isRscRequest,
 				middlewareCookieOverlay,
 				mountedSlotsHeader,
-				protocolVersion: 8,
+				protocolVersion: 10,
 				requestOrigin: url.origin,
 				renderMode,
 				resolvedUrl,
+				routePathname: metadataRoutePathname,
 				scriptNonce: scriptNonce ?? null
 			});
 			if (response.headers.get("x-vinext-app-metadata-stage-no-match") === "1") {
@@ -430,7 +435,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			}
 			return response;
 		}
-		return options.handleMetadataRouteRequest?.(cleanPathname) ?? null;
+		return options.handleMetadataRouteRequest?.(cleanPathname, metadataRoutePathname) ?? null;
 	};
 	const applyConfigHeadersToResponseStage = async (response, preserveExistingPolicy = false) => {
 		const headers = new Headers(response.headers);
@@ -759,7 +764,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				matchKind,
 				middlewareCookieOverlay,
 				preHandlerHeaders: cache === "shared" && resourceKind === "page" && dataKind === "static" ? null : [...await loadPreHandlerResponseHeaders()],
-				protocolVersion: 8,
+				protocolVersion: 10,
 				requestOrigin: url.origin,
 				resourceKind,
 				requestUrl: request.url,
@@ -938,7 +943,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			isRscRequest,
 			middlewareCookieOverlay,
 			mountedSlotsHeader,
-			protocolVersion: 8,
+			protocolVersion: 10,
 			requestOrigin: url.origin,
 			renderMode,
 			resolvedUrl,
@@ -958,6 +963,16 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		return notFoundResponse({ headers });
 	}
 	const { route, params } = match;
+	const requestPathnameDiffersFromCachePath = requestCleanPathname !== cleanPathname;
+	const rawRequestPathnameIsObservable = isInterceptionMatch || route.routeHandler != null || typeof route.__loadRouteHandler === "function";
+	if ((!isInterceptionMatch || requestPathnameDiffersFromCachePath) && options.matchRequestRoute) {
+		const cachePathMatch = options.matchRoute(cleanPathname);
+		if (requestPathnameDiffersFromCachePath && rawRequestPathnameIsObservable || !cachePathMatch || cachePathMatch.route.pattern !== route.pattern || !haveSamePageParams(cachePathMatch.params, params)) {
+			bypassInterceptionContextCache = true;
+			setInterceptionResponseUncacheable(true);
+		}
+	}
+	const cachePathname = cleanPathnameIsRequestPathname ? cleanPathname : rewriteCachePathname(canonicalPathname, cleanPathname);
 	setFrameworkRequestRoute(patternToNextFormat(route.pattern), isRscRequest);
 	if (options.ensureRouteLoaded) await traceFindPageComponents(route.pattern, () => options.ensureRouteLoaded(route));
 	const resolvedSearchParams = getResolvedSearchParams();
@@ -1001,6 +1016,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			buildId: options.buildId,
 			cacheability: responseStageCacheability(resolvedUrl),
 			bypassInterceptionContextCache,
+			cachePathname,
 			canUseCanonicalLoadingShell: route.canUseCanonicalLoadingShell === true,
 			canonicalPathname,
 			cleanPathname,
@@ -1013,7 +1029,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			middlewareCookieOverlay,
 			mountedSlotsHeader,
 			params,
-			protocolVersion: 8,
+			protocolVersion: 10,
 			requestOrigin: url.origin,
 			renderMode,
 			resolvedUrl,
@@ -1024,6 +1040,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const { setCurrentFetchSoftTags } = await import("../shims/fetch-cache.js");
 		setCurrentFetchSoftTags(buildPageCacheTags(cleanPathname, [], [...route.routeSegments], "route"));
 		return options.dispatchMatchedRouteHandler({
+			bypassInterceptionContextCache,
+			cachePathname,
 			cleanPathname,
 			middlewareContext,
 			params: route.isDynamic ? renderParams : null,
@@ -1037,6 +1055,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		buildId: options.buildId,
 		cacheability: responseStageCacheability(resolvedUrl),
 		bypassInterceptionContextCache,
+		cachePathname,
 		canUseCanonicalLoadingShell: route.canUseCanonicalLoadingShell === true,
 		canonicalPathname,
 		cleanPathname,
@@ -1049,7 +1068,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		middlewareCookieOverlay,
 		mountedSlotsHeader,
 		params,
-		protocolVersion: 8,
+		protocolVersion: 10,
 		requestOrigin: url.origin,
 		renderMode,
 		resolvedUrl,
@@ -1058,6 +1077,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		scriptNonce: scriptNonce ?? null
 	}).then(composeResponseStageResponse) : await options.dispatchMatchedPage({
 		bypassInterceptionContextCache,
+		cachePathname,
 		clientReuseManifest,
 		cleanPathname,
 		displayPathname: canonicalPathname,

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

@@ -1,7 +1,7 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import "./headers.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders } from "./request-pipeline.js";
 import { applyEffectiveRequestCookieHeader, getDraftModeCookieHeader, headersContextFromRequest, restoreDraftModeTransition } from "../shims/headers.js";
@@ -67,7 +67,7 @@ function rematchAppWorkerResponseStageRoute(options, normalized, props) {
 	return match;
 }
 async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, _stageOptions) {
-	if (props.protocolVersion !== 8 || props.buildId !== options.buildId) return new Response("Incompatible vinext App response stage", { status: 409 });
+	if (props.protocolVersion !== 10 || props.buildId !== options.buildId) return new Response("Incompatible vinext App response stage", { status: 409 });
 	if (props.kind === "app-full-request") return new Response("Invalid vinext App response stage", { status: 400 });
 	options.registerCacheAdapters();
 	await options.ensureInstrumentation?.();
@@ -114,7 +114,7 @@ async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, _st
 		ensureFetchPatch();
 		if (props.kind === "app-metadata") {
 			if (!options.handleMetadataRouteRequest) return new Response("Invalid vinext App response stage", { status: 400 });
-			let response = await options.handleMetadataRouteRequest(props.cleanPathname) ?? new Response(null, {
+			let response = await options.handleMetadataRouteRequest(props.cleanPathname, props.routePathname) ?? new Response(null, {
 				status: 204,
 				headers: { ["x-vinext-app-metadata-stage-no-match"]: "1" }
 			});
@@ -192,6 +192,8 @@ async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, _st
 			routeHandlerUrl.search = searchParams.toString();
 			for (const internalRscValue of internalRscValues) routeHandlerUrl.searchParams.append(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, internalRscValue);
 			return options.dispatchMatchedRouteHandler({
+				bypassInterceptionContextCache: props.bypassInterceptionContextCache,
+				cachePathname: props.cachePathname,
 				cleanPathname: props.cleanPathname,
 				middlewareContext,
 				params: route.isDynamic ? renderParams : null,
@@ -208,6 +210,7 @@ async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, _st
 		}, renderParams);
 		return options.dispatchMatchedPage({
 			bypassInterceptionContextCache: props.bypassInterceptionContextCache,
+			cachePathname: props.cachePathname,
 			clientReuseManifest: normalized.clientReuseManifest,
 			cleanPathname: props.cleanPathname,
 			displayPathname: props.canonicalPathname,

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

@@ -1,6 +1,6 @@
 import { decodeMatchedParams, splitPathSegments, splitPathnameForRouteMatch } from "../routing/utils.js";
-import { buildRouteTrie, trieMatchRaw } from "../routing/route-trie.js";
 import { createAppRouteGraphInterceptionId } from "../routing/app-route-graph.js";
+import { buildRouteTrie, trieMatchRaw } from "../routing/route-trie.js";
 import { extractRawRoutePatternParams, matchRoutePatternPrefix, matchRoutePatternRaw } from "../routing/route-pattern.js";
 import { canonicalizeAppPageParams } from "./app-page-segment-state.js";
 //#region src/server/app-rsc-route-matching.ts