vinext 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/routing/route-pattern.d.ts

@@ -4,6 +4,7 @@ declare function routePatternParts(pathname: string): string[];
 declare function routePattern(pathname: string): string;
 declare function fillRoutePatternSegments(pathname: string, params: RoutePatternParams): string | null;
 declare function matchRoutePattern(urlParts: readonly string[], patternParts: readonly string[]): RoutePatternParams | null;
+declare function matchRoutePatternRaw(urlParts: readonly string[], patternParts: readonly string[]): RoutePatternParams | null;
 declare function matchRoutePatternPrefix(pathParts: readonly string[], patternParts: readonly string[]): boolean;
 declare function matchRoutePatternWithOptionalDynamicSegments(pathParts: readonly string[], patternParts: readonly string[]): boolean;
 /**
@@ -61,4 +62,4 @@ declare function normalizeStaticPathname(pathname: string): string;
  */
 declare function normalizeStaticPathsEntry(entry: StaticPathsEntry, routePattern: string): NormalizedStaticPathsEntry;
 //#endregion
-export { RoutePatternParams, StaticPathsEntry, fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };
+export { RoutePatternParams, StaticPathsEntry, fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };

package/dist/routing/route-pattern.js

@@ -56,6 +56,11 @@ function fillRoutePatternSegments(pathname, params) {
 	return resolvedSegments.length > 0 ? `/${resolvedSegments.join("/")}` : "/";
 }
 function matchRoutePattern(urlParts, patternParts) {
+	const params = matchRoutePatternRaw(urlParts, patternParts);
+	if (params) decodeMatchedParams(params);
+	return params;
+}
+function matchRoutePatternRaw(urlParts, patternParts) {
 	const params = Object.create(null);
 	function matchFrom(urlIndex, patternIndex) {
 		if (patternIndex === patternParts.length) return urlIndex === urlParts.length;
@@ -83,9 +88,7 @@ function matchRoutePattern(urlParts, patternParts) {
 		if (urlIndex >= urlParts.length || urlParts[urlIndex] !== patternPart) return false;
 		return matchFrom(urlIndex + 1, patternIndex + 1);
 	}
-	if (!matchFrom(0, 0)) return null;
-	decodeMatchedParams(params);
-	return params;
+	return matchFrom(0, 0) ? params : null;
 }
 function matchRoutePatternPrefix(pathParts, patternParts) {
 	let pathIndex = 0;
@@ -162,4 +165,4 @@ function normalizeStaticPathsEntry(entry, routePattern) {
 	return { params };
 }
 //#endregion
-export { fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };
+export { fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };

package/dist/routing/route-trie.d.ts

@@ -63,5 +63,9 @@ declare function trieMatch<R>(root: TrieNode<R>, urlParts: string[]): {
   route: R;
   params: Record<string, string | string[]>;
 } | null;
+declare function trieMatchRaw<R>(root: TrieNode<R>, urlParts: string[]): {
+  route: R;
+  params: Record<string, string | string[]>;
+} | null;
 //#endregion
-export { TrieNode, buildRouteTrie, trieMatch };
+export { TrieNode, buildRouteTrie, trieMatch, trieMatchRaw };

package/dist/routing/route-trie.js

@@ -92,10 +92,13 @@ function buildRouteTrie(routes) {
 * @returns Match result with route and extracted params, or null
 */
 function trieMatch(root, urlParts) {
-	const result = match(root, urlParts, 0, []);
+	const result = trieMatchRaw(root, urlParts);
 	if (result) decodeMatchedParams(result.params);
 	return result;
 }
+function trieMatchRaw(root, urlParts) {
+	return match(root, urlParts, 0, []);
+}
 function match(node, urlParts, index, entries) {
 	if (index === urlParts.length) {
 		if (node.route !== null) return {
@@ -140,4 +143,4 @@ function match(node, urlParts, index, entries) {
 	return null;
 }
 //#endregion
-export { buildRouteTrie, trieMatch };
+export { buildRouteTrie, trieMatch, trieMatchRaw };

package/dist/server/api-handler.d.ts

@@ -11,6 +11,8 @@ import { IncomingMessage, ServerResponse } from "node:http";
 declare function handleApiRoute(runner: ModuleImporter, req: IncomingMessage, res: ServerResponse, url: string, apiRoutes: Route[], nextConfig?: {
   basePath?: string;
   i18n?: NextI18nConfig | null;
+  trustedRevalidateOrigin?: string;
+  allowedRevalidateHeaderKeys?: readonly string[];
   trailingSlash?: boolean;
 }): Promise<boolean>;
 //#endregion

package/dist/server/api-handler.js

@@ -160,7 +160,7 @@ async function writeEdgeApiResponseBody(res, body) {
 /**
 * Enhance a Node.js req/res pair with Next.js API route helpers.
 */
-function enhanceApiObjects(req, res, query, body) {
+function enhanceApiObjects(req, res, query, body, trustedRevalidateOrigin, allowedRevalidateHeaderKeys = [], dev = false) {
 	const apiReq = Object.assign(req, {
 		body,
 		query
@@ -202,7 +202,7 @@ function enhanceApiObjects(req, res, query, body) {
 			return this;
 		},
 		async revalidate(urlPath, opts) {
-			await performOnDemandRevalidate(req, urlPath, opts);
+			await performOnDemandRevalidate(req, urlPath, opts, trustedRevalidateOrigin, allowedRevalidateHeaderKeys, dev);
 		}
 	});
 	attachPagesPreviewApi(apiReq, apiRes);
@@ -248,7 +248,7 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 		}
 		const query = mergeRouteParamsIntoQuery(parseQueryString(url), params);
 		const bodyParserConfig = resolveBodyParserConfig(apiModule.config);
-		const { apiReq, apiRes } = enhanceApiObjects(req, res, query, bodyParserConfig.enabled ? await parseBody(req, bodyParserConfig.sizeLimit) : void 0);
+		const { apiReq, apiRes } = enhanceApiObjects(req, res, query, bodyParserConfig.enabled ? await parseBody(req, bodyParserConfig.sizeLimit) : void 0, nextConfig?.trustedRevalidateOrigin, nextConfig?.allowedRevalidateHeaderKeys, true);
 		await handler(apiReq, apiRes);
 		return true;
 	} catch (e) {

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

@@ -16,16 +16,15 @@ import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscR
 import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
+import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
 import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
 import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
 import { navigationPlanner } from "./navigation-planner.js";
-import { resolveHybridClientRewriteHref } from "../shims/internal/hybrid-client-route-owner.js";
-import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
-import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
+import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
@@ -43,6 +42,7 @@ import { createRoot, hydrateRoot } from "react-dom/client";
 import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hasServerActions, loadServerActionClient } from "virtual:vinext-app-capabilities";
 //#region src/server/app-browser-entry.ts
+const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
 }
@@ -302,28 +302,29 @@ function createNavigationCommitEffect(options) {
 		commitClientNavigationState(navId);
 	};
 }
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, payloadOrigin, actionType = "navigate", operationLane = "navigation", traversalIntent = null, scrollIntent = null, restoredBfcacheIds = null, reuseCurrentBfcacheIds = true, visibleCommitMode = "transition", onCommittedState, navigationCommitKind) {
+async function renderNavigationPayload(options) {
 	syncServerActionHttpFallbackHead(null);
 	return browserNavigationController.renderNavigationPayload({
-		actionType,
+		actionType: options.actionType ?? "navigate",
 		createNavigationCommitEffect,
-		historyUpdateMode,
-		navigationSnapshot,
-		nextElements: payload,
-		operationLane,
-		payloadOrigin,
-		params,
-		pendingRouterState,
-		previousNextUrl,
-		scrollIntent,
-		restoredBfcacheIds,
-		reuseCurrentBfcacheIds,
-		targetHistoryIndex: traversalIntent === null ? void 0 : traversalIntent.targetHistoryIndex,
-		targetHref,
-		navId,
-		navigationCommitKind,
-		visibleCommitMode,
-		onCommittedState
+		historyUpdateMode: options.historyUpdateMode,
+		navigationCommitKind: options.navigationCommitKind,
+		navigationInitiationState: options.navigationInitiationState,
+		navigationSnapshot: options.navigationSnapshot,
+		navId: options.navId,
+		nextElements: options.payload,
+		onCommittedState: options.onCommittedState,
+		operationLane: options.operationLane ?? "navigation",
+		params: options.params,
+		payloadOrigin: options.payloadOrigin,
+		pendingRouterState: options.pendingRouterState,
+		previousNextUrl: options.previousNextUrl,
+		restoredBfcacheIds: options.restoredBfcacheIds ?? null,
+		reuseCurrentBfcacheIds: options.reuseCurrentBfcacheIds ?? true,
+		scrollIntent: options.scrollIntent ?? null,
+		targetHistoryIndex: options.traversalIntent?.targetHistoryIndex,
+		targetHref: options.targetHref,
+		visibleCommitMode: options.visibleCommitMode ?? "transition"
 	});
 }
 async function commitSameUrlNavigatePayload(nextElements, actionInitiation, returnValue, revalidation = "none") {
@@ -725,7 +726,21 @@ function registerServerActionCallback() {
 				const hashIdx = target.href.indexOf("#");
 				const actionScrollIntent = beginAppRouterScrollIntent((hashIdx !== -1 ? target.href.slice(hashIdx) : "") || null);
 				if (target.type === "push") saveScrollPosition();
-				renderNavigationPayload(Promise.resolve(elements), createClientNavigationRenderSnapshot(target.href, actionInitiation.routerState.navigationSnapshot.params), target.href, actionInitiation.navigationId, target.type === "push" ? "push" : "replace", {}, null, null, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, target.type === "push" ? "navigate" : "replace", resolveServerActionOperationLane(revalidation), null, actionScrollIntent).catch(() => {
+				renderNavigationPayload({
+					actionType: target.type === "push" ? "navigate" : "replace",
+					historyUpdateMode: target.type === "push" ? "push" : "replace",
+					navigationInitiationState: actionInitiation.routerState,
+					navigationSnapshot: createClientNavigationRenderSnapshot(target.href, actionInitiation.routerState.navigationSnapshot.params),
+					navId: actionInitiation.navigationId,
+					operationLane: resolveServerActionOperationLane(revalidation),
+					params: {},
+					payload: Promise.resolve(elements),
+					payloadOrigin: FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN,
+					pendingRouterState: null,
+					previousNextUrl: null,
+					scrollIntent: actionScrollIntent,
+					targetHref: target.href
+				}).catch(() => {
 					browserNavigationController.performHardNavigation(target.href);
 				});
 			},
@@ -738,6 +753,7 @@ async function main() {
 	if (!claimInitialAppRouterBootstrap()) return;
 	if (hasServerActions) registerServerActionCallback();
 	installAppNavigationFailureListeners();
+	if (HAS_CLIENT_REWRITES) await preloadHybridClientRouteOwner();
 	let devErrorOverlay = null;
 	if (import.meta.env.DEV) {
 		devErrorOverlay = await import("../client/dev-error-overlay.js");
@@ -869,6 +885,8 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					if (shouldUsePendingRouterState) pendingRouterState = beginPendingBrowserRouterState();
 				}
+				const navigationInitiationState = getBrowserRouterState();
+				const mountedSlotsHeader = getMountedSlotIdsHeader(navigationInitiationState.elements);
 				while (true) {
 					const url = new URL(currentHref, window.location.origin);
 					const requestState = getRequestState(navigationKind, url.pathname, currentPrevNextUrl, activeTraversalIntent?.historyState);
@@ -876,12 +894,9 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 					const requestPreviousNextUrl = requestState.previousNextUrl;
 					if (navigationKind === "refresh") historyController.syncCurrentHistoryStatePreviousNextUrl(requestPreviousNextUrl, getBrowserRouterState().bfcacheIds);
 					setPendingPathname(url.pathname, navId);
-					const routerStateAtNavStart = getBrowserRouterState();
-					const elementsAtNavStart = routerStateAtNavStart.elements;
-					const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
 					const earlyIntentDecision = navigationKind === "navigate" ? navigationPlanner.classifyEarlyNavigationIntent({
 						basePath: __basePath,
-						currentHref: clientNavigationSnapshotHref(routerStateAtNavStart.navigationSnapshot),
+						currentHref: clientNavigationSnapshotHref(navigationInitiationState.navigationSnapshot),
 						mode: "push",
 						scroll: false,
 						targetHref: url.href
@@ -892,7 +907,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 						mountedSlotsHeader
 					});
 					const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
-					const rewrittenNavigationHref = navigationKind === "navigate" ? resolveHybridClientRewriteHref(currentHref, __basePath) : null;
+					const rewrittenNavigationHref = navigationKind === "navigate" && HAS_CLIENT_REWRITES ? resolveLoadedHybridClientRewriteHref(currentHref, __basePath) : null;
 					const additionalPrefetchRscUrls = rewrittenNavigationHref && rewrittenNavigationHref !== currentHref ? [await createRscRequestUrl(rewrittenNavigationHref, requestHeaders)] : [];
 					const visitedResponseCandidate = shouldBypassNavigationCache ? {
 						cacheKey: AppElementsWire.encodeCacheKey(rscUrl, requestInterceptionContext),
@@ -959,7 +974,26 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 						const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, cachedParams);
 						const cachedPayload = cachedRoute.elements ? Promise.resolve(cachedRoute.elements) : decodeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
-						if (await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, cachedRoute.elements ? COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN : VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds, reuseCurrentBfcacheIds, visibleCommitMode) === "no-commit") {
+						if (await renderNavigationPayload({
+							actionType: toActionType(navigationKind),
+							historyUpdateMode: currentHistoryMode,
+							navigationCommitKind: detachedNavigationCommits ? "authoritative" : void 0,
+							navigationInitiationState,
+							navigationSnapshot: cachedNavigationSnapshot,
+							navId,
+							operationLane: toOperationLane(navigationKind),
+							params: cachedParams,
+							payload: cachedPayload,
+							payloadOrigin: cachedRoute.elements ? COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN : VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN,
+							pendingRouterState: detachedNavigationCommits ? null : pendingRouterState,
+							previousNextUrl: requestPreviousNextUrl,
+							restoredBfcacheIds,
+							reuseCurrentBfcacheIds,
+							scrollIntent,
+							targetHref: currentHref,
+							traversalIntent: activeTraversalIntent,
+							visibleCommitMode
+						}) === "no-commit") {
 							if (!browserNavigationController.isCurrentNavigation(navId)) return;
 							deleteVisitedResponse(rscUrl, requestInterceptionContext);
 							continue;
@@ -1015,7 +1049,26 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 							if (optimisticPayload !== null) {
 								detachedNavigationCommits = true;
 								const optimisticNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, optimisticPayload.params);
-								renderNavigationPayload(Promise.resolve(optimisticPayload.elements), optimisticNavigationSnapshot, currentHref, navId, currentHistoryMode, optimisticPayload.params, requestPreviousNextUrl, null, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds, reuseCurrentBfcacheIds, visibleCommitMode, void 0, "detached").catch((error) => {
+								renderNavigationPayload({
+									actionType: toActionType(navigationKind),
+									historyUpdateMode: currentHistoryMode,
+									navigationCommitKind: "detached",
+									navigationInitiationState,
+									navigationSnapshot: optimisticNavigationSnapshot,
+									navId,
+									operationLane: toOperationLane(navigationKind),
+									params: optimisticPayload.params,
+									payload: Promise.resolve(optimisticPayload.elements),
+									payloadOrigin: FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN,
+									pendingRouterState: null,
+									previousNextUrl: requestPreviousNextUrl,
+									restoredBfcacheIds,
+									reuseCurrentBfcacheIds,
+									scrollIntent,
+									targetHref: currentHref,
+									traversalIntent: activeTraversalIntent,
+									visibleCommitMode
+								}).catch((error) => {
 									if (browserNavigationController.isCurrentNavigation(navId)) console.error("[vinext] Optimistic RSC navigation error:", error);
 								});
 							}
@@ -1023,7 +1076,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 					}
 					if (!navResponse) {
 						if (navigationKind === "navigate") {
-							const clientReuseManifestHeader = createClientReuseManifestHeaderFromVisibleAppState(routerStateAtNavStart);
+							const clientReuseManifestHeader = createClientReuseManifestHeaderFromVisibleAppState(navigationInitiationState);
 							if (clientReuseManifestHeader !== null) requestHeaders.set(VINEXT_CLIENT_REUSE_MANIFEST_HEADER, clientReuseManifestHeader);
 						}
 						navResponse = await fetch(rscUrl, {
@@ -1085,10 +1138,30 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 					const rscPayload = decodeAppElementsPromise(createFromFetch(Promise.resolve(reactResponse)));
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					let committedState = null;
-					if (await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds, reuseCurrentBfcacheIds, visibleCommitMode, (state) => {
-						committedState = state;
-						if (activeNavigationAbortController === navigationAbortController) activeNavigationAbortController = null;
-					}, detachedNavigationCommits ? "authoritative" : void 0) !== "committed") return;
+					if (await renderNavigationPayload({
+						actionType: toActionType(navigationKind),
+						historyUpdateMode: currentHistoryMode,
+						navigationCommitKind: detachedNavigationCommits ? "authoritative" : void 0,
+						navigationInitiationState,
+						navigationSnapshot,
+						navId,
+						onCommittedState: (state) => {
+							committedState = state;
+							if (activeNavigationAbortController === navigationAbortController) activeNavigationAbortController = null;
+						},
+						operationLane: toOperationLane(navigationKind),
+						params: navParams,
+						payload: rscPayload,
+						payloadOrigin: FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN,
+						pendingRouterState: detachedNavigationCommits ? null : pendingRouterState,
+						previousNextUrl: requestPreviousNextUrl,
+						restoredBfcacheIds,
+						reuseCurrentBfcacheIds,
+						scrollIntent,
+						targetHref: currentHref,
+						traversalIntent: activeTraversalIntent,
+						visibleCommitMode
+					}) !== "committed") return;
 					try {
 						const renderedElements = await rscPayload;
 						if (navigationCacheGeneration !== clientNavigationCacheGeneration) return;

package/dist/server/app-browser-history-controller.d.ts

@@ -18,7 +18,7 @@ type AppBrowserHistoryControllerDeps = {
   readHistoryState: () => unknown; /** Reads `window.location.href`. Injected so the controller stays unit-testable. */
   readCurrentHref: () => string; /** Wraps `pushHistoryStateWithoutNotify(state, "", href)`. */
   pushHistoryState: (state: unknown, href: string) => void; /** Wraps `replaceHistoryStateWithoutNotify(state, "", href)`. */
-  replaceHistoryState: (state: unknown, href: string) => void;
+  replaceHistoryState: (state: unknown, href?: string) => void;
   readVisibleNavigationMetadata: () => VisibleNavigationMetadata | null;
 };
 /**

package/dist/server/app-browser-history-controller.js

@@ -158,9 +158,9 @@ var AppBrowserHistoryController = class {
 			bfcacheVersion: bfcacheIds === void 0 ? void 0 : this.#restorableClientState.currentBfcacheVersion,
 			previousNextUrl
 		});
-		this.#replaceHistoryState(nextHistoryState, this.#readCurrentHref());
+		this.#replaceHistoryState(nextHistoryState);
 		if (this.#isHistoryStateNavigationMetadataInSync(this.#readHistoryState(), previousNextUrl, bfcacheIds)) return;
-		this.#replaceHistoryState(nextHistoryState, this.#readCurrentHref());
+		this.#replaceHistoryState(nextHistoryState);
 	}
 	#isHistoryStateNavigationMetadataInSync(state, previousNextUrl, bfcacheIds) {
 		return readHistoryStatePreviousNextUrl(state) === previousNextUrl && (bfcacheIds === void 0 || areBfcacheIdMapsEqual(readHistoryStateBfcacheIds(state), bfcacheIds) && this.#restorableClientState.isCurrentBfcacheVersion(state));
@@ -179,7 +179,7 @@ var AppBrowserHistoryController = class {
 			bfcacheVersion: this.#restorableClientState.currentBfcacheVersion,
 			previousNextUrl: options.previousNextUrl,
 			traversalIndex: this.#currentHistoryTraversalIndex
-		}), this.#readCurrentHref());
+		}));
 	}
 	/**
 	* Resolves a restorable snapshot candidate for the given history entry and

package/dist/server/app-browser-navigation-controller.d.ts

@@ -43,6 +43,28 @@ type BrowserNavigationControllerDeps = {
   getRouteManifest?: () => RouteManifest | null;
   syncHistoryStatePreviousNextUrl?: (previousNextUrl: string | null, bfcacheIds?: Readonly<Record<string, string>> | null) => void;
 };
+type BrowserNavigationPayloadOptions = {
+  actionType: "navigate" | "replace" | "traverse";
+  createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;
+  historyUpdateMode: HistoryUpdateMode | undefined;
+  navigationCommitKind?: "authoritative" | "detached";
+  navigationInitiationState: AppRouterState;
+  navigationSnapshot: ClientNavigationRenderSnapshot;
+  navId: number;
+  nextElements: Promise<AppElements>;
+  onCommittedState?: (state: AppRouterState) => void;
+  operationLane: OperationLane;
+  params: Record<string, string | string[]>;
+  payloadOrigin: AppNavigationPayloadOrigin;
+  pendingRouterState: PendingBrowserRouterState | null;
+  previousNextUrl: string | null;
+  restoredBfcacheIds?: Readonly<Record<string, string>> | null;
+  reuseCurrentBfcacheIds?: boolean;
+  scrollIntent?: AppRouterScrollIntent | null;
+  targetHistoryIndex?: number | null;
+  targetHref: string;
+  visibleCommitMode?: NavigationRuntimeVisibleCommitMode;
+};
 type BrowserNavigationController = {
   beginNavigation(): number;
   getActiveNavigationId(): number;
@@ -60,27 +82,7 @@ type BrowserNavigationController = {
     state: AppRouterState;
     targetHref: string;
   }): boolean;
-  renderNavigationPayload(options: {
-    actionType: "navigate" | "replace" | "traverse";
-    createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;
-    historyUpdateMode: HistoryUpdateMode | undefined;
-    navigationSnapshot: ClientNavigationRenderSnapshot;
-    nextElements: Promise<AppElements>;
-    operationLane: OperationLane;
-    payloadOrigin: AppNavigationPayloadOrigin;
-    params: Record<string, string | string[]>;
-    pendingRouterState: PendingBrowserRouterState | null;
-    previousNextUrl: string | null;
-    scrollIntent?: AppRouterScrollIntent | null;
-    restoredBfcacheIds?: Readonly<Record<string, string>> | null;
-    reuseCurrentBfcacheIds?: boolean;
-    targetHistoryIndex?: number | null;
-    targetHref: string;
-    navId: number;
-    navigationCommitKind?: "authoritative" | "detached";
-    visibleCommitMode?: NavigationRuntimeVisibleCommitMode;
-    onCommittedState?: (state: AppRouterState) => void;
-  }): Promise<NavigationPayloadOutcome>;
+  renderNavigationPayload(options: BrowserNavigationPayloadOptions): Promise<NavigationPayloadOutcome>;
   commitSameUrlNavigatePayload(nextElements: Promise<AppElements>, navigationSnapshot: ClientNavigationRenderSnapshot, returnValue?: {
     ok: boolean;
     data: unknown;

package/dist/server/app-browser-navigation-controller.js

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
+import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
 import { startTransition, useInsertionEffect, useLayoutEffect } from "react";
@@ -349,7 +349,7 @@ function createAppBrowserNavigationController(deps = {}) {
 		let snapshotActivated = false;
 		try {
 			const pending = await createPendingNavigationCommit({
-				currentState: getBrowserRouterState(),
+				currentState: options.navigationInitiationState,
 				navigationCommitKind: options.navigationCommitKind,
 				navigationId: options.navId,
 				nextElements: options.nextElements,

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

@@ -6,12 +6,12 @@ import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 //#region src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };

package/dist/server/app-browser-visible-commit.js

@@ -1,8 +1,8 @@
 import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { mergeElements } from "../shims/slot.js";
-import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
+import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
 //#region src/server/app-browser-visible-commit.ts
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");

package/dist/server/app-fallback-renderer.d.ts

@@ -5,6 +5,7 @@ import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
 import { ReactNode } from "react";
@@ -81,6 +82,7 @@ type AppFallbackRendererCallContext = {
    * render path. Defaults to `false` when no route is matched.
    */
   isEdgeRuntime?: boolean;
+  routePathname?: string;
   sourcePageSegments?: readonly string[] | null;
 };
 type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
@@ -88,6 +90,7 @@ type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
   renderHttpAccessFallback: (route: AppPageBoundaryRoute<TModule> | null, statusCode: number, isRscRequest: boolean, request: Request, opts: {
     boundaryComponent?: AppPageComponent | null;
     boundaryModule?: TModule | null;
+    intercept?: AppPageInterceptOptions<TModule> | null;
     layouts?: readonly (TModule | null | undefined)[] | null;
     matchedParams?: AppPageParams;
   }, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;

package/dist/server/app-fallback-renderer.js

@@ -1,8 +1,8 @@
-import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
+import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_NOT_FOUND_MODULE } from "./default-global-not-found-module.js";
 import { DEFAULT_NOT_FOUND_MODULE } from "./default-not-found-module.js";
-import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 //#region src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
 	headers: null,
@@ -84,6 +84,7 @@ function createAppFallbackRenderer(options) {
 				getAndClearPendingCookies,
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
+				intercept: opts?.intercept ?? null,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
 				isRscRequest,
 				layoutModules: useGlobalNotFound ? [] : opts?.layouts ?? null,
@@ -100,6 +101,7 @@ function createAppFallbackRenderer(options) {
 				rootNotFoundModule: routeMissRootNotFoundModule,
 				rootUnauthorizedModule,
 				route: useGlobalNotFound ? null : route,
+				routePathname: callContext?.routePathname,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
 				serveStreamingMetadata,

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, proxyExternalRequest } from "../config/config-matchers.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
 import { executeMiddleware } from "./middleware-runtime.js";
@@ -58,6 +58,7 @@ async function proxyExternalMiddlewareRewrite(request, rewriteUrl, context) {
 	const proxyRequest = requestWithMiddlewareRequestHeaders(request, context.requestHeaders ?? context.headers);
 	setHeadersContext(null);
 	setNavigationContext(null);
+	const { proxyExternalRequest } = await import("../config/config-matchers.js");
 	const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);
 	const headers = new Headers(proxyResponse.headers);
 	processMiddlewareHeaders(headers);

package/dist/server/app-page-boundary-render.d.ts

@@ -5,6 +5,8 @@ import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
+import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { ComponentType, ReactNode } from "react";
 
@@ -19,13 +21,20 @@ type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {
   errorPaths?: readonly TModule[] | null;
   errors?: readonly (TModule | null | undefined)[] | null;
   forbidden?: TModule | null;
+  forbiddenTreePosition?: number | null;
+  forbiddens?: readonly (TModule | null | undefined)[] | null;
   layoutTreePositions?: readonly number[] | null;
   layouts?: readonly (TModule | null | undefined)[];
   notFound?: TModule | null;
+  notFounds?: readonly (TModule | null | undefined)[] | null;
+  notFoundTreePosition?: number | null;
   params?: AppPageParams;
   pattern?: string;
   routeSegments?: readonly string[];
+  slots?: AppPageRouteWiringRoute<TModule>["slots"];
   unauthorized?: TModule | null;
+  unauthorizedTreePosition?: number | null;
+  unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 };
 type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {
   applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
@@ -70,11 +79,13 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
 type RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {
   boundaryComponent?: AppPageComponent | null;
   boundaryModule?: TModule | null;
+  intercept?: AppPageInterceptOptions<TModule> | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
   matchedParams: AppPageParams;
   rootForbiddenModule?: TModule | null;
   rootNotFoundModule?: TModule | null;
-  rootUnauthorizedModule?: TModule | null;
+  rootUnauthorizedModule?: TModule | null; /** Normalized, basePath-free application pathname used for route matching. */
+  routePathname?: string;
   route?: AppPageBoundaryRoute<TModule> | null;
   /**
    * When true, the resolved boundary is rendered without wrapping it in the