vinext 1.4.4 → 1.4.5

package/dist/shims/internal/pages-data-url.js

@@ -1,5 +1,5 @@
 import { matchRoutePattern, routePatternParts } from "../../routing/route-pattern.js";
-//#region src/shims/internal/pages-data-url.ts
+// src/shims/internal/pages-data-url.ts
 /**
 * Client-side helpers for the Pages Router `/_next/data/<buildId>/<page>.json`
 * endpoint.
@@ -68,5 +68,4 @@ function matchPagesPattern(pathname, patterns) {
 	}
 	return null;
 }
-//#endregion
 export { buildPagesDataHref, buildPagesDataPath, matchPagesPattern };

package/dist/shims/internal/pages-router-accessor.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/internal/pages-router-accessor.d.ts
 /**
  * Shared Pages Router navigation accessor.
  *
@@ -14,5 +13,4 @@ export type PagesNavigationContext = {
   searchParams: URLSearchParams;
   params: Record<string, string | string[]> | null;
 };
-export declare function getPagesNavigationContext(): PagesNavigationContext | null;
-//#endregion
+export declare function getPagesNavigationContext(): PagesNavigationContext | null;

package/dist/shims/internal/pages-router-accessor.js

@@ -1,4 +1,4 @@
-//#region src/shims/internal/pages-router-accessor.ts
+// src/shims/internal/pages-router-accessor.ts
 const PAGES_NAVIGATION_ACCESSOR_KEY = Symbol.for("vinext.navigation.pagesNavigationContextAccessor");
 function getPagesNavigationContext() {
 	const accessor = globalThis[PAGES_NAVIGATION_ACCESSOR_KEY];
@@ -9,5 +9,4 @@ function getPagesNavigationContext() {
 		return null;
 	}
 }
-//#endregion
 export { getPagesNavigationContext };

package/dist/shims/internal/pages-router-components.d.ts

@@ -1,6 +1,4 @@
-//#region src/shims/internal/pages-router-components.d.ts
 export type PagesRouterComponentsMap = Record<string, {
   __appRouter: true;
 } | Record<string, unknown>>;
-export declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;
-//#endregion
+export declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;

package/dist/shims/internal/pages-router-components.js

@@ -1,4 +1,4 @@
-//#region src/shims/internal/pages-router-components.ts
+// src/shims/internal/pages-router-components.ts
 const COMPONENTS_KEY = Symbol.for("vinext.pagesRouter.components");
 function getPagesRouterComponentsMap() {
 	const globalState = globalThis;
@@ -9,5 +9,4 @@ function getPagesRouterComponentsMap() {
 	}
 	return components;
 }
-//#endregion
 export { getPagesRouterComponentsMap };

package/dist/shims/internal/route-pattern-for-warning.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/internal/route-pattern-for-warning.d.ts
 /**
  * Side-effect-free accessor for the current render's route pattern, used by
  * Next.js-parity diagnostics such as the Link shim's
@@ -22,5 +21,4 @@
  * @internal
  */
 export declare function registerRoutePatternForWarningAccessor(accessor: () => string | null): void;
-export declare function getCurrentRoutePathnameForWarning(): string;
-//#endregion
+export declare function getCurrentRoutePathnameForWarning(): string;

package/dist/shims/internal/route-pattern-for-warning.js

@@ -1,4 +1,4 @@
-//#region src/shims/internal/route-pattern-for-warning.ts
+// src/shims/internal/route-pattern-for-warning.ts
 /**
 * Side-effect-free accessor for the current render's route pattern, used by
 * Next.js-parity diagnostics such as the Link shim's
@@ -36,5 +36,4 @@ function getCurrentRoutePathnameForWarning() {
 	}
 	return window.__NEXT_DATA__?.page ?? window.location?.pathname ?? "/";
 }
-//#endregion
 export { getCurrentRoutePathnameForWarning, registerRoutePatternForWarningAccessor };

package/dist/shims/internal/router-context.d.ts

@@ -1,5 +1,3 @@
 import { NextRouter } from "../router.js";
 import { Context } from "react";
-//#region src/shims/internal/router-context.d.ts
-export declare const RouterContext: Context<NextRouter | null>;
-//#endregion
+export declare const RouterContext: Context<NextRouter | null>;

package/dist/shims/internal/router-context.js

@@ -1,5 +1,5 @@
 import { createContext } from "react";
-//#region src/shims/internal/router-context.ts
+// src/shims/internal/router-context.ts
 /**
 * Shim for next/dist/shared/lib/router-context.shared-runtime
 *
@@ -9,5 +9,4 @@ import { createContext } from "react";
 const ROUTER_CONTEXT_KEY = Symbol.for("vinext.routerContext");
 const globalState = globalThis;
 const RouterContext = globalState[ROUTER_CONTEXT_KEY] ?? (globalState[ROUTER_CONTEXT_KEY] = createContext(null));
-//#endregion
 export { RouterContext };

package/dist/shims/internal/thenable-well-known-properties.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/internal/thenable-well-known-properties.d.ts
 declare const WELL_KNOWN_PROPERTIES: readonly ["hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable", "toString", "valueOf", "toLocaleString", "then", "catch", "finally", "status", "value", "error", "displayName", "_debugInfo", "toJSON", "$$typeof", "__esModule", "@@iterator"];
 export type WellKnownProperty = (typeof WELL_KNOWN_PROPERTIES)[number];
 export declare function isWellKnownProperty(prop: PropertyKey): boolean;
@@ -7,5 +6,4 @@ export declare function isWellKnownProperty(prop: PropertyKey): boolean;
  * proxy, not the underlying promise, so they see the param keys.
  */
 export declare function isOwnPropertyCheck(prop: PropertyKey): boolean;
-//#endregion
 export {};

package/dist/shims/internal/thenable-well-known-properties.js

