vinext 1.3.1 → 1.4.1

package/dist/routing/app-route-graph.js

@@ -702,6 +702,14 @@ function findSlotConfigLayoutTreePositions(slotDir, layoutPaths) {
 		return relativeDir ? relativeDir.split(path.sep).filter(Boolean).length : 0;
 	});
 }
+/**
+* The tree position of a slot's active page relative to the slot root, in the
+* coordinates of configLayoutTreePositions. Route groups count, unlike in
+* `routeSegments`, since each is its own loader-tree segment.
+*/
+function findSlotPageTreePosition(slot) {
+	return slot.pagePath ? findSlotConfigLayoutTreePositions(slot.ownerDir, [slot.pagePath])[0] : null;
+}
 function findSlotLoadingEntries(slotDir, pagePath, matcher) {
 	return findSlotSegmentFileEntries(slotDir, pagePath, "loading", matcher);
 }
@@ -1823,4 +1831,4 @@ function computeAppRouteStaticSiblings(allRoutes, matchedRoute) {
 	return Array.from(siblings);
 }
 //#endregion
-export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };
+export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, findOwnerRouteForDir, findSlotPageTreePosition, isInvisibleSegment, patternsStructurallyEquivalent };

package/dist/server/api-handler.js

@@ -4,16 +4,18 @@ import "./server-globals.js";
 import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
 import { NextRequest } from "../shims/server.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
