vinext 0.1.2 → 0.1.3

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

@@ -1,10 +1,11 @@
 import { stripBasePath } from "../utils/base-path.js";
+import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
 import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
-import { startTransition, useLayoutEffect } from "react";
+import { startTransition, useInsertionEffect, useLayoutEffect } from "react";
 import { flushSync } from "react-dom";
 //#region src/server/app-browser-navigation-controller.ts
 const HARD_NAVIGATION_LOOP_GUARD_KEY = "__vinext_hard_navigation_target__";
@@ -73,6 +74,7 @@ function createAppBrowserNavigationController(deps = {}) {
 	let nextNavigationRenderId = 0;
 	let activeNavigationId = 0;
 	const pendingNavigationCommits = /* @__PURE__ */ new Map();
+	const pendingNavigationFailureTargets = /* @__PURE__ */ new Map();
 	const pendingNavigationPrePaintEffects = /* @__PURE__ */ new Map();
 	let setBrowserRouterState = null;
 	let browserRouterStateRef = null;
@@ -191,6 +193,13 @@ function createAppBrowserNavigationController(deps = {}) {
 			resolve();
 		}
 	}
+	function clearCommittedNavigationFailureTargets(renderId) {
+		for (const [pendingId, targetHref] of pendingNavigationFailureTargets) {
+			if (pendingId > renderId) continue;
+			pendingNavigationFailureTargets.delete(pendingId);
+			clearAppNavigationFailureTarget(targetHref);
+		}
+	}
 	async function hmrReplaceTree(nextElements, navigationSnapshot) {
 		if (!hasBrowserRouterState()) return;
 		const pending = await createPendingNavigationCommit({
@@ -206,6 +215,9 @@ function createAppBrowserNavigationController(deps = {}) {
 		dispatchSynchronousVisibleCommit(approveHmrVisibleCommit(pending));
 	}
 	function NavigationCommitSignal({ renderId, children }) {
+		useInsertionEffect(() => {
+			clearCommittedNavigationFailureTargets(renderId);
+		}, [renderId]);
 		useLayoutEffect(() => {
 			drainPrePaintEffects(renderId);
 			const frame = requestAnimationFrame(() => {
@@ -298,6 +310,8 @@ function createAppBrowserNavigationController(deps = {}) {
 	}
 	async function renderNavigationPayload(options) {
 		const renderId = allocateRenderId();
+		const failureTarget = getAppNavigationFailureTarget(options.targetHref);
+		if (failureTarget) pendingNavigationFailureTargets.set(renderId, failureTarget);
 		let resolveCommitted;
 		const committed = new Promise((resolve) => {
 			resolveCommitted = resolve;
@@ -327,6 +341,8 @@ function createAppBrowserNavigationController(deps = {}) {
 			});
 			if (approval.decision.disposition === "no-commit") {
 				settlePendingBrowserRouterState(options.pendingRouterState);
+				pendingNavigationFailureTargets.delete(renderId);
+				if (failureTarget) clearAppNavigationFailureTarget(failureTarget);
 				pendingNavigationCommits.delete(renderId);
 				resolveCommitted?.();
 				consumeAppRouterScrollIntent(options.scrollIntent ?? null);
@@ -334,9 +350,12 @@ function createAppBrowserNavigationController(deps = {}) {
 			}
 			if (approval.decision.disposition === "hard-navigate") {
 				settlePendingBrowserRouterState(options.pendingRouterState);
+				pendingNavigationFailureTargets.delete(renderId);
 				pendingNavigationCommits.delete(renderId);
 				consumeAppRouterScrollIntent(options.scrollIntent ?? null);
-				return performHardNavigation(options.targetHref) ? "hard-navigate" : "no-commit";
+				if (performHardNavigation(options.targetHref)) return "hard-navigate";
+				if (failureTarget) clearAppNavigationFailureTarget(failureTarget);
+				return "no-commit";
 			}
 			const approvedCommit = approval.approvedCommit;
 			if (approvedCommit === null) throw new Error("[vinext] Commit decision did not approve a visible commit");
@@ -354,6 +373,7 @@ function createAppBrowserNavigationController(deps = {}) {
 			snapshotActivated = true;
 			dispatchApprovedVisibleCommit(approvedCommit, options.pendingRouterState, options.visibleCommitMode ?? "transition");
 		} catch (error) {
+			pendingNavigationFailureTargets.delete(renderId);
 			pendingNavigationPrePaintEffects.delete(renderId);
 			pendingNavigationCommits.delete(renderId);
 			if (snapshotActivated) commitClientNavigationStateImpl(options.navId);
@@ -437,6 +457,7 @@ function createAppBrowserNavigationController(deps = {}) {
 		commitSameUrlNavigatePayload,
 		hmrReplaceTree,
 		drainPrePaintEffects,
+		clearCommittedNavigationFailureTargets,
 		NavigationCommitSignal
 	};
 }

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

@@ -0,0 +1,6 @@
+import { ServerActionResultDecision } from "./navigation-planner.js";
+
+//#region src/server/app-browser-server-action-navigation.d.ts
+declare function applyServerActionResultDecision(decision: ServerActionResultDecision, clearCaches: () => void, performHardNavigation: (url: string, historyMode?: "assign" | "replace") => void): boolean;
+//#endregion
+export { applyServerActionResultDecision };

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

@@ -0,0 +1,9 @@
+//#region src/server/app-browser-server-action-navigation.ts
+function applyServerActionResultDecision(decision, clearCaches, performHardNavigation) {
+	if (decision.kind !== "hardNavigate") return false;
+	if (decision.clearClientNavigationCaches) clearCaches();
+	performHardNavigation(decision.url, decision.historyMode);
+	return true;
+}
+//#endregion
+export { applyServerActionResultDecision };

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

@@ -27,53 +27,96 @@ function getNavigationRuntimeRscBootstrap() {
 * immediately instead of polling with setTimeout.
 */
 function createProgressiveRscStream() {
-	return new ReadableStream({ start(controller) {
-		const vinext = getVinextBrowserGlobal();
-		const runtimeRsc = getNavigationRuntimeRscBootstrap();
-		const initialChunks = runtimeRsc?.rsc ?? vinext.__VINEXT_RSC_CHUNKS__ ?? [];
-		for (const chunk of initialChunks) controller.enqueue(decodeRscEmbeddedChunk(chunk));
-		if (runtimeRsc?.done || vinext.__VINEXT_RSC_DONE__) {
-			controller.close();
-			return;
-		}
-		let closed = false;
-		let cancelDocumentCompletionCheck;
-		const cancelPendingDocumentCompletionCheck = () => {
-			const cancel = cancelDocumentCompletionCheck;
-			cancelDocumentCompletionCheck = void 0;
-			cancel?.();
-		};
-		const closeOnce = () => {
-			if (!closed) {
-				closed = true;
-				cancelPendingDocumentCompletionCheck();
+	let cancelStream;
+	return new ReadableStream({
+		start(controller) {
+			const vinext = getVinextBrowserGlobal();
+			const runtimeRsc = getNavigationRuntimeRscBootstrap();
+			const initialChunks = runtimeRsc?.rsc ?? vinext.__VINEXT_RSC_CHUNKS__ ?? [];
+			for (const chunk of initialChunks) controller.enqueue(decodeRscEmbeddedChunk(chunk));
+			if (runtimeRsc?.done || vinext.__VINEXT_RSC_DONE__) {
 				controller.close();
+				return;
 			}
-		};
-		const errorOnce = () => {
-			if (!closed) {
-				closed = true;
-				cancelPendingDocumentCompletionCheck();
-				controller.error(createUnexpectedRscStreamCloseError());
+			let closed = false;
+			let cancelDocumentCompletionCheck;
+			const cancelPendingDocumentCompletionCheck = () => {
+				const cancel = cancelDocumentCompletionCheck;
+				cancelDocumentCompletionCheck = void 0;
+				cancel?.();
+			};
+			const closeOnce = () => {
+				if (!closed) {
+					closed = true;
+					cancelPendingDocumentCompletionCheck();
+					controller.close();
+				}
+			};
+			const scheduleCloseOnce = () => {
+				if (typeof queueMicrotask === "function") queueMicrotask(closeOnce);
+				else Promise.resolve().then(closeOnce);
+			};
+			const errorOnce = () => {
+				if (!closed) {
+					closed = true;
+					cancelPendingDocumentCompletionCheck();
+					controller.error(createUnexpectedRscStreamCloseError());
+				}
+			};
+			cancelStream = () => {
+				if (!closed) {
+					closed = true;
+					cancelPendingDocumentCompletionCheck();
+				}
+			};
+			const liveRuntimeRsc = getNavigationRuntime() === null ? null : ensureNavigationRuntimeRscBootstrap();
+			const arr = liveRuntimeRsc?.rsc ?? (vinext.__VINEXT_RSC_CHUNKS__ ??= []);
+			arr.push = function(...chunks) {
+				const length = Array.prototype.push.apply(this, chunks);
+				if (closed) return length;
+				for (const chunk of chunks) controller.enqueue(decodeRscEmbeddedChunk(chunk));
+				if (liveRuntimeRsc?.done || vinext.__VINEXT_RSC_DONE__) closeOnce();
+				return length;
+			};
+			if (liveRuntimeRsc) {
+				let done = Boolean(liveRuntimeRsc.done);
+				Object.defineProperty(liveRuntimeRsc, "done", {
+					configurable: true,
+					enumerable: true,
+					get() {
+						return done;
+					},
+					set(value) {
+						done = Boolean(value);
+						if (done) scheduleCloseOnce();
+					}
+				});
+			} else {
+				let done = Boolean(vinext.__VINEXT_RSC_DONE__);
+				Object.defineProperty(vinext, "__VINEXT_RSC_DONE__", {
+					configurable: true,
+					enumerable: true,
+					get() {
+						return done;
+					},
+					set(value) {
+						done = Boolean(value);
+						if (done) scheduleCloseOnce();
+					}
+				});
 			}
-		};
-		const liveRuntimeRsc = getNavigationRuntime() === null ? null : ensureNavigationRuntimeRscBootstrap();
-		const arr = liveRuntimeRsc?.rsc ?? (vinext.__VINEXT_RSC_CHUNKS__ ??= []);
-		arr.push = function(...chunks) {
-			const length = Array.prototype.push.apply(this, chunks);
-			if (closed) return length;
-			for (const chunk of chunks) controller.enqueue(decodeRscEmbeddedChunk(chunk));
-			if (liveRuntimeRsc?.done || vinext.__VINEXT_RSC_DONE__) closeOnce();
-			return length;
-		};
-		if (typeof document !== "undefined") if (document.readyState === "loading") {
-			document.addEventListener("DOMContentLoaded", errorOnce);
-			cancelDocumentCompletionCheck = () => document.removeEventListener("DOMContentLoaded", errorOnce);
-		} else {
-			const timeoutId = setTimeout(errorOnce);
-			cancelDocumentCompletionCheck = () => clearTimeout(timeoutId);
+			if (typeof document !== "undefined") if (document.readyState === "loading") {
+				document.addEventListener("DOMContentLoaded", errorOnce);
+				cancelDocumentCompletionCheck = () => document.removeEventListener("DOMContentLoaded", errorOnce);
+			} else {
+				const timeoutId = setTimeout(errorOnce);
+				cancelDocumentCompletionCheck = () => clearTimeout(timeoutId);
+			}
+		},
+		cancel() {
+			cancelStream?.();
 		}
-	} });
+	});
 }
 //#endregion
 export { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal };

package/dist/server/app-elements-wire.d.ts

@@ -14,6 +14,7 @@ declare const APP_RENDER_OBSERVATION_KEY = "__renderObservation";
 declare const APP_ROUTE_KEY = "__route";
 declare const APP_ROOT_LAYOUT_KEY = "__rootLayout";
 declare const APP_SKIPPED_LAYOUT_IDS_KEY = "__skippedLayoutIds";
+declare const APP_SOURCE_PAGE_KEY = "__sourcePage";
 declare const APP_SLOT_BINDINGS_KEY = "__slotBindings";
 /**
  * Static sibling segment names for the matched route, surfaced so the client
@@ -77,6 +78,7 @@ type AppElementsMetadata = {
   rootLayoutTreePath: string | null;
   skippedLayoutIds: readonly string[];
   slotBindings: readonly AppElementsSlotBinding[];
+  sourcePage: string | null;
 };
 type AppElementsWireElementKey = {
   kind: "layout";
@@ -104,6 +106,7 @@ type AppElementsWireMetadataInput = {
   routeId: string;
   rootLayoutTreePath: string | null;
   slotBindings?: readonly AppElementsSlotBinding[];
+  sourcePage?: string | null;
 };
 type AppElementsWireMetadataEntries = Readonly<{
   [APP_ROUTE_KEY]: string;
@@ -111,6 +114,7 @@ type AppElementsWireMetadataEntries = Readonly<{
   [APP_INTERCEPTION_CONTEXT_KEY]: string | null;
   [APP_LAYOUT_IDS_KEY]: readonly string[];
   [APP_ROOT_LAYOUT_KEY]: string | null;
+  [APP_SOURCE_PAGE_KEY]?: string;
   [APP_SLOT_BINDINGS_KEY]?: readonly AppElementsSlotBinding[];
 }>;
 /**
@@ -132,6 +136,7 @@ type AppElementsWireKeys = {
   readonly route: typeof APP_ROUTE_KEY;
   readonly skippedLayoutIds: typeof APP_SKIPPED_LAYOUT_IDS_KEY;
   readonly slotBindings: typeof APP_SLOT_BINDINGS_KEY;
+  readonly sourcePage: typeof APP_SOURCE_PAGE_KEY;
 };
 type AppElementsWireCodec = {
   readonly keys: AppElementsWireKeys;
@@ -184,4 +189,4 @@ declare function buildOutgoingAppPayload(input: {
 declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
 declare const AppElementsWire: AppElementsWireCodec;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };

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

@@ -16,6 +16,7 @@ const APP_RENDER_OBSERVATION_KEY = "__renderObservation";
 const APP_ROUTE_KEY = "__route";
 const APP_ROOT_LAYOUT_KEY = "__rootLayout";
 const APP_SKIPPED_LAYOUT_IDS_KEY = "__skippedLayoutIds";
+const APP_SOURCE_PAGE_KEY = "__sourcePage";
 const APP_SLOT_BINDINGS_KEY = "__slotBindings";
 /**
 * Static sibling segment names for the matched route, surfaced so the client
@@ -175,7 +176,8 @@ function createAppElementsWireMetadataEntries(input) {
 		[APP_ROUTE_KEY]: input.routeId,
 		[APP_INTERCEPTION_CONTEXT_KEY]: input.interceptionContext,
 		[APP_LAYOUT_IDS_KEY]: layoutIds,
-		[APP_ROOT_LAYOUT_KEY]: input.rootLayoutTreePath
+		[APP_ROOT_LAYOUT_KEY]: input.rootLayoutTreePath,
+		...input.sourcePage === null || input.sourcePage === void 0 ? {} : { [APP_SOURCE_PAGE_KEY]: input.sourcePage }
 	};
 	const entriesWithInterception = input.interception ? {
 		...entries,
@@ -330,6 +332,11 @@ function readArtifactCompatibilityMetadata(value) {
 	if (value === void 0) return createArtifactCompatibilityEnvelope();
 	return parseArtifactCompatibilityEnvelope(value) ?? createArtifactCompatibilityEnvelope();
 }
+function readSourcePageMetadata(value) {
+	if (value === void 0 || value === null) return null;
+	if (typeof value !== "string" || !value.startsWith("/")) return null;
+	return value;
+}
 function createMissingCacheEntryReuseProof() {
 	return {
 		kind: "runtime-cache-entry",
@@ -387,6 +394,7 @@ function readAppElementsMetadata(elements) {
 	const interception = parseInterceptionMetadata(elements[APP_INTERCEPTION_KEY]);
 	const artifactCompatibility = readArtifactCompatibilityMetadata(elements[APP_ARTIFACT_COMPATIBILITY_KEY]);
 	const cacheEntryReuseProof = parseCacheEntryReuseProofMetadata(elements[APP_CACHE_ENTRY_REUSE_PROOF_KEY]);
+	const sourcePage = readSourcePageMetadata(elements[APP_SOURCE_PAGE_KEY]);
 	return {
 		artifactCompatibility,
 		...cacheEntryReuseProof ? { cacheEntryReuseProof } : {},
@@ -397,7 +405,8 @@ function readAppElementsMetadata(elements) {
 		routeId,
 		rootLayoutTreePath,
 		skippedLayoutIds,
-		slotBindings
+		slotBindings,
+		sourcePage
 	};
 }
 const AppElementsWire = {
@@ -412,7 +421,8 @@ const AppElementsWire = {
 		rootLayout: APP_ROOT_LAYOUT_KEY,
 		route: APP_ROUTE_KEY,
 		skippedLayoutIds: APP_SKIPPED_LAYOUT_IDS_KEY,
-		slotBindings: APP_SLOT_BINDINGS_KEY
+		slotBindings: APP_SLOT_BINDINGS_KEY,
+		sourcePage: APP_SOURCE_PAGE_KEY
 	},
 	unmatchedSlotValue: APP_UNMATCHED_SLOT_WIRE_VALUE,
 	createMetadataEntries: createAppElementsWireMetadataEntries,
@@ -430,4 +440,4 @@ const AppElementsWire = {
 	withLayoutFlags
 };
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };

package/dist/server/app-elements.d.ts

@@ -1,4 +1,4 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 
 //#region src/server/app-elements.d.ts
 declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
@@ -6,4 +6,4 @@ declare function getMountedSlotIds(elements: AppElements): string[];
 declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
 declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };

package/dist/server/app-elements.js

@@ -1,4 +1,4 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 //#region src/server/app-elements.ts
 const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
@@ -15,4 +15,4 @@ function resolveVisitedResponseInterceptionContext(requestInterceptionContext, p
 	return payloadInterceptionContext ?? requestInterceptionContext;
 }
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };

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

@@ -70,6 +70,7 @@ type AppFallbackRendererCallContext = {
    * render path. Defaults to `false` when no route is matched.
    */
   isEdgeRuntime?: boolean;
+  sourcePageSegments?: readonly string[] | null;
 };
 type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
   renderErrorBoundary: (route: AppPageBoundaryRoute<TModule> | null, error: unknown, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;

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

@@ -88,6 +88,7 @@ function createAppFallbackRenderer(options) {
 				route,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
+				sourcePageSegments: callContext?.sourcePageSegments,
 				statusCode
 			});
 		},
@@ -122,7 +123,8 @@ function createAppFallbackRenderer(options) {
 				route,
 				renderToReadableStream: rscRenderer,
 				sanitizeErrorForClient: sanitizer,
-				scriptNonce
+				scriptNonce,
+				sourcePageSegments: callContext?.sourcePageSegments
 			});
 		}
 	};

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

@@ -174,7 +174,7 @@ function createOptimisticRouteTemplate(options) {
 		href: options.href,
 		routeManifest: options.routeManifest
 	});
-	if (match === null || !match.route.isDynamic) return null;
+	if (match === null || !options.allowLoadingShell && !match.route.isDynamic) return null;
 	if (options.interceptionContext !== null) return null;
 	const metadata = AppElementsWire.readMetadata(options.elements);
 	if (metadata.interception !== null || metadata.interceptionContext !== null) return null;
@@ -205,7 +205,7 @@ function resolveOptimisticNavigationPayload(options) {
 		href: options.href,
 		routeManifest: options.routeManifest
 	});
-	if (match === null || !match.route.isDynamic) return null;
+	if (match === null) return null;
 	const template = options.templates.get(getOptimisticRouteTemplateKey({
 		interceptionContext: options.interceptionContext,
 		mountedSlotsHeader: options.mountedSlotsHeader,

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

@@ -50,6 +50,7 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootLayouts: readonly (TModule | null | undefined)[];
   scriptNonce?: string;
+  sourcePageSegments?: readonly string[] | null;
 };
 type RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {
   boundaryComponent?: AppPageComponent | null;

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

@@ -1,14 +1,15 @@
+import { NEVER_CACHE_CONTROL } from "./cache-control.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { ErrorBoundary, GlobalErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 import { resolveAppPageHead } from "./app-page-head.js";
-import { createAppPageLayoutEntries } from "./app-page-route-wiring.js";
+import { createAppPageLayoutEntries, createAppPageSourcePage } from "./app-page-route-wiring.js";
 import { buildClientHookErrorMessage } from "../shims/client-hook-error.js";
-import DefaultGlobalError from "../shims/default-global-error.js";
 import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
 import { createAppPageFontData, renderAppPageHtmlResponse } from "./app-page-stream.js";
 import { Fragment, createElement } from "react";
@@ -76,12 +77,14 @@ function resolveHttpAccessFallbackHeadLayoutTreePositions(route, layoutModules)
 function createAppPageBoundaryRscPayload(options) {
 	const routeId = AppElementsWire.encodeRouteId(options.pathname, null);
 	const layoutEntries = createAppPageBoundaryLayoutEntries(options.route, options.layoutModules);
+	const sourcePageSegments = options.sourcePageSegments ?? options.route?.routeSegments;
 	return {
 		...AppElementsWire.createMetadataEntries({
 			interceptionContext: null,
 			layoutIds: layoutEntries.map((entry) => entry.id),
 			rootLayoutTreePath: layoutEntries[0]?.treePath ?? null,
-			routeId
+			routeId,
+			sourcePage: sourcePageSegments ? createAppPageSourcePage(sourcePageSegments) : null
 		}),
 		[routeId]: options.element
 	};
@@ -122,7 +125,8 @@ async function renderAppPageBoundaryElementResponse(options) {
 			element: options.element,
 			layoutModules: options.layoutModules,
 			pathname,
-			route: options.route
+			route: options.route,
+			sourcePageSegments: options.sourcePageSegments
 		}),
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
@@ -261,16 +265,25 @@ async function renderAppPageErrorBoundary(options) {
 			skipLayoutWrapping: errorBoundary.isGlobalError
 		});
 	};
-	const renderWith = (BoundaryComponent) => renderAppPageBoundaryElementResponse({
-		...options,
-		element: buildElement(BoundaryComponent),
-		initialDevServerError: rawError,
-		layoutModules,
-		navigationParams: matchedParams,
-		route: options.route,
-		routePattern: options.route?.pattern,
-		status: 200
-	});
+	const renderWith = async (BoundaryComponent) => {
+		const response = await renderAppPageBoundaryElementResponse({
+			...options,
+			element: buildElement(BoundaryComponent),
+			initialDevServerError: rawError,
+			layoutModules,
+			navigationParams: matchedParams,
+			route: options.route,
+			routePattern: options.route?.pattern,
+			status: errorBoundary.isGlobalError ? 500 : 200
+		});
+		if (errorBoundary.isGlobalError) {
+			response.headers.set("Cache-Control", NEVER_CACHE_CONTROL);
+			response.headers.delete("CDN-Cache-Control");
+			response.headers.delete("Cloudflare-CDN-Cache-Control");
+			response.headers.delete("Cache-Tag");
+		}
+		return response;
+	};
 	try {
 		return await renderWith(errorBoundary.component);
 	} catch (renderError) {

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

@@ -0,0 +1,53 @@
+import { CacheControlMetadata } from "../shims/cache.js";
+import { NavigationContext } from "../shims/navigation.js";
+import { AppPageFontPreload } from "./app-page-execution.js";
+import { RootParams } from "../shims/root-params.js";
+import { AppPageSsrHandler } from "./app-page-stream.js";
+import { createAppPageRenderObservation } from "./app-page-render-observation.js";
+import { ReactNode } from "react";
+
+//#region src/server/app-page-cache-render.d.ts
+type AppPageRenderableElement = ReactNode | Record<string, ReactNode>;
+type AppPageCacheRoute = {
+  pattern: string;
+  routeSegments: readonly string[];
+};
+type RenderAppPageCacheArtifactsOptions = {
+  basePath?: string;
+  captureRscData: boolean;
+  cleanPathname: string;
+  clientTraceMetadata?: readonly string[];
+  element: AppPageRenderableElement;
+  getFontLinks: () => string[];
+  getFontPreloads: () => AppPageFontPreload[];
+  getFontStyles: () => string[];
+  getNavigationContext: () => NavigationContext | null;
+  loadSsrHandler: () => Promise<AppPageSsrHandler>;
+  mountedSlotsHeader?: string | null;
+  navigationParams: Record<string, unknown>;
+  onError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
+  reactMaxHeadersLength?: number;
+  renderToReadableStream: (element: AppPageRenderableElement, options: {
+    onError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
+  }) => ReadableStream<Uint8Array>;
+  rootParams?: RootParams;
+  route: AppPageCacheRoute;
+  waitForAllReady?: boolean;
+};
+type RenderAppPageCacheArtifactsResult = {
+  cacheControl?: CacheControlMetadata;
+  html: string;
+  htmlRenderObservation: ReturnType<typeof createAppPageRenderObservation>;
+  rscData?: ArrayBuffer;
+  rscRenderObservation?: ReturnType<typeof createAppPageRenderObservation>;
+  tags: string[];
+};
+/**
+ * Render an App page element to HTML (and optionally its RSC payload) for cache
+ * storage. Combines the RSC stream, SSR handler, observation consumption, and
+ * cache-tag construction used by both normal ISR revalidation and PPR fallback
+ * shell regeneration.
+ */
+declare function renderAppPageCacheArtifacts(options: RenderAppPageCacheArtifactsOptions): Promise<RenderAppPageCacheArtifactsResult>;
+//#endregion
+export { RenderAppPageCacheArtifactsOptions, RenderAppPageCacheArtifactsResult, renderAppPageCacheArtifacts };