vinext 1.0.0-beta.3 → 1.0.0-beta.4

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

@@ -30,6 +30,10 @@ function readRequestCacheLifeForPrerender(options) {
 	if (options.isEdgeRuntime && options.revalidateSeconds === null) return (options.peekRequestCacheLife?.() ?? options.getRequestCacheLife())?.revalidate !== void 0 ? { revalidate: 0 } : null;
 	return options.peekRequestCacheLife?.() ?? options.getRequestCacheLife();
 }
+function resolveConfiguredDynamicStaleTimeSeconds() {
+	const seconds = Number(process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME);
+	return Number.isInteger(seconds) && seconds >= 0 ? seconds : 0;
+}
 function readRequestCacheLifeForCachePolicy(options) {
 	const requestCacheLife = options.getRequestCacheLife();
 	if (options.isEdgeRuntime && options.revalidateSeconds === null) return null;
@@ -322,10 +326,11 @@ async function renderAppPageLifecycle(options) {
 		layoutParamAccess: options.layoutParamAccess
 	});
 	const shouldBypassRscCacheForSkipTransport = options.isRscRequest && isSkipTransportEnabled(skipDisposition);
+	const dynamicStaleTimeSeconds = options.dynamicStaleTimeSeconds ?? (options.isForceDynamic ? resolveConfiguredDynamicStaleTimeSeconds() : void 0);
 	const outgoingElement = AppElementsWire.encodeOutgoingPayload({
 		element: options.element,
 		layoutFlags,
-		...options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic ? { dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds } : {},
+		...dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic ? { dynamicStaleTimeSeconds } : {},
 		...artifactCompatibility ? { artifactCompatibility } : {},
 		renderObservation: payloadRenderObservation,
 		skipDisposition: options.isRscRequest ? skipDisposition : void 0
@@ -385,8 +390,10 @@ async function renderAppPageLifecycle(options) {
 			revalidateSeconds
 		});
 		if (shouldBypassRscCacheForSkipTransport) options.isrDebug?.("RSC cache write skipped (skip transport payload)", options.cleanPathname);
+		const shouldEmitDynamicStaleTime = dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic && (dynamicUsedDuringBuild || options.isForceDynamic || !shouldCaptureRscForCacheMetadata);
 		const rscResponse = buildAppPageRscResponse(rscForResponse, {
-			dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic && (dynamicUsedDuringBuild || !shouldCaptureRscForCacheMetadata) ? options.dynamicStaleTimeSeconds : void 0,
+			cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
+			dynamicStaleTimeSeconds: shouldEmitDynamicStaleTime ? dynamicStaleTimeSeconds : void 0,
 			isEdgeRuntime: options.isEdgeRuntime,
 			middlewareContext: options.middlewareContext,
 			mountedSlotsHeader: options.mountedSlotsHeader,
@@ -474,7 +481,7 @@ async function renderAppPageLifecycle(options) {
 					}
 					return {
 						kind,
-						...kind === "dynamic" && options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !shouldCaptureRscForCacheMetadata ? { dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds } : {}
+						...kind === "dynamic" && dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !shouldCaptureRscForCacheMetadata ? { dynamicStaleTimeSeconds } : {}
 					};
 				},
 				fontData,
@@ -564,6 +571,7 @@ async function renderAppPageLifecycle(options) {
 	});
 	if (htmlRender.shellErrorRecovered) {
 		const response = buildAppPageHtmlResponse(safeHtmlStream, {
+			cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
 			draftCookie,
 			linkHeader,
 			isEdgeRuntime: options.isEdgeRuntime,
@@ -581,6 +589,7 @@ async function renderAppPageLifecycle(options) {
 	const shouldSpeculativelyWriteCache = options.isProduction && shouldCaptureRscForCacheMetadata && !options.isEdgeRuntime && revalidateSeconds === null && !options.isDynamicError && !options.isForceStatic && !options.scriptNonce && options.isProgressiveActionRender !== true && !dynamicUsedDuringRender;
 	if (htmlResponsePolicy.shouldWriteToCache || shouldSpeculativelyWriteCache) {
 		const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {
+			cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
 			draftCookie,
 			linkHeader,
 			isEdgeRuntime: options.isEdgeRuntime,
@@ -647,6 +656,7 @@ async function renderAppPageLifecycle(options) {
 		});
 	}
 	return buildAppPageHtmlResponse(safeHtmlStream, {
+		cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
 		draftCookie,
 		linkHeader,
 		isEdgeRuntime: options.isEdgeRuntime,

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

@@ -33,7 +33,6 @@ type ParallelGenerateStaticParamsBranch = {
   routeSegments?: readonly string[] | null;
 };
 type ValidateAppPageDynamicParamsOptions = {
-  clearRequestContext: () => void;
   enforceStaticParamsOnly: boolean;
   generateStaticParams?: GenerateStaticParams | GenerateStaticParamsSource | readonly (GenerateStaticParams | GenerateStaticParamsSource | null | undefined)[] | null;
   isDynamicRoute: boolean;

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

@@ -212,10 +212,7 @@ function normalizeGenerateStaticParams(generateStaticParams) {
 async function validateAppPageDynamicParams(options) {
 	if (!options.enforceStaticParamsOnly || !options.isDynamicRoute) return null;
 	const generateStaticParamsSources = normalizeGenerateStaticParams(options.generateStaticParams);
-	if (generateStaticParamsSources.length === 0) {
-		options.clearRequestContext();
-		return notFoundResponse();
-	}
+	if (generateStaticParamsSources.length === 0) return notFoundResponse();
 	const chainedSources = generateStaticParamsSources.filter((source) => source.chained);
 	let chainedStaticParams = null;
 	if (chainedSources.length > 0) chainedStaticParams = await generateChainedStaticParams(chainedSources);
@@ -230,17 +227,11 @@ async function validateAppPageDynamicParams(options) {
 		const result = await generateIndependentStaticParams(sources, chainedStaticParams, options.params);
 		if (result.validated) {
 			validatedIndependentResults = true;
-			if (!areStaticParamsAllowed(options.params, result.staticParams, true)) {
-				options.clearRequestContext();
-				return notFoundResponse();
-			}
+			if (!areStaticParamsAllowed(options.params, result.staticParams, true)) return notFoundResponse();
 		}
 	}
 	if (chainedStaticParams && !validatedIndependentResults) {
-		if (!areStaticParamsAllowed(options.params, chainedStaticParams)) {
-			options.clearRequestContext();
-			return notFoundResponse();
-		}
+		if (!areStaticParamsAllowed(options.params, chainedStaticParams)) return notFoundResponse();
 	}
 	return null;
 }

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

@@ -40,6 +40,7 @@ type AppPageHtmlResponsePolicy = {
   shouldWriteToCache: boolean;
 } & AppPageResponsePolicy;
 type BuildAppPageRscResponseOptions = {
+  cacheTags?: readonly string[];
   dynamicStaleTimeSeconds?: number;
   isEdgeRuntime?: boolean;
   middlewareContext: AppPageMiddlewareContext;
@@ -51,6 +52,7 @@ type BuildAppPageRscResponseOptions = {
   timing?: AppPageResponseTiming;
 };
 type BuildAppPageHtmlResponseOptions = {
+  cacheTags?: readonly string[];
   draftCookie?: string | null; /** Combined preload `Link` header value (React hints + font preloads), already capped. */
   linkHeader?: string;
   isEdgeRuntime?: boolean;

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

@@ -1,4 +1,4 @@
-import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
+import { NEXT_CACHE_TAGS_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
@@ -22,6 +22,9 @@ function applyPrerenderCacheLifeHeader(headers, requestCacheLife) {
 	if (payload.revalidate === void 0 && payload.expire === void 0) return;
 	headers.set(VINEXT_PRERENDER_CACHE_LIFE_HEADER, JSON.stringify(payload));
 }
+function applyPrerenderCacheTagsHeader(headers, cacheTags) {
+	if (cacheTags && cacheTags.length > 0) headers.set(NEXT_CACHE_TAGS_HEADER, cacheTags.join(","));
+}
 function resolveAppPageRscResponsePolicy(options) {
 	if (options.isDraftMode) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: NO_STORE_CACHE_CONTROL };
@@ -104,6 +107,7 @@ function buildAppPageRscResponse(body, options) {
 	applyRscCompatibilityIdHeader(headers);
 	applyRscDeploymentIdHeader(headers);
 	applyPrerenderCacheLifeHeader(headers, options.requestCacheLife);
+	applyPrerenderCacheTagsHeader(headers, options.cacheTags);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
 		status: options.middlewareContext.status ?? 200,
@@ -122,6 +126,7 @@ function buildAppPageHtmlResponse(body, options) {
 	if (options.linkHeader) headers.set("Link", options.linkHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
 	applyPrerenderCacheLifeHeader(headers, options.requestCacheLife);
+	applyPrerenderCacheTagsHeader(headers, options.cacheTags);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
 		status: options.middlewareContext.status ?? 200,

package/dist/server/app-page-route-wiring.d.ts

@@ -1,10 +1,10 @@
 import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
 import { AppElements, AppElementsInterception, AppElementsSlotBinding } from "./app-elements-wire.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
 import { Metadata, Viewport } from "../shims/metadata.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageRenderIdentity } from "./app-page-render-identity.js";
 import { resolveAppPageChildSegments } from "./app-page-segment-state.js";
 import { ComponentType, ReactNode } from "react";
@@ -136,6 +136,7 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   resolvedMetadata: Metadata | null;
   resolvedMetadataPathname?: string;
   resolvedViewport: Viewport;
+  scriptNonce?: string;
   streamingMetadata?: Promise<Metadata | null> | null;
   streamingMetadataOutlet?: Promise<unknown> | null;
   streamingMetadataOutletSuspended?: boolean;
@@ -173,7 +174,7 @@ declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErro
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
 declare function createAppPageSourcePage(routeSegments: readonly string[] | null | undefined): string;
-declare function createAppPageRouteBodyMetadata(metadata: Metadata | null, pathname: string, metadataPlacement: "body" | "head", trailingSlash?: boolean): ReactNode;
+declare function createAppPageRouteBodyMetadata(metadata: Metadata | null, pathname: string, metadataPlacement: "body" | "head", trailingSlash?: boolean, scriptNonce?: string): ReactNode;
 declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
 export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };

package/dist/server/app-page-route-wiring.js

@@ -1,13 +1,16 @@
 import { createAppRenderDependency, registerAppElementRenderDependencies, renderAfterAppDependencies, renderWithAppDependencyBarrier } from "./app-render-dependency.js";
-import { APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "./app-rsc-render-mode.js";
+import { APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
+import { APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "./app-rsc-render-mode.js";
 import { APP_PREFETCH_LOADING_SHELL_MARKER_KEY } from "./app-elements.js";
+import { createInlineScriptTag, escapeHtmlAttr } from "./html.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { ErrorBoundary, ForbiddenBoundary, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
 import { AppRouterScrollTarget } from "../shims/app-router-scroll.js";
+import DefaultNotFound from "../shims/default-not-found.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead, renderMetadataToHtml } from "../shims/metadata.js";
 import { Children as Children$1, ParallelSlot, Slot } from "../shims/slot.js";
+import { StreamedIconsInsertion } from "../shims/streamed-icons.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams } from "./app-page-params.js";
 import { probeReactServerSubtree } from "./app-page-probe.js";
 import { APP_PAGE_SEGMENT_KEY, resolveAppPageChildSegments, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey } from "./app-page-segment-state.js";
@@ -16,6 +19,7 @@ import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/server/app-page-route-wiring.tsx
 const APP_PAGE_LAYOUT_PROBE_CHILD = /* @__PURE__ */ jsx(Fragment, {});
 const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
+const DEFAULT_NOT_FOUND_COMPONENT = DefaultNotFound;
 function resolveSlotLayoutParams(routeSegments, treePosition, params) {
 	return resolveAppPageBranchParams(routeSegments, treePosition, params);
 }
@@ -120,17 +124,23 @@ function createAppPageLoadingEntries(route) {
 	});
 }
 function getPrefetchLoadingEntry(route) {
-	let firstEntry = null;
+	let rootEntry = null;
+	let firstNestedEntry = null;
 	for (const [index, loadingModule] of (route.loadings ?? []).entries()) {
 		if (!getDefaultExport(loadingModule)) continue;
 		const treePosition = route.loadingTreePositions?.[index];
 		if (treePosition === void 0) continue;
-		if (firstEntry === null || treePosition < firstEntry.treePosition) firstEntry = {
+		if (treePosition === 0) rootEntry ??= {
+			loadingModule,
+			treePosition
+		};
+		else if (firstNestedEntry === null || treePosition < firstNestedEntry.treePosition) firstNestedEntry = {
 			loadingModule,
 			treePosition
 		};
 	}
-	if (firstEntry) return firstEntry;
+	if (firstNestedEntry) return firstNestedEntry;
+	if (rootEntry) return rootEntry;
 	return getDefaultExport(route.loading) ? {
 		loadingModule: route.loading,
 		treePosition: route.routeSegments?.length ?? 0
@@ -194,6 +204,7 @@ function createAppPageSlotBindings(route, layoutEntries, resolveSlotOverride, op
 	if (route.childrenSlot) {
 		const ownerLayoutId = layoutEntries.find((layoutEntry) => layoutEntry.treePath === route.childrenSlot?.ownerTreePath)?.id;
 		bindings.push({
+			...route.childrenSlot.state === "active" ? { activeRouteId: options.routeId } : {},
 			ownerLayoutId: ownerLayoutId ?? null,
 			slotId: route.childrenSlot.id,
 			state: route.childrenSlot.state
@@ -226,16 +237,40 @@ function createAppPageRouteHead(metadata, viewport, pathname, metadataPlacement,
 		/* @__PURE__ */ jsx(ViewportHead, { viewport })
 	] });
 }
-function createAppPageRouteBodyMetadata(metadata, pathname, metadataPlacement, trailingSlash) {
+function hasStreamedIcons(metadata) {
+	const icons = metadata.icons;
+	if (!icons) return false;
+	if (typeof icons === "string" || icons instanceof URL || Array.isArray(icons)) return !Array.isArray(icons) || icons.length > 0;
+	if ("url" in icons) return true;
+	return Boolean(icons.shortcut || icons.icon || icons.apple || icons.other);
+}
+function createStreamedIconKey(pathname, metadataHtml) {
+	let hash = 2166136261;
+	for (let index = 0; index < metadataHtml.length; index++) {
+		hash ^= metadataHtml.charCodeAt(index);
+		hash = Math.imul(hash, 16777619);
+	}
+	return `${pathname}:${(hash >>> 0).toString(36)}`;
+}
+const STREAMED_ICON_KEY_PLACEHOLDER = "vinext-pending-streamed-icon-key";
+const REINSERT_STREAMED_ICONS_SCRIPT = `document.querySelectorAll('body link[rel="icon"], body link[rel="apple-touch-icon"]').forEach(el => document.head.appendChild(el));const a='data-vinext-streamed-icon',o=el=>{const m=el.getAttribute(a),i=m.lastIndexOf(':');return Number(m.slice(i+1))};[...document.querySelectorAll('link['+a+']')].sort((l,r)=>o(l)-o(r)).forEach(el=>document.head.appendChild(el))`;
+function createAppPageRouteBodyMetadata(metadata, pathname, metadataPlacement, trailingSlash, scriptNonce) {
 	if (!metadata || metadataPlacement !== "body") return null;
-	return /* @__PURE__ */ jsx("div", {
-		hidden: true,
-		dangerouslySetInnerHTML: { __html: renderMetadataToHtml(metadata, pathname, { trailingSlash }) }
+	const streamedIconKey = hasStreamedIcons(metadata) ? STREAMED_ICON_KEY_PLACEHOLDER : void 0;
+	const renderedMetadataHtml = renderMetadataToHtml(metadata, pathname, {
+		trailingSlash,
+		streamedIconKey
 	});
+	const metadataKey = streamedIconKey ? createStreamedIconKey(pathname, renderedMetadataHtml) : "";
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx("div", {
+		hidden: true,
+		suppressHydrationWarning: true,
+		dangerouslySetInnerHTML: { __html: (streamedIconKey ? renderedMetadataHtml.replaceAll(`<link data-vinext-streamed-icon="${STREAMED_ICON_KEY_PLACEHOLDER}:`, `<link data-vinext-streamed-icon="${escapeHtmlAttr(metadataKey)}:`) : renderedMetadataHtml) + createInlineScriptTag(REINSERT_STREAMED_ICONS_SCRIPT, scriptNonce) }
+	}), /* @__PURE__ */ jsx(StreamedIconsInsertion, { metadataKey })] });
 }
 async function AppPageStreamingMetadata(props) {
 	try {
-		return createAppPageRouteBodyMetadata(await props.metadata, props.pathname, "body", props.trailingSlash);
+		return createAppPageRouteBodyMetadata(await props.metadata, props.pathname, "body", props.trailingSlash, props.scriptNonce);
 	} catch {
 		return null;
 	}
@@ -287,6 +322,7 @@ function buildAppPageElements(options) {
 		for (const entry of loadingEntries) if (entry.treePosition <= treePosition && (!nearest || entry.treePosition > nearest.treePosition)) nearest = entry;
 		return nearest;
 	};
+	const isPrefetchEmpty = renderMode === APP_RSC_RENDER_MODE_PREFETCH_EMPTY;
 	const isPrefetchLoadingShell = renderMode === APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
 	const prefetchLoadingEntry = isPrefetchLoadingShell ? getPrefetchLoadingEntry(options.route) : null;
 	const metadataPlacement = options.metadataPlacement ?? "head";
@@ -339,13 +375,22 @@ function buildAppPageElements(options) {
 		slotBindings: createAppPageSlotBindings(options.route, layoutEntries, resolveSlotOverride, {
 			interception: renderIdentity?.interception ?? options.interception ?? null,
 			interceptionContext,
+			routeId,
 			routePath: options.routePath
 		})
 	}) };
+	if (isPrefetchEmpty) {
+		elements[APP_LAYOUT_IDS_KEY] = [];
+		elements[APP_ROOT_LAYOUT_KEY] = null;
+		elements[pageElementId] = null;
+		elements[routeId] = null;
+		return elements;
+	}
 	if (options.route.staticSiblings && options.route.staticSiblings.length > 0) elements[APP_STATIC_SIBLINGS_KEY] = options.route.staticSiblings;
 	if (options.streamingMetadata && streamingMetadataBodyId) elements[streamingMetadataBodyId] = /* @__PURE__ */ jsx(AppPageStreamingMetadata, {
 		metadata: options.streamingMetadataTags ?? options.streamingMetadata,
 		pathname: options.resolvedMetadataPathname ?? options.routePath,
+		scriptNonce: options.scriptNonce,
 		trailingSlash: options.trailingSlash
 	});
 	if (options.streamingMetadataOutlet && streamingMetadataOutletId) elements[streamingMetadataOutletId] = /* @__PURE__ */ jsx(AppPageMetadataOutlet, { metadata: options.streamingMetadataOutlet });
@@ -468,6 +513,7 @@ function buildAppPageElements(options) {
 			slotElement = options.createPageElement ? options.createPageElement(slotComponent, slotProps) : (() => {
 				return /* @__PURE__ */ jsx(slotComponent, { ...slotProps });
 			})();
+			if (overrideOrPageComponent) slotElement = /* @__PURE__ */ jsx(Fragment, { children: slotElement }, slotResetKey);
 		}
 		const branchSegments = slotOverride?.branchSegments ?? slotRouteSegments;
 		const branchLayouts = /* @__PURE__ */ new Map();
@@ -573,7 +619,9 @@ function buildAppPageElements(options) {
 		routeChildren = /* @__PURE__ */ jsx(AppRouterScrollTarget, { children: routeChildren });
 	}
 	const lastLayoutErrorModule = errorEntries.length > 0 ? errorEntries[errorEntries.length - 1].errorModule : null;
-	const notFoundComponent = getDefaultExport(options.route.notFound) ?? getDefaultExport(options.rootNotFoundModule);
+	const configuredNotFoundComponent = getDefaultExport(options.route.notFound) ?? getDefaultExport(options.rootNotFoundModule);
+	const defaultNotFoundOwnerLayoutId = configuredNotFoundComponent === null ? layoutEntries[0]?.id ?? null : null;
+	const notFoundComponent = configuredNotFoundComponent ?? (defaultNotFoundOwnerLayoutId === null ? DEFAULT_NOT_FOUND_COMPONENT : null);
 	if (notFoundComponent) routeChildren = /* @__PURE__ */ jsx(NotFoundBoundary, {
 		resetKey: routeResetKey,
 		fallback: /* @__PURE__ */ jsx(notFoundComponent, {}),
@@ -614,7 +662,7 @@ function buildAppPageElements(options) {
 			}, segmentResetKey || routeResetKey);
 		}
 		if (layoutEntry) {
-			const layoutNotFoundComponent = getDefaultExport(layoutEntry.notFoundModule);
+			const layoutNotFoundComponent = getDefaultExport(layoutEntry.notFoundModule) ?? (layoutEntry.id === defaultNotFoundOwnerLayoutId ? DEFAULT_NOT_FOUND_COMPONENT : null);
 			if (layoutNotFoundComponent) segmentChildren = /* @__PURE__ */ jsx(NotFoundBoundary, {
 				resetKey: segmentResetKey,
 				fallback: /* @__PURE__ */ jsx(layoutNotFoundComponent, {}),
@@ -680,7 +728,7 @@ function buildAppPageElements(options) {
 	elements[routeId] = /* @__PURE__ */ jsxs(Fragment$1, { children: [
 		createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash),
 		routeChildren,
-		createAppPageRouteBodyMetadata(options.resolvedMetadata, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash),
+		createAppPageRouteBodyMetadata(options.resolvedMetadata, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash, options.scriptNonce),
 		createAppPageStreamingMetadataBody(streamingMetadataBodyId)
 	] });
 	registerAppElementRenderDependencies(elements, renderDependenciesByElementId);

package/dist/server/app-pages-bridge.d.ts

@@ -1,8 +1,9 @@
 import { AppMiddlewareContext } from "./app-middleware.js";
+import { EdgeApiExecutionRuntime } from "./edge-api-runtime.js";
 
 //#region src/server/app-pages-bridge.d.ts
 type PagesEntry = {
-  handleApiRoute?: (request: Request, url: string, ctx?: unknown, trustedRevalidateOrigin?: string) => Promise<Response> | Response;
+  handleApiRoute?: (request: Request, url: string, ctx: unknown, trustedRevalidateOrigin: string | undefined, edgeRuntime: EdgeApiExecutionRuntime) => Promise<Response> | Response;
   matchApiRoute?: (url: string, request: Request) => PagesRouteMatch | null;
   matchPageRoute?: (url: string, request: Request) => PagesRouteMatch | null;
   renderPage?: (request: Request, url: string, query: Record<string, unknown>, parsedUrl: unknown, middlewareRequestHeaders?: Headers | null, options?: {

package/dist/server/app-pages-bridge.js

@@ -27,7 +27,8 @@ async function renderPagesFallback(options, dependencies) {
 		if (appRouteMatch !== null) {
 			if (apiMatch === null || !pagesRouteHasPriorityOverAppRoute(apiMatch.route, appRouteMatch.route)) return null;
 		}
-		const pagesApiResponse = await pagesEntry.handleApiRoute(pagesRequest, pagesUrl, void 0, getRequestExecutionContext()?.trustedRevalidateOrigin ?? new URL(pagesRequest.url).origin);
+		const executionContext = getRequestExecutionContext();
+		const pagesApiResponse = await pagesEntry.handleApiRoute(pagesRequest, pagesUrl, void 0, executionContext?.trustedRevalidateOrigin ?? new URL(pagesRequest.url).origin, executionContext?.hostRuntime ?? "node");
 		const draftCookie = getDraftModeCookieHeader();
 		return applyDraftModeCookie(applyRouteHandlerMiddlewareContext(pagesApiResponse, middlewareContext), draftCookie);
 	}

package/dist/server/app-rsc-cache-busting.d.ts

@@ -16,7 +16,14 @@ type CreateRscRequestHeadersOptions = {
   clientReuseManifestHeader?: string | null;
   interceptionContext?: string | null;
   mountedSlotsHeader?: string | null;
+  includePrefetchHeader?: boolean;
   renderMode?: AppRscRenderMode;
+  fetchPriority?: "auto" | "high" | "low";
+  nextUrl?: string | null;
+  prefetchRouterState?: {
+    pathAndSearch: string;
+    routeId: string;
+  } | null;
 };
 type ResolveInvalidRscCacheBustingRequestOptions = {
   isRscRequest: boolean;

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

@@ -154,6 +154,12 @@ function createRscRequestHeaders(options = {}) {
 		["RSC"]: "1"
 	});
 	applyDeploymentIdHeader(headers);
+	if (options.prefetchRouterState) {
+		if (options.includePrefetchHeader !== false) headers.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
+		headers.set(NEXT_ROUTER_STATE_TREE_HEADER, encodeURIComponent(JSON.stringify(options.prefetchRouterState)));
+	}
+	if (options.nextUrl) headers.set(NEXT_URL_HEADER, options.nextUrl);
+	if (process.env.__NEXT_TEST_MODE && options.fetchPriority) headers.set("Next-Test-Fetch-Priority", options.fetchPriority);
 	if (options.interceptionContext !== void 0 && options.interceptionContext !== null) headers.set(VINEXT_INTERCEPTION_CONTEXT_HEADER, options.interceptionContext);
 	if (options.mountedSlotsHeader !== void 0 && options.mountedSlotsHeader !== null) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
 	if (options.clientReuseManifestHeader !== void 0 && options.clientReuseManifestHeader !== null) headers.set(VINEXT_CLIENT_REUSE_MANIFEST_HEADER, options.clientReuseManifestHeader);

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

@@ -125,6 +125,7 @@ type HandleServerActionRequestOptions<TRoute> = {
   middlewareContext: AppRscMiddlewareContext;
   mountedSlotsHeader: string | null;
   request: Request;
+  scriptNonce?: string;
   routeMatch: AppRscRouteMatch<TRoute> | null;
   routePathname: string;
   searchParams: URLSearchParams;
@@ -195,6 +196,7 @@ type CreateAppRscHandlerOptions<TRoute extends AppRscHandlerRoute> = {
   imageConfig?: ImageConfig;
   isDev: boolean;
   loadPrerenderPagesRoutes?: () => Promise<unknown>;
+  matchInterceptRoute?: (pathname: string, sourcePathname: string) => AppRscRouteMatch<TRoute> | null;
   matchRoute: (pathname: string) => AppRscRouteMatch<TRoute> | null;
   matchRequestRoute?: (pathname: string) => AppRscRouteMatch<TRoute> | null;
   runMiddleware?: (options: RunAppMiddlewareOptions) => Promise<ApplyAppMiddlewareResult>;

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

@@ -328,7 +328,11 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		searchParams: getResolvedSearchParams(),
 		params: {}
 	});
-	const preActionMatch = filesystemRouteEligible ? matchCleanPathname() : null;
+	const directPreActionMatch = filesystemRouteEligible ? matchCleanPathname() : null;
+	const preActionRoutePathname = cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname;
+	const interceptionPreActionMatch = filesystemRouteEligible && directPreActionMatch === null && isRscRequest && interceptionContextHeader !== null ? options.matchInterceptRoute?.(preActionRoutePathname, interceptionContextHeader) ?? null : null;
+	const preActionMatch = directPreActionMatch ?? interceptionPreActionMatch;
+	const isInterceptionMatch = interceptionPreActionMatch !== null;
 	if (preActionMatch) setRootParams(pickRootParams(preActionMatch.params, preActionMatch.route.rootParamNames));
 	if (pagesDataRequest && didMiddlewareRewritePathname && preActionMatch) {
 		const headers = new Headers();
@@ -374,8 +378,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		middlewareContext,
 		mountedSlotsHeader,
 		request,
+		scriptNonce,
 		routeMatch: preActionMatch,
-		routePathname: cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname,
+		routePathname: preActionRoutePathname,
 		searchParams: getResolvedSearchParams()
 	}) : null;
 	if (serverActionResponse) return serverActionResponse;
@@ -383,7 +388,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	let match = preActionMatch;
 	const renderPagesForMatchKind = async (matchKind) => {
 		if (!filesystemRouteEligible) return null;
-		const response = match === null || match.route.isDynamic ? await options.renderPagesFallback?.({
+		const response = !isInterceptionMatch && (match === null || match.route.isDynamic) ? await options.renderPagesFallback?.({
 			appRouteMatch: match ?? null,
 			allowRscDocumentFallback: didMiddlewareRewritePathname,
 			isDataRequest,
@@ -409,7 +414,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		options.clearRequestContext();
 		return staticPagesFallbackResponse;
 	}
-	if (!resolvedLateRewritesForAction && (!match || match.route.isDynamic)) for (const rewrite of options.configRewrites.afterFiles) {
+	if (!isInterceptionMatch && !resolvedLateRewritesForAction && (!match || match.route.isDynamic)) for (const rewrite of options.configRewrites.afterFiles) {
 		const afterFilesRewrite = await applyRewrite({
 			basePathState,
 			clearRequestContext: options.clearRequestContext,

package/dist/server/app-rsc-render-mode.d.ts

@@ -1,9 +1,10 @@
 //#region src/server/app-rsc-render-mode.d.ts
-type AppRscRenderMode = "navigation" | "prefetch-dynamic-shell" | "prefetch-loading-shell";
+type AppRscRenderMode = "navigation" | "prefetch-empty" | "prefetch-dynamic-shell" | "prefetch-loading-shell";
 declare const APP_RSC_RENDER_MODE_NAVIGATION = "navigation";
+declare const APP_RSC_RENDER_MODE_PREFETCH_EMPTY = "prefetch-empty";
 declare const APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL = "prefetch-dynamic-shell";
 declare const APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL = "prefetch-loading-shell";
 declare function getRscRenderModeCacheVariant(mode: AppRscRenderMode): string | null;
 declare function parseAppRscRenderMode(value: string | null): AppRscRenderMode;
 //#endregion
-export { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode };
+export { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode };

package/dist/server/app-rsc-render-mode.js

@@ -1,18 +1,21 @@
 //#region src/server/app-rsc-render-mode.ts
 const APP_RSC_RENDER_MODE_NAVIGATION = "navigation";
+const APP_RSC_RENDER_MODE_PREFETCH_EMPTY = "prefetch-empty";
 const APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL = "prefetch-dynamic-shell";
 const APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL = "prefetch-loading-shell";
 function getRscRenderModeCacheVariant(mode) {
+	if (mode === "prefetch-empty") return "prefetch-empty";
 	if (mode === "prefetch-dynamic-shell") return "prefetch-dynamic-shell";
 	if (mode === "prefetch-loading-shell") return "prefetch-loading-shell";
 	return null;
 }
 function parseAppRscRenderMode(value) {
 	switch (value) {
+		case APP_RSC_RENDER_MODE_PREFETCH_EMPTY: return APP_RSC_RENDER_MODE_PREFETCH_EMPTY;
 		case APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL: return APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL;
 		case APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL: return APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
 		default: return APP_RSC_RENDER_MODE_NAVIGATION;
 	}
 }
 //#endregion
-export { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, getRscRenderModeCacheVariant, parseAppRscRenderMode };
+export { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, getRscRenderModeCacheVariant, parseAppRscRenderMode };

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

@@ -1,15 +1,63 @@
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "./headers.js";
+import { NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
 import { guardProtocolRelativeUrl } from "./request-pipeline.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
-import { APP_RSC_RENDER_MODE_NAVIGATION, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
-import { stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
+import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, stripRscSuffix } from "./app-rsc-cache-busting.js";
 import { parseClientReuseManifestHeader } from "./client-reuse-manifest.js";
 import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 //#region src/server/app-rsc-request-normalization.ts
+function extractFlightRouterStatePath(value, depth = 0) {
+	if (!Array.isArray(value) || value.length < 2 || depth > 64) return null;
+	const rawSegment = value[0];
+	const segment = Array.isArray(rawSegment) ? rawSegment[1] : rawSegment;
+	if (typeof segment !== "string") return null;
+	if (segment === "__DEFAULT__" || /^(?:\(\.\)|\(\.\.\)|\(\.\.\.\))/.test(segment)) return null;
+	const parallelRoutes = value[1];
+	if (!parallelRoutes || typeof parallelRoutes !== "object" || Array.isArray(parallelRoutes)) return null;
+	let childPath = null;
+	const children = Reflect.get(parallelRoutes, "children");
+	if (children !== void 0) childPath = extractFlightRouterStatePath(children, depth + 1);
+	if (childPath === null) for (const [key, child] of Object.entries(parallelRoutes)) {
+		if (key === "children") continue;
+		childPath = extractFlightRouterStatePath(child, depth + 1);
+		if (childPath !== null) break;
+	}
+	return `/${[segment === "" || segment === "children" || segment.startsWith("__PAGE__") || segment.startsWith("(") && segment.endsWith(")") ? "" : segment.replace(/^\/+/, ""), ...childPath === null ? [] : childPath.split("/")].filter(Boolean).join("/")}`;
+}
+function parsePrefetchRouterState(value) {
+	if (!value) return null;
+	try {
+		const parsed = JSON.parse(decodeURIComponent(value));
+		if (Array.isArray(parsed)) {
+			const pathAndSearch = extractFlightRouterStatePath(parsed);
+			return pathAndSearch === null ? null : { pathAndSearch };
+		}
+		if (!parsed || typeof parsed !== "object") return null;
+		const pathAndSearch = Reflect.get(parsed, "pathAndSearch");
+		const routeId = Reflect.get(parsed, "routeId");
+		if (typeof pathAndSearch !== "string" || !pathAndSearch.startsWith("/") || typeof routeId !== "string" || routeId.length === 0) return null;
+		return { pathAndSearch };
+	} catch {
+		return null;
+	}
+}
+function normalizeComparablePathAndSearch(value, basePath, baseUrl) {
+	const parsed = new URL(value, baseUrl);
+	const pathname = basePath && hasBasePath(parsed.pathname, basePath) ? stripBasePath(parsed.pathname, basePath) : parsed.pathname;
+	const search = parsed.searchParams.toString();
+	return `${pathname}${search ? `?${search}` : ""}`;
+}
+function tryNormalizeComparablePathAndSearch(value, basePath, baseUrl) {
+	try {
+		return normalizeComparablePathAndSearch(value, basePath, baseUrl);
+	} catch {
+		return null;
+	}
+}
 /**
 * Normalize an App Router RSC request.
 *
@@ -65,7 +113,20 @@ function normalizeRscRequest(request, basePath, allowOutsideBasePath = false) {
 	const requestCleanPathname = stripRscSuffix(requestPathname);
 	const interceptionContextHeader = normalizeInterceptionContextHeader(request.headers.get(VINEXT_INTERCEPTION_CONTEXT_HEADER));
 	const mountedSlotsHeader = normalizeMountedSlotsHeader(request.headers.get(VINEXT_MOUNTED_SLOTS_HEADER));
-	const renderMode = isRscRequest ? parseAppRscRenderMode(request.headers.get(VINEXT_RSC_RENDER_MODE_HEADER)) : APP_RSC_RENDER_MODE_NAVIGATION;
+	let renderMode = isRscRequest ? parseAppRscRenderMode(request.headers.get(VINEXT_RSC_RENDER_MODE_HEADER)) : APP_RSC_RENDER_MODE_NAVIGATION;
+	if (isRscRequest && renderMode === "navigation" && request.headers.get("Next-Router-Prefetch") === "1" && request.headers.get("Next-Router-Segment-Prefetch") === null) {
+		const nextUrl = request.headers.get(NEXT_URL_HEADER);
+		const routerState = parsePrefetchRouterState(request.headers.get(NEXT_ROUTER_STATE_TREE_HEADER));
+		if (nextUrl && routerState) {
+			const targetUrl = new URL(url);
+			targetUrl.pathname = cleanPathname;
+			targetUrl.searchParams.delete(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
+			const routerPathAndSearch = tryNormalizeComparablePathAndSearch(routerState.pathAndSearch, basePath, url);
+			const nextPathAndSearch = tryNormalizeComparablePathAndSearch(nextUrl, basePath, url);
+			const targetPathAndSearch = normalizeComparablePathAndSearch(targetUrl.href, basePath, url);
+			if (routerPathAndSearch !== null && nextPathAndSearch !== null) renderMode = routerPathAndSearch === nextPathAndSearch && routerPathAndSearch === targetPathAndSearch ? APP_RSC_RENDER_MODE_PREFETCH_EMPTY : APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
+		}
+	}
 	return {
 		clientReuseManifest: isRscRequest ? parseClientReuseManifestHeader(request.headers.get(VINEXT_CLIENT_REUSE_MANIFEST_HEADER)) : { kind: "absent" },
 		hadBasePath,

package/dist/server/app-server-action-execution.d.ts

@@ -1,5 +1,5 @@
-import { ActionRevalidationKind } from "../shims/cache-request-state.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { ActionRevalidationKind } from "../shims/cache-request-state.js";
 import { FetchCacheMode } from "../shims/fetch-cache.js";
 import { HeadersAccessPhase } from "../shims/headers.js";
 import { ReactFormState } from "react-dom/client";

package/dist/server/app-visited-response-cache.d.ts

@@ -25,5 +25,10 @@ declare function isVisitedResponseCacheEntryFresh(entry: VisitedResponseCacheEnt
   navigationKind: VisitedResponseCacheNavigationKind;
   now: number;
 }): boolean;
+declare function findVisitedResponseCacheEntry(cache: Map<string, VisitedResponseCacheEntry>, rscUrl: string, interceptionContext: string | null): {
+  cacheKey: string;
+  entry: VisitedResponseCacheEntry;
+} | null;
+declare function deleteVisitedResponseCacheEntry(cache: Map<string, VisitedResponseCacheEntry>, rscUrl: string, interceptionContext: string | null): boolean;
 //#endregion
-export { MAX_TRAVERSAL_CACHE_TTL, VISITED_RESPONSE_CACHE_TTL, VisitedResponseCacheEntry, createVisitedResponseCacheEntry, isVisitedResponseCacheEntryFresh };
+export { MAX_TRAVERSAL_CACHE_TTL, VISITED_RESPONSE_CACHE_TTL, VisitedResponseCacheEntry, createVisitedResponseCacheEntry, deleteVisitedResponseCacheEntry, findVisitedResponseCacheEntry, isVisitedResponseCacheEntryFresh };