+import { logRequestError } from "./request-error-log.js";
 import { mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { tracePagesApiHandler } from "./pages-execution-tracing.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, resolveBodyParserConfig } from "./pages-body-parser-config.js";
-import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
+import { PagesBodyParseError, createPagesBodyDecoder, isJsonMediaType } from "./pages-media-type.js";
 import { performOnDemandRevalidate } from "./pages-revalidate.js";
 import { attachPagesPreviewApi, attachPagesRequestCookies } from "./pages-node-compat.js";
 import { finalizeEdgeApiResponse, isEdgeApiRuntime } from "./edge-api-runtime.js";
 import { signalFromNodeResponse } from "./node-response-signal.js";
 import { Buffer } from "node:buffer";
 import { decode } from "node:querystring";
+import { Stream } from "node:stream";
 //#region src/server/api-handler.ts
 /**
 * Default request body size (1 MB). Matches Next.js default bodyParser sizeLimit.
@@ -32,6 +34,8 @@ const MAX_BODY_SIZE = DEFAULT_PAGES_API_BODY_SIZE_LIMIT;
 * HMAC signature verification).
 */
 async function parseBody(req, sizeLimit = MAX_BODY_SIZE) {
+	const { mediaType, decoder } = await createPagesBodyDecoder(req.headers["content-type"]);
+	if (req.destroyed) throw req.errored ?? /* @__PURE__ */ new Error("Request aborted");
 	return new Promise((resolve, reject) => {
 		const chunks = [];
 		let totalSize = 0;
@@ -55,10 +59,10 @@ async function parseBody(req, sizeLimit = MAX_BODY_SIZE) {
 		req.on("end", () => {
 			if (settled) return;
 			settled = true;
-			const raw = Buffer.concat(chunks).toString("utf-8");
-			const mediaType = getMediaType(req.headers["content-type"]);
+			const body = Buffer.concat(chunks);
+			const raw = decoder.decode(body);
 			if (!raw) {
-				resolve(isJsonMediaType(mediaType) ? {} : mediaType === "application/x-www-form-urlencoded" ? decode(raw) : void 0);
+				resolve(isJsonMediaType(mediaType) ? {} : mediaType === "application/x-www-form-urlencoded" ? decode(raw) : body.length > 0 ? raw : void 0);
 				return;
 			}
 			if (isJsonMediaType(mediaType)) try {
@@ -188,6 +192,18 @@ function enhanceApiObjects(req, res, query, body, trustedRevalidateOrigin, allow
 			this.end(JSON.stringify(data));
 		},
 		send(data) {
+			if (this.statusCode === 204 || this.statusCode === 304) {
+				this.removeHeader("Content-Type");
+				this.removeHeader("Content-Length");
+				this.removeHeader("Transfer-Encoding");
+				this.end();
+				return;
+			}
+			if (data instanceof Stream) {
+				if (!this.getHeader("Content-Type")) this.setHeader("Content-Type", "application/octet-stream");
+				data.pipe(this);
+				return;
+			}
 			if (Buffer.isBuffer(data)) {
 				if (!this.getHeader("Content-Type")) this.setHeader("Content-Type", "application/octet-stream");
 				this.setHeader("Content-Length", String(data.length));
@@ -272,7 +288,7 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 			res.end(e.message);
 			return true;
 		}
-		console.error(e);
+		logRequestError(e);
 		await reportRequestError(e, {
 			path: url,
 			method: req.method ?? "GET",

package/dist/server/app-bfcache-identity.js

@@ -1,7 +1,7 @@
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { isNestedBfcacheSlotSegmentIdFor } from "./bfcache-identity.js";
 import { isBfcacheSegmentId } from "./app-bfcache-id.js";
+import { isNestedBfcacheSlotSegmentIdFor } from "./bfcache-identity.js";
 //#region src/server/app-bfcache-identity.ts
 let nextBfcacheId = 0;
 function rememberBfcacheId(value) {

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

@@ -1,35 +1,33 @@
 import { addBasePathToPathname, stripBasePath } from "../utils/base-path.js";
-import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
+import { VINEXT_MOUNTED_LAYOUTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
 import { splitPathnameForRouteMatch } from "../routing/utils.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { matchRoutePattern } from "../routing/route-pattern.js";
 import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
 import { retryScrollTo, scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.js";
-import { AppElementsWire } from "./app-elements-wire.js";
-import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
-import { getBfcacheIdMapContext, getNavigationContext, setNavigationContext } from "../shims/navigation-context-state.js";
-import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
-import DefaultGlobalError from "../shims/default-global-error.js";
-import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
-import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
-import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
-import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, setAppElementsRenderedSearch } from "../shims/slot.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, formatRscRequestPath, isRscCompatibilityIdCompatible } from "./app-rsc-cache-busting.js";
+import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
 import { createNavigationRuntimeRouteManifestLoader, getNavigationRuntime, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
 import { createBfcacheSegmentIdentityMap, 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 { isExternalHistoryState, readHistoryStateActiveRoutePaths, readHistoryStatePreviousNextUrl, resolveActiveRoutePaths } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { stripRscCompletionMetadataResponse } from "./rsc-completion-metadata.js";
 import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
 import { navigationPlanner } from "./navigation-planner.js";
-import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, parseRenderedPathAndSearchHeader, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
+import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
+import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { getBfcacheIdMapContext, getNavigationContext, setNavigationContext } from "../shims/navigation-context-state.js";
+import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidateDynamicPrefetchCache, invalidatePrefetchCache, invalidateVisitedResponsePrefetches, parseRenderedPathAndSearchHeader, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, trackAppRouterNavigationInFlight, useRouter } from "../shims/navigation.js";
+import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
+import { createMountedLayoutsHeader, holdsSkippedLayouts } from "./app-mounted-layouts.js";
+import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, setAppElementsRenderedSearch } from "../shims/slot.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, navigateDocumentDirectly } from "./app-browser-navigation-controller.js";
 import { createAppRouteTree } from "./app-route-tree.js";
@@ -38,17 +36,19 @@ import { createSupplementalRefreshCoordinator, mergeRefreshedParallelSlot, requi
 import { createAppBrowserNavigationAbortCoordinator } from "./app-browser-navigation-abort.js";
 import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition, resolveFetchedHydrationLocation } from "./app-browser-hydration.js";
 import { AppBrowserHistoryController } from "./app-browser-history-controller.js";
-import { createVisitedResponseCacheEntry, deleteAllVisitedResponseCacheEntries, deleteInvalidatedHistoryRestoreEntries, deleteVisitedResponseCacheEntry, findVisitedResponseCacheEntry, hasNavigationResponseHistoryLifetime, isVisitedResponseCacheEntryFresh } from "./app-visited-response-cache.js";
+import { createVisitedResponseCacheEntry, deleteAllVisitedResponseCacheEntries, deleteVisitedResponseCacheEntry, findVisitedResponseCacheEntry, findVisitedResponseForFullPrefetch, hasNavigationResponseHistoryLifetime, isVisitedResponseCacheEntryFresh, revokeHistoryRestoreNavigationReuse } from "./app-visited-response-cache.js";
 import { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition, shouldCommitPopstateUrlWithoutNavigation } from "./app-browser-popstate.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
+import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
 import { createDevOnCaughtError, createOnUncaughtError, createProdOnCaughtError, createProdOnRecoverableError } from "./app-browser-error.js";
 import { createHydrationCachePublication } from "./app-hydration-cache-publication.js";
 import { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl } from "./app-browser-prefetch-response.js";
-import { canCommitOptimisticRouteTemplate, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload } from "./app-optimistic-routing.js";
+import { canCommitOptimisticRouteTemplate, createOptimisticRouteTemplate, createOptimisticRouteTemplateStore, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload } from "./app-optimistic-routing.js";
 import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
-import { createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
-import { flushSync } from "react-dom";
+import { Fragment, createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
 import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
+import { flushSync } from "react-dom";
 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";
@@ -80,9 +80,7 @@ function setClientRscCompatibilityId(compatibilityId) {
 	if (IS_STATIC_EXPORT || !compatibilityId) return;
 	clientRscCompatibilityId = compatibilityId;
 }
-const optimisticRouteTemplates = /* @__PURE__ */ new Map();
-const optimisticRouteTemplateSources = /* @__PURE__ */ new Set();
-const optimisticRouteTemplateLearning = /* @__PURE__ */ new Map();
+const optimisticRouteTemplates = createOptimisticRouteTemplateStore();
 function claimInitialAppRouterBootstrap() {
 	if (window.__VINEXT_RSC_ROOT__ || window.__VINEXT_RSC_BOOTSTRAP_STATE__) return false;
 	window.__VINEXT_RSC_BOOTSTRAP_STATE__ = "starting";
@@ -114,8 +112,8 @@ const historyController = new AppBrowserHistoryController({
 	maxHistoryStateSnapshots: 50,
 	readHistoryState: () => window.history.state,
 	readCurrentHref: () => window.location.href,
-	pushHistoryState: (state, href) => pushHistoryStateWithoutNotify(state, "", href),
-	replaceHistoryState: (state, href) => replaceHistoryStateWithoutNotify(state, "", href),
+	pushHistoryState: (state, href, land) => pushHistoryStateWithoutNotify(state, "", href, land),
+	replaceHistoryState: (state, href, land) => replaceHistoryStateWithoutNotify(state, "", href, land),
 	readVisibleNavigationMetadata: () => {
 		if (!hasBrowserRouterState()) return null;
 		const routerState = getBrowserRouterState();
@@ -223,7 +221,7 @@ function restoreHistoryStateSnapshot(historyState, navId, onApprovedBeforeCommit
 	});
 	if (!restored) return false;
 	clientNavigationCacheGeneration += 1;
-	deleteInvalidatedHistoryRestoreEntries(visitedResponseCache);
+	revokeHistoryRestoreNavigationReuse(visitedResponseCache);
 	disableNavigationResponsePrefetchCacheReuse();
 	commitClientNavigationState(navId, { releaseSnapshot: false });
 	return true;
@@ -250,17 +248,23 @@ function stageClientParams(params) {
 }
 function clearVisitedResponseCache() {
 	visitedResponseCache.clear();
+	invalidateVisitedResponsePrefetches();
 }
-function clearPrefetchState() {
-	invalidatePrefetchCache();
+function clearPrefetchState(options) {
+	invalidatePrefetchCache(options);
 	optimisticRouteTemplates.clear();
-	optimisticRouteTemplateSources.clear();
-	optimisticRouteTemplateLearning.clear();
 }
-function clearClientNavigationCaches() {
+function clearClientNavigationCaches(options) {
+	clientNavigationCacheGeneration += 1;
+	clearVisitedResponseCache();
+	clearPrefetchState(options);
+	historyController.invalidateRestorableClientState();
+}
+function clearDynamicClientNavigationCaches() {
 	clientNavigationCacheGeneration += 1;
 	clearVisitedResponseCache();
-	clearPrefetchState();
+	invalidateDynamicPrefetchCache();
+	optimisticRouteTemplates.clear();
 	historyController.invalidateRestorableClientState();
 }
 function getMatchedUrlPathname(matchedUrl) {
@@ -343,10 +347,10 @@ function parsePrefetchCacheKey(cacheKey) {
 }
 async function learnOptimisticRouteTemplateFromPrefetch(options) {
 	const source = parsePrefetchCacheKey(options.cacheKey);
-	if (source.interceptionContext !== options.interceptionContext) return false;
-	if (resolvePrefetchCacheEntryMountedSlotsHeader(options.entry) !== options.mountedSlotsHeader) return false;
-	if (options.interceptionContext !== null) return false;
-	if (!isRscResponseCompatible(options.entry.snapshot.compatibilityIdHeader)) return false;
+	if (source.interceptionContext !== options.interceptionContext) return null;
+	if (resolvePrefetchCacheEntryMountedSlotsHeader(options.entry) !== options.mountedSlotsHeader) return null;
+	if (options.interceptionContext !== null) return null;
+	if (!isRscResponseCompatible(options.entry.snapshot.compatibilityIdHeader)) return null;
 	const elements = await decodeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(options.entry.snapshot))));
 	const template = createOptimisticRouteTemplate({
 		allowLoadingShell: options.entry.optimisticRouteShell === true,
@@ -357,40 +361,36 @@ async function learnOptimisticRouteTemplateFromPrefetch(options) {
 		mountedSlotsHeader: options.mountedSlotsHeader,
 		routeManifest: options.routeManifest
 	});
-	if (template === null) return false;
-	optimisticRouteTemplates.set(getOptimisticRouteTemplateKey({
-		interceptionContext: options.interceptionContext,
-		mountedSlotsHeader: options.mountedSlotsHeader,
-		routeId: template.routeId
-	}), template);
-	return true;
+	if (template === null) return null;
+	return {
+		key: getOptimisticRouteTemplateKey({
+			interceptionContext: options.interceptionContext,
+			mountedSlotsHeader: options.mountedSlotsHeader,
+			routeId: template.routeId
+		}),
+		template
+	};
 }
 async function learnOptimisticRouteTemplatesFromPrefetchCache(options) {
-	if (options.routeManifest === null) return;
-	const learning = [...optimisticRouteTemplateLearning.values()];
+	const { routeManifest } = options;
+	if (routeManifest === null) return;
+	const learning = optimisticRouteTemplates.pendingLearning();
 	for (const [cacheKey, entry] of getPrefetchCache()) {
 		const sourceKey = getOptimisticPrefetchSourceKey({
 			cacheKey,
 			interceptionContext: options.interceptionContext,
 			mountedSlotsHeader: options.mountedSlotsHeader
 		});
-		if (optimisticRouteTemplateSources.has(sourceKey)) continue;
-		if (optimisticRouteTemplateLearning.has(sourceKey)) continue;
+		if (optimisticRouteTemplates.hasSource(sourceKey)) continue;
 		if (!isSettledPrefetchCacheEntry(entry)) continue;
 		if (entry.prefetchKind === "route-tree") continue;
-		const promise = learnOptimisticRouteTemplateFromPrefetch({
+		learning.push(optimisticRouteTemplates.learn(sourceKey, () => learnOptimisticRouteTemplateFromPrefetch({
 			cacheKey,
 			entry,
 			interceptionContext: options.interceptionContext,
 			mountedSlotsHeader: options.mountedSlotsHeader,
-			routeManifest: options.routeManifest
-		}).then((learned) => {
-			if (learned) optimisticRouteTemplateSources.add(sourceKey);
-		}).finally(() => {
-			optimisticRouteTemplateLearning.delete(sourceKey);
-		});
-		optimisticRouteTemplateLearning.set(sourceKey, promise);
-		learning.push(promise);
+			routeManifest
+		})));
 	}
 	if (learning.length === 0) return;
 	await Promise.allSettled(learning);
@@ -533,7 +533,7 @@ function evictVisitedResponseCacheIfNeeded() {
 function readVisitedResponseCacheCandidate(rscUrl, interceptionContext, mountedSlotsHeader, navigationKind) {
 	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	const match = findVisitedResponseCacheEntry(visitedResponseCache, rscUrl, interceptionContext);
-	if (!match) return {
+	if (!match || match.entry.navigationReuseRevoked) return {
 		cacheKey,
 		entry: null,
 		facts: {
@@ -568,13 +568,14 @@ function applyVisitedResponseCacheCandidateDecision(candidate, decision) {
 function deleteVisitedResponse(rscUrl, interceptionContext) {
 	deleteVisitedResponseCacheEntry(visitedResponseCache, rscUrl, interceptionContext);
 }
-function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, params, prefetchFallbackTtlMs = DYNAMIC_NAVIGATION_CACHE_TTL, requestMountedSlotsHeader = snapshot.mountedSlotsHeader ?? null, elements, seedPrefetchCache = true, prefetchSnapshot = snapshot, reuseAfterHistoryRestore = false) {
+function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, params, prefetchFallbackTtlMs = DYNAMIC_NAVIGATION_CACHE_TTL, requestMountedSlotsHeader = snapshot.mountedSlotsHeader ?? null, elements, seedPrefetchCache = true, prefetchSnapshot = snapshot, reuseAfterHistoryRestore = false, fromHydration = false) {
 	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	deleteAllVisitedResponseCacheEntries(visitedResponseCache, rscUrl, interceptionContext);
 	evictVisitedResponseCacheIfNeeded();
 	const entry = createVisitedResponseCacheEntry({
 		fallbackTtlMs: prefetchFallbackTtlMs,
 		elements,
+		fromHydration,
 		now: Date.now(),
 		mountedSlotsHeader: requestMountedSlotsHeader,
 		params,
@@ -699,7 +700,6 @@ function BrowserRoot({ hydrationCachePublication, initialElements, initialNaviga
 		interception: initialMetadata.interception,
 		interceptionContext: initialMetadata.interceptionContext,
 		layoutIds: initialMetadata.layoutIds,
-		layoutFlags: initialMetadata.layoutFlags,
 		navigationSnapshot: initialNavigationSnapshot,
 		previousNextUrl: null,
 		renderId: 0,
@@ -966,6 +966,7 @@ function registerServerActionCallback() {
 		return loadServerActionClient().then(({ invokeClientServerAction }) => invokeClientServerAction(id, args, actionInitiation, {
 			basePath: __basePath,
 			clearClientNavigationCaches,
+			clearDynamicClientNavigationCaches,
 			clientRscCompatibilityId,
 			commitSameUrlNavigatePayload,
 			navigationPlanner,
@@ -999,6 +1000,10 @@ function registerServerActionCallback() {
 		})).finally(releaseCacheInvalidationGuard);
 	});
 }
+function ReplayInitialDevServerErrors({ report }) {
+	useEffect(report, [report]);
+	return null;
+}
 async function main() {
 	if (!claimInitialAppRouterBootstrap()) return;
 	loadNavigationRuntimeRouteManifest();
@@ -1010,7 +1015,7 @@ async function main() {
 		devErrorOverlay = await import("../client/dev-error-overlay.js");
 		devErrorOverlay.installDevErrorOverlay();
 		devErrorOverlay.installViteHmrErrorHandler(import.meta.hot);
-		devErrorOverlay.reportInitialDevServerErrors();
+		if (document.documentElement.id !== "__next_error__") devErrorOverlay.reportInitialDevServerErrors();
 	}
 	const initialRscBootstrap = getNavigationRuntime()?.bootstrap.rsc;
 	const rscStream = await readInitialRscStream();
@@ -1059,7 +1064,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 		const fallbackTtlMs = initialRscBootstrap?.initialCacheKind === "static" ? PREFETCH_CACHE_TTL : DYNAMIC_NAVIGATION_CACHE_TTL;
 		hydrationCachePublication.publish(() => {
 			if (cacheGeneration !== clientNavigationCacheGeneration) return () => {};
-			return storeVisitedResponseSnapshot(rscUrl, metadata.interceptionContext, snapshot, initialParams, fallbackTtlMs, mountedSlotsHeader, elements, false, snapshot, initialRscBootstrap?.initialCacheKind === "static" || metadata.interceptionContext !== null);
+			return storeVisitedResponseSnapshot(rscUrl, metadata.interceptionContext, snapshot, initialParams, fallbackTtlMs, mountedSlotsHeader, elements, false, snapshot, initialRscBootstrap?.initialCacheKind === "static" || metadata.interceptionContext !== null, true);
 		});
 	}).catch(() => {});
 	historyController.writeBootstrapHistoryMetadata();
@@ -1097,7 +1102,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 		for (const style of errorShellStyles) style.remove();
 		startTransition(() => {
 			const clientRoot = createRoot(document, createRootOptions);
-			clientRoot.render(children);
+			clientRoot.render(import.meta.env.DEV && devErrorOverlay ? createElement(Fragment, null, children, createElement(ReplayInitialDevServerErrors, { report: devErrorOverlay.reportInitialDevServerErrors })) : children);
 			window.__VINEXT_RSC_ROOT__ = clientRoot;
 		});
 	} else window.__VINEXT_RSC_ROOT__ = hydrateRootInTransition({
@@ -1151,6 +1156,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 			};
 			let restoredBfcacheIds = navigationKind === "traverse" ? historyController.readCurrentBfcacheVersionHistoryIds(activeTraversalIntent?.historyState ?? window.history.state) : null;
 			const reuseCurrentBfcacheIds = navigationKind !== "traverse" || !historyController.isCacheInvalidationGuarded() && historyController.isCurrentBfcacheVersion(activeTraversalIntent?.historyState ?? window.history.state);
+			const releaseNavigationInFlight = trackAppRouterNavigationInFlight();
 			try {
 				const shouldUsePendingRouterState = programmaticTransition;
 				if (hasBrowserRouterState()) {
@@ -1171,6 +1177,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 				}
 				const navigationInitiationState = getBrowserRouterState();
 				const mountedSlotsHeader = getMountedSlotIdsHeader(navigationInitiationState.elements);
+				let mountedLayoutsHeader = navigationKind === "navigate" ? createMountedLayoutsHeader(navigationInitiationState.elements, navigationInitiationState.layoutIds) : null;
 				while (true) {
 					const url = new URL(currentHref, window.location.origin);
 					const requestState = getRequestState(navigationKind, url.pathname, currentPrevNextUrl, activeTraversalIntent?.historyState);
@@ -1380,7 +1387,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 								interceptionContext: requestInterceptionContext,
 								mountedSlotsHeader,
 								routeManifest,
-								templates: optimisticRouteTemplates
+								templates: optimisticRouteTemplates.templates
 							});
 							if (optimisticPayload !== null && canCommitOptimisticRouteTemplate({
 								currentElements: navigationInitiationState.elements,
@@ -1419,13 +1426,16 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 							}
 						}
 					}
+					let sentMountedLayouts = false;
 					if (!navResponse) {
-						if (navigationKind === "navigate") {
-							const clientReuseManifestHeader = createClientReuseManifestHeaderFromVisibleAppState(navigationInitiationState);
-							if (clientReuseManifestHeader !== null) requestHeaders.set(VINEXT_CLIENT_REUSE_MANIFEST_HEADER, clientReuseManifestHeader);
+						let liveRequestHeaders = requestHeaders;
+						if (mountedLayoutsHeader !== null && requestInterceptionContext === null) {
+							liveRequestHeaders = new Headers(requestHeaders);
+							liveRequestHeaders.set(VINEXT_MOUNTED_LAYOUTS_HEADER, mountedLayoutsHeader);
+							sentMountedLayouts = true;
 						}
 						navResponse = await fetch(rscUrl, {
-							headers: requestHeaders,
+							headers: liveRequestHeaders,
 							credentials: "include",
 							priority: "auto",
 							signal: navigationAbortHandle.signal
@@ -1508,6 +1518,15 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 							navigationAbortHandle.release();
 						}).then(requireCompleteSupplementalRefresh);
 					}
+					if (sentMountedLayouts) {
+						const elements = await rscPayload;
+						if (!browserNavigationController.isCurrentNavigation(navId)) return;
+						if (!holdsSkippedLayouts(navigationInitiationState, elements) || !holdsSkippedLayouts(getBrowserRouterState(), elements)) {
+							mountedLayoutsHeader = null;
+							continue;
+						}
+						rscPayload = Promise.resolve(elements);
+					}
 					if (IS_STATIC_EXPORT) {
 						const staticExportElements = await rscPayload;
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
@@ -1584,13 +1603,12 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 							const state = committedState;
 							const committedElements = {
 								...state.elements,
-								[AppElementsWire.keys.layoutFlags]: state.layoutFlags,
 								[AppElementsWire.keys.layoutIds]: state.layoutIds,
 								[AppElementsWire.keys.skippedLayoutIds]: [],
 								[AppElementsWire.keys.slotBindings]: state.slotBindings
 							};
 							if (navigationCacheGeneration !== clientNavigationCacheGeneration) return;
-							storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, navParams, DYNAMIC_NAVIGATION_CACHE_TTL, mountedSlotsHeader, committedElements, true, prefetchSnapshot, interceptionContext !== null || hasNavigationResponseHistoryLifetime(snapshot));
+							storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, navParams, DYNAMIC_NAVIGATION_CACHE_TTL, mountedSlotsHeader, committedElements, isCompleteAppPayloadMetadata(metadata), prefetchSnapshot, interceptionContext !== null || hasNavigationResponseHistoryLifetime(snapshot));
 						}
 					} catch {}
 					return;
@@ -1603,9 +1621,11 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 				navigationAbortHandle.release();
 				browserNavigationController.finalizeNavigation(navId, pendingRouterState);
 				discardedServerActionRefreshScheduler.markNavigationSettled();
+				releaseNavigationInFlight();
 				if (startedHardNavigation) await waitForMpaNavigationRestore();
 			}
 		},
+		readVisitedResponseForFullPrefetch: (rscUrls, interceptionContext, mountedSlotsHeader) => findVisitedResponseForFullPrefetch(visitedResponseCache, rscUrls, interceptionContext, mountedSlotsHeader),
 		preparePrefetchResponse: (response) => {
 			if (!isRscResponseCompatible(response.headers.get("X-Vinext-RSC-Compatibility-Id"))) return Promise.reject(/* @__PURE__ */ new Error("[vinext] Prefetched another deployment's payload"));
 			return decodeAppElementsPromise(createFromFetch(Promise.resolve(response)));

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

@@ -1,3 +1,4 @@
+import { RouterHistoryWriteLanding } from "../shims/navigation.js";
 import { BfcacheIdMap, HistoryTraversalIntent } from "./app-history-state.js";
 import { AppRouterState } from "./app-browser-state.js";
 import { HistoryUpdateMode } from "./app-browser-navigation-controller.js";
@@ -19,10 +20,10 @@ 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;
+  /** Wraps `pushHistoryStateWithoutNotify(state, "", href, land)`. */
+  pushHistoryState: (state: unknown, href: string, land?: RouterHistoryWriteLanding) => void;
+  /** Wraps `replaceHistoryStateWithoutNotify(state, "", href, land)`. */
+  replaceHistoryState: (state: unknown, href?: string, land?: RouterHistoryWriteLanding) => void;
   readVisibleNavigationMetadata: () => VisibleNavigationMetadata | null;
 };
 /**