vinext 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/shims/link.d.ts

@@ -1,19 +1,11 @@
 import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
-import { UrlQuery } from "../utils/query.js";
+import { UrlObject } from "node:url";
 import React, { AnchorHTMLAttributes } from "react";
 
 //#region src/shims/link.d.ts
-type NavigateEvent = {
-  url: URL; /** Call to prevent the Link's default navigation (e.g. for View Transitions). */
-  preventDefault(): void; /** Whether preventDefault() has been called. */
-  defaultPrevented: boolean;
-};
-type LinkProps = {
-  href: string | {
-    pathname?: string;
-    query?: UrlQuery;
-  }; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
-  as?: string; /** Replace the current history entry instead of pushing */
+type LinkProps<_RouteInferType = unknown> = {
+  href: string | UrlObject; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
+  as?: string | UrlObject; /** Replace the current history entry instead of pushing */
   replace?: boolean; /** Prefetch the page in the background (App Router default: auto, Pages Router default: true) */
   prefetch?: boolean | "auto" | null;
   /**
@@ -39,7 +31,10 @@ type LinkProps = {
    */
   shallow?: boolean; /** Locale for i18n (used for locale-prefixed URLs) */
   locale?: string | false; /** Called before navigation happens (Next.js 16). Return value is ignored. */
-  onNavigate?: (event: NavigateEvent) => void;
+  onNavigate?: (event: {
+    preventDefault(): void;
+  }) => void;
+  transitionTypes?: string[];
   children?: React.ReactNode;
 } & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, "href">;
 type LinkPrefetchMode = "disabled" | "auto" | "full" | "full-after-shell";
@@ -65,11 +60,8 @@ declare function resolveAutoAppRoutePrefetch(href: string): {
   shouldPrefetch: boolean;
 };
 declare const Link: React.ForwardRefExoticComponent<{
-  href: string | {
-    pathname?: string;
-    query?: UrlQuery;
-  }; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
-  as?: string; /** Replace the current history entry instead of pushing */
+  href: string | UrlObject; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
+  as?: string | UrlObject; /** Replace the current history entry instead of pushing */
   replace?: boolean; /** Prefetch the page in the background (App Router default: auto, Pages Router default: true) */
   prefetch?: boolean | "auto" | null;
   /**
@@ -95,8 +87,11 @@ declare const Link: React.ForwardRefExoticComponent<{
    */
   shallow?: boolean; /** Locale for i18n (used for locale-prefixed URLs) */
   locale?: string | false; /** Called before navigation happens (Next.js 16). Return value is ignored. */
-  onNavigate?: (event: NavigateEvent) => void;
+  onNavigate?: (event: {
+    preventDefault(): void;
+  }) => void;
+  transitionTypes?: string[];
   children?: React.ReactNode;
-} & Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> & React.RefAttributes<HTMLAnchorElement>>;
+} & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, "href"> & React.RefAttributes<HTMLAnchorElement>>;
 //#endregion
-export { canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };
+export { LinkProps, canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };

package/dist/shims/link.js

@@ -28,6 +28,7 @@ import { jsx } from "react/jsx-runtime";
 * page swap via the router's navigation system.
 */
 const HAS_PAGES_ROUTER = process.env.__VINEXT_HAS_PAGES_ROUTER !== "false";
+const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
 const LinkStatusContext = createContext({ pending: false });
 /**
 * useLinkStatus returns the pending state of the enclosing <Link>.
@@ -37,7 +38,12 @@ const LinkStatusContext = createContext({ pending: false });
 function useLinkStatus() {
 	return useContext(LinkStatusContext);
 }
-if (typeof window !== "undefined") registerNavigationRuntimeFunctions({ notifyLinkNavigationStart });
+let linkPrefetchNavigationEpoch = 0;
+function notifyLinkNavigationStartAndCancelPrefetchSetup() {
+	linkPrefetchNavigationEpoch += 1;
+	notifyLinkNavigationStart();
+}
+if (typeof window !== "undefined") registerNavigationRuntimeFunctions({ notifyLinkNavigationStart: notifyLinkNavigationStartAndCancelPrefetchSetup });
 /** basePath from next.config.js, injected by the plugin at build time */
 const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 /** trailingSlash from next.config.js, injected by the plugin at build time */
