vinext 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/shims/navigation.d.ts

@@ -1,7 +1,9 @@
 import { AppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime.js";
+import { AppElements } from "../server/app-elements-wire.js";
 import { AppRouterInstance, NavigateOptions, PrefetchOptions as PrefetchOptions$1 } from "./internal/app-router-context.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
+import { AppRscRenderMode } from "../server/app-rsc-render-mode.js";
 import { GLOBAL_ACCESSORS_KEY, NavigationContext, NavigationStateAccessors, SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
@@ -27,6 +29,7 @@ type CachedRscResponse = {
   expiresAt?: number;
   mountedSlotsHeader?: string | null;
   paramsHeader: string | null;
+  preparedElements?: AppElements;
   renderedPathAndSearch: string | null;
   url: string;
 };
@@ -46,6 +49,7 @@ type PrefetchCacheEntry = {
   snapshot?: CachedRscResponse;
   cacheKeys?: Set<string>;
   pending?: Promise<void>;
+  preparedElements?: AppElements;
   prefetchKind?: PrefetchCacheKind;
   searchAgnosticShell?: boolean;
   size?: number;
@@ -54,6 +58,13 @@ type PrefetchCacheEntry = {
 declare function getCurrentInterceptionContext(): string | null;
 declare function getPrefetchInterceptionContext(targetHref: string): string | null;
 declare function getCurrentNextUrl(): string;
+declare function createAppPrefetchRequestHeaders(options: {
+  fetchPriority: "auto" | "high" | "low";
+  interceptionContext?: string | null;
+  mountedSlotsHeader?: string | null;
+  prefetchKind?: "auto" | "full";
+  renderMode?: AppRscRenderMode;
+}): Headers;
 /** Get or create the shared in-memory RSC prefetch cache on window. */
 declare function getPrefetchCache(): Map<string, PrefetchCacheEntry>;
 /**
@@ -69,6 +80,7 @@ declare function hasPrefetchCacheEntryForNavigation(rscUrl: string, interception
   notifyInvalidation?: boolean;
 }): boolean;
 declare function hasSearchAgnosticPrefetchShellForRoute(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): boolean;
+declare function discardLearningOnlyPrefetchCacheEntry(rscUrl: string, interceptionContext?: string | null): boolean;
 declare function invalidatePrefetchCache(): void;
 declare function seedPrefetchResponseSnapshot(rscUrl: string, snapshot: CachedRscResponse, interceptionContext?: string | null, mountedSlotsHeader?: string | null, fallbackTtlMs?: number): void;
 declare function deletePrefetchResponseSnapshot(rscUrl: string, snapshot: CachedRscResponse, interceptionContext?: string | null): void;
@@ -121,8 +133,10 @@ declare function restoreRscResponse(cached: CachedRscResponse, copy?: boolean):
 declare function prefetchRscResponse(rscUrl: string, fetchPromise: Promise<Response>, interceptionContext?: string | null, mountedSlotsHeader?: string | null, options?: PrefetchOptions, behavior?: {
   cacheForNavigation?: boolean;
   fallbackTtlMs?: number;
+  minimumTtlMs?: number;
   optimisticRouteShell?: boolean;
   prefetchKind?: PrefetchCacheKind;
+  prepareSnapshot?: (snapshot: CachedRscResponse) => Promise<AppElements>;
   searchAgnosticShell?: boolean;
 }): void;
 declare function peekPrefetchResponseForNavigation(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): CachedRscResponse | null;
@@ -131,7 +145,9 @@ declare function peekPrefetchResponseForNavigation(rscUrl: string, interceptionC
  * Only returns settled (non-pending) snapshots synchronously.
  * Returns null if the entry is still in flight or doesn't exist.
  */
-declare function consumePrefetchResponse(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): CachedRscResponse | null;
+declare function consumePrefetchResponse(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null, options?: {
+  additionalRscUrls?: readonly string[];
+}): CachedRscResponse | null;
 /**
  * Consume a prefetched response for navigation. Unlike the synchronous cache
  * read above, this waits for an already-started prefetch snapshot before
@@ -303,4 +319,4 @@ declare function useSelectedLayoutSegments(parallelRoutesKey?: string): string[]
  */
 declare function useServerInsertedHTML(callback: () => unknown): void;
 //#endregion
-export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createAppPrefetchRequestHeaders, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, discardLearningOnlyPrefetchCacheEntry, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.js

@@ -8,12 +8,12 @@ import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
 import { toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
-import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
+import { retryScrollTo, scrollToHashTarget, scrollToHashTargetOnNextFrame } from "./hash-scroll.js";
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
-import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent } from "./app-router-scroll-state.js";
+import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
 import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
@@ -121,6 +121,15 @@ function getCurrentNextUrl() {
 	if (isServer) return "/";
 	return window.location.pathname + window.location.search;
 }
+function createAppPrefetchRequestHeaders(options) {
+	const prefetchRouterState = getNavigationRuntime()?.functions.getPrefetchRouterState?.() ?? null;
+	return createRscRequestHeaders({
+		...options,
+		nextUrl: getCurrentNextUrl(),
+		includePrefetchHeader: options.prefetchKind !== "full",
+		prefetchRouterState
+	});
+}
 /** Get or create the shared in-memory RSC prefetch cache on window. */
 function getPrefetchCache() {
 	if (isServer) return /* @__PURE__ */ new Map();
@@ -156,11 +165,11 @@ function resolveCachedRscResponseExpiresAt(timestamp, cached, fallbackTtlMs) {
 	if (isCacheExpiresAt(cached.expiresAt)) return cached.expiresAt;
 	return timestamp + resolveCachedRscResponseTtlMs(cached, fallbackTtlMs);
 }
-function resolvePrefetchedRscResponseExpiresAt(timestamp, cached, fallbackTtlMs) {
+function resolvePrefetchedRscResponseExpiresAt(timestamp, cached, fallbackTtlMs, minimumTtlMs = MIN_PREFETCH_STALE_TIME_MS) {
 	if (isCacheExpiresAt(cached.expiresAt)) return cached.expiresAt;
 	const seconds = cached.dynamicStaleTimeSeconds;
-	if (!isDynamicStaleTimeSeconds(seconds)) return timestamp + Math.max(fallbackTtlMs, MIN_PREFETCH_STALE_TIME_MS);
-	return timestamp + Math.max(seconds * 1e3, MIN_PREFETCH_STALE_TIME_MS);
+	if (!isDynamicStaleTimeSeconds(seconds)) return timestamp + Math.max(fallbackTtlMs, minimumTtlMs);
+	return timestamp + Math.max(seconds * 1e3, minimumTtlMs);
 }
 function resolvePrefetchCacheEntryExpiresAt(entry) {
 	if (entry.expiresAt !== void 0) return entry.expiresAt;
@@ -347,12 +356,15 @@ function notifyPrefetchInvalidated(entry) {
 	}
 }
 function deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, notify) {
-	adjustPrefetchCacheByteSize(cache, -getPrefetchCacheEntrySize(entry));
 	const cacheKeys = entry.cacheKeys ?? /* @__PURE__ */ new Set([cacheKey]);
-	for (const key of cacheKeys) {
-		if (cache.get(key) === entry) cache.delete(key);
+	let removedOwnedKey = false;
+	for (const key of cacheKeys) if (cache.get(key) === entry) {
+		cache.delete(key);
 		prefetched.delete(key);
+		removedOwnedKey = true;
 	}
+	if (!removedOwnedKey) return;
+	adjustPrefetchCacheByteSize(cache, -getPrefetchCacheEntrySize(entry));
 	entry.cacheKeys = void 0;
 	if (notify) notifyPrefetchInvalidated(entry);
 	else {
@@ -360,6 +372,22 @@ function deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, notify) {
 		entry.onInvalidateCallbacks = void 0;
 	}
 }
+function discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext = null) {
+	const cache = getPrefetchCache();
+	const prefetched = getPrefetchedUrls();
+	const normalizedTarget = normalizeRscCacheLookupUrl(rscUrl);
+	if (normalizedTarget === null) return false;
+	let discarded = false;
+	for (const [cacheKey, entry] of cache) {
+		if (entry.cacheForNavigation !== false || entry.prefetchKind !== "navigation") continue;
+		const source = parsePrefetchCacheKey(cacheKey);
+		if (source.interceptionContext !== interceptionContext) continue;
+		if (normalizeRscCacheLookupUrl(source.rscUrl) !== normalizedTarget) continue;
+		deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, false);
+		discarded = true;
+	}
+	return discarded;
+}
 function invalidatePrefetchCacheEntry(cacheKey) {
 	const cache = getPrefetchCache();
 	const entry = cache.get(cacheKey);
@@ -565,7 +593,12 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 			entry.snapshot = snapshot;
 			entry.size = snapshot.buffer.byteLength;
 			adjustPrefetchCacheByteSize(cache, entry.size - previousSize);
-			entry.expiresAt = resolvePrefetchedRscResponseExpiresAt(entry.timestamp, entry.snapshot, behavior.fallbackTtlMs ?? PREFETCH_CACHE_TTL);
+			entry.expiresAt = resolvePrefetchedRscResponseExpiresAt(entry.timestamp, entry.snapshot, behavior.fallbackTtlMs ?? PREFETCH_CACHE_TTL, behavior.minimumTtlMs);
+			if (behavior.prepareSnapshot) try {
+				const preparedElements = await behavior.prepareSnapshot(snapshot);
+				if (cache.get(cacheKey) !== entry) return;
+				entry.preparedElements = preparedElements;
+			} catch {}
 			addRenderedPathAndSearchPrefetchAlias(cache, prefetched, cacheKey, entry);
 			evictPrefetchCacheIfNeeded();
 		} else {
@@ -620,28 +653,37 @@ function peekPrefetchResponseForNavigation(rscUrl, interceptionContext = null, m
 * Only returns settled (non-pending) snapshots synchronously.
 * Returns null if the entry is still in flight or doesn't exist.
 */
-function consumePrefetchResponse(rscUrl, interceptionContext = null, mountedSlotsHeader = null) {
+function consumePrefetchResponse(rscUrl, interceptionContext = null, mountedSlotsHeader = null, options) {
 	const cache = getPrefetchCache();
 	const exactCacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	const exactEntry = cache.get(exactCacheKey);
 	if (exactEntry && exactEntry.cacheForNavigation !== false && !isPrefetchCacheEntryCompatibleWithMountedSlots(exactEntry, mountedSlotsHeader)) deletePrefetchCacheEntry(cache, getPrefetchedUrls(), exactCacheKey, exactEntry, false);
-	const match = findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader);
+	const match = findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader, options?.additionalRscUrls);
 	if (!match) return null;
 	const { cacheKey, entry } = match;
 	return consumeMatchedPrefetchResponse(cacheKey, entry, mountedSlotsHeader);
 }
 function consumeMatchedPrefetchResponse(cacheKey, entry, mountedSlotsHeader) {
+	const cache = getPrefetchCache();
 	if (entry.pending || entry.outcome !== "cache-seeded") return null;
 	if (entry.cacheForNavigation === false) return null;
-	deletePrefetchCacheEntry(getPrefetchCache(), getPrefetchedUrls(), cacheKey, entry, false);
 	if (entry.snapshot) {
 		if (!isPrefetchCacheEntryCompatibleWithMountedSlots(entry, mountedSlotsHeader)) return null;
-		if (resolvePrefetchCacheEntryExpiresAt(entry) <= Date.now()) return null;
+		if (resolvePrefetchCacheEntryExpiresAt(entry) <= Date.now()) {
+			deletePrefetchCacheEntry(cache, getPrefetchedUrls(), cacheKey, entry, false);
+			return null;
+		}
+		deletePrefetchCacheEntry(cache, getPrefetchedUrls(), cacheKey, entry, false);
+		const snapshot = entry.snapshot;
 		if (entry.expiresAt !== void 0 || entry.snapshot.expiresAt !== void 0) return {
-			...entry.snapshot,
-			expiresAt: resolvePrefetchCacheEntryExpiresAt(entry)
+			...snapshot,
+			expiresAt: resolvePrefetchCacheEntryExpiresAt(entry),
+			...entry.preparedElements ? { preparedElements: entry.preparedElements } : {}
 		};
-		return entry.snapshot;
+		return entry.preparedElements ? {
+			...snapshot,
+			preparedElements: entry.preparedElements
+		} : snapshot;
 	}
 	return null;
 }
@@ -1036,7 +1078,7 @@ function commitHashOnlyHistoryState(href, mode, scroll) {
 function applyAppRouterScrollFallback(intent) {
 	if (typeof document === "undefined" || typeof window === "undefined") return;
 	if (intent.hash !== null) {
-		scrollToHashTarget(intent.hash);
+		scrollToHashTargetOnNextFrame(intent.hash, () => isLatestAppRouterScrollIntent(intent));
 		return;
 	}
 	if (intent.targetHoistedInHead) return;
@@ -1259,7 +1301,10 @@ const _appRouter = {
 			const fullHref = toBrowserNavigationHref(prefetchHref, window.location.href, __basePath);
 			const interceptionContext = getPrefetchInterceptionContext(fullHref);
 			const mountedSlotsHeader = getMountedSlotsHeader();
-			const headers = createRscRequestHeaders({ interceptionContext });
+			const headers = createAppPrefetchRequestHeaders({
+				fetchPriority: "low",
+				interceptionContext
+			});
 			if (mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
 			const rscUrl = await createRscRequestUrl(fullHref, headers);
 			const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
@@ -1273,7 +1318,11 @@ const _appRouter = {
 				headers,
 				credentials: "include",
 				priority: "low"
-			}), "low"), interceptionContext, mountedSlotsHeader, options);
+			}), "low"), interceptionContext, mountedSlotsHeader, options, {
+				cacheForNavigation: false,
+				optimisticRouteShell: true,
+				prefetchKind: "navigation"
+			});
 		})().catch((error) => {
 			console.error("[vinext] RSC prefetch setup error:", error);
 		});
@@ -1412,4 +1461,4 @@ if (!isServer) {
 	}
 }
 //#endregion
-export { BailoutToCSRError, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createAppPrefetchRequestHeaders, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, discardLearningOnlyPrefetchCacheEntry, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/request-context.d.ts

@@ -27,7 +27,8 @@
  */
 type ExecutionContextLike = {
   waitUntil(promise: Promise<unknown>): void;
-  passThroughOnException?(): void;
+  passThroughOnException?(): void; /** Host runtime executing the current request. */
+  hostRuntime?: "node" | "worker";
   /**
    * Optional host-provided cache handle that some runtimes expose on the
    * execution context. Typed as `unknown` to keep this module runtime-agnostic;

package/dist/shims/slot.d.ts

@@ -25,6 +25,7 @@ type MergeElementsOptions = {
   preservePreviousSlotIds?: readonly string[];
 };
 declare function updateBfcacheSlotEntryOrder(previousOrder: readonly string[], activeStateKey: string, maxEntries?: number): string[];
+declare function getNonCacheComponentsSegmentKey(id: string, activeStateKey: string): string | undefined;
 declare function mergeElements(prev: AppElements, next: AppElements, options?: MergeElementsOptions | boolean): AppElements;
 declare function Slot({
   id,
@@ -42,4 +43,4 @@ declare function ParallelSlot({
   name: string;
 }): string | number | bigint | boolean | Iterable<React$1.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React$1.ReactNode> | React$1.ReactElement<unknown, string | React$1.JSXElementConstructor<any>> | React$1.ReactPortal | null | undefined> | React$1.ReactElement<unknown, string | React$1.JSXElementConstructor<any>> | null;
 //#endregion
-export { BfcacheSlotEntry, BfcacheStateKeyMapContext, Children, ChildrenContext, ElementsContext, ParallelSlot, ParallelSlotsContext, Slot, UNMATCHED_SLOT, mergeElements, updateBfcacheSlotEntryOrder };
+export { BfcacheSlotEntry, BfcacheStateKeyMapContext, Children, ChildrenContext, ElementsContext, ParallelSlot, ParallelSlotsContext, Slot, UNMATCHED_SLOT, getNonCacheComponentsSegmentKey, mergeElements, updateBfcacheSlotEntryOrder };

package/dist/shims/slot.js

@@ -137,6 +137,10 @@ function BfcacheActivitySlotBoundary({ activeStateKey, content, elements, id, Se
 		})
 	}, entry.stateKey)) });
 }
+function getNonCacheComponentsSegmentKey(id, activeStateKey) {
+	const parsed = AppElementsWire.parseElementKey(id);
+	return parsed?.kind === "page" || parsed?.kind === "slot" && parsed.name === "children" ? activeStateKey : void 0;
+}
 function BfcacheSlotBoundary({ content, id }) {
 	const SegmentContext = BfcacheSegmentIdContext;
 	const elements = React$1.useContext(ElementsContext);
@@ -150,7 +154,7 @@ function BfcacheSlotBoundary({ content, id }) {
 	if (!isCacheComponentsEnabled()) return /* @__PURE__ */ jsx(SegmentContext.Provider, {
 		value: id,
 		children: content
-	});
+	}, getNonCacheComponentsSegmentKey(id, activeStateKey));
 	return /* @__PURE__ */ jsx(BfcacheActivitySlotBoundary, {
 		activeStateKey,
 		content,
@@ -224,4 +228,4 @@ function ParallelSlot({ name }) {
 	return React$1.useContext(ParallelSlotsContext)?.[name] ?? null;
 }
 //#endregion
-export { BfcacheStateKeyMapContext, Children, ChildrenContext, ElementsContext, ParallelSlot, ParallelSlotsContext, Slot, UNMATCHED_SLOT, mergeElements, updateBfcacheSlotEntryOrder };
+export { BfcacheStateKeyMapContext, Children, ChildrenContext, ElementsContext, ParallelSlot, ParallelSlotsContext, Slot, UNMATCHED_SLOT, getNonCacheComponentsSegmentKey, mergeElements, updateBfcacheSlotEntryOrder };

package/dist/shims/streamed-icons.d.ts

@@ -0,0 +1,9 @@
+//#region src/shims/streamed-icons.d.ts
+declare function reconcileStreamedIcons(metadataKey: string): void;
+declare function StreamedIconsInsertion({
+  metadataKey
+}: {
+  metadataKey: string;
+}): null;
+//#endregion
+export { StreamedIconsInsertion, reconcileStreamedIcons };

package/dist/shims/streamed-icons.js

@@ -0,0 +1,33 @@
+"use client";
+import { useLayoutEffect } from "react";
+//#region src/shims/streamed-icons.tsx
+const STREAMED_ICON_ATTRIBUTE = "data-vinext-streamed-icon";
+function getStreamedIconOrder(icon, metadataKey) {
+	const marker = icon.getAttribute(STREAMED_ICON_ATTRIBUTE);
+	const prefix = `${metadataKey}:`;
+	if (!marker?.startsWith(prefix)) return null;
+	const order = Number(marker.slice(prefix.length));
+	return Number.isInteger(order) && order >= 0 ? order : null;
+}
+function reconcileStreamedIcons(metadataKey) {
+	document.querySelectorAll(`body link[${STREAMED_ICON_ATTRIBUTE}]`).forEach((icon) => document.head.appendChild(icon));
+	const ownedIcons = [...document.querySelectorAll(`head link[${STREAMED_ICON_ATTRIBUTE}]`)];
+	const retainedIcons = /* @__PURE__ */ new Map();
+	for (const icon of ownedIcons) {
+		const order = getStreamedIconOrder(icon, metadataKey);
+		if (order === null) {
+			icon.remove();
+			continue;
+		}
+		const previousIcon = retainedIcons.get(order);
+		if (previousIcon) previousIcon.remove();
+		retainedIcons.set(order, icon);
+	}
+	for (const [, icon] of [...retainedIcons].sort(([leftOrder], [rightOrder]) => leftOrder - rightOrder)) document.head.appendChild(icon);
+}
+function StreamedIconsInsertion({ metadataKey }) {
+	useLayoutEffect(() => reconcileStreamedIcons(metadataKey), [metadataKey]);
+	return null;
+}
+//#endregion
+export { StreamedIconsInsertion, reconcileStreamedIcons };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {