vinext 1.3.0 → 1.3.1

package/dist/shims/metadata.js

@@ -23,12 +23,23 @@ async function resolveModuleViewport(mod, params = {}, searchParams, parent = Pr
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
 		});
-		return await mod.generateViewport(props, parent);
+		return await callSegmentResolver(mod.generateViewport, props, parent);
 	}
 	if (mod.viewport && typeof mod.viewport === "object") return mod.viewport;
 	return null;
 }
 /**
+* Call a segment's generateMetadata() or generateViewport() with `parent`, as
+* Next.js's getResult does for both.
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/metadata/resolve-metadata.ts (getResult)
+*/
+function callSegmentResolver(resolver, props, parent) {
+	if (!(Reflect.get(resolver, USE_CACHE_FUNCTION_SYMBOL) === true)) return resolver(props, parent);
+	const acceptsSecondArgument = Reflect.get(resolver, USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL);
+	if (!(typeof acceptsSecondArgument === "boolean" ? acceptsSecondArgument : resolver.length >= 2)) return resolver(props);
+	return parent.then(() => resolver(props, parent));
+}
+/**
 * Merge viewport configs from multiple sources (layouts + page).
 * Later entries override earlier ones.
 */
@@ -232,13 +243,26 @@ function postProcessMetadata(merged) {
 * tags are the exception: Next.js merges those across segments.
 */
 function mergeMetadataEntries(entries) {
+	return mergeEntries(entries, false);
+}
+/**
+* Merge metadata into the `parent` a later segment's resolver receives. Like
+* {@link mergeMetadataEntries}, except the title stays resolved as Next.js's
+* `{ absolute, template }`, so `(await parent).title?.absolute` reads the
+* title so far. `template` is the one the next title gets, so merging this
+* parent with later entries resolves their titles as the full merge does.
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/metadata/resolvers/resolve-title.ts
+*/
+function mergeParentMetadataEntries(entries) {
+	return mergeEntries(entries, true);
+}
+function mergeEntries(entries, resolvedTitle) {
 	if (entries.length === 0) return {};
 	const merged = {};
 	let parentTemplate;
 	for (const entry of entries) {
 		const meta = entry.metadata;
 		const isPage = Boolean(entry.isPage);
-		const contributesTitle = entry.contributesTitle !== false;
 		for (const key of Object.keys(meta)) {
 			if (key === "title") continue;
 			const incoming = meta[key];
@@ -249,9 +273,13 @@ function mergeMetadataEntries(entries) {
 			};
 			else merged[key] = incoming;
 		}
-		if (contributesTitle && meta.title !== void 0) merged.title = resolveTitle(meta.title, parentTemplate);
-		if (contributesTitle && !isPage && meta.title && typeof meta.title === "object" && meta.title.template) parentTemplate = meta.title.template;
+		if (meta.title !== void 0) merged.title = resolveTitle(meta.title, parentTemplate);
+		if (!isPage && meta.title && typeof meta.title === "object" && meta.title.template) parentTemplate = meta.title.template;
 	}
+	if (resolvedTitle && Object.hasOwn(merged, "title")) merged.title = {
+		absolute: resolveStringTitle(merged.title) ?? "",
+		template: parentTemplate ?? null
+	};
 	return merged;
 }
 /**
@@ -268,13 +296,10 @@ async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Pr
 	if (typeof mod.generateMetadata === "function") {
 		const generateMetadata = mod.generateMetadata;
 		const asyncParams = makeThenableParams(params);
-		const props = searchParams === void 0 ? withUseCacheLayoutMarker(generateMetadata, { params: asyncParams }) : withUseCachePageMarker(generateMetadata, {
+		return await callSegmentResolver(generateMetadata, searchParams === void 0 ? withUseCacheLayoutMarker(generateMetadata, { params: asyncParams }) : withUseCachePageMarker(generateMetadata, {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
-		});
-		const isUseCacheFunction = Reflect.get(generateMetadata, USE_CACHE_FUNCTION_SYMBOL) === true;
-		const acceptsSecondArgument = Reflect.get(generateMetadata, USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL);
-		return await (!isUseCacheFunction || (typeof acceptsSecondArgument === "boolean" ? acceptsSecondArgument : generateMetadata.length >= 2) ? generateMetadata(props, parent) : generateMetadata(props));
+		}), parent);
 	}
 	if (mod.metadata && typeof mod.metadata === "object") return mod.metadata;
 	return null;
@@ -607,24 +632,61 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash, streamedIconKey
 				}
 			}
 		}
-		if (og.videos) for (const video of og.videos) {
-			elements.push(/* @__PURE__ */ jsx("meta", {
-				property: "og:video",
-				content: resolveUrl(video.url)
-			}, key++));
-			if (video.width) elements.push(/* @__PURE__ */ jsx("meta", {
-				property: "og:video:width",
-				content: String(video.width)
-			}, key++));
-			if (video.height) elements.push(/* @__PURE__ */ jsx("meta", {
-				property: "og:video:height",
-				content: String(video.height)
+		if (og.videos) {
+			const videos = normalizeUrlDescriptorEntries(og.videos, (url) => ({ url }));
+			for (const video of videos) {
+				if (video.url) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:video",
+					content: stringifyUrl(video.url)
+				}, key++));
+				if (video.secureUrl) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:video:secure_url",
+					content: stringifyUrl(video.secureUrl)
+				}, key++));
+				if (video.type) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:video:type",
+					content: video.type
+				}, key++));
+				if (video.width) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:video:width",
+					content: String(video.width)
+				}, key++));
+				if (video.height) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:video:height",
+					content: String(video.height)
+				}, key++));
+			}
+		}
+		if (og.audio) {
+			const audios = normalizeUrlDescriptorEntries(og.audio, (url) => ({ url }));
+			for (const audio of audios) {
+				if (audio.url) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:audio",
+					content: stringifyUrl(audio.url)
+				}, key++));
+				if (audio.secureUrl) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:audio:secure_url",
+					content: stringifyUrl(audio.secureUrl)
+				}, key++));
+				if (audio.type) elements.push(/* @__PURE__ */ jsx("meta", {
+					property: "og:audio:type",
+					content: audio.type
+				}, key++));
+			}
+		}
+		const ogListTags = [
+			["og:email", og.emails],
+			["og:phone_number", og.phoneNumbers],
+			["og:fax_number", og.faxNumbers],
+			["og:locale:alternate", og.alternateLocale]
+		];
+		for (const [property, value] of ogListTags) {
+			if (!value) continue;
+			for (const content of Array.isArray(value) ? value : [value]) elements.push(/* @__PURE__ */ jsx("meta", {
+				property,
+				content
 			}, key++));
 		}
-		if (og.audio) for (const audio of og.audio) elements.push(/* @__PURE__ */ jsx("meta", {
-			property: "og:audio",
-			content: resolveUrl(audio.url)
-		}, key++));
 	}
 	if (metadata.twitter) {
 		const tw = metadata.twitter;
@@ -867,4 +929,4 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash, streamedIconKey
 	return /* @__PURE__ */ jsx(Fragment$1, { children: elements });
 }
 //#endregion
-export { DEFAULT_VIEWPORT, MetadataHead, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };
+export { DEFAULT_VIEWPORT, MetadataHead, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeParentMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };

package/dist/shims/navigation-errors.d.ts

@@ -58,4 +58,5 @@ export declare function isDynamicServerError(error: unknown): error is DynamicSe
  * them. This covers the categories vinext can currently produce.
  */
 export declare function unstable_rethrow(error: unknown): void;
-//#endregion
+//#endregion
+export {};

package/dist/shims/navigation.d.ts

@@ -3,6 +3,7 @@ import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime
 import { AppElements } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { AppRouterInstance, NavigateOptions, PrefetchOptions as PrefetchOptions$1 } from "./internal/app-router-context.js";
+import { AppRoutePrefetchPolicy } from "./internal/app-route-prefetch-policy.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";
@@ -67,7 +68,13 @@ export type PrefetchOptions = {
 export type PrefetchCacheKind = "loading-shell" | "navigation" | "route-tree";
 export type PrefetchCacheEntry = {
   cacheForNavigation?: boolean;
+  /**
+   * Set while a full prefetch would be kept as learning-only if its page
+   * renders dynamically. A hover upgrade turns it into a full prefetch.
+   */
+  dynamicStaleTime?: "learning-only" | "full-prefetch";
   expiresAt?: number;
+  fallbackTtlMs?: number;
   invalidationTimer?: ReturnType<typeof setTimeout>;
   mountedSlotsHeader?: string | null;
   onInvalidateCallbacks?: Set<() => void>;
@@ -116,6 +123,10 @@ export declare function hasPrefetchCacheEntryForNavigation(rscUrl: string, inter
   additionalRscUrls?: readonly string[];
   notifyInvalidation?: boolean;
   onInvalidate?: () => void;
+  /** Called with the matched entry, and the key it was found under, when it is reused. */
+  onReuse?: (entry: PrefetchCacheEntry, cacheKey: string) => void;
+  /** Whether an in-flight entry counts as reusable. Defaults to true. */
+  reusePending?: boolean;
 }): boolean;
 /**
  * Return whether the exact learning-only Link prefetch is still usable.
@@ -124,7 +135,16 @@ export declare function hasPrefetchCacheEntryForNavigation(rscUrl: string, inter
  */
 export declare function hasFreshLearningOnlyPrefetchCacheEntry(rscUrl: string, interceptionContext?: string | null): boolean;
 export declare function hasSearchAgnosticPrefetchShellForRoute(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): boolean;
-export declare function discardLearningOnlyPrefetchCacheEntry(rscUrl: string, interceptionContext?: string | null): boolean;
+export declare function discardLearningOnlyPrefetchCacheEntry(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): boolean;
+/**
+ * Make a prefetch reusable by a navigation, as an `unstable_dynamicOnHover`
+ * hover does. A pending one that would be kept as learning-only becomes a full
+ * prefetch and takes the full-prefetch lifetime. One already kept as
+ * learning-only because its page rendered dynamically is left for the full
+ * prefetch to replace: Next.js refetches it with `FetchStrategy.Full`, so the
+ * page reflects the cookies and headers at hover time.
+ */
+export declare function promotePrefetchCacheEntryForNavigation(cacheKey: string, entry: PrefetchCacheEntry): void;
 export declare function invalidatePrefetchCache(): void;
 /**
  * Prevent completed navigation responses from becoming authoritative again
@@ -206,7 +226,7 @@ export declare function fetchRouteTreeGatedPrefetch(options: {
  */
 export declare function prefetchRscResponse(rscUrl: string, fetchPromise: Promise<Response>, interceptionContext?: string | null, mountedSlotsHeader?: string | null, options?: PrefetchOptions, behavior?: {
   cacheForNavigation?: boolean;
-  dynamicStaleTime?: "verbatim" | "full-prefetch" | "ignore";
+  dynamicStaleTime?: AppRoutePrefetchPolicy["dynamicStaleTime"];
   fallbackTtlMs?: number;
   optimisticRouteShell?: boolean;
   prefetchKind?: PrefetchCacheKind;

package/dist/shims/navigation.js

@@ -70,9 +70,9 @@ function useChildSegments(parallelRoutesKey = "children") {
 		return [];
 	}
 }
-const _READONLY_SEARCH_PARAMS = Symbol("vinext.navigation.readonlySearchParams");
-const _READONLY_SEARCH_PARAMS_SOURCE = Symbol("vinext.navigation.readonlySearchParamsSource");
-const _READONLY_SEARCH_PARAMS_SOURCE_KEY = Symbol("vinext.navigation.readonlySearchParamsSourceKey");
+const _READONLY_SEARCH_PARAMS = Symbol.for("vinext.navigation.readonlySearchParams");
+const _READONLY_SEARCH_PARAMS_SOURCE = Symbol.for("vinext.navigation.readonlySearchParamsSource");
+const _READONLY_SEARCH_PARAMS_SOURCE_KEY = Symbol.for("vinext.navigation.readonlySearchParamsSourceKey");
 const PAGES_NAVIGATION_NOTIFY_KEY = Symbol.for("vinext.navigation.pagesNavigationNotify");
 const isServer = typeof window === "undefined";
 /** basePath from next.config.js, injected by the plugin at build time */
@@ -296,9 +296,11 @@ function findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mounte
 function hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext = null, mountedSlotsHeader = null, options = {}) {
 	const match = findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader, options.additionalRscUrls);
 	if (match === null) return false;
+	if (match.entry.pending !== void 0 && options.reusePending === false) return false;
 	if (match.entry.pending !== void 0 || resolvePrefetchCacheEntryExpiresAt(match.entry) > Date.now()) {
 		touchPrefetchCacheEntry(getPrefetchCache(), match.cacheKey, match.entry);
 		attachPrefetchInvalidationToEntry(match.cacheKey, match.entry, options.onInvalidate);
+		options.onReuse?.(match.entry, match.cacheKey);
 		return true;
 	}
 	deletePrefetchCacheEntry(getPrefetchCache(), getPrefetchedUrls(), match.cacheKey, match.entry, options.notifyInvalidation ?? true);
@@ -494,7 +496,7 @@ function deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, notify) {
 		entry.onInvalidateCallbacks = void 0;
 	}
 }
-function discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext = null) {
+function discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext = null, mountedSlotsHeader = null) {
 	const cache = getPrefetchCache();
 	const prefetched = getPrefetchedUrls();
 	const normalizedTarget = normalizeRscCacheLookupUrl(rscUrl);
@@ -505,6 +507,7 @@ function discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext = nul
 		const source = parsePrefetchCacheKey(cacheKey);
 		if (source.interceptionContext !== interceptionContext) continue;
 		if (normalizeRscCacheLookupUrl(source.rscUrl) !== normalizedTarget) continue;
+		if (!isPrefetchCacheEntryCompatibleWithMountedSlots(entry, mountedSlotsHeader)) continue;
 		superseded.push([cacheKey, entry]);
 	}
 	for (const [cacheKey, entry] of superseded) {
@@ -513,6 +516,25 @@ function discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext = nul
 	}
 	return superseded.length > 0;
 }
+/**
+* Make a prefetch reusable by a navigation, as an `unstable_dynamicOnHover`
+* hover does. A pending one that would be kept as learning-only becomes a full
+* prefetch and takes the full-prefetch lifetime. One already kept as
+* learning-only because its page rendered dynamically is left for the full
+* prefetch to replace: Next.js refetches it with `FetchStrategy.Full`, so the
+* page reflects the cookies and headers at hover time.
+*/
+function promotePrefetchCacheEntryForNavigation(cacheKey, entry) {
+	if (entry.dynamicStaleTime !== "learning-only") {
+		entry.cacheForNavigation = true;
+		return;
+	}
+	if (entry.cacheForNavigation === false) return;
+	entry.dynamicStaleTime = "full-prefetch";
+	if (entry.snapshot === void 0) return;
+	entry.expiresAt = resolvePrefetchedRscResponseExpiresAt(entry.timestamp, entry.snapshot, entry.fallbackTtlMs ?? PREFETCH_CACHE_TTL, "full-prefetch");
+	schedulePrefetchInvalidation(cacheKey, entry);
+}
 function invalidatePrefetchCacheEntry(cacheKey) {
 	const cache = getPrefetchCache();
 	const entry = cache.get(cacheKey);
@@ -837,6 +859,10 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 		searchAgnosticShell: behavior.searchAgnosticShell === true,
 		timestamp: now
 	};
