vinext 1.0.0-beta.8 → 1.0.0

package/dist/shims/link.js

@@ -1,15 +1,16 @@
 "use client";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "./url-safety.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
 import { RouterContext } from "./internal/router-context.js";
 import { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
 import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
-import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
-import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
+import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toCanonicalBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { interpolateDynamicRouteHref, resolveDynamicRouteHref } from "./internal/interpolate-as.js";
-import { getCurrentBrowserLocale } from "./client-locale.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 { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { getCurrentBrowserLocale } from "./client-locale.js";
 import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
 import { scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
@@ -65,22 +66,23 @@ const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 /** trailingSlash from next.config.js, injected by the plugin at build time */
 const __trailingSlash = process.env.__VINEXT_TRAILING_SLASH === "true";
 const __prefetchInlining = process.env.__VINEXT_PREFETCH_INLINING === "true";
-function resolveHref(href) {
+function resolveHref(href, validate = false) {
 	if (typeof href === "string") return href;
-	let url = href.pathname ?? "";
-	if (href.query) {
-		const params = urlQueryToSearchParams(href.query);
-		url = appendSearchParamsToUrl(url, params);
-	}
-	if (href.hash) url += href.hash.startsWith("#") ? href.hash : `#${href.hash}`;
-	return url;
+	return validate ? formatUrlObjectWithValidation(href) : formatUrlObject(href);
+}
+function resolvePagesLinkValue(value, pagesRouter, routePathnameForWarning) {
+	const formatted = resolveHref(value, pagesRouter !== null);
+	if (pagesRouter === null) return formatted;
+	if (typeof pagesRouter.pathname === "string" && typeof pagesRouter.asPath === "string" && !formatted.startsWith("?") && !formatted.startsWith("#")) return resolvePagesRouterHref(formatted, pagesRouter, __basePath);
+	return normalizeRouterHref(formatted, routePathnameForWarning);
 }
 function resolvePagesQueryOnlyHref(href) {
 	if (!HAS_PAGES_ROUTER) return href;
 	if (!href.startsWith("?") && !href.startsWith("#") || typeof window === "undefined") return href;
 	const pagesRouter = window.next?.appDir === true ? void 0 : window.next?.router;
+	const visibleHref = pagesRouter && "reload" in pagesRouter && "asPath" in pagesRouter && typeof pagesRouter.asPath === "string" ? pagesRouter.asPath : void 0;
 	return resolvePagesRouterQueryOnlyHref(href, {
-		asPath: pagesRouter && "reload" in pagesRouter && "asPath" in pagesRouter && typeof pagesRouter.asPath === "string" ? pagesRouter.asPath : void 0,
+		asPath: visibleHref,
 		basePath: __basePath,
 		fallbackHref: window.location.href,
 		locales: window.__VINEXT_LOCALES__
@@ -94,52 +96,6 @@ function applyPagesNavigationFallback(href, replace) {
 	else window.history.pushState({}, "", href);
 	window.dispatchEvent(new PopStateEvent("popstate"));
 }
-/**
-* Collapse repeated forward-slashes (and convert backslashes to forward-slashes)
-* in the path portion of a URL, preserving any query string.
-*
-* Ported from Next.js: packages/next/src/shared/lib/utils/normalize-repeated-slashes.ts
-* https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/utils/normalize-repeated-slashes.ts
-*/
-function normalizeRepeatedSlashes(url) {
-	const urlParts = url.split("?");
-	const urlNoQueryString = urlParts.shift() ?? "";
-	const queryString = urlParts.join("?");
-	return urlNoQueryString.replace(/\\/g, "/").replace(/\/\/+/g, "/") + (queryString ? `?${queryString}` : "");
-}
-/**
-* Emit Next.js's "Invalid href" `console.error` when `href` contains repeated
-* forward slashes or backslashes in its path portion, and return the
-* normalized URL (with `\\` converted to `/` and runs of `/` collapsed). If
-* the href is already well-formed, the original string is returned unchanged.
-*
-* Ported from Next.js: packages/next/src/client/resolve-href.ts
-* https://github.com/vercel/next.js/blob/canary/packages/next/src/client/resolve-href.ts
-*
-* Matches the message asserted by:
-* test/e2e/repeated-forward-slashes-error/repeated-forward-slashes-error.test.ts
-*
-* Note: Next.js fires this warning unconditionally on every call to
-* `resolveHref`. We mirror that behaviour (no dedup) for exact parity.
-*
-* Note: Next.js uses `router.pathname` (the route pattern, e.g.
-* `/posts/[id]`) for the "in page" segment of the message. The Next.js
-* compat test asserts this exact text (`in page: '/my/path/[name]'`), so we
-* source it from the current render's route pattern via
-* `getCurrentRoutePathnameForWarning()`: the Pages Router SSR context's route
-* pattern on the server, `window.location.pathname` on the client, falling
-* back to `"/"`.
-*/
-function warnAndNormalizeRepeatedSlashesInHref(urlAsString) {
-	if (urlAsString.startsWith("//")) return urlAsString;
-	const urlProtoMatch = urlAsString.match(/^[a-z][a-z0-9+.-]*:\/\//i);
-	const urlAsStringNoProto = urlProtoMatch ? urlAsString.slice(urlProtoMatch[0].length) : urlAsString;
-	if (!(urlAsStringNoProto.split("?", 1)[0] || "").match(/(\/\/|\\)/)) return urlAsString;
-	const pathname = getCurrentRoutePathnameForWarning();
-	console.error(`Invalid href '${urlAsString}' passed to next/router in page: '${pathname}'. Repeated forward-slashes (//) or backslashes \\ are not valid in the href.`);
-	const normalizedNoProto = normalizeRepeatedSlashes(urlAsStringNoProto);
-	return (urlProtoMatch ? urlProtoMatch[0] : "") + normalizedNoProto;
-}
 function resolveLinkPrefetchMode(prefetchProp, isDangerous) {
 	if (isDangerous || prefetchProp === false) return "disabled";
 	if (prefetchProp === true) return "full";
@@ -169,12 +125,13 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 		currentOrigin: window.location.origin
 	});
 	if (prefetchHref == null) return;
-	const fullHref = toBrowserNavigationHref(prefetchHref, window.location.href, __basePath);
-	const fullRouteHref = toBrowserNavigationHref(pagesRouteHref === void 0 ? prefetchHref : getLinkPrefetchHref({
+	const fullHref = toCanonicalBrowserNavigationHref(prefetchHref, window.location.href, __basePath, __trailingSlash);
+	const routePrefetchHref = pagesRouteHref === void 0 ? prefetchHref : getLinkPrefetchHref({
 		href: pagesRouteHref,
 		basePath: __basePath,
 		currentOrigin: window.location.origin
-	}) ?? prefetchHref, window.location.href, __basePath);
+	}) ?? prefetchHref;
+	const fullRouteHref = toCanonicalBrowserNavigationHref(routePrefetchHref, window.location.href, __basePath, __trailingSlash);
 	const target = new URL(fullHref, window.location.href);
 	if (target.origin === window.location.origin && target.pathname === window.location.pathname && target.search === window.location.search) return;
 	if (mode === "auto" && priority === "low" && target.origin === window.location.origin && target.pathname === window.location.pathname && target.search !== window.location.search && target.hash !== "") return;
@@ -182,10 +139,11 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 		(async () => {
 			if (hasAppNavigationRuntime()) {
 				if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
-				const [navigation, { AppElementsWire }, rscCacheBusting, { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, headersModule, hybridRouteOwner] = await Promise.all([
+				const [navigation, { AppElementsWire }, rscCacheBusting, { resolveAppPrefetchRscRequest }, { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, headersModule, hybridRouteOwner] = await Promise.all([
 					loadNavigationModule(),
 					import("../server/app-elements.js"),
 					import("../server/app-rsc-cache-busting.js"),
+					import("./internal/app-prefetch-rsc-request.js"),
 					import("../server/app-rsc-render-mode.js"),
 					import("../server/headers.js"),
 					HAS_PAGES_ROUTER || HAS_CLIENT_REWRITES ? loadHybridClientRouteOwnerModule() : null
@@ -197,10 +155,11 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 				const hybridOwner = HAS_PAGES_ROUTER ? hybridRouteOwner.resolveHybridClientRouteOwner(prefetchHref, __basePath) : null;
 				if (hybridOwner === "pages" || hybridOwner === "document") return;
 				const rewrittenPrefetchHref = HAS_CLIENT_REWRITES ? hybridRouteOwner.resolveHybridClientRewriteHref(fullHref, __basePath) : null;
-				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(rewrittenPrefetchHref ?? prefetchHref) : resolveFullAppRoutePrefetch();
-				if (!autoPrefetch.shouldPrefetch) return;
+				const prefetchPolicyHref = rewrittenPrefetchHref ?? prefetchHref;
 				const interceptionContext = getPrefetchInterceptionContext(fullHref);
 				const mountedSlotsHeader = getMountedSlotsHeader();
+				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(prefetchPolicyHref) : resolveFullAppRoutePrefetch();
+				if (!autoPrefetch.shouldPrefetch) return;
 				const isOptimisticRouteShellPrefetch = !autoPrefetch.cacheForNavigation;
 				const hasSearchParams = new URL(fullHref, window.location.href).search !== "";
 				const isAutomaticSearchParamShell = mode === "auto" && isOptimisticRouteShellPrefetch && hasSearchParams;
@@ -221,8 +180,12 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					headers.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
 					headers.set(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, "1");
 				}
-				const rscUrl = await createRscRequestUrl(fullHref, headers);
-				const additionalRscUrls = rewrittenPrefetchHref && rewrittenPrefetchHref !== fullHref ? [await createRscRequestUrl(rewrittenPrefetchHref, headers)] : [];
+				const { additionalRscUrls, rscUrl } = await resolveAppPrefetchRscRequest({
+					fullHref,
+					headers,
+					rewrittenPrefetchHref
+				});
+				if (navigationEpoch !== linkPrefetchNavigationEpoch) return;
 				const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 				const prefetched = getPrefetchedUrls();
 				if (autoPrefetch.cacheForNavigation) discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext);
@@ -327,7 +290,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 			} else if (HAS_PAGES_ROUTER && window.__NEXT_DATA__) {
 				const dataTarget = resolvePagesDataNavigationTarget(fullRouteHref, __basePath, { locale });
 				if (dataTarget) {
-					const middlewareDataHref = fullRouteHref === fullHref ? dataTarget.middlewareDataHref : getPagesMiddlewareDataHref(fullHref, __basePath, { locale }) ?? void 0;
+					const middlewareDataHref = fullRouteHref === fullHref ? dataTarget.middlewareDataHref : getPagesMiddlewareDataHref(fullHref, __basePath, { locale }, fullRouteHref) ?? void 0;
 					prefetchPagesData({
 						...dataTarget,
 						middlewareDataHref
@@ -357,7 +320,7 @@ async function promotePrefetchEntriesForNavigation(href) {
 	const [{ getPrefetchCache }, { stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([loadNavigationModule(), import("../server/app-rsc-cache-busting.js")]);
 	let target;
 	try {
-		target = new URL(toBrowserNavigationHref(href, window.location.href, __basePath), window.location.href);
+		target = new URL(toCanonicalBrowserNavigationHref(href, window.location.href, __basePath, __trailingSlash), window.location.href);
 	} catch {
 		return;
 	}
@@ -489,56 +452,41 @@ function applyLocaleToHref(href, locale) {
 	}
 	return addLocalePrefix(href, resolvedLocale, defaultLocale);
 }
-/**
-* For the `<Link href="/blog/[slug]" as="/blog/test-post">` case, project the
-* bracket-pattern href + the resolved `as` back into a concrete route URL the
-* Pages Router can fetch (`/blog/test-post`). Returns null when:
-*   - `href` has no bracket params (already concrete; the existing forwarding
-*     path works as-is)
-*   - interpolation fails because a required param could not be resolved
-*     (caller falls back to `as`, matching pre-PR behavior)
-*
-* The query for interpolation is the href's own query — `as` is the matcher
-* input rather than the source of param values. For string hrefs the search
-* portion is parsed into the query record; for object hrefs we take
-* `href.query` directly.
-*/
+/** Resolve a dynamic route pattern to the concrete URL used for prefetching. */
 function resolveConcreteRouteHref(href, as) {
 	if (typeof as !== "string") return null;
-	return interpolateDynamicRouteHref(typeof href === "string" ? href : resolveHref(href), as, typeof href === "string" || !href.query || typeof href.query === "string" ? void 0 : href.query)?.href || null;
+	return interpolateDynamicRouteHref(href, as)?.href || null;
 }
 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, ...rest }, forwardedRef) {
 	const pagesRouter = useContext(RouterContext);
-	const asHref = as === void 0 ? void 0 : resolveHref(as);
-	const hrefStr = resolveHref(href);
+	const routePathnameForWarning = getCurrentRoutePathnameForWarning();
+	const hrefStr = resolvePagesLinkValue(href, pagesRouter, routePathnameForWarning);
+	const asHref = as === void 0 ? void 0 : resolvePagesLinkValue(as, pagesRouter, routePathnameForWarning);
 	const { locale, ...restWithoutLocale } = rest;
 	let children = childrenProp;
 	if (legacyBehavior && (typeof childrenProp === "string" || typeof childrenProp === "number")) children = React.createElement("a", null, childrenProp);
 	const hrefForImplicitInterpolation = isAbsoluteOrProtocolRelativeUrl(hrefStr) ? hrefStr.startsWith("//") ? null : toSameOriginAppPath(hrefStr, __basePath) : hrefStr;
 	const implicitDynamicRouteHref = HAS_PAGES_ROUTER && pagesRouter !== null && asHref === void 0 && hrefForImplicitInterpolation !== null ? resolveDynamicRouteHref(hrefForImplicitInterpolation) : null;
-	const dynamicRouteHref = implicitDynamicRouteHref ? {
-		...implicitDynamicRouteHref,
-		href: hrefStr
-	} : null;
-	const pagesAsHref = asHref ?? dynamicRouteHref?.as;
+	const pagesAsHref = asHref ?? implicitDynamicRouteHref?.as;
 	const unresolvedHref = pagesAsHref ?? hrefStr;
-	const rawResolvedHref = typeof unresolvedHref === "string" && unresolvedHref.startsWith("#") && !getNavigationRuntime()?.functions.navigate ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
-	const concreteRouteHref = HAS_PAGES_ROUTER ? resolveConcreteRouteHref(dynamicRouteHref ? hrefForImplicitInterpolation ?? href : href, pagesAsHref) : null;
-	const routeHrefRaw = dynamicRouteHref?.href ?? concreteRouteHref ?? hrefStr;
+	const resolvedHref = unresolvedHref.startsWith("#") && !getNavigationRuntime()?.functions.navigate ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
+	const concreteRouteHref = HAS_PAGES_ROUTER ? resolveConcreteRouteHref(hrefForImplicitInterpolation ?? hrefStr, pagesAsHref) : null;
+	const routeHrefRaw = hrefStr;
 	const prefetchRouteHrefRaw = concreteRouteHref ?? routeHrefRaw;
-	const hasPagesHrefAsPair = HAS_PAGES_ROUTER && typeof pagesAsHref === "string" && typeof routeHrefRaw === "string" && pagesAsHref !== routeHrefRaw;
-	const resolvedHref = typeof rawResolvedHref === "string" ? warnAndNormalizeRepeatedSlashesInHref(rawResolvedHref) : rawResolvedHref;
-	const isDangerous = typeof resolvedHref === "string" && isDangerousScheme(resolvedHref);
-	const normalizedHref = normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : resolvedHref, locale), __trailingSlash);
-	const normalizedRouteHref = hasPagesHrefAsPair ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : prefetchRouteHrefRaw, locale), __trailingSlash) : normalizedHref;
+	const hasPagesHrefAsPair = HAS_PAGES_ROUTER && pagesAsHref !== void 0 && pagesAsHref !== routeHrefRaw;
+	const isDangerous = isDangerousScheme(resolvedHref);
+	const isRouteDangerous = isDangerousScheme(prefetchRouteHrefRaw);
+	const isPrefetchDangerous = isDangerous || pagesRouter !== null && isRouteDangerous;
+	const localizedHref = applyLocaleToHref(isDangerous ? "/" : resolvedHref, locale);
+	const normalizedHref = normalizePathTrailingSlash(localizedHref, __trailingSlash);
+	const normalizedRouteHref = hasPagesHrefAsPair ? normalizePathTrailingSlash(applyLocaleToHref(isRouteDangerous ? "/" : prefetchRouteHrefRaw, locale), __trailingSlash) : normalizedHref;
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
 	const pendingPagesIntentPrefetchRef = useRef(null);
-	const setPendingRef = useRef(null);
-	if (setPendingRef.current === null) setPendingRef.current = (next) => {
+	const setPendingRef = useRef((next) => {
 		if (mountedRef.current) setPending(next);
-	};
+	});
 	useEffect(() => {
 		mountedRef.current = true;
 		const setter = setPendingRef.current;
@@ -553,11 +501,11 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	const prefetchRouterMode = getLinkPrefetchRouterMode();
 	const isShallowPagesLink = prefetchRouterMode === "pages" && shallow;
 	const effectivePrefetchProp = isShallowPagesLink ? false : prefetchProp;
-	const prefetchMode = resolveLinkPrefetchMode(effectivePrefetchProp, isDangerous);
+	const prefetchMode = resolveLinkPrefetchMode(effectivePrefetchProp, isPrefetchDangerous);
 	const shouldViewportPrefetch = canLinkPrefetch({
 		nodeEnv: process.env.NODE_ENV,
 		prefetch: effectivePrefetchProp,
-		isDangerous
+		isDangerous: isPrefetchDangerous
 	});
 	const setRefs = useCallback((node) => {
 		internalRef.current = node;
@@ -611,7 +559,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		if (isShallowPagesLink || !canLinkIntentPrefetch({
 			nodeEnv: process.env.NODE_ENV,
 			prefetch: effectivePrefetchProp,
-			isDangerous,
+			isDangerous: isPrefetchDangerous,
 			routerMode: prefetchRouterMode
 		})) return;
 		const intentMode = unstable_dynamicOnHover ? "full-after-shell" : prefetchMode;
@@ -623,7 +571,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		prefetchUrl(normalizedHref, intentMode, "high", normalizedRouteHref === normalizedHref ? void 0 : normalizedRouteHref, locale);
 	}, [
 		effectivePrefetchProp,
-		isDangerous,
+		isPrefetchDangerous,
 		isShallowPagesLink,
 		prefetchMode,
 		prefetchRouterMode,
@@ -677,7 +625,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		const pagesNavigateHref = HAS_PAGES_ROUTER && resolvedHref.startsWith("?") ? resolvePagesLinkNavigationHref(resolvedHref, locale) : navigateHref;
 		const pagesAsForLink = hasPagesHrefAsPair ? pagesNavigateHref : void 0;
 		const pagesHrefForLink = pagesAsForLink === void 0 ? pagesNavigateHref : routeHrefRaw;
-		const absoluteFullHref = toBrowserNavigationHref(hasAppNavigationRuntime ? navigateHref : pagesNavigateHref, window.location.href, __basePath);
+		const absoluteFullHref = toCanonicalBrowserNavigationHref(hasAppNavigationRuntime ? navigateHref : pagesNavigateHref, window.location.href, __basePath, __trailingSlash);
 		if (onNavigate) try {
 			const navUrl = new URL(absoluteFullHref, window.location.origin);
 			let prevented = false;
@@ -713,8 +661,9 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			return;
 		} else if (HAS_PAGES_ROUTER) {
 			const Router = window.next?.appDir === true ? void 0 : window.next?.router;
+			const pagesRouter = Router && "reload" in Router ? Router : void 0;
 			await navigatePagesRouterLinkWithFallback({
-				router: Router && "reload" in Router ? Router : void 0,
+				router: pagesRouter,
 				loadRouter: async () => (await import("next/router")).default,
 				navigation: {
 					href: pagesHrefForLink,
@@ -747,15 +696,16 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 				if (typeof childRef === "function") childRef(node);
 				else if (childRef) childRef.current = node;
 			};
+			const dangerousChild = React.cloneElement(child, {
+				ref: setDangerousRefs,
+				onClick: (event) => {
+					if (childOnClick) childOnClick(event);
+					reportBlockedDangerousNavigation();
+				}
+			});
 			return /* @__PURE__ */ jsx(LinkStatusContext.Provider, {
 				value: linkStatusValue,
-				children: React.cloneElement(child, {
-					ref: setDangerousRefs,
-					onClick: (event) => {
-						if (childOnClick) childOnClick(event);
-						reportBlockedDangerousNavigation();
-					}
-				})
+				children: dangerousChild
 			});
 		}
 		return /* @__PURE__ */ jsx(LinkStatusContext.Provider, {
@@ -805,9 +755,10 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			}
 		};
 		if (shouldForwardHref) clonedProps.href = fullHref;
+		const clonedChild = React.cloneElement(child, clonedProps);
 		return /* @__PURE__ */ jsx(LinkStatusContext.Provider, {
 			value: linkStatusValue,
-			children: React.cloneElement(child, clonedProps)
+			children: clonedChild
 		});
 	}
 	return /* @__PURE__ */ jsx(LinkStatusContext.Provider, {

package/dist/shims/metadata.d.ts

@@ -2,26 +2,26 @@ 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
-type Viewport = Viewport$1;
-type ResolvedViewport = ResolvedViewport$1;
+export type Viewport = Viewport$1;
+export type ResolvedViewport = ResolvedViewport$1;
 /**
  * Resolve viewport config from a module. Handles both static `viewport` export
  * and async `generateViewport()` function.
  */
-declare function resolveModuleViewport(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<ResolvedViewport>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
+export declare function resolveModuleViewport(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<ResolvedViewport>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
 /**
  * Merge viewport configs from multiple sources (layouts + page).
  * Later entries override earlier ones.
  */
-declare const DEFAULT_VIEWPORT: ResolvedViewport;
-declare function mergeViewport(viewportList: readonly Viewport[]): ResolvedViewport;
+export declare const DEFAULT_VIEWPORT: ResolvedViewport;
+export declare function mergeViewport(viewportList: readonly Viewport[]): ResolvedViewport;
 /**
  * React component that renders viewport meta tags into <head>.
  */
-declare function ViewportHead({ viewport }: {
+export declare function ViewportHead({ viewport }: {
   viewport: Viewport;
 }): React.JSX.Element;
-type Metadata = {
+export type Metadata = {
   title?: string | {
     default?: string;
     template?: string;
@@ -193,7 +193,7 @@ type IconsMap = {
   other?: IconDescriptor | IconDescriptor[];
 };
 type IconsMetadata = IconInput | IconInput[] | IconsMap;
-type MetadataMergeEntry = {
+export type MetadataMergeEntry = {
   contributesTitle?: boolean;
   isPage?: boolean;
   metadata: Metadata;
@@ -209,7 +209,7 @@ type MetadataMergeEntry = {
  *
  * Shallow merge: later entries override earlier ones (per Next.js docs).
  */
-declare function mergeMetadata(metadataList: Metadata[]): Metadata;
+export declare function mergeMetadata(metadataList: Metadata[]): Metadata;
 /**
  * Post-process merged metadata to cross-fill openGraph and Twitter fields.
  *
@@ -222,7 +222,7 @@ declare function mergeMetadata(metadataList: Metadata[]): Metadata;
  * Ported from Next.js:
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/metadata/resolve-metadata.ts
  */
-declare function postProcessMetadata(merged: Metadata): Metadata;
+export declare function postProcessMetadata(merged: Metadata): Metadata;
 /**
  * Merge metadata from multiple sources (layouts + page).
  *
@@ -235,7 +235,7 @@ declare function postProcessMetadata(merged: Metadata): Metadata;
  * For top-level keys, later entries override earlier ones. `other` custom meta
  * tags are the exception: Next.js merges those across segments.
  */
-declare function mergeMetadataEntries(entries: readonly MetadataMergeEntry[]): Metadata;
+export declare function mergeMetadataEntries(entries: readonly MetadataMergeEntry[]): Metadata;
 /**
  * Resolve metadata from a module. Handles both static `metadata` export
  * and async `generateMetadata()` function.
@@ -246,17 +246,16 @@ declare function mergeMetadataEntries(entries: readonly MetadataMergeEntry[]): M
  *   resolution approach. If not provided, defaults to a promise that resolves
  *   to an empty object (so `await parent` never throws).
  */
-declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<Metadata>, searchParamsObserver?: ThenableParamsObserver): Promise<Metadata | null>;
+export declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<Metadata>, searchParamsObserver?: ThenableParamsObserver): Promise<Metadata | null>;
 type MetadataHeadProps = {
   metadata: Metadata;
   pathname?: string;
   trailingSlash?: boolean;
   streamedIconKey?: string;
 };
-declare function renderMetadataToHtml(metadata: Metadata, pathname?: string, options?: {
+export declare function renderMetadataToHtml(metadata: Metadata, pathname?: string, options?: {
   trailingSlash?: boolean;
   streamedIconKey?: string;
 }): string;
-declare function MetadataHead({ metadata, pathname, trailingSlash, streamedIconKey }: MetadataHeadProps): React.JSX.Element;
-//#endregion
-export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, ResolvedViewport, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };
+export declare function MetadataHead({ metadata, pathname, trailingSlash, streamedIconKey }: MetadataHeadProps): React.JSX.Element;
+//#endregion

package/dist/shims/metadata.js

@@ -1,5 +1,6 @@
 import { isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
 import { makeThenableParams } from "./thenable-params.js";
+import { 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
@@ -18,10 +19,10 @@ const USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL = Symbol.for("vinext.useCacheAcce
 async function resolveModuleViewport(mod, params = {}, searchParams, parent = Promise.resolve(mergeViewport([])), searchParamsObserver) {
 	if (typeof mod.generateViewport === "function") {
 		const asyncParams = makeThenableParams(params);
-		const props = searchParams === void 0 ? { params: asyncParams } : {
+		const props = searchParams === void 0 ? { params: asyncParams } : withUseCachePageMarker(mod.generateViewport, {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
-		};
+		});
 		return await mod.generateViewport(props, parent);
 	}
 	if (mod.viewport && typeof mod.viewport === "object") return mod.viewport;
@@ -67,10 +68,7 @@ function mergeViewport(viewportList) {
 		case "viewportFit":
 			merged.viewportFit = viewport.viewportFit;
 			break;
-		case "interactiveWidget":
-			merged.interactiveWidget = viewport.interactiveWidget;
-			break;
-		default:
+		case "interactiveWidget": merged.interactiveWidget = viewport.interactiveWidget;
 	}
 	return merged;
 }
@@ -197,11 +195,13 @@ function postProcessMetadata(merged) {
 		}
 		if (!hasTwDescription) autoFill.description = result.openGraph.description || result.description || void 0;
 		if (!hasTwImages && result.openGraph.images !== void 0) autoFill.images = result.openGraph.images;
-		if (Object.keys(autoFill).length > 0) if (existingTwitter) result.twitter = {
-			...existingTwitter,
-			...autoFill
-		};
-		else result.twitter = autoFill;
+		if (Object.keys(autoFill).length > 0) {
+			if (existingTwitter) result.twitter = {
+				...existingTwitter,
+				...autoFill
+			};
+			else result.twitter = autoFill;
+		}
 	}
 	if (result.twitter) {
 		const tw = { ...result.twitter };
@@ -268,10 +268,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 ? { params: asyncParams } : {
+		const props = searchParams === void 0 ? { 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));
@@ -509,33 +509,37 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash, streamedIconKey
 		name: "category",
 		content: metadata.category
 	}, key++));
-	if (metadata.robots) if (typeof metadata.robots === "string") elements.push(/* @__PURE__ */ jsx("meta", {
-		name: "robots",
-		content: metadata.robots
-	}, key++));
-	else {
-		const { googleBot, ...robotsRest } = metadata.robots;
-		const robotParts = [];
-		for (const [k, v] of Object.entries(robotsRest)) if (v === true) robotParts.push(k);
-		else if (v === false) robotParts.push(`no${k}`);
-		else if (typeof v === "string" || typeof v === "number") robotParts.push(`${k}:${v}`);
-		if (robotParts.length > 0) elements.push(/* @__PURE__ */ jsx("meta", {
+	if (metadata.robots) {
+		if (typeof metadata.robots === "string") elements.push(/* @__PURE__ */ jsx("meta", {
 			name: "robots",
-			content: robotParts.join(", ")
-		}, key++));
-		if (googleBot) if (typeof googleBot === "string") elements.push(/* @__PURE__ */ jsx("meta", {
-			name: "googlebot",
-			content: googleBot
+			content: metadata.robots
 		}, key++));
 		else {
-			const gbParts = [];
-			for (const [k, v] of Object.entries(googleBot)) if (v === true) gbParts.push(k);
-			else if (v === false) gbParts.push(`no${k}`);
-			else if (typeof v === "string" || typeof v === "number") gbParts.push(`${k}:${v}`);
-			if (gbParts.length > 0) elements.push(/* @__PURE__ */ jsx("meta", {
-				name: "googlebot",
-				content: gbParts.join(", ")
+			const { googleBot, ...robotsRest } = metadata.robots;
+			const robotParts = [];
+			for (const [k, v] of Object.entries(robotsRest)) if (v === true) robotParts.push(k);
+			else if (v === false) robotParts.push(`no${k}`);
+			else if (typeof v === "string" || typeof v === "number") robotParts.push(`${k}:${v}`);
+			if (robotParts.length > 0) elements.push(/* @__PURE__ */ jsx("meta", {
+				name: "robots",
+				content: robotParts.join(", ")
 			}, key++));
+			if (googleBot) {
+				if (typeof googleBot === "string") elements.push(/* @__PURE__ */ jsx("meta", {
+					name: "googlebot",
+					content: googleBot
+				}, key++));
+				else {
+					const gbParts = [];
+					for (const [k, v] of Object.entries(googleBot)) if (v === true) gbParts.push(k);
+					else if (v === false) gbParts.push(`no${k}`);
+					else if (typeof v === "string" || typeof v === "number") gbParts.push(`${k}:${v}`);
+					if (gbParts.length > 0) elements.push(/* @__PURE__ */ jsx("meta", {
+						name: "googlebot",
+						content: gbParts.join(", ")
+					}, key++));
+				}
+			}
 		}
 	}
 	if (metadata.openGraph) {

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

@@ -0,0 +1,9 @@
+//#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

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

@@ -0,0 +1,19 @@
+//#region 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. */
+function setNavigationContext(context) {
+	const globalState = globalThis;
+	const accessors = globalState[GLOBAL_ACCESSORS_KEY];
+	if (accessors) {
+		accessors.setServerContext(context);
+		return;
+	}
+	const fallback = globalState[NAVIGATION_FALLBACK_STATE_KEY] ??= {
+		serverContext: null,
+		serverInsertedHTMLCallbacks: []
+	};
+	fallback.serverContext = context;
+}
+//#endregion
+export { setNavigationContext };