@@ -1,4 +1,4 @@
-//#region src/shims/internal/thenable-well-known-properties.ts
+// src/shims/internal/thenable-well-known-properties.ts
 const wellKnownProperties = /* @__PURE__ */ new Set([
 	"hasOwnProperty",
 	"isPrototypeOf",
@@ -29,5 +29,4 @@ function isWellKnownProperty(prop) {
 function isOwnPropertyCheck(prop) {
 	return prop === "hasOwnProperty" || prop === "propertyIsEnumerable";
 }
-//#endregion
 export { isOwnPropertyCheck, isWellKnownProperty };

package/dist/shims/internal/utils.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/internal/utils.d.ts
 /**
  * Shim for next/dist/shared/lib/utils
  *
@@ -47,5 +46,4 @@ export declare function execOnce<T extends (...args: unknown[]) => unknown>(fn:
 export declare function getLocationOrigin(): string;
 export declare function getURL(): string;
 export declare const SP: boolean;
-export declare const ST: boolean;
-//#endregion
+export declare const ST: boolean;

package/dist/shims/internal/utils.js

@@ -1,4 +1,4 @@
-//#region src/shims/internal/utils.ts
+// src/shims/internal/utils.ts
 /**
 * Standard Next.js error shape.
 */
@@ -23,5 +23,4 @@ function getURL() {
 }
 const SP = typeof performance !== "undefined";
 const ST = SP && typeof performance.mark === "function";
-//#endregion
 export { SP, ST, execOnce, getLocationOrigin, getURL };

package/dist/shims/internal/work-store-scope.d.ts

@@ -1,5 +1,3 @@
-//#region src/shims/internal/work-store-scope.d.ts
 export declare function runInWorkStoreScope<T>(fn: () => T): T;
 export declare function runOutsideWorkStoreScope<T>(fn: () => T): T;
-export declare function isInsideWorkStoreScope(): boolean;
-//#endregion
+export declare function isInsideWorkStoreScope(): boolean;

package/dist/shims/internal/work-store-scope.js

@@ -1,5 +1,5 @@
 import { getOrCreateAls } from "./als-registry.js";
-//#region src/shims/internal/work-store-scope.ts
+// src/shims/internal/work-store-scope.ts
 /**
 * Marks the work that Next.js runs with a work store (`workAsyncStorage`):
 * App Router renders, Server Actions, route handlers and metadata routes,
@@ -20,5 +20,4 @@ function runOutsideWorkStoreScope(fn) {
 function isInsideWorkStoreScope() {
 	return _workStoreScopeAls.getStore() === true;
 }
-//#endregion
 export { isInsideWorkStoreScope, runInWorkStoreScope, runOutsideWorkStoreScope };

package/dist/shims/internal/work-unit-async-storage.d.ts

@@ -1,5 +1,4 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-//#region src/shims/internal/work-unit-async-storage.d.ts
 export type RequestStore = {
   readonly type: "request";
 };
@@ -28,5 +27,4 @@ export type PrerenderLegacyStore = {
 export type WorkUnitStore = RequestStore | PrerenderStore | CacheStore | GenerateStaticParamsStore | PrerenderLegacyStore;
 export type WorkUnitAsyncStorage = AsyncLocalStorage<WorkUnitStore>;
 export declare const workUnitAsyncStorage: WorkUnitAsyncStorage;
-export declare const requestAsyncStorage: WorkUnitAsyncStorage;
-//#endregion
+export declare const requestAsyncStorage: WorkUnitAsyncStorage;

package/dist/shims/internal/work-unit-async-storage.js

@@ -1,6 +1,6 @@
 import { registerAlsForScopeExit } from "./als-registry.js";
 import { AsyncLocalStorage } from "node:async_hooks";
-//#region src/shims/internal/work-unit-async-storage.ts
+// src/shims/internal/work-unit-async-storage.ts
 /**
 * Shim for next/dist/server/app-render/work-unit-async-storage.external
 * and next/dist/client/components/request-async-storage.external
@@ -15,5 +15,4 @@ import { AsyncLocalStorage } from "node:async_hooks";
 const workUnitAsyncStorage = new AsyncLocalStorage();
 registerAlsForScopeExit(workUnitAsyncStorage);
 const requestAsyncStorage = workUnitAsyncStorage;
-//#endregion
 export { requestAsyncStorage, workUnitAsyncStorage };

package/dist/shims/layout-segment-context.d.ts

@@ -1,7 +1,6 @@
 import { SegmentMap } from "./navigation-context-state.js";
 import "./navigation-server.js";
 import { ReactNode } from "react";
-//#region src/shims/layout-segment-context.d.ts
 export declare function mergeLayoutSegmentMap(previous: SegmentMap | null, next: SegmentMap): SegmentMap;
 /**
  * Wraps children with the layout segment context.
@@ -18,5 +17,4 @@ export declare function LayoutSegmentProvider({ providerId, segmentMap, children
   providerId?: string;
   segmentMap: SegmentMap;
   children: ReactNode;
-}): string | number | bigint | boolean | import("react").FunctionComponentElement<import("react").ProviderProps<SegmentMap>> | Iterable<ReactNode> | Promise<string | number | bigint | boolean | Iterable<ReactNode> | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | import("react").ReactPortal | null | undefined> | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | null | undefined;
-//#endregion
+}): string | number | bigint | boolean | import("react").FunctionComponentElement<import("react").ProviderProps<SegmentMap>> | Iterable<ReactNode> | Promise<string | number | bigint | boolean | Iterable<ReactNode> | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | import("react").ReactPortal | null | undefined> | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | null | undefined;

package/dist/shims/layout-segment-context.js

@@ -2,7 +2,7 @@
 import { getLayoutSegmentContext } from "./navigation-context-state.js";
 import "./navigation-server.js";
 import { createElement, useEffect, useRef } from "react";
-//#region src/shims/layout-segment-context.tsx
+// src/shims/layout-segment-context.tsx
 /**
 * Layout segment context provider.
 *
@@ -49,5 +49,4 @@ function LayoutSegmentProvider({ providerId, segmentMap, children }) {
 	if (!ctx) return children;
 	return createElement(ctx.Provider, { value: mergedSegmentMap }, children);
 }
-//#endregion
 export { LayoutSegmentProvider, mergeLayoutSegmentMap };

package/dist/shims/legacy-image.d.ts

@@ -1,6 +1,4 @@
 import React from "react";
 import { ImageLoader, ImageLoaderProps, ImageProps } from "@vinext/types/next/upstream/dist/client/legacy/image";
-//#region src/shims/legacy-image.d.ts
 declare function LegacyImage(props: ImageProps): React.ReactElement;
-//#endregion
 export { type ImageLoader, type ImageLoaderProps, type ImageProps, LegacyImage as default };

package/dist/shims/legacy-image.js

@@ -1,7 +1,7 @@
 import Image from "./image.js";
 import "react";
 import { jsx } from "react/jsx-runtime";
-//#region src/shims/legacy-image.tsx
+// src/shims/legacy-image.tsx
 function LegacyImage(props) {
 	const { layout = "intrinsic", objectFit, objectPosition, onLoadingComplete, onLoad, alt, width, height, style, lazyRoot: _lazyRoot, lazyBoundary: _lazyBoundary, ...rest } = props;
 	const modernStyle = { ...style };
@@ -35,5 +35,4 @@ function LegacyImage(props) {
 		...rest
 	});
 }
-//#endregion
 export { LegacyImage as default };

package/dist/shims/link-prefetch.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/link-prefetch.d.ts
 export type LinkPrefetchIntent = "viewport" | "intent";
 export type LinkPrefetchPriority = "low" | "high";
 export type LinkPrefetchRouterMode = "app" | "pages";
@@ -36,5 +35,4 @@ export declare function getLinkPrefetchHref(input: {
   href: string;
   basePath: string;
   currentOrigin: string | undefined;
-}): string | null;
-//#endregion
+}): string | null;

package/dist/shims/link-prefetch.js

@@ -1,6 +1,6 @@
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { collapseLeadingSlashes, isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
-//#region src/shims/link-prefetch.ts
+// src/shims/link-prefetch.ts
 function canLinkPrefetch(input) {
 	return input.nodeEnv === "production" && input.prefetch !== false && !input.isDangerous;
 }
@@ -40,5 +40,4 @@ function getLinkPrefetchHref(input) {
 		return null;
 	}
 }
-//#endregion
 export { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchDecision, getLinkPrefetchHref };

package/dist/shims/link.d.ts

@@ -2,7 +2,6 @@ import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
 import { canAutoPrefetchFullAppRoute, resolveAutoAppRoutePrefetch } from "./internal/app-route-prefetch-policy.js";
 import { UrlObject } from "node:url";
 import React, { AnchorHTMLAttributes } from "react";
-//#region src/shims/link.d.ts
 export type LinkProps<_RouteInferType = unknown> = {
   href: string | UrlObject;
   /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
@@ -101,5 +100,4 @@ declare const Link: React.ForwardRefExoticComponent<{
   transitionTypes?: string[];
   children?: React.ReactNode;
 } & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, "href"> & React.RefAttributes<HTMLAnchorElement>>;
-//#endregion
 export { canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch };

package/dist/shims/link.js

@@ -1,26 +1,26 @@
 "use client";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { NAVIGATION_RUNTIME_KEY, getNavigationRuntime, isNavigationRuntimeFunctions, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "./url-safety.js";
+import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
+import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toCanonicalBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
-import { RouterContext } from "./internal/router-context.js";
+import { getI18nContext } from "./i18n-context.js";
+import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
-import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
-import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toCanonicalBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { interpolateDynamicRouteHref, resolveDynamicRouteHref } from "./internal/interpolate-as.js";
-import { formatUrlObject, formatUrlObjectWithValidation } from "./internal/format-url-object.js";
-import { normalizeRouterHref, resolvePagesRouterHref } from "./internal/normalize-router-href.js";
-import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
-import { getCurrentBrowserLocale } from "./client-locale.js";
-import { NAVIGATION_RUNTIME_KEY, getNavigationRuntime, isNavigationRuntimeFunctions, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
-import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
-import { cancelQueuedAppPrefetchFetch, getAppPrefetchFetchClaimSequence, isAppPrefetchFetchClaimed, scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
-import { getI18nContext } from "./i18n-context.js";
-import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
+import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
 import { canAutoPrefetchFullAppRoute, resolveAutoAppRoutePrefetch, resolveFullAppRoutePrefetch } from "./internal/app-route-prefetch-policy.js";
+import { RouterContext } from "./internal/router-context.js";
+import { getCurrentBrowserLocale } from "./client-locale.js";
 import { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation } from "./internal/link-status-registry.js";
+import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
+import { normalizeRouterHref, resolvePagesRouterHref } from "./internal/normalize-router-href.js";
+import { formatUrlObject, formatUrlObjectWithValidation } from "./internal/format-url-object.js";
+import { cancelQueuedAppPrefetchFetch, getAppPrefetchFetchClaimSequence, isAppPrefetchFetchClaimed, scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
 import React, { createContext, forwardRef, useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
-//#region src/shims/link.tsx
+// src/shims/link.tsx
 /**
 * next/link shim
 *
@@ -36,7 +36,7 @@ let navigationModulePromise = null;
 let loadedHybridClientRouteOwnerModule = null;
 let hybridClientRouteOwnerModulePromise = null;
 function loadNavigationModule() {
-	return navigationModulePromise ??= import("./navigation.js").then((module) => {
+	return navigationModulePromise ??= import("./app-router-navigation.js").then((module) => {
 		loadedNavigationModule = module;
 		return module;
 	});
@@ -47,14 +47,18 @@ function loadHybridClientRouteOwnerModule() {
 		return module;
 	});
 }
+let appElementsModulePromise = null;
 let appRscCacheBustingModulePromise = null;
 let appPrefetchModulesPromise = null;
+function loadAppElementsModule() {
+	return appElementsModulePromise ??= import("../server/app-elements.js");
+}
 function loadAppRscCacheBustingModule() {
 	return appRscCacheBustingModulePromise ??= import("../server/app-rsc-cache-busting.js");
 }
 function loadAppPrefetchModules() {
 	return appPrefetchModulesPromise ??= Promise.all([
-		import("../server/app-elements.js"),
+		loadAppElementsModule(),
 		loadAppRscCacheBustingModule(),
 		import("./internal/app-prefetch-rsc-request.js"),
 		import("../server/app-rsc-render-mode.js"),
@@ -205,13 +209,12 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 				if (!autoPrefetch.shouldPrefetch) return;
 				const isOptimisticRouteShellPrefetch = !autoPrefetch.cacheForNavigation;
 				const hasSearchParams = new URL(fullHref, window.location.href).search !== "";
-				const isAutomaticSearchParamShell = mode === "auto" && isOptimisticRouteShellPrefetch && hasSearchParams;
-				const hasSearchAgnosticShell = isAutomaticSearchParamShell && (autoPrefetch.rendersDynamically === true || hasSearchAgnosticPrefetchShellForRoute(await createRscRequestUrl(fullHref, new Headers()), interceptionContext, mountedSlotsHeader));
+				const fetchesDynamicShell = mode === "auto" && isOptimisticRouteShellPrefetch && hasSearchParams && String(process.env.__NEXT_CACHE_COMPONENTS) === "true" && autoPrefetch.rendersDynamically !== true && !hasSearchAgnosticPrefetchShellForRoute(await createRscRequestUrl(fullHref, new Headers()), interceptionContext, mountedSlotsHeader);
 				const headers = createAppPrefetchRequestHeaders({
 					interceptionContext,
 					fetchPriority: priority,
 					prefetchKind: mode === "full" || mode === "full-after-shell" ? "full" : "auto",
-					renderMode: isOptimisticRouteShellPrefetch ? hasSearchAgnosticShell ? APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL : isAutomaticSearchParamShell ? APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL : APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL : void 0
+					renderMode: isOptimisticRouteShellPrefetch ? fetchesDynamicShell ? APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL : APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL : void 0
 				});
 				if (mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
 				const shouldSendSegmentPrefetchHeaders = isOptimisticRouteShellPrefetch || mode === "auto";
@@ -237,12 +240,10 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 				}
 				if (autoPrefetch.cacheForNavigation) discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext, mountedSlotsHeader);
 				const owned = createOwnedLinkPrefetch(owner);
-				const fetchFullRscPayload = () => scheduleOwnedLinkPrefetch(owned, (signal) => fetch(rscUrl, {
+				const fetchFullRscPayload = () => scheduleOwnedLinkPrefetch(owned, (signal) => fetchAppPrefetch(rscUrl, {
 					headers,
-					credentials: "include",
 					priority,
-					signal,
-					purpose: "prefetch"
+					signal
 				}), priority);
 				const fetchLoadingShellForReuse = async () => {
 					const shellHeaders = createAppPrefetchRequestHeaders({
@@ -262,12 +263,10 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 					if (shellEntry === void 0) {
 						getPrefetchedUrls().add(shellCacheKey);
 						const shellOwned = createOwnedLinkPrefetch(owner);
-						const shellFetchPromise = scheduleOwnedLinkPrefetch(shellOwned, (signal) => fetch(shellRscUrl, {
+						const shellFetchPromise = scheduleOwnedLinkPrefetch(shellOwned, (signal) => fetchAppPrefetch(shellRscUrl, {
 							headers: shellHeaders,
-							credentials: "include",
 							priority,
-							signal,
-							purpose: "prefetch"
+							signal
 						}), priority);
 						trackOwnedLinkPrefetch(shellOwned, shellFetchPromise);
 						prefetchRscResponse(shellRscUrl, shellFetchPromise, interceptionContext, mountedSlotsHeader, void 0, {
@@ -291,12 +290,10 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 					const ownerLeaveCount = owner?.leaveCount;
 					const probeRscUrl = await createRscRequestUrl(fullHref, probeHeaders);
 					if (owner && owner.leaveCount !== ownerLeaveCount) throw new DOMException("Prefetch is no longer wanted", "AbortError");
-					return fetch(probeRscUrl, {
+					return fetchAppPrefetch(probeRscUrl, {
 						method: "HEAD",
 						headers: probeHeaders,
-						credentials: "include",
-						priority,
-						purpose: "prefetch"
+						priority
 					});
 				};
 				const onReuse = (entry, matchedCacheKey) => {
@@ -327,12 +324,10 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 					}
 					return fetchRouteTreeGatedPrefetch({
 						fetchFullRscPayload,
-						fetchRouteTree: (routeTreeRscUrl, routeTreeHeaders) => scheduleOwnedLinkPrefetch(owned, (signal) => fetch(routeTreeRscUrl, {
+						fetchRouteTree: (routeTreeRscUrl, routeTreeHeaders) => scheduleOwnedLinkPrefetch(owned, (signal) => fetchAppPrefetch(routeTreeRscUrl, {
 							headers: routeTreeHeaders,
-							credentials: "include",
 							priority,
-							signal,
-							purpose: "prefetch"
+							signal
 						}), priority),
 						fullHref,
 						headers,
@@ -349,7 +344,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 					optimisticRouteShell: isOptimisticRouteShellPrefetch,
 					prefetchKind: isOptimisticRouteShellPrefetch ? "loading-shell" : "navigation",
 					prepareSnapshot: autoPrefetch.cacheForNavigation ? prepareNavigationPrefetchSnapshot : void 0,
-					searchAgnosticShell: isAutomaticSearchParamShell && !hasSearchAgnosticShell
+					searchAgnosticShell: fetchesDynamicShell
 				});
 			} else if (HAS_PAGES_ROUTER && window.__NEXT_DATA__) {
 				const dataTarget = resolvePagesDataNavigationTarget(fullRouteHref, __basePath, { locale });
@@ -381,7 +376,11 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 async function promotePrefetchEntriesForNavigation(href) {
 	if (typeof window === "undefined") return;
 	if (!hasLinkAppNavigationRuntime()) return;
-	const [{ getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, promotePrefetchCacheEntryForNavigation }, { parseRscRequestPath, stripRscCacheBustingSearchParam }] = await Promise.all([loadNavigationModule(), loadAppRscCacheBustingModule()]);
+	const [{ getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, promotePrefetchCacheEntryForNavigation }, { parseRscRequestPath, stripRscCacheBustingSearchParam }, { AppElementsWire }] = await Promise.all([
+		loadNavigationModule(),
+		loadAppRscCacheBustingModule(),
+		loadAppElementsModule()
+	]);
 	let target;
 	const fullHref = toCanonicalBrowserNavigationHref(href, window.location.href, __basePath, __trailingSlash);
 	try {
@@ -395,9 +394,8 @@ async function promotePrefetchEntriesForNavigation(href) {
 		if (entry.optimisticRouteShell === true) continue;
 		if (entry.prefetchKind === "route-tree") continue;
 		if ((entry.mountedSlotsHeader ?? null) !== mountedSlotsHeader) continue;
-		const separatorIndex = cacheKey.indexOf("\0");
-		const rscUrl = separatorIndex === -1 ? cacheKey : cacheKey.slice(0, separatorIndex);
-		if ((separatorIndex === -1 ? null : cacheKey.slice(separatorIndex + 1)) !== interceptionContext) continue;
+		const { interceptionContext: cacheKeyInterceptionContext, rscUrl } = AppElementsWire.decodeCacheKey(cacheKey);
+		if (cacheKeyInterceptionContext !== interceptionContext) continue;
 		let cached;
 		try {
 			cached = parseRscRequestPath(rscUrl);
@@ -418,6 +416,14 @@ const visibleLinkPrefetches = /* @__PURE__ */ new Set();
 const visibleAppPrefetchQueue = [];
 let visibleAppPrefetchDrainScheduled = false;
 const ownedLinkPrefetches = /* @__PURE__ */ new WeakMap();
+/** Send an App Router prefetch request with the credentials and hints all stages share. */
+function fetchAppPrefetch(url, init) {
+	return fetch(url, {
+		...init,
+		credentials: "include",
+		purpose: "prefetch"
+	});
+}
 function createOwnedLinkPrefetch(owner) {
 	if (owner === void 0) return void 0;
 	return {
@@ -596,6 +602,12 @@ function resolveConcreteRouteHref(href, as) {
 	if (typeof as !== "string") return null;
 	return interpolateDynamicRouteHref(href, as)?.href || null;
 }
+/** Point Link's internal anchor ref and the user's ref at the same node. */
+function setAnchorRefs(internalRef, ref, node) {
+	internalRef.current = node;
+	if (typeof ref === "function") ref(node);
+	else if (ref) ref.current = node;
+}
 const Link = forwardRef(function Link({ href, as, replace = false, prefetch: prefetchProp, scroll = true, shallow = false, children: childrenProp, onClick, onMouseEnter, onTouchStart, onNavigate, unstable_dynamicOnHover = false, legacyBehavior = false, passHref = false, transitionTypes: _transitionTypes, locale, ...anchorProps }, forwardedRef) {
 	const pagesRouter = useContext(RouterContext);
 	const hrefStr = resolvePagesLinkValue(href, pagesRouter);
@@ -647,11 +659,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		prefetch: effectivePrefetchProp,
 		isDangerous: isPrefetchDangerous
 	});
-	const setRefs = useCallback((node) => {
-		internalRef.current = node;
-		if (typeof forwardedRef === "function") forwardedRef(node);
-		else if (forwardedRef) forwardedRef.current = node;
-	}, [forwardedRef]);
+	const setRefs = useCallback((node) => setAnchorRefs(internalRef, forwardedRef, node), [forwardedRef]);
 	useLayoutEffect(() => {
 		if (!shouldViewportPrefetch || typeof window === "undefined") return;
 		const node = internalRef.current;
@@ -833,11 +841,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			const child = React.Children.only(children);
 			const childOnClick = child.props.onClick;
 			const childRef = child.props.ref;
-			const setDangerousRefs = (node) => {
-				internalRef.current = node;
-				if (typeof childRef === "function") childRef(node);
-				else if (childRef) childRef.current = node;
-			};
+			const setDangerousRefs = (node) => setAnchorRefs(internalRef, childRef, node);
 			const dangerousChild = React.cloneElement(child, {
 				ref: setDangerousRefs,
 				onClick: (event) => {
@@ -875,11 +879,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		const childOnMouseEnter = childPropsExisting.onMouseEnter;
 		const childOnTouchStart = childPropsExisting.onTouchStart;
 		const childRef = childPropsExisting.ref;
-		const setLegacyRefs = (node) => {
-			internalRef.current = node;
-			if (typeof childRef === "function") childRef(node);
-			else if (childRef) childRef.current = node;
-		};
+		const setLegacyRefs = (node) => setAnchorRefs(internalRef, childRef, node);
 		const clonedProps = {
 			ref: setLegacyRefs,
 			onClick: (event) => {
@@ -916,5 +916,4 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		})
 	});
 });
-//#endregion
 export { canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };

package/dist/shims/metadata.d.ts

@@ -1,7 +1,6 @@
 import { ThenableParamsObserver } from "./thenable-params.js";
 import React from "react";
 import { ResolvedViewport as ResolvedViewport$1, Viewport as Viewport$1 } from "@vinext/types/next/upstream/dist/lib/metadata/types/metadata-interface";
-//#region src/shims/metadata.d.ts
 export type Viewport = Viewport$1;
 export type ResolvedViewport = ResolvedViewport$1;
 /**
@@ -280,5 +279,4 @@ export declare function renderMetadataToHtml(metadata: Metadata, pathname?: stri
   streamedIconKey?: string;
 }): string;
 export declare function MetadataHead({ metadata, pathname, trailingSlash, streamedIconKey }: MetadataHeadProps): React.JSX.Element;
-//#endregion
 export {};

package/dist/shims/metadata.js

@@ -1,9 +1,9 @@
-import { isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
 import { makeThenableParams } from "./thenable-params.js";
+import { isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
 import { withUseCacheLayoutMarker, withUseCachePageMarker } from "./internal/app-page-props-cache-key.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
-//#region src/shims/metadata.tsx
+// src/shims/metadata.tsx
 /**
 * Metadata support for App Router.
 *
@@ -966,5 +966,4 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash, streamedIconKey
 	}
 	return /* @__PURE__ */ jsx(Fragment$1, { children: elements });
 }
-//#endregion
 export { DEFAULT_VIEWPORT, MetadataHead, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeParentMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };

package/dist/shims/navigation-context-accessors.d.ts

@@ -1,9 +1,7 @@
-//#region src/shims/navigation-context-accessors.d.ts
 export type NavigationContext = {
   pathname: string;
   searchParams: URLSearchParams;
   params: Record<string, string | string[]>;
 };
 /** Lightweight server context setter for request-only runtimes such as middleware. */
-export declare function setNavigationContext(context: NavigationContext | null): void;
-//#endregion
+export declare function setNavigationContext(context: NavigationContext | null): void;

package/dist/shims/navigation-context-accessors.js

@@ -1,4 +1,4 @@
-//#region src/shims/navigation-context-accessors.ts
+// src/shims/navigation-context-accessors.ts
 const GLOBAL_ACCESSORS_KEY = Symbol.for("vinext.navigation.globalAccessors");
 const NAVIGATION_FALLBACK_STATE_KEY = Symbol.for("vinext.navigation.fallback");
 /** Lightweight server context setter for request-only runtimes such as middleware. */
@@ -15,5 +15,4 @@ function setNavigationContext(context) {
 	};
 	fallback.serverContext = context;
 }
-//#endregion
 export { setNavigationContext };

package/dist/shims/navigation-context-state.d.ts

@@ -1,6 +1,5 @@
 import { SearchParamsGate } from "./search-params-gate.js";
 import * as React$1 from "react";
-//#region src/shims/navigation-context-state.d.ts
 /**
  * Map of parallel route key to child segments below the current layout.
  * The "children" key is always present.
@@ -48,5 +47,4 @@ export declare function setNavigationContext(context: NavigationContext | null):
 export declare function registerServerInsertedHTMLCallback(callback: () => unknown): void;
 export declare function flushServerInsertedHTML(): unknown[];
 export declare function renderServerInsertedHTML(): unknown[];
-export declare function clearServerInsertedHTML(): void;
-//#endregion
+export declare function clearServerInsertedHTML(): void;