vinext 0.1.1 → 0.1.3

package/dist/server/app-browser-rsc-redirect.js

@@ -6,17 +6,23 @@ function toVisibleAppHref(href, origin) {
 	stripRscCacheBustingSearchParam(url);
 	return `${stripRscSuffix(url.pathname)}${url.search}${url.hash}`;
 }
-function resolveRscRedirectLifecycleHop(options) {
-	const responseUrl = new URL(options.responseUrl, options.origin);
-	if (responseUrl.origin !== options.origin) return {
-		href: responseUrl.href,
+function toStreamedRedirectVisibleAppHref(href, origin) {
+	const url = new URL(href, origin);
+	return `${url.pathname}${url.search}${url.hash}`;
+}
+function resolveRedirectLifecycleHopFromTarget(options) {
+	if (options.targetUrl.origin !== options.origin) return {
+		href: options.targetUrl.href,
 		kind: "terminal-hard-navigation",
 		reason: "externalRedirect",
 		redirectDepth: options.redirectDepth
 	};
-	const redirectedHref = resolveHardNavigationTargetFromRscResponse(responseUrl.href, options.currentHref, options.origin);
-	if (redirectedHref === toVisibleAppHref(options.currentHref, options.origin)) return { kind: "no-redirect" };
-	const maxRedirectDepth = options.maxRedirectDepth ?? 10;
+	const redirectedHref = options.redirectedHref;
+	if (redirectedHref === toVisibleAppHref(options.currentHref, options.origin)) return {
+		href: redirectedHref,
+		kind: "no-redirect"
+	};
+	const maxRedirectDepth = options.maxRedirectDepth ?? MAX_RSC_REDIRECT_DEPTH;
 	if (options.redirectDepth >= maxRedirectDepth) return {
 		href: redirectedHref,
 		kind: "terminal-hard-navigation",
@@ -31,5 +37,21 @@ function resolveRscRedirectLifecycleHop(options) {
 		redirectDepth: options.redirectDepth + 1
 	};
 }
+function resolveRscRedirectLifecycleHop(options) {
+	const responseUrl = new URL(options.responseUrl, options.origin);
+	return resolveRedirectLifecycleHopFromTarget({
+		...options,
+		redirectedHref: resolveHardNavigationTargetFromRscResponse(responseUrl.href, options.currentHref, options.origin),
+		targetUrl: responseUrl
+	});
+}
+function resolveStreamedRscRedirectLifecycleHop(options) {
+	const streamedRedirectUrl = new URL(options.streamedRedirectTarget, options.origin);
+	return resolveRedirectLifecycleHopFromTarget({
+		...options,
+		redirectedHref: toStreamedRedirectVisibleAppHref(options.streamedRedirectTarget, options.origin),
+		targetUrl: streamedRedirectUrl
+	});
+}
 //#endregion
-export { MAX_RSC_REDIRECT_DEPTH, resolveRscRedirectLifecycleHop };
+export { resolveRscRedirectLifecycleHop, resolveStreamedRscRedirectLifecycleHop };

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-state.js

@@ -7,9 +7,10 @@ import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
 import "./app-bfcache-id.js";
 import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isBfcacheSegmentId, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
-import { createCacheEntryReuseProof } from "./cache-proof.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
+import { createSnapshotPathAndSearch } from "../shims/navigation.js";
+import { createCacheEntryReuseProof } from "./cache-proof.js";
 //#region src/server/app-browser-state.ts
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };
 const VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "visited-cache" };
@@ -222,10 +223,6 @@ function createPendingNavigationTraceFields(options) {
 		...options.targetHref !== void 0 ? { targetHref: options.targetHref } : {}
 	};
 }