+	if (behavior.dynamicStaleTime === "learning-only" && behavior.searchAgnosticShell !== true) {
+		entry.dynamicStaleTime = "learning-only";
+		entry.fallbackTtlMs = behavior.fallbackTtlMs ?? PREFETCH_CACHE_TTL;
+	}
 	addPrefetchInvalidationCallback(entry, options?.onInvalidate);
 	entry.fetchPromise = fetchPromise;
 	entry.pending = fetchPromise.then(async (response) => {
@@ -847,8 +873,13 @@ 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, behavior.searchAgnosticShell === true ? "ignore" : behavior.dynamicStaleTime ?? (behavior.optimisticRouteShell === true ? "ignore" : "verbatim"));
-			if (behavior.prepareSnapshot && snapshot.redirectHeader === void 0) try {
+			const fallbackTtlMs = behavior.fallbackTtlMs ?? PREFETCH_CACHE_TTL;
+			const dynamicStaleTime = behavior.searchAgnosticShell === true ? "ignore" : entry.dynamicStaleTime ?? behavior.dynamicStaleTime ?? (behavior.optimisticRouteShell === true ? "ignore" : "verbatim");
+			if (dynamicStaleTime === "learning-only" && isStaleTimeSeconds(snapshot.dynamicStaleTimeSeconds)) {
+				entry.cacheForNavigation = false;
+				entry.expiresAt = entry.timestamp + Math.max(fallbackTtlMs, MIN_PREFETCH_STALE_TIME_MS);
+			} else entry.expiresAt = resolvePrefetchedRscResponseExpiresAt(entry.timestamp, entry.snapshot, fallbackTtlMs, dynamicStaleTime === "learning-only" ? "verbatim" : dynamicStaleTime);
+			if (behavior.prepareSnapshot && entry.cacheForNavigation && snapshot.redirectHeader === void 0) try {
 				const preparedElements = await behavior.prepareSnapshot(snapshot);
 				if (cache.get(cacheKey) !== entry) return;
 				entry.preparedElements = preparedElements;
@@ -952,8 +983,12 @@ async function consumePrefetchResponseForNavigation(rscUrl, interceptionContext
 	if (options?.shouldConsume?.() === false) return null;
 	const allowExpiredInFlightHandoff = entry.pending !== void 0;
 	if (entry.pending !== void 0) {
-		promoteAppPrefetchFetch(entry.fetchPromise);
-		await entry.pending.catch(() => {});
+		const releaseClaim = promoteAppPrefetchFetch(entry.fetchPromise, options?.shouldConsume);
+		try {
+			await entry.pending.catch(() => {});
+		} finally {
+			releaseClaim();
+		}
 		if (cache.get(cacheKey) !== entry) return null;
 		if (options?.shouldConsume?.() === false) return null;
 	}
@@ -1040,14 +1075,31 @@ let _cachedEmptyClientSearchParams = null;
 * be visible until the next commit.
 */
 function getSearchParamsSnapshot() {
-	if (getNavigationContext()) return getServerSearchParamsSnapshot();
+	const hasAppContext = getNavigationContext() !== null;
 	const pagesCtx = getPagesNavigationContext();
-	if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
-	const cached = getClientNavigationState()?.cachedReadonlySearchParams;
-	if (cached) return cached;
+	if (!hasAppContext && pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
+	const state = getClientNavigationState();
+	if (state) {
+		if (hasAppContext) adoptHydrationSearchParams(state);
+		return state.cachedReadonlySearchParams;
+	}
 	if (_cachedEmptyClientSearchParams === null) _cachedEmptyClientSearchParams = new ReadonlyURLSearchParams();
 	return _cachedEmptyClientSearchParams;
 }
+let _comparedHydrationSearchParams = null;
+/**
+* Keep the hydrated search params object when the browser URL has the same
+* query. React compares the two snapshots by identity once hydrated, so a new
+* object would re-render every useSearchParams() caller and re-run effects
+* keyed on it, where Next.js keeps one object from the first render.
+*/
+function adoptHydrationSearchParams(state) {
+	const hydrated = getServerSearchParamsSnapshot();
+	if (hydrated === state.cachedReadonlySearchParams) return;
+	if (hydrated === _comparedHydrationSearchParams) return;
+	_comparedHydrationSearchParams = hydrated;
+	if (hydrated.toString() === state.cachedReadonlySearchParams.toString()) state.cachedReadonlySearchParams = hydrated;
+}
 function syncCommittedUrlStateFromLocation() {
 	const state = getClientNavigationState();
 	if (!state) return false;
@@ -1635,7 +1687,7 @@ const _appRouter = {
 			const kind = options?.kind === "full" ? "full" : "auto";
 			const [{ resolveAutoAppRoutePrefetch, resolveFullAppRoutePrefetch }, { resolveAppPrefetchRscRequest }] = await Promise.all([import("./internal/app-route-prefetch-policy.js"), import("./internal/app-prefetch-rsc-request.js")]);
 			if (setup.cancelled) return;
-			const policy = kind === "full" ? resolveFullAppRoutePrefetch() : resolveAutoAppRoutePrefetch(rewrittenPrefetchHref ?? fullHref);
+			const policy = kind === "full" ? resolveFullAppRoutePrefetch() : resolveAutoAppRoutePrefetch(rewrittenPrefetchHref ?? fullHref, interceptionContext);
 			const reusable = policy.shouldPrefetch && policy.cacheForNavigation;
 			const requiresRouteTreePrefetch = policy.requiresRouteTreePrefetch === true;
 			if (reusable && kind === "full") headers.delete(NEXT_ROUTER_PREFETCH_HEADER);
@@ -1647,7 +1699,7 @@ const _appRouter = {
 			if (!reusable && kind === "auto") {
 				headers.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
 				headers.set(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, "1");
-				headers.set(VINEXT_RSC_RENDER_MODE_HEADER, hasSearchParams ? APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL : APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL);
+				headers.set(VINEXT_RSC_RENDER_MODE_HEADER, hasSearchParams && policy.rendersDynamically !== true ? APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL : APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL);
 			}
 			const { additionalRscUrls, rscUrl } = await resolveAppPrefetchRscRequest({
 				fullHref,
@@ -1657,15 +1709,17 @@ const _appRouter = {
 			if (setup.cancelled) return;
 			const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 			const prefetched = getPrefetchedUrls();
+			if (policy.dynamicStaleTime !== "full-prefetch" && hasFreshLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext)) {
+				attachPrefetchInvalidationCallback(cacheKey, options?.onInvalidate);
+				return;
+			}
 			if (reusable) {
-				discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext);
+				discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext, mountedSlotsHeader);
 				if (hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader, {
 					additionalRscUrls,
-					onInvalidate: options?.onInvalidate
+					onInvalidate: options?.onInvalidate,
+					onReuse: policy.dynamicStaleTime === "full-prefetch" ? (entry, matchedCacheKey) => promotePrefetchCacheEntryForNavigation(matchedCacheKey, entry) : void 0
 				})) return;
-			} else if (hasFreshLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext)) {
-				attachPrefetchInvalidationCallback(cacheKey, options?.onInvalidate);
-				return;
 			}
 			prefetched.add(cacheKey);
 			const fetchFullRscPayload = () => scheduleAppPrefetchFetch((signal) => fetch(rscUrl, {
@@ -1860,4 +1914,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, createAppPrefetchRequestHeaders, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getFreshPrefetchCacheEntry, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasFreshLearningOnlyPrefetchCacheEntry, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, parseRenderedPathAndSearchHeader, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, prepareNavigationPrefetchSnapshot, 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, disableNavigationResponsePrefetchCacheReuse, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getFreshPrefetchCacheEntry, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasFreshLearningOnlyPrefetchCacheEntry, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, parseRenderedPathAndSearchHeader, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, prepareNavigationPrefetchSnapshot, promotePrefetchCacheEntryForNavigation, 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/pages-router-runtime.d.ts

@@ -8,4 +8,5 @@ export declare function setPagesRouterPopStateHandler(handler: PagesRouterPopSta
  */
 export declare function setStampInitialHistoryState(fn: () => void): void;
 export declare function installPagesRouterRuntime(): void;
-//#endregion
+//#endregion
+export {};

package/dist/shims/ppr-fallback-shell.d.ts

@@ -29,4 +29,5 @@ export declare function waitForPprFallbackShellCacheReady(state: PprFallbackShel
 export declare function preparePprFallbackShellFinalRender(state: PprFallbackShellState): void;
 export declare function beginPprFallbackShellFinalRender(state: PprFallbackShellState): void;
 export declare function isPprFallbackShellAbortError(error: unknown): boolean;
-//#endregion
+//#endregion
+export {};

package/dist/shims/router.js

@@ -1006,15 +1006,26 @@ function getClientConfigRouteContext(href) {
 		search: parsed.search
 	};
 }
+/**
+* matchRedirect has already applied basePath to a config destination, so a
+* local one that resolves outside it (`/../outside`, or a `basePath: false`
+* rule) is another app's URL. resolveLocalRedirectUrl would treat it as an app
+* path and re-add basePath, so it is followed as a document navigation instead,
+* landing where the server's redirect does.
+*/
+function configRedirectLeavesBasePath(location) {
+	if (!__basePath || !location.startsWith("/") || location.startsWith("//")) return false;
+	return !hasBasePath(new URL(location, "http://vinext.local").pathname, __basePath);
+}
 async function resolveClientConfigRedirect(href) {
 	const redirects = window.__VINEXT_CLIENT_REDIRECTS__;
 	if (!redirects || redirects.length === 0) return null;
 	const routeContext = getClientConfigRouteContext(href);
 	if (!routeContext) return null;
-	const [{ matchClientRedirect }, { preserveRedirectDestinationQuery }] = await Promise.all([import("../client/client-redirect-matcher.js"), import("../config/config-matchers.js")]);
+	const [{ matchClientRedirect }, { encodeRedirectLocation, preserveRedirectDestinationQuery }] = await Promise.all([import("../client/client-redirect-matcher.js"), import("../config/config-matchers.js")]);
 	const redirect = matchClientRedirect(routeContext.pathname, redirects, routeContext.context, routeContext.basePathState);
 	if (!redirect) return null;
-	return preserveRedirectDestinationQuery(__basePath && routeContext.basePathState.hadBasePath && !isExternalUrl(redirect.destination) && !hasBasePath(redirect.destination, __basePath) ? __basePath + redirect.destination : redirect.destination, routeContext.search, redirect.destinationQuery);
+	return encodeRedirectLocation(preserveRedirectDestinationQuery(redirect.destination, routeContext.search, redirect.destinationQuery));
 }
 async function applyClientConfigRewrite(href, rewrite) {
 	const routeContext = getClientConfigRouteContext(href);
@@ -1569,7 +1580,7 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 			const routeMasked = options.routeMasked ?? routeUrl !== url;
 			const configRedirect = hasClientRedirectRules() && clientConfigRedirectCouldMatch(browserUrl) ? await resolveClientConfigRedirect(browserUrl) : null;
 			if (configRedirect) {
-				const redirectedUrl = resolveLocalRedirectUrl(configRedirect);
+				const redirectedUrl = configRedirectLeavesBasePath(configRedirect) ? null : resolveLocalRedirectUrl(configRedirect);
 				if (!redirectedUrl) scheduleHardNavigationAndThrow(configRedirect, "Navigation redirected externally");
 				throw new InternalNavigationRedirect(redirectedUrl);
 			}

package/dist/shims/unified-request-context.js

@@ -1,5 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { isFullyBufferedBody, markFullyBufferedBody, preserveFullyBufferedBodyMetadata } from "../server/fully-buffered-response.js";
+import { deferUntilStreamConsumed } from "../server/defer-until-stream-consumed.js";
 //#region src/shims/unified-request-context.ts
 const _REQUEST_CONTEXT_ALS_KEY = Symbol.for("vinext.requestContext.als");
 const _g = globalThis;
@@ -161,9 +162,8 @@ function closeAfterResponseWithBody(response, ctx) {
 		return response;
 	}
 	if (isFullyBufferedBody(response) && !requiresResponseCloseTracking(ctx)) return response;
-	const passthrough = new TransformStream();
-	response.body.pipeTo(passthrough.writable).then(() => void closeAfterResponse(ctx), () => void closeAfterResponse(ctx));
-	const wrapped = new Response(passthrough.readable, {
+	const body = deferUntilStreamConsumed(response.body, () => void closeAfterResponse(ctx));
+	const wrapped = new Response(body, {
 		status: response.status,
 		statusText: response.statusText,
 		headers: response.headers

package/dist/typegen.d.ts

@@ -10,4 +10,5 @@ export type GenerateRouteTypesResult = {
   nextEnvStatus: "created" | "updated" | "unchanged";
 };
 export declare function generateRouteTypes(options: GenerateRouteTypesOptions): Promise<GenerateRouteTypesResult>;
-//#endregion
+//#endregion
+export {};

package/dist/utils/client-build-manifest.d.ts

@@ -4,6 +4,8 @@ type ClientBuildManifest = Record<string, BuildManifestChunk>;
 export declare function readClientBuildManifest(manifestPath: string): ClientBuildManifest | undefined;
 export declare function findClientEntryFileFromManifest(buildManifest: ClientBuildManifest, assetBase: string): string | undefined;
 export declare function findPagesClientEntryFileFromManifest(buildManifest: ClientBuildManifest, assetBase: string): string | undefined;
+/** Whether a build-manifest entry is the Pages Router client entry. */
+export declare function isPagesClientEntryChunk(key: string, entry: BuildManifestChunk): boolean;
 export declare function findClientEntryFile(options: {
   buildManifest?: ClientBuildManifest;
   clientDir: string;
@@ -16,4 +18,5 @@ export declare function findPagesClientEntryFile(options: {
   assetsSubdir: string;
   assetBase: string;
 }): string | undefined;
-//#endregion
+//#endregion
+export {};

package/dist/utils/client-build-manifest.js

@@ -42,7 +42,7 @@ function findPagesClientEntryFileFromManifest(buildManifest, assetBase) {
 }
 function findEntryFileFromManifest(buildManifest, assetBase, markers, fallbackToFirstEntry) {
 	const entries = Object.entries(buildManifest).filter(([, entry]) => entry.isEntry && entry.file);
-	const matchers = [(marker, key, entry) => entry.name === marker || isVirtualEntryId(key, marker) || entry.src !== void 0 && isVirtualEntryId(entry.src, marker), (marker, _key, entry) => entry.file.includes(marker)];
+	const matchers = [matchesEntryIdentity, (marker, _key, entry) => entry.file.includes(marker)];
 	for (const matches of matchers) for (const marker of markers) {
 		const markedEntry = entries.find(([key, entry]) => matches(marker, key, entry));
 		if (markedEntry) return manifestFileWithBase(markedEntry[1].file, assetBase);
@@ -50,6 +50,13 @@ function findEntryFileFromManifest(buildManifest, assetBase, markers, fallbackTo
 	const chosen = fallbackToFirstEntry ? entries[0]?.[1] : void 0;
 	return chosen ? manifestFileWithBase(chosen.file, assetBase) : void 0;
 }
+function matchesEntryIdentity(marker, key, entry) {
+	return entry.name === marker || isVirtualEntryId(key, marker) || entry.src !== void 0 && isVirtualEntryId(entry.src, marker);
+}
+/** Whether a build-manifest entry is the Pages Router client entry. */
+function isPagesClientEntryChunk(key, entry) {
+	return entry.isEntry === true && PAGES_CLIENT_ENTRY_MARKERS.some((marker) => matchesEntryIdentity(marker, key, entry));
+}
 function isVirtualEntryId(id, marker) {
 	const virtualId = `virtual:${marker}`;
 	return id === virtualId || id.endsWith(`/${virtualId}`);
@@ -92,4 +99,4 @@ function readStringArray(value) {
 	return Array.isArray(value) && value.every((item) => typeof item === "string") ? value : void 0;
 }
 //#endregion
-export { findClientEntryFile, findClientEntryFileFromManifest, findPagesClientEntryFile, findPagesClientEntryFileFromManifest, readClientBuildManifest };
+export { findClientEntryFile, findClientEntryFileFromManifest, findPagesClientEntryFile, findPagesClientEntryFileFromManifest, isPagesClientEntryChunk, readClientBuildManifest };

package/dist/utils/client-entry-manifest.d.ts

@@ -1,10 +1,23 @@
+import { ClientReferenceChunks } from "./client-reference-chunks.js";
 //#region src/utils/client-entry-manifest.d.ts
 export declare const VINEXT_CLIENT_ENTRY_MANIFEST = "vinext-client-entry-manifest.json";
+/**
+ * Build manifest keys of App Router client reference modules -> the chunk of
+ * the module that registers the reference (see build/client-reference-chunks.ts).
+ * It names source files, so it sits under `.vite/` with Vite's build manifest,
+ * which deploys leave out of the public assets.
+ */
+export declare const VINEXT_CLIENT_REFERENCE_SOURCES = ".vite/vinext-client-reference-sources.json";
 export type ClientEntryManifest = {
   pagesClientEntry?: string;
   appBrowserEntry?: string;
+  /** The App Router RouteManifest chunk, which the browser entry imports as it boots. */
+  appRouteManifest?: string;
+  /** What each App Router client reference loads in the browser. */
+  appClientReferenceChunks?: ClientReferenceChunks;
 };
 export declare function readClientEntryManifest(clientDir: string): ClientEntryManifest | undefined;
+export declare function readClientReferenceSources(clientDir: string): Record<string, string> | undefined;
 export declare function findClientEntryFileFromVinextManifest(manifest: ClientEntryManifest | undefined, assetBase: string): string | undefined;
 export declare function findPagesClientEntryFileFromVinextManifest(manifest: ClientEntryManifest | undefined, assetBase: string): string | undefined;
 //#endregion

package/dist/utils/client-entry-manifest.js

@@ -4,6 +4,13 @@ import { manifestFileWithBase } from "./manifest-paths.js";
 import fs from "node:fs";
 //#region src/utils/client-entry-manifest.ts
 const VINEXT_CLIENT_ENTRY_MANIFEST = "vinext-client-entry-manifest.json";
+/**
+* Build manifest keys of App Router client reference modules -> the chunk of
+* the module that registers the reference (see build/client-reference-chunks.ts).
+* It names source files, so it sits under `.vite/` with Vite's build manifest,
+* which deploys leave out of the public assets.
+*/
+const VINEXT_CLIENT_REFERENCE_SOURCES = ".vite/vinext-client-reference-sources.json";
 function readClientEntryManifest(clientDir) {
 	const manifestPath = path.join(clientDir, VINEXT_CLIENT_ENTRY_MANIFEST);
 	if (!fs.existsSync(manifestPath)) return void 0;
@@ -13,11 +20,23 @@ function readClientEntryManifest(clientDir) {
 		const manifest = {};
 		if (typeof value.pagesClientEntry === "string") manifest.pagesClientEntry = value.pagesClientEntry;
 		if (typeof value.appBrowserEntry === "string") manifest.appBrowserEntry = value.appBrowserEntry;
+		if (typeof value.appRouteManifest === "string") manifest.appRouteManifest = value.appRouteManifest;
+		if (isUnknownRecord(value.appClientReferenceChunks)) manifest.appClientReferenceChunks = value.appClientReferenceChunks;
 		return manifest.pagesClientEntry || manifest.appBrowserEntry ? manifest : void 0;
 	} catch {
 		return;
 	}
 }
+function readClientReferenceSources(clientDir) {
+	const sourcesPath = path.join(clientDir, VINEXT_CLIENT_REFERENCE_SOURCES);
+	if (!fs.existsSync(sourcesPath)) return void 0;
+	try {
+		const value = JSON.parse(fs.readFileSync(sourcesPath, "utf-8"));
+		return isUnknownRecord(value) ? value : void 0;
+	} catch {
+		return;
+	}
+}
 function findClientEntryFileFromVinextManifest(manifest, assetBase) {
 	const entry = manifest?.pagesClientEntry ?? manifest?.appBrowserEntry;
 	return entry ? manifestFileWithBase(entry, assetBase) : void 0;
@@ -26,4 +45,4 @@ function findPagesClientEntryFileFromVinextManifest(manifest, assetBase) {
 	return manifest?.pagesClientEntry ? manifestFileWithBase(manifest.pagesClientEntry, assetBase) : void 0;
 }
 //#endregion
-export { VINEXT_CLIENT_ENTRY_MANIFEST, findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest };
+export { VINEXT_CLIENT_ENTRY_MANIFEST, VINEXT_CLIENT_REFERENCE_SOURCES, findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest, readClientReferenceSources };