vinext 1.4.4 → 1.4.5

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

@@ -1,15 +1,15 @@
-import { stripBasePath } from "../utils/base-path.js";
-import { withBasePath } from "../shims/url-utils.js";
-import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
+import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { withBasePath } from "../shims/url-utils.js";
+import { stripBasePath } from "../utils/base-path.js";
 import { resolveActiveRoutePaths } from "./app-history-state.js";
-import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
-import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit, createPendingNavigationCommitFromElements } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
+import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
+import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { startTransition, useInsertionEffect, useLayoutEffect } from "react";
 import { flushSync } from "react-dom";
-//#region src/server/app-browser-navigation-controller.ts
+// src/server/app-browser-navigation-controller.ts
 const HARD_NAVIGATION_LOOP_GUARD_KEY = "__vinext_hard_navigation_target__";
 function normalizeBrowserHref(href) {
 	try {
@@ -689,5 +689,4 @@ function createAppBrowserNavigationController(deps = {}) {
 		NavigationHistoryCommit
 	};
 }
-//#endregion
 export { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch, createSnapshotPathAndSearch, navigateDocumentDirectly };

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

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

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

@@ -1,8 +1,7 @@
 import { stripBasePath } from "../utils/base-path.js";
-//#region src/server/app-browser-navigation-response.ts
+// src/server/app-browser-navigation-response.ts
 function shouldRecoverSamePathSearchCommitOnResponseCompletion(options) {
 	if (!options.programmaticTransition || options.navigationKind !== "navigate") return false;
 	return options.currentSnapshot.pathname === stripBasePath(options.targetUrl.pathname, options.basePath) && options.currentSnapshot.search !== options.targetUrl.search;
 }
-//#endregion
 export { shouldRecoverSamePathSearchCommitOnResponseCompletion };

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

@@ -1,5 +1,4 @@
 import { NavigationRuntimeNavigate } from "../client/navigation-runtime.js";
-//#region src/server/app-browser-popstate.d.ts
 type RestoreScrollPosition = (state: unknown, options?: {
   shouldContinue?: () => boolean;
 }) => void;
@@ -26,5 +25,4 @@ export declare function shouldCommitPopstateUrlWithoutNavigation(options: {
   isSameAppRouteTarget: boolean;
 }): boolean;
 export declare function createPopstateRestoreHandler(deps: BrowserPopstateRestoreDeps): (event: PopStateEvent) => void;
-//#endregion
 export {};

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

@@ -1,6 +1,6 @@
 import { isExternalHistoryState, readHistoryStateTraversalIndex } from "./app-history-state.js";
 import "./app-browser-state.js";
-//#region src/server/app-browser-popstate.ts
+// src/server/app-browser-popstate.ts
 function hasSavedScrollPosition(state) {
 	return Boolean(state && typeof state === "object" && "__vinext_scrollY" in state);
 }
@@ -44,5 +44,4 @@ function createPopstateRestoreHandler(deps) {
 		});
 	};
 }
-//#endregion
 export { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition, shouldCommitPopstateUrlWithoutNavigation };

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