@@ -51,11 +57,12 @@ function resolveHref(href) {
 		const params = urlQueryToSearchParams(href.query);
 		url = appendSearchParamsToUrl(url, params);
 	}
+	if (href.hash) url += href.hash.startsWith("#") ? href.hash : `#${href.hash}`;
 	return url;
 }
 function resolvePagesQueryOnlyHref(href) {
 	if (!HAS_PAGES_ROUTER) return href;
-	if (!href.startsWith("?") || typeof window === "undefined") return href;
+	if (!href.startsWith("?") && !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,
@@ -206,6 +213,7 @@ function resolveFullAppRoutePrefetch() {
 */
 function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 	if (typeof window === "undefined") return;
+	const navigationEpoch = linkPrefetchNavigationEpoch;
 	const prefetchHref = getLinkPrefetchHref({
 		href,
 		basePath: __basePath,
@@ -224,20 +232,21 @@ 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, { resolveHybridClientRewriteHref, resolveHybridClientRouteOwner }] = await Promise.all([
+				const [navigation, { AppElementsWire }, rscCacheBusting, { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, headersModule, hybridRouteOwner] = await Promise.all([
 					import("./navigation.js"),
 					import("../server/app-elements.js"),
 					import("../server/app-rsc-cache-busting.js"),
 					import("../server/app-rsc-render-mode.js"),
 					import("../server/headers.js"),
-					import("./internal/hybrid-client-route-owner.js")
+					HAS_PAGES_ROUTER || HAS_CLIENT_REWRITES ? import("./internal/hybrid-client-route-owner.js") : null
 				]);
+				if (navigationEpoch !== linkPrefetchNavigationEpoch) return;
 				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, peekPrefetchResponseForNavigation, prefetchRscResponse, restoreRscResponse, PREFETCH_CACHE_TTL } = navigation;
 				const { createRscRequestHeaders, createRscRequestUrl } = rscCacheBusting;
 				const { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } = headersModule;
-				const hybridOwner = resolveHybridClientRouteOwner(prefetchHref, __basePath);
+				const hybridOwner = HAS_PAGES_ROUTER ? hybridRouteOwner.resolveHybridClientRouteOwner(prefetchHref, __basePath) : null;
 				if (hybridOwner === "pages" || hybridOwner === "document") return;
-				const rewrittenPrefetchHref = resolveHybridClientRewriteHref(fullHref, __basePath);
+				const rewrittenPrefetchHref = HAS_CLIENT_REWRITES ? hybridRouteOwner.resolveHybridClientRewriteHref(fullHref, __basePath) : null;
 				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(rewrittenPrefetchHref ?? prefetchHref) : mode === "full-after-shell" ? {
 					cacheForNavigation: true,
 					prefetchShellFirst: true,
@@ -369,7 +378,8 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					await shellEntry?.pending?.catch(() => {});
 					const renderedPathAndSearch = shellEntry?.snapshot?.renderedPathAndSearch;
 					if (renderedPathAndSearch) {
-						const cachedRenderedResponse = peekPrefetchResponseForNavigation(await createRscRequestUrl(renderedPathAndSearch, headers), interceptionContext, mountedSlotsHeader);
+						const renderedRscUrl = await createRscRequestUrl(renderedPathAndSearch, headers);
+						const cachedRenderedResponse = peekPrefetchResponseForNavigation(renderedRscUrl, interceptionContext, mountedSlotsHeader);
 						if (cachedRenderedResponse) return restoreRscResponse(cachedRenderedResponse);
 					}
 					return scheduleAppPrefetchFetch(() => fetch(rscUrl, {
@@ -568,18 +578,20 @@ function applyLocaleToHref(href, locale) {
 */
 function resolveConcreteRouteHref(href, as) {
 	if (typeof as !== "string") return null;
-	return interpolateDynamicRouteHref(typeof href === "string" ? href : resolveHref(href), as, typeof href === "string" ? void 0 : href.query)?.href || 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;
 }
-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, ...rest }, forwardedRef) {
+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 asHref = as === void 0 ? void 0 : resolveHref(as);
 	const { locale, ...restWithoutLocale } = rest;
 	let children = childrenProp;
 	if (legacyBehavior && (typeof childrenProp === "string" || typeof childrenProp === "number")) children = React.createElement("a", null, childrenProp);
-	const rawResolvedHref = as ?? resolveHref(href);
-	const routeHrefRaw = (HAS_PAGES_ROUTER ? resolveConcreteRouteHref(href, as) : null) ?? (typeof href === "string" ? href : resolveHref(href));
+	const unresolvedHref = asHref ?? resolveHref(href);
+	const rawResolvedHref = typeof unresolvedHref === "string" && unresolvedHref.startsWith("#") ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
+	const routeHrefRaw = (HAS_PAGES_ROUTER ? resolveConcreteRouteHref(href, asHref) : null) ?? (typeof href === "string" ? href : resolveHref(href));
 	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 = HAS_PAGES_ROUTER && typeof as === "string" && typeof routeHrefRaw === "string" && as !== routeHrefRaw ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : routeHrefRaw, locale), __trailingSlash) : normalizedHref;
+	const normalizedRouteHref = HAS_PAGES_ROUTER && typeof asHref === "string" && typeof routeHrefRaw === "string" && asHref !== routeHrefRaw ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : routeHrefRaw, locale), __trailingSlash) : normalizedHref;
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
@@ -701,7 +713,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		e.preventDefault();
 		const hasAppNavigationRuntime = Boolean(getNavigationRuntime()?.functions.navigate);
 		const pagesNavigateHref = HAS_PAGES_ROUTER && resolvedHref.startsWith("?") ? resolvePagesLinkNavigationHref(resolvedHref, locale) : navigateHref;
-		const pagesAsForLink = HAS_PAGES_ROUTER && typeof as === "string" && typeof routeHrefRaw === "string" && as !== routeHrefRaw ? pagesNavigateHref : void 0;
+		const pagesAsForLink = HAS_PAGES_ROUTER && typeof asHref === "string" && typeof routeHrefRaw === "string" && asHref !== routeHrefRaw ? pagesNavigateHref : void 0;
 		const pagesHrefForLink = pagesAsForLink === void 0 ? pagesNavigateHref : routeHrefRaw;
 		const absoluteFullHref = toBrowserNavigationHref(hasAppNavigationRuntime ? navigateHref : pagesNavigateHref, window.location.href, __basePath);
 		if (onNavigate) try {

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

@@ -13,7 +13,7 @@ type NavigationContext = {
   searchParams: URLSearchParams;
   params: Record<string, string | string[]>;
 };
-declare const ServerInsertedHTMLContext: React$1.Context<((callback: () => unknown) => void) | null> | null;
+declare const ServerInsertedHTMLContext: React$1.Context<((callback: () => React$1.ReactNode) => 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;

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

@@ -26,7 +26,8 @@ type RedirectErrorShape = Error & {
 };
 /**
  * vinext accepts its three-part redirect digest and Next.js's five-part form.
- * A prefix check is deliberate because vinext permits an empty redirect type.
+ * This is deliberately only a cheap prefix gate because vinext permits an
+ * empty redirect type; parseRedirectDigest is the authoritative validator.
  */
 declare function isRedirectError(error: unknown): error is RedirectErrorShape;
 declare function decodeRedirectError(digest: string): {

package/dist/shims/navigation-errors.js

@@ -1,3 +1,4 @@
+import { parseRedirectDigest } from "../utils/redirect-digest.js";
 //#region src/shims/navigation-errors.ts
 /**
 * Server-safe navigation control-flow errors and predicates.
@@ -52,24 +53,19 @@ function unauthorized() {
 }
 /**
 * vinext accepts its three-part redirect digest and Next.js's five-part form.
-* A prefix check is deliberate because vinext permits an empty redirect type.
+* This is deliberately only a cheap prefix gate because vinext permits an
+* empty redirect type; parseRedirectDigest is the authoritative validator.
 */
 function isRedirectError(error) {
 	return !!error && typeof error === "object" && "digest" in error && typeof error.digest === "string" && error.digest.startsWith("NEXT_REDIRECT;");
 }
 function decodeRedirectError(digest) {
-	if (!digest.startsWith("NEXT_REDIRECT;")) return null;
-	const parts = digest.split(";");
-	const encodedTarget = parts.length >= 5 ? parts.slice(2, -2).join(";") : parts[2];
-	if (!encodedTarget) return null;
-	try {
-		return {
-			url: decodeURIComponent(encodedTarget),
-			type: parts[1] === "push" ? "push" : "replace"
-		};
-	} catch {
-		return null;
-	}
+	const redirect = parseRedirectDigest(digest);
+	if (!redirect) return null;
+	return {
+		url: redirect.url,
+		type: redirect.type === "push" ? "push" : "replace"
+	};
 }
 function isNextRouterError(error) {
 	return isRedirectError(error) || isHTTPAccessFallbackError(error);

package/dist/shims/navigation.d.ts

@@ -6,8 +6,12 @@ import { GLOBAL_ACCESSORS_KEY, NavigationContext, NavigationStateAccessors, Segm
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
+import { Params } from "@vinext/types/next/upstream/dist/server/request/params";
 
 //#region src/shims/navigation.d.ts
+/** Load rewrite-aware hybrid route ownership before navigation becomes interactive. */
+declare function preloadHybridClientRouteOwner(): Promise<void>;
+declare function resolveLoadedHybridClientRewriteHref(href: string, basePath: string): string | null;
 /** basePath from next.config.js, injected by the plugin at build time */
 declare const __basePath: string;
 /** Maximum buffered bytes in the RSC prefetch cache. Mirrors Next.js' 50 MB LRU. */
@@ -203,7 +207,7 @@ declare function clearPendingPathname(navId: number): void;
  * Returns the current pathname.
  * Server: from request context. Client: from window.location.
  */
-declare function usePathname(): string | null;
+declare function usePathname(): string;
 /**
  * Returns the current search params as a read-only URLSearchParams.
  */
@@ -211,7 +215,7 @@ declare function useSearchParams(): ReadonlyURLSearchParams;
 /**
  * Returns the dynamic params for the current route.
  */
-declare function useParams<T extends Record<string, string | string[]> = Record<string, string | string[]>>(): T | null;
+declare function useParams<T extends Params = Params>(): T | null;
 /**
  * Commit pending client navigation state to committed snapshots.
  *
@@ -252,7 +256,6 @@ declare const appRouterInstance: AppRouterInstance;
  * and layers the nearest segment's contextual `bfcacheId` on top.
  */
 declare function useRouter(): {
-  bfcacheId: string;
   back(): void;
   forward(): void;
   refresh(): void;
@@ -260,6 +263,7 @@ declare function useRouter(): {
   replace(href: string, options?: NavigateOptions): void;
   prefetch(href: string, options?: PrefetchOptions$1): void;
   experimental_gesturePush?(href: string, options?: NavigateOptions): void;
+  bfcacheId: string;
 };
 /**
  * Returns the active child segment one level below the layout where it's called.
@@ -299,4 +303,4 @@ declare function useSelectedLayoutSegments(parallelRoutesKey?: string): string[]
  */
 declare function useServerInsertedHTML(callback: () => unknown): void;
 //#endregion
-export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.js

@@ -1,11 +1,13 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
-import { isAbsoluteOrProtocolRelativeUrl, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
+import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
+import { toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
@@ -22,7 +24,6 @@ import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navig
 import { navigationPlanner } from "../server/navigation-planner.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { getPagesNavigationContext } from "./internal/pages-router-accessor.js";
-import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
 import { releaseAppPrefetchFetchSlot, scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
@@ -34,6 +35,22 @@ import * as React$1 from "react";
 * Server-side: reads from a request context set by the RSC handler.
 * Client-side: reads from browser Location API and provides navigation.
 */
+const HAS_PAGES_ROUTER = process.env.__VINEXT_HAS_PAGES_ROUTER !== "false";
+let hybridClientRouteOwnerModule = null;
+let hybridClientRouteOwnerModulePromise = null;
+/** Load rewrite-aware hybrid route ownership before navigation becomes interactive. */
+async function preloadHybridClientRouteOwner() {
+	if (hybridClientRouteOwnerModule) return;
+	hybridClientRouteOwnerModulePromise ??= import("./internal/hybrid-client-route-owner.js");
+	hybridClientRouteOwnerModule = await hybridClientRouteOwnerModulePromise;
+}
+function resolveLoadedHybridClientRewriteHref(href, basePath) {
+	return hybridClientRouteOwnerModule?.resolveHybridClientRewriteHref(href, basePath) ?? null;
+}
+function resolveHybridClientRouteOwner(href) {
+	if (!HAS_PAGES_ROUTER) return null;
+	return hybridClientRouteOwnerModule ? hybridClientRouteOwnerModule.resolveHybridClientRouteOwner(href, __basePath) : resolveDirectHybridClientRouteOwner(href, __basePath);
+}
 /**
 * Read the child segments for a parallel route below the current layout.
 * Returns [] if no context is available (RSC environment, outside React tree)
@@ -331,7 +348,7 @@ function notifyPrefetchInvalidated(entry) {
 }
 function deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, notify) {
 	adjustPrefetchCacheByteSize(cache, -getPrefetchCacheEntrySize(entry));
-	const cacheKeys = entry.cacheKeys ?? new Set([cacheKey]);
+	const cacheKeys = entry.cacheKeys ?? /* @__PURE__ */ new Set([cacheKey]);
 	for (const key of cacheKeys) {
 		if (cache.get(key) === entry) cache.delete(key);
 		prefetched.delete(key);
@@ -384,7 +401,7 @@ function seedPrefetchResponseSnapshot(rscUrl, snapshot, interceptionContext = nu
 	const timestamp = Date.now();
 	const entry = {
 		cacheForNavigation: true,
-		cacheKeys: new Set([cacheKey]),
+		cacheKeys: /* @__PURE__ */ new Set([cacheKey]),
 		expiresAt: resolveCachedRscResponseExpiresAt(timestamp, snapshot, fallbackTtlMs),
 		mountedSlotsHeader,
 		outcome: "cache-seeded",
@@ -428,7 +445,7 @@ function storePrefetchResponse(rscUrl, response, interceptionContext = null, opt
 	const existing = cache.get(cacheKey);
 	if (existing) deletePrefetchCacheEntry(cache, prefetched, cacheKey, existing, false);
 	const entry = {
-		cacheKeys: new Set([cacheKey]),
+		cacheKeys: /* @__PURE__ */ new Set([cacheKey]),
 		mountedSlotsHeader: null,
 		outcome: "pending",
 		timestamp: Date.now()
@@ -531,7 +548,7 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 	if (existing) deletePrefetchCacheEntry(cache, prefetched, cacheKey, existing, false);
 	const entry = {
 		cacheForNavigation: behavior.cacheForNavigation ?? true,
-		cacheKeys: new Set([cacheKey]),
+		cacheKeys: /* @__PURE__ */ new Set([cacheKey]),
 		mountedSlotsHeader,
 		optimisticRouteShell: behavior.optimisticRouteShell === true,
 		outcome: "pending",
@@ -577,7 +594,7 @@ function addRenderedPathAndSearchPrefetchAlias(cache, prefetched, primaryCacheKe
 	if (aliasCacheKey === primaryCacheKey) return;
 	const existing = cache.get(aliasCacheKey);
 	if (existing && existing !== entry) deletePrefetchCacheEntry(cache, prefetched, aliasCacheKey, existing, false);
-	entry.cacheKeys ??= new Set([primaryCacheKey]);
+	entry.cacheKeys ??= /* @__PURE__ */ new Set([primaryCacheKey]);
 	entry.cacheKeys.add(aliasCacheKey);
 	cache.set(aliasCacheKey, entry);
 	prefetched.add(aliasCacheKey);
@@ -941,12 +958,6 @@ function useParams() {
 	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.params;
 	return params;
 }
-/**
-* Check if a href is an external URL (any URL scheme per RFC 3986, or protocol-relative).
-*/
-function isExternalUrl(href) {
-	return isAbsoluteOrProtocolRelativeUrl(href);
-}
 function withSuppressedUrlNotifications(fn) {
 	const state = getClientNavigationState();
 	if (!state) return fn();
@@ -1094,7 +1105,7 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 		}
 		normalizedHref = localPath;
 	}
-	const hybridOwner = resolveHybridClientRouteOwner(normalizedHref, __basePath);
+	const hybridOwner = resolveHybridClientRouteOwner(normalizedHref);
 	if (hybridOwner === "pages" || hybridOwner === "document") {
 		const fullHref = toBrowserNavigationHref(normalizedHref, window.location.href, __basePath);
 		notifyAppRouterTransitionStart(fullHref, mode);
@@ -1238,12 +1249,12 @@ const _appRouter = {
 		}
 		(async () => {
 			let prefetchHref = href;
-			if (isAbsoluteOrProtocolRelativeUrl(href)) {
+			if (isExternalUrl(href)) {
 				const localPath = toSameOriginAppPath(href, __basePath);
 				if (localPath == null) return;
 				prefetchHref = localPath;
 			}
-			const hybridOwner = resolveHybridClientRouteOwner(prefetchHref, __basePath);
+			const hybridOwner = resolveHybridClientRouteOwner(prefetchHref);
 			if (hybridOwner === "pages" || hybridOwner === "document") return;
 			const fullHref = toBrowserNavigationHref(prefetchHref, window.location.href, __basePath);
 			const interceptionContext = getPrefetchInterceptionContext(fullHref);
@@ -1273,7 +1284,7 @@ if (process.env.__NEXT_GESTURE_TRANSITION) _appRouter.experimental_gesturePush =
 	if (isServer) return;
 	if (!getNavigationRuntime()?.functions.navigate) return;
 	let appHref = href;
-	if (isAbsoluteOrProtocolRelativeUrl(href)) {
+	if (isExternalUrl(href)) {
 		const localPath = toSameOriginAppPath(href, __basePath);
 		if (localPath === null) return;
 		appHref = localPath;
@@ -1401,4 +1412,4 @@ if (!isServer) {
 	}
 }
 //#endregion
-export { BailoutToCSRError, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/next-shims-augmentations.d.ts

@@ -0,0 +1 @@
+import "@vinext/types/next/augmentations";

package/dist/shims/next-shims-public.d.ts

@@ -0,0 +1 @@
+import "@vinext/types/next";

package/dist/shims/public-shim-map.json.js

@@ -0,0 +1,103 @@
+//#region src/shims/public-shim-map.json
+var public_shim_map_default = {
+	"next/link": {
+		"shim": "link",
+		"types": "upstream"
+	},
+	"next/head": {
+		"shim": "head",
+		"types": "upstream"
+	},
+	"next/router": {
+		"shim": "router",
+		"types": "upstream"
+	},
+	"next/compat/router": {
+		"shim": "compat-router",
+		"types": "upstream"
+	},
+	"next/image": {
+		"shim": "image",
+		"types": "upstream"
+	},
+	"next/legacy/image": {
+		"shim": "legacy-image",
+		"types": "upstream"
+	},
+	"next/dynamic": {
+		"shim": "dynamic",
+		"types": "upstream"
+	},
+	"next/app": {
+		"shim": "app",
+		"types": "upstream"
+	},
+	"next/document": {
+		"shim": "document",
+		"types": "upstream"
+	},
+	"next/config": {
+		"shim": "config",
+		"types": "vinext"
+	},
+	"next/script": {
+		"shim": "script",
+		"types": "upstream"
+	},
+	"next/server": {
+		"shim": "server",
+		"types": "upstream"
+	},
+	"next/navigation": {
+		"shim": "navigation",
+		"types": "upstream",
+		"reactServer": true
+	},
+	"next/headers": {
+		"shim": "headers",
+		"types": "upstream"
+	},
+	"next/font/google": {
+		"shim": "font-google",
+		"types": "upstream"
+	},
+	"next/font/local": {
+		"shim": "font-local",
+		"types": "upstream"
+	},
+	"next/cache": {
+		"shim": "cache",
+		"types": "upstream"
+	},
+	"next/form": {
+		"shim": "form",
+		"types": "upstream"
+	},
+	"next/og": {
+		"shim": "og",
+		"types": "upstream"
+	},
+	"next/web-vitals": {
+		"shim": "web-vitals",
+		"types": "vinext"
+	},
+	"next/amp": {
+		"shim": "amp",
+		"types": "vinext"
+	},
+	"next/offline": {
+		"shim": "offline",
+		"types": "vinext"
+	},
+	"next/error": {
+		"shim": "error",
+		"types": "upstream",
+		"reactServer": true
+	},
+	"next/constants": {
+		"shim": "constants",
+		"types": "upstream"
+	}
+};
+//#endregion
+export { public_shim_map_default as default };

package/dist/shims/readonly-url-search-params.d.ts

@@ -4,9 +4,9 @@
  * Mutation methods remain present for instanceof/API compatibility but throw.
  */
 declare class ReadonlyURLSearchParams extends URLSearchParams {
-  append(_name: string, _value: string): never;
-  delete(_name: string, _value?: string): never;
-  set(_name: string, _value: string): never;
+  append(): never;
+  delete(): never;
+  set(): never;
   sort(): never;
 }
 //#endregion

package/dist/shims/readonly-url-search-params.js

@@ -9,13 +9,13 @@ var ReadonlyURLSearchParamsError = class extends Error {
 * Mutation methods remain present for instanceof/API compatibility but throw.
 */
 var ReadonlyURLSearchParams = class extends URLSearchParams {
-	append(_name, _value) {
+	append() {
 		throw new ReadonlyURLSearchParamsError();
 	}
-	delete(_name, _value) {
+	delete() {
 		throw new ReadonlyURLSearchParamsError();
 	}
-	set(_name, _value) {
+	set() {
 		throw new ReadonlyURLSearchParamsError();
 	}
 	sort() {

package/dist/shims/request-state-types.d.ts

@@ -1,6 +1,6 @@
 import { NavigationContext } from "./navigation-context-state.js";
-import { RootParamsState } from "./root-params.js";
 import { CacheLifeConfig, CacheState } from "./cache-request-state.js";
+import { RootParamsState } from "./root-params.js";
 import { ExecutionContextLike } from "./request-context.js";
 import { FetchCacheState } from "./fetch-cache.js";
 import { HeadersAccessPhase, HeadersContext, VinextHeadersShimState } from "./headers.js";

package/dist/shims/router-state.d.ts

@@ -16,6 +16,7 @@ type SSRContext = {
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
+  isPreview?: boolean;
   isFallback?: boolean;
 };
 type RouterState = {