vinext 1.0.0-beta.9 → 1.0.0

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

@@ -210,17 +210,20 @@ function createAppBrowserNavigationController(deps = {}) {
 			clearAppNavigationFailureTarget(targetHref);
 		}
 	}
-	async function hmrReplaceTree(nextElements, navigationSnapshot) {
+	async function hmrReplaceTree(nextElements, pendingNavigationSnapshot) {
 		const hmrUpdateId = ++latestHmrUpdateId;
 		const startedDuringUserNavigation = pendingUserNavigationLane === "navigation";
 		if (!hasBrowserRouterState()) return;
+		const currentState = getBrowserRouterState();
+		const renderId = allocateRenderId();
+		const [navigationSnapshot] = await Promise.all([pendingNavigationSnapshot, nextElements]);
 		const pending = await createPendingNavigationCommit({
-			currentState: getBrowserRouterState(),
+			currentState,
 			nextElements,
 			navigationSnapshot,
 			operationLane: "hmr",
 			payloadOrigin: FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN,
-			renderId: allocateRenderId(),
+			renderId,
 			type: "replace"
 		});
 		if (hmrUpdateId !== latestHmrUpdateId || startedDuringUserNavigation) return;
@@ -337,7 +340,8 @@ function createAppBrowserNavigationController(deps = {}) {
 		return true;
 	}
 	function notifyDiscardedServerActionRevalidation(lifecycleOptions) {
-		if (!shouldScheduleRefreshForDiscardedServerAction(lifecycleOptions?.revalidation ?? "none")) return;
+		const revalidation = lifecycleOptions?.revalidation ?? "none";
+		if (!shouldScheduleRefreshForDiscardedServerAction(revalidation)) return;
 		lifecycleOptions?.onDiscardedRevalidation?.();
 	}
 	function isSamePathSearchHashCommit(targetHref) {

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

@@ -1,11 +1,10 @@
 import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 //#region src/server/app-browser-navigation-response.d.ts
-declare function shouldRecoverSamePathSearchCommitOnResponseCompletion(options: {
+export declare function shouldRecoverSamePathSearchCommitOnResponseCompletion(options: {
   basePath: string;
   currentSnapshot: ClientNavigationRenderSnapshot;
   navigationKind: "navigate" | "traverse" | "refresh";
   programmaticTransition: boolean;
   targetUrl: URL;
 }): boolean;
-//#endregion
-export { shouldRecoverSamePathSearchCommitOnResponseCompletion };
+//#endregion

package/dist/server/app-browser-popstate.d.ts

@@ -19,12 +19,11 @@ type SynchronousPopstateScrollRestoreDeps = {
   markScrollRestoreConsumed: (navId: number) => void;
   restorePopstateScrollPosition: RestoreScrollPosition;
 };
-declare function restoreSynchronousPopstateScrollPosition(deps: SynchronousPopstateScrollRestoreDeps, state: unknown): void;
-declare function shouldCommitPopstateUrlWithoutNavigation(options: {
+export declare function restoreSynchronousPopstateScrollPosition(deps: SynchronousPopstateScrollRestoreDeps, state: unknown): void;
+export declare function shouldCommitPopstateUrlWithoutNavigation(options: {
   historyState: unknown;
   isCurrentExternalHistoryTree: boolean;
   isSameAppRouteTarget: boolean;
 }): boolean;
-declare function createPopstateRestoreHandler(deps: BrowserPopstateRestoreDeps): (event: PopStateEvent) => void;
-//#endregion
-export { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition, shouldCommitPopstateUrlWithoutNavigation };
+export declare function createPopstateRestoreHandler(deps: BrowserPopstateRestoreDeps): (event: PopStateEvent) => void;
+//#endregion

package/dist/server/app-browser-prefetch-response.d.ts

@@ -1,6 +1,6 @@
 import { CachedRscResponse, peekPrefetchResponseForNavigation } from "../shims/navigation.js";
 //#region src/server/app-browser-prefetch-response.d.ts
-declare function peekSettledPrefetchResponseForNavigation(options: {
+export declare function peekSettledPrefetchResponseForNavigation(options: {
   additionalRscUrls: readonly string[];
   bypassNavigationCache: boolean;
   interceptionContext: string | null;
@@ -9,17 +9,16 @@ declare function peekSettledPrefetchResponseForNavigation(options: {
   peek?: typeof peekPrefetchResponseForNavigation;
   targetPathAndSearch: string;
 }): CachedRscResponse | null;
-declare function resolvePrefetchNavigationResponseUrl(options: {
+export declare function resolvePrefetchNavigationResponseUrl(options: {
   additionalRscUrls: readonly string[];
   origin: string;
   responseUrl: string;
   visibleRscUrl: string;
 }): string;
-declare function prepareConsumedPrefetchResponseForPublication(response: CachedRscResponse, responseUrl: string): {
+export declare function prepareConsumedPrefetchResponseForPublication(response: CachedRscResponse, responseUrl: string): {
   expiresAt: number | undefined;
   preparedElements: CachedRscResponse["preparedElements"];
   snapshot: CachedRscResponse;
 };
-declare function preserveCommittedPrefetchExpiry(snapshot: CachedRscResponse, expiresAt: number | undefined): CachedRscResponse;
-//#endregion
-export { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl };
+export declare function preserveCommittedPrefetchExpiry(snapshot: CachedRscResponse, expiresAt: number | undefined): CachedRscResponse;
+//#endregion

package/dist/server/app-browser-rsc-redirect.d.ts

@@ -1,5 +1,5 @@
 //#region src/server/app-browser-rsc-redirect.d.ts
-declare function blockDangerousStreamedRscRedirect(response: Response, streamedRedirectTarget: string | null): boolean;
+export declare function blockDangerousStreamedRscRedirect(response: Response, streamedRedirectTarget: string | null): boolean;
 type RscRedirectHistoryUpdateMode = "push" | "replace" | undefined;
 type RscRedirectLifecycleDecision = {
   href: string;
@@ -16,7 +16,7 @@ type RscRedirectLifecycleDecision = {
   reason: "externalRedirect" | "maxRedirectsExceeded";
   redirectDepth: number;
 };
-declare function resolveRscRedirectLifecycleHop(options: {
+export declare function resolveRscRedirectLifecycleHop(options: {
   currentHref: string;
   historyUpdateMode: RscRedirectHistoryUpdateMode;
   maxRedirectDepth?: number;
@@ -25,7 +25,7 @@ declare function resolveRscRedirectLifecycleHop(options: {
   requestPreviousNextUrl: string | null;
   responseUrl: string;
 }): RscRedirectLifecycleDecision;
-declare function resolveStreamedRscRedirectLifecycleHop(options: {
+export declare function resolveStreamedRscRedirectLifecycleHop(options: {
   currentHref: string;
   historyUpdateMode: Exclude<RscRedirectHistoryUpdateMode, undefined>;
   maxRedirectDepth?: number;
@@ -34,5 +34,4 @@ declare function resolveStreamedRscRedirectLifecycleHop(options: {
   requestPreviousNextUrl: string | null;
   streamedRedirectTarget: string;
 }): RscRedirectLifecycleDecision;
-//#endregion
-export { blockDangerousStreamedRscRedirect, resolveRscRedirectLifecycleHop, resolveStreamedRscRedirectLifecycleHop };
+//#endregion

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

@@ -5,7 +5,7 @@ import { AppBrowserServerActionResult, ServerActionRevalidationKind } from "./ap
 import { AppRouterState } from "./app-browser-state.js";
 //#region src/server/app-browser-server-action-client.d.ts
 type ServerActionResult = AppBrowserServerActionResult<AppWireElements>;
-type ClientServerActionInitiation = {
+export type ClientServerActionInitiation = {
   href: string;
   navigationId: number;
   path: string;
@@ -15,18 +15,19 @@ type ActionRedirectTarget = {
   href: string;
   type: string;
   status: number;
+  /** The path and query the server rendered the target with, when known. */
+  renderedPathAndSearch: string | null;
 };
-type ClientServerActionDeps = {
+export type ClientServerActionDeps = {
   basePath: string;
   clearClientNavigationCaches(): void;
   clientRscCompatibilityId: string | null;
-  commitSameUrlNavigatePayload(elements: Promise<AppElements>, actionInitiation: ClientServerActionInitiation, returnValue: ServerActionResult["returnValue"] | undefined, revalidation: ServerActionRevalidationKind): Promise<unknown>;
+  commitSameUrlNavigatePayload(elements: Promise<AppElements>, actionInitiation: ClientServerActionInitiation, returnValue: ServerActionResult["returnValue"] | undefined, revalidation: ServerActionRevalidationKind, renderedPathAndSearch: string | null): Promise<unknown>;
   navigationPlanner: typeof navigationPlanner;
   performHardNavigation(url: string, historyMode?: "assign" | "replace"): void;
   renderRedirectPayload(elements: AppElements, target: ActionRedirectTarget, actionInitiation: ClientServerActionInitiation, revalidation: ServerActionRevalidationKind): void;
   syncCurrentHistoryState(previousNextUrl: string | null, bfcacheIds: Readonly<Record<string, string>>): void;
   syncServerActionHttpFallbackHead(status: number | null): void;
 };
-declare function invokeClientServerAction(id: string, args: unknown[], actionInitiation: ClientServerActionInitiation, deps: ClientServerActionDeps): Promise<unknown>;
-//#endregion
-export { ClientServerActionDeps, ClientServerActionInitiation, invokeClientServerAction };
+export declare function invokeClientServerAction(id: string, args: unknown[], actionInitiation: ClientServerActionInitiation, deps: ClientServerActionDeps): Promise<unknown>;
+//#endregion

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

@@ -1,11 +1,12 @@
 import { hasBasePath } from "../utils/base-path.js";
-import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER } from "./headers.js";
+import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
 import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl } from "./app-rsc-cache-busting.js";
 import { throwOnServerActionNotFound } from "./server-action-not-found.js";
 import { createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult, shouldSyncServerActionHttpFallbackHead } from "./app-browser-action-result.js";
+import { parseRenderedPathAndSearchHeader } from "../shims/navigation.js";
 import { resolveServerActionRequestState } from "./app-browser-state.js";
 import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.js";
 import { createFromFetch, createTemporaryReferenceSet, encodeReply } from "@vitejs/plugin-rsc/browser";
@@ -34,7 +35,8 @@ function resolveActionRedirectTarget(response, basePath, performHardNavigation)
 		return {
 			href: redirectUrl.href,
 			type: response.headers.get("x-action-redirect-type") ?? "push",
-			status: statusHeader ? parseInt(statusHeader, 10) : 307
+			status: statusHeader ? parseInt(statusHeader, 10) : 307,
+			renderedPathAndSearch: parseRenderedPathAndSearchHeader(response.headers.get(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER))
 		};
 	} catch {
 		performHardNavigation(actionRedirect);
@@ -84,7 +86,8 @@ async function invokeClientServerAction(id, args, actionInitiation, deps) {
 		responseUrl: fetchResponse.url
 	});
 	const fetchResponseIsRsc = actionResultFacts.isRscContentType;
-	if (applyServerActionResultDecision(deps.navigationPlanner.classifyServerActionResult(actionResultFacts), () => deps.clearClientNavigationCaches(), (url, historyMode) => deps.performHardNavigation(url, historyMode))) return;
+	const actionResultDecision = deps.navigationPlanner.classifyServerActionResult(actionResultFacts);
+	if (applyServerActionResultDecision(actionResultDecision, () => deps.clearClientNavigationCaches(), (url, historyMode) => deps.performHardNavigation(url, historyMode))) return;
 	const revalidation = parseServerActionRevalidationHeader(fetchResponse.headers);
 	if (revalidation !== "none") deps.clearClientNavigationCaches();
 	const invalidResponseError = await readInvalidServerActionResponseError(fetchResponse.clone(), actionRedirectTarget !== null);
@@ -110,13 +113,14 @@ async function invokeClientServerAction(id, args, actionInitiation, deps) {
 		return;
 	}
 	deps.syncServerActionHttpFallbackHead(shouldSyncServerActionHttpFallbackHead(result) ? fetchResponse.status : null);
+	const renderedPathAndSearch = parseRenderedPathAndSearchHeader(fetchResponse.headers.get(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER));
 	if (isServerActionResult(result)) {
 		if (result.root !== void 0) {
 			const returnValue = result.returnValue && !result.returnValue.ok ? {
 				ok: false,
 				data: normalizeServerActionThrownValue(result.returnValue.data, fetchResponse.status)
 			} : result.returnValue;
-			return deps.commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result.root)), actionInitiation, returnValue, revalidation);
+			return deps.commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result.root)), actionInitiation, returnValue, revalidation, renderedPathAndSearch);
 		}
 		if (result.returnValue) {
 			if (!result.returnValue.ok) throw normalizeServerActionThrownValue(result.returnValue.data, fetchResponse.status);
@@ -124,7 +128,7 @@ async function invokeClientServerAction(id, args, actionInitiation, deps) {
 		}
 		return;
 	}
-	return deps.commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result)), actionInitiation, void 0, revalidation);
+	return deps.commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result)), actionInitiation, void 0, revalidation, renderedPathAndSearch);
 }
 //#endregion
 export { invokeClientServerAction };

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

@@ -1,5 +1,4 @@
 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 };
+export declare function applyServerActionResultDecision(decision: ServerActionResultDecision, clearCaches: () => void, performHardNavigation: (url: string, historyMode?: "assign" | "replace") => void): boolean;
+//#endregion

package/dist/server/app-browser-state.d.ts

@@ -16,15 +16,15 @@ type OperationRecordBase = {
   navigationId?: number;
   startedVisibleCommitVersion: number;
 };
-type PendingOperationRecord = OperationRecordBase & {
+export type PendingOperationRecord = OperationRecordBase & {
   state: "pending";
 };
-type CommittedOperationRecord = OperationRecordBase & {
+export type CommittedOperationRecord = OperationRecordBase & {
   state: "committed";
   visibleCommitVersion: number;
 };
 type OperationRecord = PendingOperationRecord | CommittedOperationRecord;
-type AppRouterState = {
+export type AppRouterState = {
   activeOperation: OperationRecord | null;
   bfcacheIds: BfcacheIdMap;
   elements: AppElements;
@@ -40,7 +40,7 @@ type AppRouterState = {
   slotBindings: readonly AppElementsSlotBinding[];
   visibleCommitVersion: number;
 };
-type AppRouterAction = {
+export type AppRouterAction = {
   bfcacheIds: BfcacheIdMap;
   cacheEntryReuseProof?: CacheEntryReuseProof;
   elements: AppElements;
@@ -59,7 +59,7 @@ type AppRouterAction = {
   slotBindings: readonly AppElementsSlotBinding[];
   type: "navigate" | "replace" | "traverse";
 };
-type PendingNavigationCommit = {
+export type PendingNavigationCommit = {
   action: AppRouterAction;
   cacheEntryReuseProof?: CacheEntryReuseProof;
   interception: AppElementsInterception | null;
@@ -70,16 +70,16 @@ type PendingNavigationCommit = {
   restoredHistorySnapshot?: boolean;
   skippedLayoutIds: readonly string[];
 };
-type AppNavigationPayloadOrigin = Readonly<{
+export type AppNavigationPayloadOrigin = Readonly<{
   origin: "committed-cache";
 } | {
   origin: "fresh";
 } | {
   origin: "visited-cache";
 }>;
-declare const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
-declare const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
-declare const VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
+export declare const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
+export declare const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
+export declare const VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
 type PendingNavigationCommitDisposition = "dispatch" | "hard-navigate" | "skip";
 type CacheRestorableAppPayloadMetadata = Readonly<{
   cacheEntryReuseProof?: CacheEntryReuseProof;
@@ -99,11 +99,11 @@ type NonDispatchPendingNavigationCommitDispositionDecision = {
   trace: NavigationTrace;
 };
 type PendingNavigationCommitDispositionDecision = DispatchPendingNavigationCommitDispositionDecision | NonDispatchPendingNavigationCommitDispositionDecision;
-declare function isCompleteAppPayloadMetadata(metadata: CacheRestorableAppPayloadMetadata): boolean;
-declare function isCacheRestorableAppPayloadMetadata(metadata: CacheRestorableAppPayloadMetadata): metadata is CacheRestorableAppPayloadMetadata & {
+export declare function isCompleteAppPayloadMetadata(metadata: CacheRestorableAppPayloadMetadata): boolean;
+export declare function isCacheRestorableAppPayloadMetadata(metadata: CacheRestorableAppPayloadMetadata): metadata is CacheRestorableAppPayloadMetadata & {
   cacheEntryReuseProof: CacheEntryReuseProof;
 };
-declare function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl: string | null, basePath?: string): string | null;
+export declare function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl: string | null, basePath?: string): string | null;
 type ResolveServerActionRequestStateOptions = {
   actionId: string;
   basePath: string;
@@ -125,8 +125,8 @@ type ResolveServerActionRequestStateResult = {
  * X-Vinext-Interception-Context is the equivalent signal for the server-side
  * `findIntercept` lookup.
  */
-declare function resolveServerActionRequestState(options: ResolveServerActionRequestStateOptions): ResolveServerActionRequestStateResult;
-declare function resolvePendingNavigationCommitDispositionDecision(options: {
+export declare function resolveServerActionRequestState(options: ResolveServerActionRequestStateOptions): ResolveServerActionRequestStateResult;
+export declare function resolvePendingNavigationCommitDispositionDecision(options: {
   activeNavigationId: number;
   currentState: AppRouterState;
   pending: PendingNavigationCommit;
@@ -147,11 +147,11 @@ type CreatePendingNavigationCommitOptions = {
   reuseCurrentBfcacheIds?: boolean;
   type: "navigate" | "replace" | "traverse";
 };
-declare function createPendingNavigationCommitFromElements(options: CreatePendingNavigationCommitOptions & {
+export declare function createPendingNavigationCommitFromElements(options: CreatePendingNavigationCommitOptions & {
   nextElements: AppElements;
 }): PendingNavigationCommit;
-declare function createPendingNavigationCommit(options: CreatePendingNavigationCommitOptions & {
+export declare function createPendingNavigationCommit(options: CreatePendingNavigationCommitOptions & {
   nextElements: Promise<AppElements>;
 }): Promise<PendingNavigationCommit>;
 //#endregion
-export { AppNavigationPayloadOrigin, AppRouterAction, AppRouterState, COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, CommittedOperationRecord, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, type HistoryTraversalIntent, type OperationLane, PendingNavigationCommit, PendingOperationRecord, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, createAppOwnedHistoryState, createBfcacheSegmentIdentityMap, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, createInitialBfcacheIdMap, createNextBfcacheIdMap, createPendingNavigationCommit, createPendingNavigationCommitFromElements, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, preserveBfcacheIdsForMergedElements, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState };
+export { type HistoryTraversalIntent, type OperationLane, createAppOwnedHistoryState, createBfcacheSegmentIdentityMap, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, createInitialBfcacheIdMap, createNextBfcacheIdMap, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, preserveBfcacheIdsForMergedElements, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent };

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

@@ -1,9 +1,11 @@
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { NEXT_ACTION_HEADER, RSC_ACTION_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
+import { VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./app-rsc-vary.js";
+import { NEXT_ACTION_HEADER, RSC_ACTION_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
+import { bindAppElementsRenderedSearch } from "../shims/slot.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
 import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
@@ -51,7 +53,8 @@ function createRouteSnapshotRouteId(options) {
 }
 function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl, basePath = "") {
 	if (previousNextUrl === null) return null;
-	return stripBasePath(new URL(previousNextUrl, "http://localhost").pathname, basePath);
+	const parsedUrl = new URL(previousNextUrl, "http://localhost");
+	return stripBasePath(parsedUrl.pathname, basePath);
 }
 /**
 * Pure: builds the fetch Headers for a server-action POST. Carries the same
@@ -281,6 +284,7 @@ function mergeSkippedLayoutSlotPreservation(options) {
 }
 function createPendingNavigationCommitFromElements(options) {
 	const elements = options.nextElements;
+	bindAppElementsRenderedSearch(elements, options.navigationSnapshot);
 	const metadata = AppElementsWire.readMetadata(elements);
 	const cacheEntryReuseProof = metadata.cacheEntryReuseProof ?? (requiresCacheEntryReuseProof(options.payloadOrigin) ? createCacheEntryReuseProof(null) : void 0);
 	const requestedPreviousNextUrl = options.previousNextUrl !== void 0 ? options.previousNextUrl : options.currentState.previousNextUrl;

package/dist/server/app-browser-stream.d.ts

@@ -8,11 +8,11 @@ type VinextBrowserGlobals = {
   [RSC_FORM_STATE_GLOBAL]?: ReactFormState;
   __VINEXT_RSC_PARAMS__?: Record<string, string | string[]>;
 };
-declare function getVinextBrowserGlobal(): typeof globalThis & VinextBrowserGlobals;
+export declare function getVinextBrowserGlobal(): typeof globalThis & VinextBrowserGlobals;
 /**
  * Convert embedded chunks back to a ReadableStream of Uint8Array chunks.
  */
-declare function chunksToReadableStream(chunks: readonly RscEmbeddedChunk[]): ReadableStream<Uint8Array>;
+export declare function chunksToReadableStream(chunks: readonly RscEmbeddedChunk[]): ReadableStream<Uint8Array>;
 /**
  * Create a ReadableStream from progressively-embedded RSC chunks.
  *
@@ -20,6 +20,5 @@ declare function chunksToReadableStream(chunks: readonly RscEmbeddedChunk[]): Re
  * <script> tags. We monkey-patch `push()` so new chunks stream to React
  * immediately instead of polling with setTimeout.
  */
-declare function createProgressiveRscStream(): ReadableStream<Uint8Array>;
-//#endregion
-export { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal };
+export declare function createProgressiveRscStream(): ReadableStream<Uint8Array>;
+//#endregion

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

@@ -105,12 +105,14 @@ function createProgressiveRscStream() {
 					}
 				});
 			}
-			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() {

package/dist/server/app-browser-supplemental-refresh.d.ts

@@ -2,8 +2,8 @@ import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { AppRouterState } from "./app-browser-state.js";
 //#region src/server/app-browser-supplemental-refresh.d.ts
-type SupplementalRefreshDegradedReason = "aborted" | "failed" | "timeout";
-type SupplementalRefreshResult<T> = {
+export type SupplementalRefreshDegradedReason = "aborted" | "failed" | "timeout";
+export type SupplementalRefreshResult<T> = {
   degraded: false;
   value: Awaited<T>;
 } | {
@@ -11,39 +11,38 @@ type SupplementalRefreshResult<T> = {
   reason: SupplementalRefreshDegradedReason;
   value: Awaited<T>;
 };
-declare class SupplementalRefreshError extends Error {
+export declare class SupplementalRefreshError extends Error {
   readonly reason: SupplementalRefreshDegradedReason;
   constructor(reason: SupplementalRefreshDegradedReason);
 }
-declare function requireCompleteSupplementalRefresh<T>(result: SupplementalRefreshResult<T>): Awaited<T>;
-declare function resolveServerActionSupplementalRefresh<T>(result: SupplementalRefreshResult<T>, currentValue: Awaited<T>): {
+export declare function requireCompleteSupplementalRefresh<T>(result: SupplementalRefreshResult<T>): Awaited<T>;
+export declare function resolveServerActionSupplementalRefresh<T>(result: SupplementalRefreshResult<T>, currentValue: Awaited<T>): {
   retry: boolean;
   value: Awaited<T>;
 };
-type SupplementalRefreshHandle = {
+export type SupplementalRefreshHandle = {
   finish(): void;
   signal: AbortSignal;
 };
-declare function mergeRefreshedParallelSlot(currentElements: AppElements, refreshedElements: AppElements): AppElements;
-declare function resolvePersistedSourcePageRefreshes(options: {
+export declare function mergeRefreshedParallelSlot(currentElements: AppElements, refreshedElements: AppElements): AppElements;
+export declare function resolvePersistedSourcePageRefreshes(options: {
   activeRoutePaths?: readonly string[];
   basePath: string;
   refreshUrl: URL;
   state: Pick<AppRouterState, "previousNextUrl" | "slotBindings">;
 }): string[];
-declare function createSupplementalRefreshCoordinator(): {
+export declare function createSupplementalRefreshCoordinator(): {
   abortAll(): void;
   begin(options: {
     activeNavigationId: number;
     startedNavigationId: number;
   }): SupplementalRefreshHandle;
 };
-declare function resolveSupplementalRefreshes<T>(options: {
+export declare function resolveSupplementalRefreshes<T>(options: {
   merge: (current: Awaited<T>, supplemental: Awaited<T>) => Awaited<T>;
   primary: Promise<T>;
   signal: AbortSignal;
   supplemental: ReadonlyArray<(signal: AbortSignal) => Promise<T>>;
   timeoutMs?: number;
 }): Promise<SupplementalRefreshResult<T>>;
-//#endregion
-export { SupplementalRefreshDegradedReason, SupplementalRefreshError, SupplementalRefreshHandle, SupplementalRefreshResult, createSupplementalRefreshCoordinator, mergeRefreshedParallelSlot, requireCompleteSupplementalRefresh, resolvePersistedSourcePageRefreshes, resolveServerActionSupplementalRefresh, resolveSupplementalRefreshes };
+//#endregion

package/dist/server/app-browser-visible-commit.d.ts

@@ -23,7 +23,7 @@ type NoCommitDecision = {
 };
 type CommitDecision = VisibleCommitDecision | HardNavigateCommitDecision | NoCommitDecision;
 declare const approvedVisibleCommitBrand: unique symbol;
-type ApprovedVisibleCommit = {
+export type ApprovedVisibleCommit = {
   readonly [approvedVisibleCommitBrand]: true;
   readonly action: AppRouterAction;
   readonly decision: VisibleCommitDecision;
@@ -48,14 +48,14 @@ type ClassifiedPendingNavigationCommit = {
   pending: PendingNavigationCommit;
   trace: NavigationTrace;
 };
-declare function applyApprovedVisibleCommit(state: AppRouterState, commit: ApprovedVisibleCommit): AppRouterState;
-declare function approveHmrVisibleCommit(options: {
+export declare function applyApprovedVisibleCommit(state: AppRouterState, commit: ApprovedVisibleCommit): AppRouterState;
+export declare function approveHmrVisibleCommit(options: {
   currentState: AppRouterState;
   pending: PendingNavigationCommit;
   routeManifest?: RouteManifest | null;
   targetHref: string;
 }): CommitApproval;
-declare function approvePendingNavigationCommit(options: {
+export declare function approvePendingNavigationCommit(options: {
   activeNavigationId: number;
   currentState: AppRouterState;
   pending: PendingNavigationCommit;
@@ -63,7 +63,7 @@ declare function approvePendingNavigationCommit(options: {
   startedNavigationId: number;
   targetHref: string;
 }): CommitApproval;
-declare function resolveAndClassifyNavigationCommit(options: {
+export declare function resolveAndClassifyNavigationCommit(options: {
   activeNavigationId: number;
   currentState: AppRouterState;
   getActiveNavigationId?: () => number;
@@ -79,5 +79,4 @@ declare function resolveAndClassifyNavigationCommit(options: {
   targetHref: string;
   type: "navigate" | "replace" | "traverse";
 }): Promise<ClassifiedPendingNavigationCommit>;
-//#endregion
-export { ApprovedVisibleCommit, applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit };
+//#endregion

package/dist/server/app-client-reference-preloader.d.ts

@@ -9,6 +9,5 @@ type ClientReferencePreloaderOptions = {
 type ClientReferencePreloader = {
   preload: (referenceIds?: Iterable<string>) => Promise<void>;
 };
-declare function createClientReferencePreloader(options: ClientReferencePreloaderOptions): ClientReferencePreloader;
-//#endregion
-export { createClientReferencePreloader };
+export declare function createClientReferencePreloader(options: ClientReferencePreloaderOptions): ClientReferencePreloader;
+//#endregion

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

@@ -0,0 +1,25 @@
+//#region src/server/app-elements-wire-key.d.ts
+/** Encode and validate the lightweight AppElements slot identity wire shape. */
+export declare function createAppElementsWireSlotId(slotName: string, treePath: string): string;
+export declare function isAppElementsWireSlotId(key: string): boolean;
+export type AppElementsWireElementKey = {
+  kind: "layout";
+  treePath: string;
+} | {
+  interceptionContext: string | null;
+  kind: "page";
+  path: string;
+} | {
+  interceptionContext: string | null;
+  kind: "route";
+  path: string;
+} | {
+  kind: "slot";
+  name: string;
+  treePath: string;
+} | {
+  kind: "template";
+  treePath: string;
+};
+export declare function parseAppElementsWireElementKey(key: string): AppElementsWireElementKey | null;
+//#endregion

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

@@ -0,0 +1,69 @@
+//#region src/server/app-elements-wire-key.ts
+/** Encode and validate the lightweight AppElements slot identity wire shape. */
+function createAppElementsWireSlotId(slotName, treePath) {
+	return `slot:${slotName}:${treePath}`;
+}
+function isAppElementsWireSlotId(key) {
+	if (!key.startsWith("slot:")) return false;
+	const body = key.slice(5);
+	const separatorIndex = body.indexOf(":");
+	return separatorIndex > 0 && body.charCodeAt(separatorIndex + 1) === 47;
+}
+function parsePathWithInterception(input) {
+	const separatorIndex = input.indexOf("\0");
+	const path = separatorIndex === -1 ? input : input.slice(0, separatorIndex);
+	if (!path.startsWith("/")) return null;
+	return {
+		interceptionContext: separatorIndex === -1 ? null : input.slice(separatorIndex + 1),
+		path
+	};
+}
+function parseTreePath(input) {
+	return input.startsWith("/") ? input : null;
+}
+function parseAppElementsWireElementKey(key) {
+	if (key.startsWith("route:")) {
+		const parsed = parsePathWithInterception(key.slice(6));
+		return parsed ? {
+			interceptionContext: parsed.interceptionContext,
+			kind: "route",
+			path: parsed.path
+		} : null;
+	}
+	if (key.startsWith("page:")) {
+		const parsed = parsePathWithInterception(key.slice(5));
+		return parsed ? {
+			interceptionContext: parsed.interceptionContext,
+			kind: "page",
+			path: parsed.path
+		} : null;
+	}
+	if (key.startsWith("layout:")) {
+		const treePath = parseTreePath(key.slice(7));
+		return treePath ? {
+			kind: "layout",
+			treePath
+		} : null;
+	}
+	if (key.startsWith("template:")) {
+		const treePath = parseTreePath(key.slice(9));
+		return treePath ? {
+			kind: "template",
+			treePath
+		} : null;
+	}
+	if (key.startsWith("slot:")) {
+		const body = key.slice(5);
+		const separatorIndex = body.indexOf(":");
+		if (separatorIndex <= 0) return null;
+		const treePath = parseTreePath(body.slice(separatorIndex + 1));
+		return treePath ? {
+			kind: "slot",
+			name: body.slice(0, separatorIndex),
+			treePath
+		} : null;
+	}
+	return null;
+}
+//#endregion
+export { createAppElementsWireSlotId, isAppElementsWireSlotId, parseAppElementsWireElementKey };