@@ -1,5 +1,4 @@
-import { CachedRscResponse, peekPrefetchResponseForNavigation } from "../shims/navigation.js";
-//#region src/server/app-browser-prefetch-response.d.ts
+import { CachedRscResponse, peekPrefetchResponseForNavigation } from "../shims/app-router-navigation.js";
 export declare function peekSettledPrefetchResponseForNavigation(options: {
   additionalRscUrls: readonly string[];
   bypassNavigationCache: boolean;
@@ -20,5 +19,4 @@ export declare function prepareConsumedPrefetchResponseForPublication(response:
   preparedElements: CachedRscResponse["preparedElements"];
   snapshot: CachedRscResponse;
 };
-export declare function preserveCommittedPrefetchExpiry(snapshot: CachedRscResponse, expiresAt: number | undefined): CachedRscResponse;
-//#endregion
+export declare function preserveCommittedPrefetchExpiry(snapshot: CachedRscResponse, expiresAt: number | undefined): CachedRscResponse;

package/dist/server/app-browser-prefetch-response.js

@@ -1,6 +1,6 @@
 import { formatRscRequestPath, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
-import { peekPrefetchResponseForNavigation } from "../shims/navigation.js";
-//#region src/server/app-browser-prefetch-response.ts
+import { peekPrefetchResponseForNavigation } from "../shims/app-router-navigation.js";
+// src/server/app-browser-prefetch-response.ts
 function peekSettledPrefetchResponseForNavigation(options) {
 	if (options.navigationKind !== "navigate" || options.bypassNavigationCache) return null;
 	return (options.peek ?? peekPrefetchResponseForNavigation)(options.targetPathAndSearch, options.interceptionContext, options.mountedSlotsHeader, { additionalRscUrls: options.additionalRscUrls });
@@ -50,5 +50,4 @@ function preserveCommittedPrefetchExpiry(snapshot, expiresAt) {
 		expiresAt
 	};
 }
-//#endregion
 export { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl };

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

@@ -1,4 +1,3 @@
-//#region src/server/app-browser-rsc-redirect.d.ts
 export declare function blockDangerousStreamedRscRedirect(response: Response, streamedRedirectTarget: string | null): boolean;
 type RscRedirectHistoryUpdateMode = "push" | "replace" | undefined;
 type RscRedirectLifecycleDecision = {
@@ -34,5 +33,4 @@ export declare function resolveStreamedRscRedirectLifecycleHop(options: {
   requestPreviousNextUrl: string | null;
   streamedRedirectTarget: string;
 }): RscRedirectLifecycleDecision;
-//#endregion
 export {};

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

@@ -1,6 +1,6 @@
-import { isDangerousScheme, reportBlockedDangerousNavigation } from "../shims/url-safety.js";
 import { resolveHardNavigationTargetFromRscResponse, stripRscCacheBustingSearchParam, toPathAbsolutePathname } from "./app-rsc-cache-busting.js";
-//#region src/server/app-browser-rsc-redirect.ts
+import { isDangerousScheme, reportBlockedDangerousNavigation } from "../shims/url-safety.js";
+// src/server/app-browser-rsc-redirect.ts
 const MAX_RSC_REDIRECT_DEPTH = 10;
 function blockDangerousStreamedRscRedirect(response, streamedRedirectTarget) {
 	if (streamedRedirectTarget === null || !isDangerousScheme(streamedRedirectTarget)) return false;
@@ -60,5 +60,4 @@ function resolveStreamedRscRedirectLifecycleHop(options) {
 		targetUrl: streamedRedirectUrl
 	});
 }
-//#endregion
 export { blockDangerousStreamedRscRedirect, resolveRscRedirectLifecycleHop, resolveStreamedRscRedirectLifecycleHop };

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

@@ -1,9 +1,8 @@
 import { AppElements, AppWireElements } from "./app-elements-wire.js";
-import "./app-elements.js";
 import { navigationPlanner } from "./navigation-planner.js";
 import { AppBrowserServerActionResult, ServerActionRevalidationKind } from "./app-browser-action-result.js";
 import { AppRouterState } from "./app-browser-state.js";
-//#region src/server/app-browser-server-action-client.d.ts
+import "./app-elements.js";
 type ServerActionResult = AppBrowserServerActionResult<AppWireElements>;
 export type ClientServerActionInitiation = {
   href: string;
@@ -32,5 +31,4 @@ export type ClientServerActionDeps = {
   syncServerActionHttpFallbackHead(status: number | null): void;
 };
 export declare function invokeClientServerAction(id: string, args: unknown[], actionInitiation: ClientServerActionInitiation, deps: ClientServerActionDeps): Promise<unknown>;
-//#endregion
 export {};

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

@@ -1,16 +1,16 @@
-import { hasBasePath } from "../utils/base-path.js";
-import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
+import { parseRenderedPathAndSearchHeader } from "../shims/app-router-navigation.js";
 import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl, toPathAbsolutePathname } from "./app-rsc-cache-busting.js";
+import { createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult, shouldSyncServerActionHttpFallbackHead } from "./app-browser-action-result.js";
+import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.js";
 import { AppElementsWire } from "./app-elements-wire.js";
+import { resolveServerActionRequestState } from "./app-browser-state.js";
 import "./app-elements.js";
-import { parseRenderedPathAndSearchHeader } from "../shims/navigation.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl, toPathAbsolutePathname } 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 { resolveServerActionRequestState } from "./app-browser-state.js";
-import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.js";
+import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
+import { hasBasePath } from "../utils/base-path.js";
 import { createFromFetch, createTemporaryReferenceSet, encodeReply } from "@vitejs/plugin-rsc/browser";
-//#region src/server/app-browser-server-action-client.ts
+// src/server/app-browser-server-action-client.ts
 function resolveActionRedirectTarget(response, basePath, performHardNavigation) {
 	const actionRedirect = response.headers.get(ACTION_REDIRECT_HEADER);
 	if (!actionRedirect) return null;
@@ -131,5 +131,4 @@ async function invokeClientServerAction(id, args, actionInitiation, deps) {
 	}
 	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,4 +1,2 @@
 import { ServerActionResultDecision } from "./navigation-planner.js";
-//#region src/server/app-browser-server-action-navigation.d.ts
-export declare function applyServerActionResultDecision(decision: ServerActionResultDecision, clearCaches: () => void, performHardNavigation: (url: string, historyMode?: "assign" | "replace") => void): boolean;
-//#endregion
+export declare function applyServerActionResultDecision(decision: ServerActionResultDecision, clearCaches: () => void, performHardNavigation: (url: string, historyMode?: "assign" | "replace") => void): boolean;

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

@@ -1,9 +1,8 @@
-//#region src/server/app-browser-server-action-navigation.ts
+// 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.d.ts

@@ -1,14 +1,13 @@
 import { BrowserRouteManifest } from "../routing/browser-route-manifest.js";
-import { CacheEntryReuseProof } from "./cache-proof.js";
-import { AppElements, AppElementsInterception, AppElementsSlotBinding } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { NavigationTrace } from "./navigation-trace.js";
-import { OperationLane } from "./operation-token.js";
+import { AppElements, AppElementsInterception, AppElementsSlotBinding } from "./app-elements-wire.js";
+import { CacheEntryReuseProof } from "./cache-proof.js";
 import "./navigation-planner.js";
+import { OperationLane } from "./operation-token.js";
+import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { BfcacheIdMap, HistoryTraversalIntent, createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
-//#region src/server/app-browser-state.d.ts
 type OperationRecordBase = {
   id: number;
   lane: OperationLane;
@@ -151,5 +150,4 @@ export declare function createPendingNavigationCommitFromElements(options: Creat
 export declare function createPendingNavigationCommit(options: CreatePendingNavigationCommitOptions & {
   nextElements: Promise<AppElements>;
 }): Promise<PendingNavigationCommit>;
-//#endregion
 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,21 +1,21 @@
 import { stripBasePath } from "../utils/base-path.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 { normalizePathnameForRouteMatch } from "../routing/utils.js";
-import { normalizePath } from "./normalize-path.js";
-import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
-import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
-import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
+import { holdsSkippedLayouts } from "./app-mounted-layouts.js";
+import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
+import { NEXT_ACTION_HEADER, RSC_ACTION_HEADER } from "./headers.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
-import { verifyOperationTokenForCommit } from "./operation-token.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import { createCacheEntryReuseProof } from "./cache-proof.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
+import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { bindAppElementsRenderedSearch } from "../shims/slot.js";
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
+import { normalizePath } from "./normalize-path.js";
 import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
-import { holdsSkippedLayouts } from "./app-mounted-layouts.js";
-import { createCacheEntryReuseProof } from "./cache-proof.js";
-//#region src/server/app-browser-state.ts
+import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
+// src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };
 const VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "visited-cache" };
@@ -92,7 +92,9 @@ function resolvePendingNavigationCommitDispositionDecision(options) {
 		preserveElementIds: [],
 		trace: createNavigationTrace(NavigationTraceReasonCodes.staleOperation, traceFields)
 	};
-	const visibleCommitVersion = options.currentState.activeOperation?.navigationId === options.startedNavigationId && options.currentState.activeOperation.navigationCommitKind === "detached" && options.pending.action.operation.navigationCommitKind === "authoritative" ? options.pending.action.operation.startedVisibleCommitVersion : options.currentState.visibleCommitVersion;
+	const isAuthoritativeSameNavigationHandoff = options.currentState.activeOperation?.navigationId === options.startedNavigationId && options.currentState.activeOperation.navigationCommitKind === "detached" && options.pending.action.operation.navigationCommitKind === "authoritative";
+	const isSupersededNavigationCommit = options.pending.action.operation.navigationId === options.startedNavigationId && options.currentState.activeOperation?.lane === "navigation" && options.currentState.activeOperation.navigationId !== void 0 && options.currentState.activeOperation.navigationId < options.startedNavigationId;
+	const visibleCommitVersion = isAuthoritativeSameNavigationHandoff || isSupersededNavigationCommit ? options.pending.action.operation.startedVisibleCommitVersion : options.currentState.visibleCommitVersion;
 	const verdict = verifyOperationTokenForCommit(token, {
 		activeNavigationId: options.activeNavigationId,
 		visibleCommitVersion
@@ -341,5 +343,4 @@ async function createPendingNavigationCommit(options) {
 		nextElements: await options.nextElements
 	});
 }
-//#endregion
 export { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, 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 };

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

@@ -1,7 +1,6 @@
 import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { RscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
 import { ReactFormState } from "react-dom/client";
-//#region src/server/app-browser-stream.d.ts
 type VinextBrowserGlobals = {
   __VINEXT_RSC_CHUNKS__?: RscEmbeddedChunk[];
   __VINEXT_RSC_DONE__?: boolean;
@@ -21,5 +20,4 @@ export declare function chunksToReadableStream(chunks: readonly RscEmbeddedChunk
  * immediately instead of polling with setTimeout.
  */
 export declare function createProgressiveRscStream(): ReadableStream<Uint8Array>;
-//#endregion
 export {};

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

@@ -1,6 +1,6 @@
-import { decodeRscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
 import { ensureNavigationRuntimeRscBootstrap, getNavigationRuntime } from "../client/navigation-runtime.js";
-//#region src/server/app-browser-stream.ts
+import { decodeRscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
+// src/server/app-browser-stream.ts
 function getVinextBrowserGlobal() {
 	return globalThis;
 }
@@ -120,5 +120,4 @@ function createProgressiveRscStream() {
 		}
 	});
 }
-//#endregion
 export { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal };

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

@@ -1,8 +1,7 @@
-import { BrowserRouteManifest, BrowserRouteManifestInterception } from "../routing/browser-route-manifest.js";
-import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { AppElements } from "./app-elements-wire.js";
 import { AppRouterState } from "./app-browser-state.js";
-//#region src/server/app-browser-supplemental-refresh.d.ts
+import { BrowserRouteManifest, BrowserRouteManifestInterception } from "../routing/browser-route-manifest.js";
 export type SupplementalRefreshDegradedReason = "aborted" | "failed" | "timeout";
 export type SupplementalRefreshResult<T> = {
   degraded: false;
@@ -57,5 +56,4 @@ export declare function resolveSupplementalRefreshes<T>(options: {
   signal: AbortSignal;
   supplemental: ReadonlyArray<(signal: AbortSignal) => Promise<T>>;
   timeoutMs?: number;
-}): Promise<SupplementalRefreshResult<T>>;
-//#endregion
+}): Promise<SupplementalRefreshResult<T>>;

package/dist/server/app-browser-supplemental-refresh.js

@@ -1,11 +1,11 @@
-import { removeTrailingSlash, restoreBasePath, stripBasePath } from "../utils/base-path.js";
-import { normalizePathnameForRouteMatch, splitPathnameForRouteMatch } from "../routing/utils.js";
-import { normalizePath } from "./normalize-path.js";
-import { matchRoutePattern } from "../routing/route-pattern.js";
-import { APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_SLOT_BINDINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { isNestedBfcacheSlotSegmentIdFor } from "./bfcache-identity.js";
-//#region src/server/app-browser-supplemental-refresh.ts
+import { matchRoutePattern } from "../routing/route-pattern.js";
+import { normalizePathnameForRouteMatch, splitPathnameForRouteMatch } from "../routing/utils.js";
+import { APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_SLOT_BINDINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
+import { removeTrailingSlash, restoreBasePath, stripBasePath } from "../utils/base-path.js";
+import { normalizePath } from "./normalize-path.js";
+// src/server/app-browser-supplemental-refresh.ts
 const SUPPLEMENTAL_REFRESH_TIMEOUT_MS = 1e4;
 var SupplementalRefreshError = class extends Error {
 	reason;
@@ -233,5 +233,4 @@ async function resolveSupplementalRefreshes(options) {
 		options.signal.removeEventListener("abort", abort);
 	}
 }
-//#endregion
 export { SupplementalRefreshError, createSupplementalRefreshCoordinator, mergeRefreshedParallelSlot, requireCompleteSupplementalRefresh, resolvePersistedRefreshInterceptions, resolvePersistedSourcePageRefreshes, resolveServerActionSupplementalRefresh, resolveSupplementalRefreshes };

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

@@ -1,11 +1,10 @@
+import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { BrowserRouteManifest } from "../routing/browser-route-manifest.js";
 import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
-import { NavigationTrace } from "./navigation-trace.js";
-import { OperationLane } from "./operation-token.js";
 import { AppNavigationPayloadOrigin, AppRouterAction, AppRouterState, PendingNavigationCommit } from "./app-browser-state.js";
-//#region src/server/app-browser-visible-commit.d.ts
+import { OperationLane } from "./operation-token.js";
+import { NavigationTrace } from "./navigation-trace.js";
 type VisibleCommitDecision = {
   disposition: "commit";
   preserveAbsentSlots: boolean;
@@ -79,5 +78,4 @@ export declare function resolveAndClassifyNavigationCommit(options: {
   targetHref: string;
   type: "navigate" | "replace" | "traverse";
 }): Promise<ClassifiedPendingNavigationCommit>;
-//#endregion
 export {};

package/dist/server/app-browser-visible-commit.js

@@ -1,11 +1,11 @@
 import { AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
-import "./app-elements.js";
-import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { mergeElements } from "../shims/slot.js";
 import { createBfcacheSegmentIdentityMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
-import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
 import { resolveAppPageRouteStateKey } from "./app-page-segment-state.js";
-//#region src/server/app-browser-visible-commit.ts
+import "./app-elements.js";
+import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
+import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
+// src/server/app-browser-visible-commit.ts
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");
 function hasSameServerTemplateSeedIdentity(id, currentSnapshot, nextSnapshot) {
 	const parsed = AppElementsWire.parseElementKey(id);
@@ -260,5 +260,4 @@ async function resolveAndClassifyNavigationCommit(options) {
 		trace: approval.decision.trace
 	};
 }
-//#endregion
 export { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit };

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

@@ -1,5 +1,4 @@
 import { ClientReferenceChunks } from "../utils/client-reference-chunks.js";
-//#region src/server/app-client-reference-manifest.d.ts
 type ClientManifestEntry = {
   id: string;
   name: string;
@@ -27,5 +26,4 @@ export declare const ssrServerConsumerManifest: {
   moduleMap: Record<string, Record<string, ClientManifestEntry>>;
   moduleLoading: null;
 };
-//#endregion
 export {};

package/dist/server/app-client-reference-manifest.js

@@ -1,5 +1,5 @@
 import { toFlightChunks } from "../utils/client-reference-chunks.js";
-//#region src/server/app-client-reference-manifest.ts
+// src/server/app-client-reference-manifest.ts
 /**
 * Names the chunks each client reference loads in its Flight row, as Next.js
 * does, so the browser loads a reference without a registry of every client
@@ -42,5 +42,4 @@ const ssrServerConsumerManifest = {
 	} }),
 	moduleLoading: null
 };
-//#endregion
 export { createClientReferenceChunksManifest, ssrServerConsumerManifest };

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

@@ -1,4 +1,3 @@
-//#region src/server/app-client-reference-preloader.d.ts
 type ClientReferenceRequire = (id: string) => Promise<unknown>;
 type ClientReferenceMap = Readonly<Record<string, unknown>>;
 type ClientReferencePreloaderOptions = {
@@ -52,5 +51,4 @@ export type RouteClientReferenceSet = {
  */
 export declare function resolveRouteClientReferences(plan: RouteClientReferences | null, routePattern: string | null | undefined): RouteClientReferenceSet | undefined;
 export declare function createClientReferencePreloader(options: ClientReferencePreloaderOptions): ClientReferencePreloader;
-//#endregion
 export {};

package/dist/server/app-client-reference-preloader.js

@@ -1,5 +1,5 @@
 import { shareIsolatePromise } from "./isolate-shared-promise.js";
-//#region src/server/app-client-reference-preloader.ts
+// src/server/app-client-reference-preloader.ts
 const resolvedPreload = Promise.resolve();
 /**
 * The client references a render of `routePattern` preloads, or of no route
@@ -78,5 +78,4 @@ function createClientReferencePreloader(options) {
 		return allReferencesPreloadPromise;
 	} };
 }
-//#endregion
 export { createClientReferencePreloader, resolveRouteClientReferences };

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

@@ -1,4 +1,3 @@
-//#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;
@@ -21,5 +20,4 @@ export type AppElementsWireElementKey = {
   kind: "template";
   treePath: string;
 };
-export declare function parseAppElementsWireElementKey(key: string): AppElementsWireElementKey | null;
-//#endregion
+export declare function parseAppElementsWireElementKey(key: string): AppElementsWireElementKey | null;

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

@@ -1,4 +1,4 @@
-//#region src/server/app-elements-wire-key.ts
+// 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}`;
@@ -65,5 +65,4 @@ function parseAppElementsWireElementKey(key) {
 	}
 	return null;
 }
-//#endregion
 export { createAppElementsWireSlotId, isAppElementsWireSlotId, parseAppElementsWireElementKey };

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

@@ -4,7 +4,6 @@ import { BfcacheSegmentIdentity } from "./bfcache-identity.js";
 import { compareStrings } from "../utils/compare.js";
 import { AppElementsWireElementKey } from "./app-elements-wire-key.js";
 import { ReactNode } from "react";
-//#region src/server/app-elements-wire.d.ts
 export declare const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
 export declare const APP_CACHE_ENTRY_REUSE_PROOF_KEY = "__cacheEntryReuseProof";
 export declare const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
@@ -116,6 +115,10 @@ type AppElementsWireCodec = {
   readonly unmatchedSlotValue: typeof APP_UNMATCHED_SLOT_WIRE_VALUE;
   createMetadataEntries(input: AppElementsWireMetadataInput): AppElementsWireMetadataEntries;
   decode(elements: AppWireElements): AppElements;
+  decodeCacheKey(cacheKey: string): {
+    interceptionContext: string | null;
+    rscUrl: string;
+  };
   encodeCacheKey(rscUrl: string, interceptionContext: string | null): string;
   encodeLayoutId(treePath: string): string;
   encodeOutgoingPayload(input: {
@@ -151,5 +154,4 @@ export declare function buildOutgoingAppPayload(input: {
 }): ReactNode | AppOutgoingElements;
 export declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
 export declare const AppElementsWire: AppElementsWireCodec;
-//#endregion
 export {};

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

@@ -1,10 +1,10 @@
-import { isUnknownRecord } from "../utils/record.js";
-import { compareStrings } from "../utils/compare.js";
+import { createArtifactCompatibilityEnvelope, parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
+import { compareStrings } from "../utils/compare.js";
+import { isUnknownRecord } from "../utils/record.js";
 import { createAppElementsWireSlotId, isAppElementsWireSlotId, parseAppElementsWireElementKey } from "./app-elements-wire-key.js";
-import { createArtifactCompatibilityEnvelope, parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { isValidElement } from "react";
-//#region src/server/app-elements-wire.ts
+// src/server/app-elements-wire.ts
 const APP_INTERCEPTION_SEPARATOR = "\0";
 const LEGACY_APP_SOURCE_PAGE_KEY = "__sourcePage";
 const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
@@ -99,6 +99,17 @@ function createAppPayloadTemplateId(treePath) {
 function createAppPayloadCacheKey(rscUrl, interceptionContext) {
 	return appendInterceptionContext(rscUrl, interceptionContext);
 }
+function parseAppPayloadCacheKey(cacheKey) {
+	const separatorIndex = cacheKey.indexOf(APP_INTERCEPTION_SEPARATOR);
+	if (separatorIndex === -1) return {
+		interceptionContext: null,
+		rscUrl: cacheKey
+	};
+	return {
+		interceptionContext: cacheKey.slice(separatorIndex + 1),
+		rscUrl: cacheKey.slice(0, separatorIndex)
+	};
+}
 function isAppElementsWireBfcacheIdentityId(key) {
 	const kind = parseAppElementsWireElementKey(key)?.kind;
 	return kind === "page" || kind === "layout" || kind === "template" || kind === "slot";
@@ -361,6 +372,7 @@ const AppElementsWire = {
 	unmatchedSlotValue: APP_UNMATCHED_SLOT_WIRE_VALUE,
 	createMetadataEntries: createAppElementsWireMetadataEntries,
 	decode: normalizeAppElements,
+	decodeCacheKey: parseAppPayloadCacheKey,
 	encodeCacheKey: createAppPayloadCacheKey,
 	encodeLayoutId: createAppPayloadLayoutId,
 	encodeOutgoingPayload: buildOutgoingAppPayload,
@@ -372,5 +384,4 @@ const AppElementsWire = {
 	parseElementKey: parseAppElementsWireElementKey,
 	readMetadata: readAppElementsMetadata
 };
-//#endregion
 export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata };

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

@@ -1,5 +1,4 @@
 import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsBfcacheSegmentIdentities, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata } from "./app-elements-wire.js";
-//#region src/server/app-elements.d.ts
 export declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 type AppElementsStateKeyRebinder = (stateKey: string) => string;
 export declare function setOptimisticStateKeyRebinder(elements: Record<string, unknown>, rebind: AppElementsStateKeyRebinder): void;
@@ -9,5 +8,4 @@ export declare const APP_STREAMING_METADATA_BODY_ID_PREFIX = "__vinext_streaming
 export declare function getMountedSlotIds(elements: AppElements): string[];
 export declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
 export declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
-//#endregion
 export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsBfcacheSegmentIdentities, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata };

package/dist/server/app-elements.js

@@ -1,6 +1,6 @@
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata } from "./app-elements-wire.js";
-//#region src/server/app-elements.ts
+// src/server/app-elements.ts
 const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 /**
 * An optimistic shell's rebinder from the learned URL's segment state keys to
@@ -30,5 +30,4 @@ function getMountedSlotIdsHeader(elements) {
 function resolveVisitedResponseInterceptionContext(requestInterceptionContext, payloadInterceptionContext) {
 	return payloadInterceptionContext ?? requestInterceptionContext;
 }
-//#endregion
 export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_STREAMING_METADATA_BODY_ID_PREFIX, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, readOptimisticStateKeyRebinder, resolveVisitedResponseInterceptionContext, setOptimisticStateKeyRebinder };