vinext 0.1.3 → 0.1.5

package/dist/shims/error-boundary.js

@@ -1,7 +1,9 @@
 "use client";
-import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
-import { decodeRedirectError, isRedirectError, usePathname, useRouter } from "./navigation.js";
+import { decodeRedirectError, isRedirectError } from "./navigation-errors.js";
+import "./navigation-server.js";
+import { useErrorBoundaryPathname, useErrorBoundaryRouter } from "./error-boundary-navigation.js";
 import DefaultGlobalError from "./default-global-error.js";
+import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
 import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import React from "react";
@@ -31,7 +33,7 @@ function removeDevErrorRecoveryListener(listener) {
 	window.removeEventListener(VINEXT_DEV_ERROR_RECOVERY_EVENT, listener);
 }
 function HandleRedirect({ redirect, redirectType, reset }) {
-	const router = useRouter();
+	const router = useErrorBoundaryRouter();
 	React.useEffect(() => {
 		React.startTransition(() => {
 			if (redirectType === "push") router.push(redirect);
@@ -146,7 +148,7 @@ var ErrorBoundaryInner = class extends React.Component {
 };
 function ErrorBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children
@@ -154,7 +156,7 @@ function ErrorBoundary({ fallback, children, resetKey }) {
 }
 function GlobalErrorBoundary({ fallback, children }) {
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		fallback,
 		isImplicitRootErrorBoundary: fallback === DefaultGlobalError,
 		children
@@ -208,7 +210,7 @@ var NotFoundBoundaryInner = class extends React.Component {
 */
 function NotFoundBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(NotFoundBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children
@@ -249,7 +251,7 @@ var ForbiddenBoundaryInner = class extends React.Component {
 };
 function ForbiddenBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(ForbiddenBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children
@@ -290,7 +292,7 @@ var UnauthorizedBoundaryInner = class extends React.Component {
 };
 function UnauthorizedBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(UnauthorizedBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children

package/dist/shims/error.js

@@ -1,6 +1,7 @@
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { RouterContext } from "./internal/router-context.js";
-import { isNextRouterError } from "./navigation.js";
+import { isNextRouterError } from "./navigation-errors.js";
+import "./navigation.js";
 import { useUntrackedPathname } from "./internal/navigation-untracked.js";
 import React from "react";
 //#region src/shims/error.tsx

package/dist/shims/fetch-cache.js

@@ -1,9 +1,9 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { getRequestExecutionContext } from "./request-context.js";
+import { getDataCacheHandler } from "./cache-handler.js";
 import { markDynamicUsage } from "./headers.js";
 import { encodeCacheTags } from "../utils/encode-cache-tag.js";
-import { getDataCacheHandler } from "./cache.js";
 //#region src/shims/fetch-cache.ts
 /**
 * Extended fetch() with Next.js caching semantics.

package/dist/shims/form.js

@@ -4,8 +4,8 @@ import { isDangerousScheme } from "./url-safety.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { toSameOriginPath, withBasePath } from "./url-utils.js";
-import { hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { createRscRequestHeaders, createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
+import { hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { getMountedSlotsHeader, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
 import { useMergedRef } from "./use-merged-ref.js";
 import { forwardRef, useActionState, useCallback, useEffect, useRef } from "react";

package/dist/shims/image.js

@@ -175,6 +175,13 @@ function sanitizeBlurDataURL(url) {
 function isRemoteUrl(src) {
 	return src.startsWith("http://") || src.startsWith("https://") || src.startsWith("//");
 }
+function isSvgUrl(src) {
+	try {
+		return new URL(src, "http://vinext.local").pathname.toLowerCase().endsWith(".svg");
+	} catch {
+		return false;
+	}
+}
 function getFillStyle(style, backgroundStyle) {
 	return {
 		position: "absolute",
@@ -236,7 +243,7 @@ function generateSrcSet(src, originalWidth, quality = 75) {
 	if (widths.length === 0) return `${imageOptimizationUrl(src, originalWidth, quality)} ${originalWidth}w`;
 	return widths.map((w) => `${imageOptimizationUrl(src, w, quality)} ${w}w`).join(", ");
 }
-const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill, preload, priority, quality, placeholder, blurDataURL, loader, sizes, className, style, onLoad, onLoadingComplete, onError, unoptimized: _unoptimized, overrideSrc: _overrideSrc, loading, ...rest }, ref) {
+const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill, preload, priority, quality, placeholder, blurDataURL, loader, sizes, className, style, onLoad, onLoadingComplete, onError, unoptimized: _unoptimized, overrideSrc, loading, ...rest }, ref) {
 	const lastLoadedSrcRef = useRef(void 0);
 	const lastErrorSrcRef = useRef(void 0);
 	const didInsertRef = useRef(false);
@@ -319,6 +326,40 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 		lastErrorSrcRef.current = src;
 		markBlurComplete();
 	} : void 0;
+	if (_unoptimized === true) {
+		const renderedSrc = overrideSrc || src;
+		const sanitizedBlur = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
+		const blurStyle = !blurComplete && placeholder === "blur" && sanitizedBlur ? {
+			backgroundImage: `url(${sanitizedBlur})`,
+			backgroundSize: "cover",
+			backgroundRepeat: "no-repeat",
+			backgroundPosition: "center"
+		} : void 0;
+		preloadImageResource({
+			shouldPreload,
+			src: renderedSrc,
+			fetchPriority: priorityFetchPriority
+		});
+		return /* @__PURE__ */ jsx("img", {
+			ref: mergedRef,
+			src: renderedSrc,
+			alt,
+			width: fill ? void 0 : imgWidth,
+			height: fill ? void 0 : imgHeight,
+			loading: imageLoading,
+			fetchPriority: priorityFetchPriority,
+			decoding: "async",
+			className,
+			"data-nimg": fill ? "fill" : "1",
+			onLoad: handleLoad,
+			onError: handleError,
+			style: fill ? getFillStyle(style, blurStyle) : {
+				...blurStyle,
+				...style
+			},
+			...rest
+		});
+	}
 	if (loader) {
 		const resolvedSrc = loader({
 			src,
@@ -364,11 +405,11 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 		} : void 0;
 		const bg = showBlur ? `url(${sanitizedBlur})` : void 0;
 		if (fill) {
-			const fillSizes = sizes ?? "100vw";
+			const imageSizes = sizes ?? "100vw";
 			preloadImageResource({
 				shouldPreload,
 				src,
-				sizes: fillSizes,
+				sizes: imageSizes,
 				fetchPriority: priorityFetchPriority
 			});
 			return /* @__PURE__ */ jsx("img", {
@@ -378,7 +419,7 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 				loading: imageLoading,
 				fetchPriority: priorityFetchPriority,
 				decoding: "async",
-				sizes: fillSizes,
+				sizes: imageSizes,
 				className,
 				"data-nimg": "fill",
 				onLoad: handleLoad,
@@ -414,8 +455,7 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 		}
 	}
 	const imgQuality = quality ?? 75;
-	const isSvg = src.endsWith(".svg");
-	const skipOptimization = _unoptimized === true || isSvg && !__dangerouslyAllowSVG;
+	const skipOptimization = isSvgUrl(src) && !__dangerouslyAllowSVG;
 	const srcSet = imgWidth && !fill && !skipOptimization ? generateSrcSet(src, imgWidth, imgQuality) : imgWidth && !fill ? RESPONSIVE_WIDTHS.filter((w) => w <= imgWidth * 2).map((w) => `${src} ${w}w`).join(", ") || `${src} ${imgWidth}w` : void 0;
 	const optimizedSrc = skipOptimization ? src : imgWidth ? imageOptimizationUrl(src, imgWidth, imgQuality) : imageOptimizationUrl(src, RESPONSIVE_WIDTHS[0], imgQuality);
 	const sanitizedLocalBlur = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
@@ -460,7 +500,7 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 * Returns the props that would be passed to the underlying <img> element.
 */
 function getImageProps(props) {
-	const { src: srcProp, alt, width, height, fill, preload: _preload, priority, quality: _quality, placeholder, blurDataURL: blurDataURLProp, loader, sizes, className, style, onLoad: _onLoad, onLoadingComplete: _onLoadingComplete, unoptimized: _unoptimized, overrideSrc: _overrideSrc, loading, ...rest } = props;
+	const { src: srcProp, alt, width, height, fill, preload: _preload, priority, quality: _quality, placeholder, blurDataURL: blurDataURLProp, loader, sizes, className, style, onLoad: _onLoad, onLoadingComplete: _onLoadingComplete, unoptimized: _unoptimized, overrideSrc, loading, ...rest } = props;
 	const { src, width: imgWidth, height: imgHeight, blurDataURL: imgBlurDataURL } = resolveImageSource({
 		src: srcProp,
 		width,
@@ -468,6 +508,32 @@ function getImageProps(props) {
 		blurDataURL: blurDataURLProp
 	});
 	const shouldPreload = _preload === true || priority === true;
+	if (_unoptimized === true) {
+		const renderedSrc = overrideSrc || src;
+		const sanitizedBlurURL = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
+		const blurStyle = placeholder === "blur" && sanitizedBlurURL ? {
+			backgroundImage: `url(${sanitizedBlurURL})`,
+			backgroundSize: "cover",
+			backgroundRepeat: "no-repeat",
+			backgroundPosition: "center"
+		} : void 0;
+		return { props: {
+			src: renderedSrc,
+			alt,
+			width: fill ? void 0 : imgWidth,
+			height: fill ? void 0 : imgHeight,
+			loading: priority ? "eager" : shouldPreload ? loading : loading ?? "lazy",
+			fetchPriority: priority ? "high" : void 0,
+			decoding: "async",
+			className,
+			"data-nimg": fill ? "fill" : "1",
+			style: fill ? getFillStyle(style, blurStyle) : {
+				...blurStyle,
+				...style
+			},
+			...rest
+		} };
+	}
 	let blockedInProd = false;
 	if (isRemoteUrl(src)) {
 		const validation = validateRemoteUrl(src);
@@ -483,8 +549,7 @@ function getImageProps(props) {
 		width: imgWidth ?? 0,
 		quality: imgQuality
 	}) : src;
-	const isSvg = resolvedSrc.endsWith(".svg");
-	const skipOpt = _unoptimized === true || isSvg && !__dangerouslyAllowSVG || blockedInProd || !!loader || isRemoteUrl(resolvedSrc);
+	const skipOpt = isSvgUrl(resolvedSrc) && !__dangerouslyAllowSVG || blockedInProd || !!loader || isRemoteUrl(resolvedSrc);
 	const optimizedSrc = skipOpt ? resolvedSrc : imgWidth ? imageOptimizationUrl(resolvedSrc, imgWidth, imgQuality) : imageOptimizationUrl(resolvedSrc, RESPONSIVE_WIDTHS[0], imgQuality);
 	const srcSet = imgWidth && !fill && !isRemoteUrl(resolvedSrc) && !loader && !skipOpt ? generateSrcSet(resolvedSrc, imgWidth, imgQuality) : void 0;
 	const sanitizedBlurURL = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;

package/dist/shims/internal/app-page-props-cache-key.d.ts

@@ -0,0 +1,5 @@
+//#region src/shims/internal/app-page-props-cache-key.d.ts
+declare function markAppPagePropsForUseCache<T extends object>(props: T): T;
+declare function isMarkedAppPagePropsObject(value: object): boolean;
+//#endregion
+export { isMarkedAppPagePropsObject, markAppPagePropsForUseCache };

package/dist/shims/internal/app-page-props-cache-key.js

@@ -0,0 +1,16 @@
+//#region src/shims/internal/app-page-props-cache-key.ts
+const APP_PAGE_PROPS_CACHE_KEY_MARKER = Symbol.for("vinext.appPagePropsCacheKeyMarker");
+function markAppPagePropsForUseCache(props) {
+	Object.defineProperty(props, APP_PAGE_PROPS_CACHE_KEY_MARKER, {
+		configurable: false,
+		enumerable: false,
+		value: true,
+		writable: false
+	});
+	return props;
+}
+function isMarkedAppPagePropsObject(value) {
+	return Reflect.get(value, APP_PAGE_PROPS_CACHE_KEY_MARKER) === true;
+}
+//#endregion
+export { isMarkedAppPagePropsObject, markAppPagePropsForUseCache };

package/dist/shims/internal/navigation-untracked.js

@@ -1,5 +1,6 @@
+import { getNavigationContext } from "../navigation-context-state.js";
 import { getPagesNavigationContext } from "./pages-router-accessor.js";
-import { getClientNavigationState, getNavigationContext, useClientNavigationRenderSnapshot } from "../navigation.js";
+import { getClientNavigationState, useClientNavigationRenderSnapshot } from "../navigation.js";
 //#region src/shims/internal/navigation-untracked.ts
 /**
 * Internal navigation-untracked pathname hook.

package/dist/shims/internal/pages-data-fetch-dedup.d.ts

@@ -24,19 +24,18 @@
  *   directly by anyone, which keeps subsequent clones legal even after one
  *   caller has consumed its copy.
  *
- * - No `AbortSignal` is honored at the shared layer. Each `Router.push` cycle
- *   has its own AbortController that supersedes prior navigations via
- *   `_navigationId`; aborting the shared fetch on behalf of one caller would
- *   destroy the dedup gain for every other concurrent caller. Cancellation is
- *   handled by the caller's `assertStillCurrent()` checkpoints after `await`,
- *   not by abort propagation.
+ * - Each caller owns one waiter. Cancelling a waiter leaves the shared request
+ *   alive while another waiter remains; cancelling the final waiter aborts the
+ *   underlying fetch and evicts the entry immediately so a replacement caller
+ *   can retry without joining a doomed request.
  *
  * - The map is module-scoped (one per realm). The Pages Router runs in the
  *   browser only, so a single `Map` is sufficient.
  */
 /**
  * Dedupe a `fetch()` against the `_next/data` endpoint. Multiple concurrent
- * callers for the same `dataHref` share one underlying network request.
+ * callers for the same resolved URL and deployment ID share one underlying
+ * network request.
  *
  * Each call returns a freshly-cloned `Response` so consumers can read the
  * body independently. Once the in-flight Promise settles (resolve or reject)

package/dist/shims/internal/pages-data-fetch-dedup.js

@@ -1,3 +1,4 @@
+import "../../utils/deployment-id.js";
 //#region src/shims/internal/pages-data-fetch-dedup.ts
 /**
 * In-flight request dedup for the Pages Router `/_next/data/<id>/<page>.json`
@@ -24,21 +25,57 @@
 *   directly by anyone, which keeps subsequent clones legal even after one
 *   caller has consumed its copy.
 *
-* - No `AbortSignal` is honored at the shared layer. Each `Router.push` cycle
-*   has its own AbortController that supersedes prior navigations via
-*   `_navigationId`; aborting the shared fetch on behalf of one caller would
-*   destroy the dedup gain for every other concurrent caller. Cancellation is
-*   handled by the caller's `assertStillCurrent()` checkpoints after `await`,
-*   not by abort propagation.
+* - Each caller owns one waiter. Cancelling a waiter leaves the shared request
+*   alive while another waiter remains; cancelling the final waiter aborts the
+*   underlying fetch and evicts the entry immediately so a replacement caller
+*   can retry without joining a doomed request.
 *
 * - The map is module-scoped (one per realm). The Pages Router runs in the
 *   browser only, so a single `Map` is sufficient.
 */
-/** Inflight fetch promises keyed by the resolved data URL. */
+/** Inflight fetch entries keyed by the resolved data request identity. */
 const inflight = /* @__PURE__ */ new Map();
+function getInflightKey(dataHref, init) {
+	let resolvedHref = dataHref;
+	if (typeof window !== "undefined") try {
+		resolvedHref = new URL(dataHref, window.location.href).href;
+	} catch {}
+	const deploymentId = new Headers(init?.headers).get("x-deployment-id") ?? "";
+	return `${resolvedHref}\n${deploymentId}`;
+}
+function cloneSharedResponse(key, entry, signal) {
+	entry.waiters += 1;
+	return new Promise((resolve, reject) => {
+		let released = false;
+		const release = (cancelled) => {
+			if (released) return;
+			released = true;
+			entry.waiters -= 1;
+			if (cancelled && entry.waiters === 0 && !entry.settled) {
+				if (inflight.get(key) === entry) inflight.delete(key);
+				entry.controller.abort();
+			}
+		};
+		const abort = () => {
+			release(true);
+			reject(new DOMException("Aborted", "AbortError"));
+		};
+		signal?.addEventListener("abort", abort, { once: true });
+		entry.promise.then((response) => {
+			signal?.removeEventListener("abort", abort);
+			release(false);
+			resolve(response.clone());
+		}, (error) => {
+			signal?.removeEventListener("abort", abort);
+			release(false);
+			reject(error);
+		});
+	});
+}
 /**
 * Dedupe a `fetch()` against the `_next/data` endpoint. Multiple concurrent
-* callers for the same `dataHref` share one underlying network request.
+* callers for the same resolved URL and deployment ID share one underlying
+* network request.
 *
 * Each call returns a freshly-cloned `Response` so consumers can read the
 * body independently. Once the in-flight Promise settles (resolve or reject)
@@ -48,20 +85,36 @@ const inflight = /* @__PURE__ */ new Map();
 * dropped on failure so the next navigation can retry.
 */
 function dedupedPagesDataFetch(dataHref, init) {
-	let entry = inflight.get(dataHref);
+	const key = getInflightKey(dataHref, init);
+	const signal = init?.signal ?? void 0;
+	if (signal?.aborted) return Promise.reject(new DOMException("Aborted", "AbortError"));
+	let entry = inflight.get(key);
 	if (!entry) {
-		entry = fetch(dataHref, init).finally(() => {
-			if (inflight.get(dataHref) === entry) inflight.delete(dataHref);
-		});
-		inflight.set(dataHref, entry);
+		const controller = new AbortController();
+		let currentEntry;
+		currentEntry = {
+			controller,
+			promise: fetch(dataHref, {
+				...init,
+				signal: controller.signal
+			}).finally(() => {
+				currentEntry.settled = true;
+				if (inflight.get(key) === currentEntry) inflight.delete(key);
+			}),
+			settled: false,
+			waiters: 0
+		};
+		inflight.set(key, currentEntry);
+		entry = currentEntry;
 	}
-	return entry.then((res) => res.clone());
+	return cloneSharedResponse(key, entry, signal);
 }
 /**
 * Drop every cached in-flight entry. Intended for tests; production code
 * does not need to call this because entries self-evict on settle.
 */
 function clearPagesDataInflight() {
+	for (const entry of inflight.values()) entry.controller.abort();
 	inflight.clear();
 }
 //#endregion

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

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../../utils/base-path.js";
 import { getLocalePathPrefix } from "../../utils/domain-locale.js";
 import { buildPagesDataHref, matchPagesPattern } from "./pages-data-url.js";
-import { dedupedPagesDataFetch } from "./pages-data-fetch-dedup.js";
 import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../../utils/deployment-id.js";
+import { dedupedPagesDataFetch } from "./pages-data-fetch-dedup.js";
 //#region src/shims/internal/pages-data-target.ts
 /**
 * Shared decision helper for the Pages Router `/_next/data/<id>/<page>.json`

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

@@ -1,4 +1,4 @@
-import { SegmentMap } from "./navigation.js";
+import { SegmentMap } from "./navigation-context-state.js";
 import { ReactNode } from "react";
 
 //#region src/shims/layout-segment-context.d.ts

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

@@ -1,5 +1,6 @@
 "use client";
-import { getLayoutSegmentContext } from "./navigation.js";
+import { getLayoutSegmentContext } from "./navigation-context-state.js";
+import "./navigation-server.js";
 import { createElement } from "react";
 //#region src/shims/layout-segment-context.tsx
 /**

package/dist/shims/link.js

@@ -14,10 +14,10 @@ import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.j
 import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
-import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
+import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
 import { getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
-import { navigatePagesRouterLink } from "../client/pages-router-link-navigation.js";
 import { getI18nContext } from "./i18n-context.js";
 import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
 import { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation } from "./internal/link-status-registry.js";
@@ -56,6 +56,19 @@ function resolveHref(href) {
 	}
 	return url;
 }
+function resolvePagesQueryOnlyHref(href) {
+	if (!href.startsWith("?") || typeof window === "undefined") return href;
+	const pagesRouter = window.next?.appDir === true ? void 0 : window.next?.router;
+	return resolvePagesRouterQueryOnlyHref(href, {
+		asPath: pagesRouter && "reload" in pagesRouter && "asPath" in pagesRouter && typeof pagesRouter.asPath === "string" ? pagesRouter.asPath : void 0,
+		basePath: __basePath,
+		fallbackHref: window.location.href,
+		locales: window.__VINEXT_LOCALES__
+	});
+}
+function resolvePagesLinkNavigationHref(href, locale) {
+	return normalizePathTrailingSlash(applyLocaleToHref(resolvePagesQueryOnlyHref(href), locale), __trailingSlash);
+}
 /**
 * Collapse repeated forward-slashes (and convert backslashes to forward-slashes)
 * in the path portion of a URL, preserving any query string.
@@ -493,7 +506,9 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			navigateHref = localPath;
 		}
 		e.preventDefault();
-		const absoluteFullHref = toBrowserNavigationHref(navigateHref, window.location.href, __basePath);
+		const hasAppNavigationRuntime = Boolean(getNavigationRuntime()?.functions.navigate);
+		const pagesNavigateHref = resolvedHref.startsWith("?") ? resolvePagesLinkNavigationHref(resolvedHref, locale) : navigateHref;
+		const absoluteFullHref = toBrowserNavigationHref(hasAppNavigationRuntime ? navigateHref : pagesNavigateHref, window.location.href, __basePath);
 		if (onNavigate) try {
 			const navUrl = new URL(absoluteFullHref, window.location.origin);
 			let prevented = false;
@@ -509,12 +524,12 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			onNavigate(navEvent);
 			if (navEvent.defaultPrevented) return;
 		} catch {}
-		if (getNavigationRuntime()?.functions.navigate && ["pages", "document"].includes(resolveHybridClientRouteOwner(navigateHref, __basePath) ?? "")) {
+		if (hasAppNavigationRuntime && ["pages", "document"].includes(resolveHybridClientRouteOwner(navigateHref, __basePath) ?? "")) {
 			if (replace) window.location.replace(absoluteFullHref);
 			else window.location.assign(absoluteFullHref);
 			return;
 		}
-		if (getNavigationRuntime()?.functions.navigate) {
+		if (hasAppNavigationRuntime) {
 			const setter = setPendingRef.current;
 			if (setter) setLinkForCurrentNavigation(setter);
 			setPending(true);
@@ -525,19 +540,25 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 				});
 			});
 			return;
-		} else try {
-			const Router = (await import("next/router.js")).default;
-			await navigatePagesRouterLink(Router, {
-				href: navigateHref,
-				replace,
-				scroll,
-				shallow,
-				locale
+		} else {
+			const Router = window.next?.appDir === true ? void 0 : window.next?.router;
+			await navigatePagesRouterLinkWithFallback({
+				router: Router && "reload" in Router ? Router : void 0,
+				loadRouter: async () => (await import("next/router.js")).default,
+				navigation: {
+					href: pagesNavigateHref,
+					replace,
+					scroll,
+					shallow,
+					locale,
+					interpolateDynamicRoute: resolvedHref.startsWith("?")
+				},
+				fallback: () => {
+					if (replace) window.history.replaceState({}, "", absoluteFullHref);
+					else window.history.pushState({}, "", absoluteFullHref);
+					window.dispatchEvent(new PopStateEvent("popstate"));
+				}
 			});
-		} catch {
-			if (replace) window.history.replaceState({}, "", absoluteFullHref);
-			else window.history.pushState({}, "", absoluteFullHref);
-			window.dispatchEvent(new PopStateEvent("popstate"));
 		}
 	};
 	const anchorProps = restWithoutLocale;

package/dist/shims/metadata.js

@@ -621,7 +621,7 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 				}
 			}
 		}
-		if (tw.players) {
+		if (tw.card === "player" && tw.players) {
 			const players = Array.isArray(tw.players) ? tw.players : [tw.players];
 			for (const player of players) {
 				const playerUrl = player.playerUrl.toString();
@@ -644,7 +644,7 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 				}, key++));
 			}
 		}
-		if (tw.app) {
+		if (tw.card === "app" && tw.app) {
 			const { app } = tw;
 			for (const platform of [
 				"iphone",
@@ -655,11 +655,11 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 					name: `twitter:app:name:${platform}`,
 					content: app.name
 				}, key++));
-				if (app.id[platform] !== void 0) elements.push(/* @__PURE__ */ jsx("meta", {
+				if (app.id[platform]) elements.push(/* @__PURE__ */ jsx("meta", {
 					name: `twitter:app:id:${platform}`,
 					content: String(app.id[platform])
 				}, key++));
-				if (app.url?.[platform] !== void 0) {
+				if (app.url?.[platform]) {
 					const appUrl = app.url[platform].toString();
 					elements.push(/* @__PURE__ */ jsx("meta", {
 						name: `twitter:app:url:${platform}`,

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

@@ -0,0 +1,40 @@
+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.
+ */
+type SegmentMap = Readonly<Record<string, string[]>> & {
+  readonly children: string[];
+};
+type NavigationContext = {
+  pathname: string;
+  searchParams: URLSearchParams;
+  params: Record<string, string | string[]>;
+};
+declare const ServerInsertedHTMLContext: React$1.Context<((callback: () => unknown) => void) | null> | null;
+declare function getLayoutSegmentContext(): React$1.Context<SegmentMap> | null;
+declare function getBfcacheIdMapContext(): React$1.Context<Readonly<Record<string, string>> | null> | null;
+declare function getBfcacheSegmentIdContext(): React$1.Context<string | null> | null;
+type NavigationStateAccessors = {
+  getServerContext: () => NavigationContext | null;
+  setServerContext: (context: NavigationContext | null) => void;
+  getInsertedHTMLCallbacks: () => Array<() => unknown>;
+  clearInsertedHTMLCallbacks: () => void;
+};
+declare const GLOBAL_ACCESSORS_KEY: unique symbol;
+declare function clearClientHydrationContext(): void;
+/**
+ * Register request-scoped accessors supplied by navigation-state.ts.
+ * The global accessor key also bridges separate Vite module instances.
+ */
+declare function _registerStateAccessors(accessors: NavigationStateAccessors): void;
+declare function getNavigationContext(): NavigationContext | null;
+declare function setNavigationContext(context: NavigationContext | null): void;
+declare function registerServerInsertedHTMLCallback(callback: () => unknown): void;
+declare function flushServerInsertedHTML(): unknown[];
+declare function renderServerInsertedHTML(): unknown[];
+declare function clearServerInsertedHTML(): void;
+//#endregion
+export { GLOBAL_ACCESSORS_KEY, NavigationContext, NavigationStateAccessors, SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext };