vinext 1.0.0-beta.2 → 1.0.0-beta.4

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);
 }
@@ -108,6 +112,66 @@ function createAppPageErrorEntries(route) {
 		}];
 	});
 }
+function createAppPageLoadingEntries(route) {
+	return (route.loadings ?? []).flatMap((loadingModule, index) => {
+		if (!loadingModule) return [];
+		const treePosition = route.loadingTreePositions?.[index];
+		if (treePosition === void 0) return [];
+		return [{
+			loadingModule,
+			treePosition
+		}];
+	});
+}
+function getPrefetchLoadingEntry(route) {
+	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 (treePosition === 0) rootEntry ??= {
+			loadingModule,
+			treePosition
+		};
+		else if (firstNestedEntry === null || treePosition < firstNestedEntry.treePosition) firstNestedEntry = {
+			loadingModule,
+			treePosition
+		};
+	}
+	if (firstNestedEntry) return firstNestedEntry;
+	if (rootEntry) return rootEntry;
+	return getDefaultExport(route.loading) ? {
+		loadingModule: route.loading,
+		treePosition: route.routeSegments?.length ?? 0
+	} : null;
+}
+function createAppPageSlotLoadingEntries(slot, override) {
+	const entries = [];
+	const slotLoadingModules = (slot.loadings?.length ?? 0) > 0 ? slot.loadings : slot.loading ? [slot.loading] : [];
+	const slotLoadingTreePositions = (slot.loadingTreePositions?.length ?? 0) > 0 ? slot.loadingTreePositions : [0];
+	for (const [index, loadingModule] of slotLoadingModules.entries()) {
+		const treePosition = slotLoadingTreePositions[index];
+		if (!getDefaultExport(loadingModule) || treePosition === void 0) continue;
+		if (override && treePosition !== 0) continue;
+		entries.push({
+			loadingModule,
+			treePosition
+		});
+	}
+	for (const [index, loadingModule] of (override?.loadingModules ?? []).entries()) {
+		const treePosition = override?.loadingTreePositions?.[index];
+		if (!getDefaultExport(loadingModule) || treePosition === void 0) continue;
+		entries.push({
+			loadingModule,
+			treePosition
+		});
+	}
+	return entries;
+}
+function getFirstLoadingEntry(entries) {
+	return entries.reduce((first, entry) => first === null || entry.treePosition < first.treePosition ? entry : first, null);
+}
 function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, getEffectiveSlotParams, resolveSlotOverride) {
 	const parallelSlots = {};
 	for (const [slotKey, slot] of Object.entries(route.slots ?? {})) {
@@ -140,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
@@ -172,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;
 	}
@@ -223,13 +312,27 @@ function buildAppPageElements(options) {
 	const streamingMetadataOutletId = options.streamingMetadataOutlet ? `__vinext_streaming_metadata_outlet:${routeId}` : null;
 	const layoutEntries = createAppPageLayoutEntries(options.route);
 	const templateEntries = createAppPageTemplateEntries(options.route);
+	const loadingEntries = createAppPageLoadingEntries(options.route);
 	const errorEntries = createAppPageErrorEntries(options.route);
+	const findNearestAncestorLoadingEntry = (treePosition) => {
+		for (let index = loadingEntries.length - 1; index >= 0; index--) if (loadingEntries[index].treePosition < treePosition) return loadingEntries[index];
+	};
+	const findNearestLoadingEntryAtOrAbove = (treePosition) => {
+		let nearest;
+		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";
 	const layoutEntriesByTreePosition = /* @__PURE__ */ new Map();
 	const templateEntriesByTreePosition = /* @__PURE__ */ new Map();
+	const loadingEntriesByTreePosition = /* @__PURE__ */ new Map();
 	const errorEntriesByTreePosition = /* @__PURE__ */ new Map();
 	for (const layoutEntry of layoutEntries) layoutEntriesByTreePosition.set(layoutEntry.treePosition, layoutEntry);
 	for (const templateEntry of templateEntries) templateEntriesByTreePosition.set(templateEntry.treePosition, templateEntry);
+	for (const loadingEntry of loadingEntries) loadingEntriesByTreePosition.set(loadingEntry.treePosition, loadingEntry);
 	for (const errorEntry of errorEntries) errorEntriesByTreePosition.set(errorEntry.treePosition, errorEntry);
 	const layoutIndicesByTreePosition = /* @__PURE__ */ new Map();
 	for (let index = 0; index < layoutEntries.length; index++) layoutIndicesByTreePosition.set(layoutEntries[index].treePosition, index);
@@ -249,6 +352,7 @@ function buildAppPageElements(options) {
 	const orderedTreePositions = Array.from(/* @__PURE__ */ new Set([
 		...layoutEntries.map((entry) => entry.treePosition),
 		...templateEntries.map((entry) => entry.treePosition),
+		...loadingEntries.map((entry) => entry.treePosition),
 		...errorEntries.map((entry) => entry.treePosition)
 	])).sort((left, right) => left - right);
 	const resolveSlotOverride = (slotKey, slotName) => {
@@ -256,6 +360,11 @@ function buildAppPageElements(options) {
 		if (overrideByKey) return overrideByKey;
 		if (slotKey === slotName || (slotNameCounts.get(slotName) ?? 0) === 1) return options.slotOverrides?.[slotName];
 	};
+	const prefetchSlotLoadingEntries = isPrefetchLoadingShell ? Object.entries(options.route.slots ?? {}).flatMap(([slotKey, slot]) => {
+		return getFirstLoadingEntry(createAppPageSlotLoadingEntries(slot, resolveSlotOverride(slotKey, slot.name) ?? null)) ? [{ ownerTreePosition: slot.ownerTreePosition ?? 0 }] : [];
+	}) : [];
+	const prefetchCutoffTreePosition = isPrefetchLoadingShell ? prefetchLoadingEntry?.treePosition ?? prefetchSlotLoadingEntries.reduce((deepest, entry) => Math.max(deepest, entry.ownerTreePosition), 0) : null;
+	const includesPrefetchTreePosition = (treePosition) => prefetchCutoffTreePosition === null || treePosition <= prefetchCutoffTreePosition;
 	const elements = { ...AppElementsWire.createMetadataEntries({
 		interception: renderIdentity?.interception ?? options.interception ?? null,
 		interceptionContext,
@@ -266,18 +375,28 @@ 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 });
 	const getEffectiveSlotParams = (slotKey, slotName) => resolveSlotOverride(slotKey, slotName)?.params ?? options.matchedParams;
 	for (const treePosition of orderedTreePositions) {
+		if (isPrefetchLoadingShell && !includesPrefetchTreePosition(treePosition)) continue;
 		const layoutIndex = layoutIndicesByTreePosition.get(treePosition);
 		if (layoutIndex !== void 0) {
 			const layoutEntry = layoutEntries[layoutIndex];
@@ -298,19 +417,31 @@ function buildAppPageElements(options) {
 		pageDependencies.push(templateDependency);
 	}
 	const routeLoadingComponent = getDefaultExport(options.route.loading);
-	const isPrefetchLoadingShell = renderMode === APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
-	if (isPrefetchLoadingShell && routeLoadingComponent !== null) elements[APP_PREFETCH_LOADING_SHELL_MARKER_KEY] = "LoadingBoundary";
+	const prefetchLoadingComponent = getDefaultExport(prefetchLoadingEntry?.loadingModule);
+	if (isPrefetchLoadingShell && (prefetchLoadingComponent !== null || prefetchSlotLoadingEntries.length > 0)) elements[APP_PREFETCH_LOADING_SHELL_MARKER_KEY] = "LoadingBoundary";
 	elements[pageElementId] = isPrefetchLoadingShell ? null : renderAfterAppDependencies(options.element, pageDependencies);
 	for (const templateEntry of templateEntries) {
+		if (isPrefetchLoadingShell && !includesPrefetchTreePosition(templateEntry.treePosition)) continue;
 		const templateComponent = getDefaultExport(templateEntry.templateModule);
 		if (!templateComponent) continue;
 		const TemplateComponent = templateComponent;
 		const templateDependency = templateDependenciesById.get(templateEntry.id);
-		const templateElement = templateDependency ? renderWithAppDependencyBarrier(/* @__PURE__ */ jsx(TemplateComponent, { children: /* @__PURE__ */ jsx(Children$1, {}) }), templateDependency) : /* @__PURE__ */ jsx(TemplateComponent, { children: /* @__PURE__ */ jsx(Children$1, {}) });
+		let templateElement = templateDependency ? renderWithAppDependencyBarrier(/* @__PURE__ */ jsx(TemplateComponent, { children: /* @__PURE__ */ jsx(Children$1, {}) }), templateDependency) : /* @__PURE__ */ jsx(TemplateComponent, { children: /* @__PURE__ */ jsx(Children$1, {}) });
+		const ancestorLoadingEntry = findNearestAncestorLoadingEntry(templateEntry.treePosition);
+		const ancestorLoadingComponent = getDefaultExport(ancestorLoadingEntry?.loadingModule);
+		if (ancestorLoadingComponent && ancestorLoadingEntry) {
+			const AncestorLoadingComponent = ancestorLoadingComponent;
+			const loadingResetKey = resolveAppPageSegmentStateKey(routeSegments, ancestorLoadingEntry.treePosition, options.matchedParams);
+			templateElement = /* @__PURE__ */ jsx(Suspense, {
+				fallback: /* @__PURE__ */ jsx(AncestorLoadingComponent, {}),
+				children: templateElement
+			}, loadingResetKey || routeResetKey);
+		}
 		elements[templateEntry.id] = renderAfterAppDependencies(templateElement, templateDependenciesBeforeById.get(templateEntry.id) ?? []);
 	}
 	for (let index = 0; index < layoutEntries.length; index++) {
 		const layoutEntry = layoutEntries[index];
+		if (isPrefetchLoadingShell && !includesPrefetchTreePosition(layoutEntry.treePosition)) continue;
 		const layoutComponent = getDefaultExport(layoutEntry.layoutModule);
 		if (!layoutComponent) continue;
 		const layoutParams = resolveAppPageSegmentParams(options.route.routeSegments, layoutEntry.treePosition, options.matchedParams);
@@ -329,79 +460,147 @@ function buildAppPageElements(options) {
 		}
 		const LayoutComponent = layoutComponent;
 		const layoutDependency = layoutDependenciesByIndex.get(index);
-		const layoutElement = layoutDependency ? renderWithAppDependencyBarrier(/* @__PURE__ */ jsx(LayoutComponent, {
+		let layoutElement = layoutDependency ? renderWithAppDependencyBarrier(/* @__PURE__ */ jsx(LayoutComponent, {
 			...layoutProps,
 			children: /* @__PURE__ */ jsx(Children$1, {})
 		}), layoutDependency) : /* @__PURE__ */ jsx(LayoutComponent, {
 			...layoutProps,
 			children: /* @__PURE__ */ jsx(Children$1, {})
 		});
+		const ancestorLoadingEntry = findNearestAncestorLoadingEntry(layoutEntry.treePosition);
+		const ancestorLoadingComponent = getDefaultExport(ancestorLoadingEntry?.loadingModule);
+		if (ancestorLoadingComponent && ancestorLoadingEntry) {
+			const AncestorLoadingComponent = ancestorLoadingComponent;
+			const loadingResetKey = resolveAppPageSegmentStateKey(routeSegments, ancestorLoadingEntry.treePosition, options.matchedParams);
+			layoutElement = /* @__PURE__ */ jsx(Suspense, {
+				fallback: /* @__PURE__ */ jsx(AncestorLoadingComponent, {}),
+				children: layoutElement
+			}, loadingResetKey || routeResetKey);
+		}
 		elements[layoutEntry.id] = renderAfterAppDependencies(layoutElement, layoutDependenciesBefore[index] ?? []);
 	}
 	for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {
 		const slotName = slot.name;
 		const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;
+		const targetTreePosition = layoutEntries[targetIndex]?.treePosition ?? 0;
+		const ownerTreePosition = slot.ownerTreePosition ?? targetTreePosition;
+		const isOwnedAtRoutePrefetchCutoff = isPrefetchLoadingShell && prefetchLoadingEntry !== null && ownerTreePosition === prefetchLoadingEntry.treePosition;
+		if (isPrefetchLoadingShell && (prefetchLoadingEntry ? ownerTreePosition > prefetchLoadingEntry.treePosition : !includesPrefetchTreePosition(targetTreePosition))) continue;
 		const slotId = resolveAppPageSlotId(slot, layoutEntries[targetIndex]?.treePath ?? "/");
 		const slotOverride = resolveSlotOverride(slotKey, slotName);
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
 		const slotRouteSegments = slotOverride?.routeSegments ?? slot.routeSegments ?? [];
 		const slotOwnerParams = resolveAppPageSegmentParams(options.route.routeSegments, layoutEntries[targetIndex]?.treePosition ?? 0, options.matchedParams);
 		const slotResetKey = resolveAppPageRouteStateKey(slotRouteSegments, slotParams);
+		const hasSlotTreeOverride = slotOverride?.pageModule != null || slotOverride?.layoutModules !== void 0;
+		const slotLoadingEntries = createAppPageSlotLoadingEntries(slot, hasSlotTreeOverride ? slotOverride ?? null : null);
+		const prefetchSlotLoadingEntry = isOwnedAtRoutePrefetchCutoff ? prefetchLoadingEntry : isPrefetchLoadingShell ? getFirstLoadingEntry(slotLoadingEntries) : null;
+		if (isPrefetchLoadingShell && prefetchSlotLoadingEntry === null) continue;
 		const overrideOrPageComponent = getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);
 		const defaultComponent = getDefaultExport(slot.default);
 		if (!overrideOrPageComponent && defaultComponent && options.isRscRequest && options.mountedSlotIds?.has(slotId)) continue;
 		const slotComponent = overrideOrPageComponent ?? defaultComponent;
-		if (!slotComponent) {
+		if (!slotComponent && !isOwnedAtRoutePrefetchCutoff) {
 			elements[slotId] = AppElementsWire.unmatchedSlotValue;
 			continue;
 		}
-		const slotProps = { params: options.makeThenableParams(slotParams) };
-		if (options.searchParams !== void 0) slotProps.searchParams = options.searchParams;
-		if (slotOverride?.props) Object.assign(slotProps, slotOverride.props);
-		let slotElement = options.createPageElement ? options.createPageElement(slotComponent, slotProps) : (() => {
-			return /* @__PURE__ */ jsx(slotComponent, { ...slotProps });
-		})();
-		const hasSlotTreeOverride = slotOverride?.pageModule != null || slotOverride?.layoutModules !== void 0;
-		const interceptLayouts = slotOverride?.layoutModules ?? [];
-		for (let layoutIndex = interceptLayouts.length - 1; layoutIndex >= 0; layoutIndex--) {
-			const interceptLayoutComponent = getDefaultExport(interceptLayouts[layoutIndex]);
-			if (!interceptLayoutComponent) continue;
-			const InterceptLayoutComponent = interceptLayoutComponent;
-			const interceptLayoutParams = resolveSlotLayoutParams(slotOverride?.branchSegments ?? slotRouteSegments, slotOverride?.layoutSegments?.[layoutIndex]?.length ?? slotRouteSegments.length, slotParams);
-			slotElement = /* @__PURE__ */ jsx(InterceptLayoutComponent, {
-				params: options.makeThenableParams(interceptLayoutParams),
-				children: slotElement
+		let slotElement;
+		if (prefetchSlotLoadingEntry) slotElement = /* @__PURE__ */ jsx(getDefaultExport(prefetchSlotLoadingEntry.loadingModule), {});
+		else {
+			const slotProps = { params: options.makeThenableParams(slotParams) };
+			if (options.searchParams !== void 0) slotProps.searchParams = options.searchParams;
+			if (slotOverride?.props) Object.assign(slotProps, slotOverride.props);
+			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();
+		const addBranchLayout = (treePosition, entry) => {
+			const entries = branchLayouts.get(treePosition) ?? [];
+			entries.push(entry);
+			branchLayouts.set(treePosition, entries);
+		};
+		if (hasSlotTreeOverride) for (const [layoutIndex, layoutModule] of (slotOverride?.layoutModules ?? []).entries()) {
+			const component = getDefaultExport(layoutModule);
+			if (!component) continue;
+			const treePosition = slotOverride?.layoutSegments?.[layoutIndex]?.length ?? branchSegments.length;
+			addBranchLayout(treePosition, {
+				component,
+				params: resolveSlotLayoutParams(branchSegments, treePosition, slotParams)
 			});
 		}
-		if (!hasSlotTreeOverride) for (let layoutIndex = (slot.configLayouts?.length ?? 0) - 1; layoutIndex >= 0; layoutIndex--) {
-			const nestedLayoutComponent = getDefaultExport(slot.configLayouts?.[layoutIndex]);
-			if (!nestedLayoutComponent) continue;
-			const NestedLayoutComponent = nestedLayoutComponent;
-			const nestedLayoutParams = resolveSlotLayoutParams(slotRouteSegments, slot.configLayoutTreePositions?.[layoutIndex] ?? 0, slotParams);
-			slotElement = /* @__PURE__ */ jsx(NestedLayoutComponent, {
-				params: options.makeThenableParams({
+		else for (const [layoutIndex, layoutModule] of (slot.configLayouts ?? []).entries()) {
+			const component = getDefaultExport(layoutModule);
+			if (!component) continue;
+			const treePosition = slot.configLayoutTreePositions?.[layoutIndex] ?? 0;
+			addBranchLayout(treePosition, {
+				component,
+				params: {
 					...slotOwnerParams,
-					...nestedLayoutParams
-				}),
-				children: slotElement
+					...resolveSlotLayoutParams(slotRouteSegments, treePosition, slotParams)
+				}
 			});
 		}
 		const slotLayoutComponent = overrideOrPageComponent ? getDefaultExport(slot.layout) : null;
-		if (slotLayoutComponent) slotElement = /* @__PURE__ */ jsx(slotLayoutComponent, {
-			params: options.makeThenableParams(slotOwnerParams),
-			children: slotElement
-		});
-		const slotLoadingComponent = getDefaultExport(slot.loading);
-		if (slotLoadingComponent) slotElement = /* @__PURE__ */ jsx(Suspense, {
-			fallback: /* @__PURE__ */ jsx(slotLoadingComponent, {}),
-			children: slotElement
-		}, slotResetKey);
+		if (slotLayoutComponent) {
+			const rootEntries = branchLayouts.get(0) ?? [];
+			branchLayouts.set(0, [{
+				component: slotLayoutComponent,
+				params: slotOwnerParams
+			}, ...rootEntries]);
+		}
+		const branchLoadings = /* @__PURE__ */ new Map();
+		for (const entry of slotLoadingEntries) {
+			const component = getDefaultExport(entry.loadingModule);
+			if (!component) continue;
+			const components = branchLoadings.get(entry.treePosition) ?? [];
+			components.push(component);
+			branchLoadings.set(entry.treePosition, components);
+		}
 		const slotErrorComponent = getErrorBoundaryExport(slot.error);
-		if (slotErrorComponent) slotElement = /* @__PURE__ */ jsx(ErrorBoundary, {
-			resetKey: slotResetKey,
-			fallback: slotErrorComponent,
-			children: slotElement
-		});
+		const branchTreePositions = Array.from(/* @__PURE__ */ new Set([
+			...branchLayouts.keys(),
+			...branchLoadings.keys(),
+			...slotErrorComponent ? [0] : []
+		])).filter((treePosition) => !prefetchSlotLoadingEntry || !isOwnedAtRoutePrefetchCutoff && treePosition <= prefetchSlotLoadingEntry.treePosition).sort((left, right) => left - right);
+		for (let index = branchTreePositions.length - 1; index >= 0; index--) {
+			const treePosition = branchTreePositions[index];
+			const loadingComponents = prefetchSlotLoadingEntry ? [] : branchLoadings.get(treePosition) ?? [];
+			for (let loadingIndex = loadingComponents.length - 1; loadingIndex >= 0; loadingIndex--) {
+				const LoadingComponent = loadingComponents[loadingIndex];
+				const loadingResetKey = resolveAppPageSegmentStateKey(branchSegments, treePosition, slotParams);
+				slotElement = /* @__PURE__ */ jsx(Suspense, {
+					fallback: /* @__PURE__ */ jsx(LoadingComponent, {}),
+					children: slotElement
+				}, loadingResetKey || slotResetKey);
+			}
+			if (treePosition === 0 && slotErrorComponent) slotElement = /* @__PURE__ */ jsx(ErrorBoundary, {
+				resetKey: slotResetKey,
+				fallback: slotErrorComponent,
+				children: slotElement
+			});
+			const layoutEntriesAtPosition = branchLayouts.get(treePosition) ?? [];
+			for (let layoutIndex = layoutEntriesAtPosition.length - 1; layoutIndex >= 0; layoutIndex--) {
+				const layoutEntry = layoutEntriesAtPosition[layoutIndex];
+				const LayoutComponent = layoutEntry.component;
+				slotElement = /* @__PURE__ */ jsx(LayoutComponent, {
+					params: options.makeThenableParams(layoutEntry.params),
+					children: slotElement
+				});
+			}
+		}
+		const ownerLoadingEntry = isPrefetchLoadingShell ? void 0 : findNearestLoadingEntryAtOrAbove(ownerTreePosition);
+		const ownerLoadingComponent = getDefaultExport(ownerLoadingEntry?.loadingModule);
+		if (ownerLoadingComponent && ownerLoadingEntry) {
+			const OwnerLoadingComponent = ownerLoadingComponent;
+			const ownerResetKey = resolveAppPageSegmentStateKey(routeSegments, ownerLoadingEntry.treePosition, options.matchedParams);
+			slotElement = /* @__PURE__ */ jsx(Suspense, {
+				fallback: /* @__PURE__ */ jsx(OwnerLoadingComponent, {}),
+				children: slotElement
+			}, ownerResetKey || slotResetKey);
+		}
 		elements[slotId] = renderAfterAppDependencies(slotElement, targetIndex >= 0 ? slotDependenciesByLayoutIndex[targetIndex] ?? [] : []);
 	}
 	let routeChildren = /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(LayoutSegmentProvider, {
@@ -409,8 +608,8 @@ function buildAppPageElements(options) {
 		segmentMap: { children: [APP_PAGE_SEGMENT_KEY] },
 		children: /* @__PURE__ */ jsx(Slot, { id: pageElementId })
 	}), createAppPageStreamingMetadataOutlet(streamingMetadataOutletId, options.streamingMetadataOutletSuspended)] });
-	if (isPrefetchLoadingShell) if (routeLoadingComponent === null) routeChildren = null;
-	else routeChildren = /* @__PURE__ */ jsx(routeLoadingComponent, {});
+	if (isPrefetchLoadingShell) if (prefetchLoadingComponent === null) routeChildren = null;
+	else routeChildren = /* @__PURE__ */ jsx(prefetchLoadingComponent, {});
 	else {
 		routeChildren = /* @__PURE__ */ jsx(RedirectBoundary, { children: routeChildren });
 		if (routeLoadingComponent) routeChildren = /* @__PURE__ */ jsx(Suspense, {
@@ -420,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, {}),
@@ -444,15 +645,24 @@ function buildAppPageElements(options) {
 		fallback: pageErrorComponent,
 		children: routeChildren
 	});
-	for (let index = orderedTreePositions.length - 1; index >= 0; index--) {
-		const treePosition = orderedTreePositions[index];
+	const renderedTreePositions = isPrefetchLoadingShell ? orderedTreePositions.filter(includesPrefetchTreePosition) : orderedTreePositions;
+	for (let index = renderedTreePositions.length - 1; index >= 0; index--) {
+		const treePosition = renderedTreePositions[index];
 		const segmentResetKey = resolveAppPageSegmentStateKey(routeSegments, treePosition, options.matchedParams);
 		let segmentChildren = routeChildren;
 		const layoutEntry = layoutEntriesByTreePosition.get(treePosition);
 		const templateEntry = templateEntriesByTreePosition.get(treePosition);
+		const loadingEntry = loadingEntriesByTreePosition.get(treePosition);
 		const errorEntry = errorEntriesByTreePosition.get(treePosition);
+		if (!isPrefetchLoadingShell && treePosition < routeSegments.length) {
+			const segmentLoadingComponent = getDefaultExport(loadingEntry?.loadingModule);
+			if (segmentLoadingComponent) segmentChildren = /* @__PURE__ */ jsx(Suspense, {
+				fallback: /* @__PURE__ */ jsx(segmentLoadingComponent, {}),
+				children: segmentChildren
+			}, 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, {}),
@@ -518,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) => 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

@@ -1,3 +1,4 @@
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute } from "./hybrid-route-priority.js";
 //#region src/server/app-pages-bridge.ts
@@ -26,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);
+		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-route-handler-cache.js

@@ -12,6 +12,10 @@ async function readAppRouteHandlerCacheResponse(options) {
 	try {
 		const cached = await options.isrGet(routeKey);
 		const cachedValue = getCachedAppRouteValue(cached);
+		if (cached?.isExpired) {
+			options.isrDebug?.("MISS (expired route)", options.cleanPathname);
+			return null;
+		}
 		if (cachedValue && !cached?.isStale) {
 			options.isrDebug?.("HIT (route)", options.cleanPathname);
 			options.clearRequestContext();

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

@@ -1,4 +1,4 @@
-import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { consumeDynamicUsage, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, isDraftModeRequest, markDynamicUsage, setHeadersAccessPhase } from "../shims/headers.js";
@@ -23,7 +23,7 @@ function buildRouteHandlerPageCacheTags(pathname, extraTags, routeSegments) {
 	return buildPageCacheTags(pathname, extraTags, routeSegments, "route");
 }
 async function runInRouteHandlerRevalidationContext(options, renderFn) {
-	await runWithRequestContext(createRequestContext({
+	const requestContext = createRequestContext({
 		headersContext: createStaticGenerationHeadersContext({
 			draftModeEnabled: false,
 			draftModeSecret: options.draftModeSecret,
@@ -33,7 +33,8 @@ async function runInRouteHandlerRevalidationContext(options, renderFn) {
 		}),
 		executionContext: getRequestExecutionContext(),
 		unstableCacheRevalidation: "foreground"
-	}), async () => {
+	});
+	const revalidation = runWithRequestContext(requestContext, async () => {
 		ensureFetchPatch();
 		setCurrentFetchSoftTags(buildRouteHandlerPageCacheTags(options.cleanPathname, [], options.routeSegments));
 		setCurrentFetchCacheMode(options.fetchCacheMode);
@@ -44,6 +45,11 @@ async function runInRouteHandlerRevalidationContext(options, renderFn) {
 			await _drainPendingRevalidations();
 		}
 	});
+	try {
+		await revalidation;
+	} finally {
+		await closeAfterResponse(requestContext);
+	}
 }
 async function dispatchAppRouteHandler(options) {
 	const { route } = options;

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

@@ -1,9 +1,9 @@
 import "../utils/protocol-headers.js";
 import "./headers.js";
 import { processMiddlewareHeaders } from "./request-pipeline.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildAppRouteMissIsrCacheControl, decideIsr } from "./isr-decision.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { getSetCookieName } from "./cookie-utils.js";
 //#region src/server/app-route-handler-response.ts

package/dist/server/app-route-module-loader.d.ts

@@ -28,6 +28,8 @@ type LazyModuleLoaderArray = readonly (LazyModuleThunk | null | undefined)[];
 type LazyLoadableIntercept = {
   interceptLayouts?: readonly unknown[] | null;
   __loadInterceptLayouts?: LazyModuleLoaderArray | null;
+  interceptLoadings?: readonly unknown[] | null;
+  __loadInterceptLoadings?: LazyModuleLoaderArray | null;
   __loadState?: {
     interceptLayoutsLoading: Promise<readonly unknown[]> | null;
   };
@@ -38,6 +40,7 @@ type LazyLoadableSlot = {
   layout?: unknown;
   configLayouts?: readonly unknown[];
   loading?: unknown;
+  loadings?: readonly unknown[];
   error?: unknown;
   notFound?: unknown;
   __loadPage?: LazyModuleThunk | null;
@@ -45,6 +48,7 @@ type LazyLoadableSlot = {
   __loadLayout?: LazyModuleThunk | null;
   __loadConfigLayouts?: LazyModuleLoaderArray | null;
   __loadLoading?: LazyModuleThunk | null;
+  __loadLoadings?: LazyModuleLoaderArray | null;
   __loadError?: LazyModuleThunk | null;
   __loadNotFound?: LazyModuleThunk | null; /** Hydrated only after an intercept matches, not with the slot's base modules. */
   intercepts?: LazyLoadableIntercept[];
@@ -54,6 +58,7 @@ type LazyLoadableRoute = {
   routeHandler?: unknown;
   layouts?: unknown[];
   templates?: unknown[];
+  loadings?: unknown[];
   errors?: unknown[];
   errorPaths?: unknown[];
   notFounds?: unknown[];
@@ -70,6 +75,7 @@ type LazyLoadableRoute = {
   __loadRouteHandler?: LazyModuleThunk | null;
   __loadLayouts?: LazyModuleLoaderArray | null;
   __loadTemplates?: LazyModuleLoaderArray | null;
+  __loadLoadings?: LazyModuleLoaderArray | null;
   __loadErrors?: LazyModuleLoaderArray | null;
   __loadErrorPaths?: LazyModuleLoaderArray | null;
   __loadNotFounds?: LazyModuleLoaderArray | null;