-function createNavigationSnapshotUrl(snapshot) {
-	const query = snapshot.searchParams.toString();
-	return query === "" ? snapshot.pathname : `${snapshot.pathname}?${query}`;
-}
 function createMountedParallelSlotSnapshots(elements) {
 	const snapshots = [];
 	for (const slotId of getMountedSlotIds(elements)) {
@@ -239,7 +236,7 @@ function createMountedParallelSlotSnapshots(elements) {
 	return snapshots;
 }
 function createVisibleRouteSnapshot(state) {
-	const displayUrl = createNavigationSnapshotUrl(state.navigationSnapshot);
+	const displayUrl = createSnapshotPathAndSearch(state.navigationSnapshot);
 	const matchedUrl = normalizeNavigationSnapshotMatchedUrl(state.navigationSnapshot.pathname);
 	return {
 		displayUrl,
@@ -257,7 +254,7 @@ function createVisibleRouteSnapshot(state) {
 	};
 }
 function createPendingRouteSnapshot(pending) {
-	const displayUrl = createNavigationSnapshotUrl(pending.action.navigationSnapshot);
+	const displayUrl = createSnapshotPathAndSearch(pending.action.navigationSnapshot);
 	const matchedUrl = normalizeNavigationSnapshotMatchedUrl(pending.action.navigationSnapshot.pathname);
 	return {
 		displayUrl,

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-browser-visible-commit.js

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

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

@@ -52,7 +52,8 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   loadGlobalNotFoundModule?: (() => Promise<TModule | null | undefined>) | null;
   makeThenableParams: (params: AppPageParams) => unknown;
   metadataRoutes: MetadataFileRoute[]; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
-  basePath?: string;
+  basePath?: string; /** Configured next.config `trailingSlash`, threaded into canonical URL rendering. */
+  trailingSlash?: boolean;
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;
   rscRenderer: (element: ReactNode | AppElements, options: {
@@ -69,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

@@ -7,7 +7,7 @@ const EMPTY_MW_CTX = {
 	status: null
 };
 function createAppFallbackRenderer(options) {
-	const { basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader } = options;
+	const { basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
 	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
 	const effectiveGlobalErrorModule = globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE;
 	const effectiveRootNotFoundModule = rootNotFoundModule ?? DEFAULT_NOT_FOUND_MODULE;
@@ -58,6 +58,7 @@ function createAppFallbackRenderer(options) {
 			}
 			return renderAppPageHttpAccessFallback({
 				basePath,
+				trailingSlash,
 				boundaryComponent: opts?.boundaryComponent ?? null,
 				boundaryModule: opts?.boundaryModule ?? null,
 				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
@@ -87,6 +88,7 @@ function createAppFallbackRenderer(options) {
 				route,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
+				sourcePageSegments: callContext?.sourcePageSegments,
 				statusCode
 			});
 		},
@@ -96,6 +98,7 @@ function createAppFallbackRenderer(options) {
 		renderErrorBoundary(route, error, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, callContext) {
 			return renderAppPageErrorBoundary({
 				basePath,
+				trailingSlash,
 				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
 				clearRequestContext,
 				createRscOnErrorHandler(pathname, routePath) {
@@ -120,7 +123,8 @@ function createAppFallbackRenderer(options) {
 				route,
 				renderToReadableStream: rscRenderer,
 				sanitizeErrorForClient: sanitizer,
-				scriptNonce
+				scriptNonce,
+				sourcePageSegments: callContext?.sourcePageSegments
 			});
 		}
 	};

package/dist/server/app-middleware.js

@@ -115,6 +115,7 @@ async function applyAppMiddleware(options) {
 	if (!forwarded.applied) {
 		const result = await executeMiddleware({
 			basePath: options.basePath,
+			hadBasePath: true,
 			i18nConfig: options.i18nConfig,
 			isDataRequest: options.isDataRequest,
 			isProxy: options.isProxy,

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

@@ -1,5 +1,6 @@
 import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
+import { matchRoutePattern } from "../routing/route-pattern.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
@@ -135,6 +136,20 @@ function matchOptimisticRouteManifestRoute(options) {
 	decodeMatchedParams(match.params);
 	return match;
 }
+function mergeParams(target, source) {
+	for (const [key, value] of Object.entries(source)) target[key] = value;
+}
+function resolveOptimisticNavigationParams(options) {
+	const navigationParams = { ...options.match.params };
+	for (const binding of options.routeManifest.segmentGraph.slotBindings.values()) {
+		if (binding.routeId !== options.match.route.id || binding.state !== "active") continue;
+		const patternParts = binding.slotPatternParts;
+		if (!patternParts) continue;
+		const matched = matchRoutePattern(options.urlParts, patternParts);
+		if (matched) mergeParams(navigationParams, matched);
+	}
+	return navigationParams;
+}
 function elementHasSuspenseFallback(value, depth = 0) {
 	if (depth > 100) return false;
 	if (Array.isArray(value)) return value.some((entry) => elementHasSuspenseFallback(entry, depth + 1));
@@ -159,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;
@@ -183,12 +198,14 @@ function createOptimisticRouteElements(template) {
 }
 function resolveOptimisticNavigationPayload(options) {
 	if (options.interceptionContext !== null) return null;
+	const urlParts = hrefToRouteParts(options.href, options.basePath);
+	if (urlParts === null) return null;
 	const match = matchOptimisticRouteManifestRoute({
 		basePath: options.basePath,
 		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,
@@ -198,7 +215,11 @@ function resolveOptimisticNavigationPayload(options) {
 	if (template.mountedSlotsHeader !== options.mountedSlotsHeader) return null;
 	return {
 		elements: createOptimisticRouteElements(template),
-		params: match.params,
+		params: resolveOptimisticNavigationParams({
+			match,
+			routeManifest: options.routeManifest,
+			urlParts
+		}),
 		template
 	};
 }

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

@@ -41,7 +41,8 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   makeThenableParams: (params: AppPageParams) => unknown;
   middlewareContext: AppPageMiddlewareContext;
   metadataRoutes: MetadataFileRoute[]; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
-  basePath?: string;
+  basePath?: string; /** Configured next.config `trailingSlash`, threaded into canonical URL rendering. */
+  trailingSlash?: boolean;
   renderToReadableStream: (element: ReactNode | AppElements, options: {
     onError: AppPageBoundaryOnError;
   }) => ReadableStream<Uint8Array>;
@@ -49,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;