vinext 1.2.0 → 1.3.0

package/dist/shims/image.js

@@ -1,7 +1,6 @@
 "use client";
-import { getDeploymentId } from "../utils/deployment-id.js";
 import { useMergedRef } from "./use-merged-ref.js";
-import { hasRemoteMatch, isPrivateIp } from "./image-config.js";
+import { RESPONSIVE_WIDTHS, __dangerouslyAllowSVG, __globallyUnoptimized, __isDev, generateImageAttributes, getFillStyle, getImageProps, imageOptimizationUrl, isRemoteUrl, isSvgUrl, resolveImageSource, sanitizeBlurDataURL, validateRemoteUrl } from "./image-props.js";
 import { forwardRef, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 import * as ReactDOM from "react-dom";
@@ -18,108 +17,11 @@ import { Image as Image$1 } from "@unpic/react";
 * Remote images are validated against `images.remotePatterns` and
 * `images.domains` from next.config.js. Unmatched URLs are blocked
 * in production and warn in development, matching Next.js behavior.
-*/
-/**
-* Image config injected at build time via Vite define.
-* Serialized as JSON — parsed once at module level.
-*/
-const __imageRemotePatterns = (() => {
-	try {
-		return JSON.parse(process.env.__VINEXT_IMAGE_REMOTE_PATTERNS ?? "[]");
-	} catch {
-		return [];
-	}
-})();
-const __imageDomains = (() => {
-	try {
-		return JSON.parse(process.env.__VINEXT_IMAGE_DOMAINS ?? "[]");
-	} catch {
-		return [];
-	}
-})();
-const __hasImageConfig = __imageRemotePatterns.length > 0 || __imageDomains.length > 0;
-const __isDev = process.env.NODE_ENV !== "production";
-const __imageDeviceSizes = (() => {
-	try {
-		return JSON.parse(process.env.__VINEXT_IMAGE_DEVICE_SIZES ?? "[640,750,828,1080,1200,1920,2048,3840]");
-	} catch {
-		return [
-			640,
-			750,
-			828,
-			1080,
-			1200,
-			1920,
-			2048,
-			3840
-		];
-	}
-})();
-const __imageSizes = (() => {
-	try {
-		return JSON.parse(process.env.__VINEXT_IMAGE_SIZES ?? "[32,48,64,96,128,256,384]");
-	} catch {
-		return [
-			32,
-			48,
-			64,
-			96,
-			128,
-			256,
-			384
-		];
-	}
-})();
-/**
-* Whether dangerouslyAllowSVG is enabled in next.config.js.
-* When false (default), .svg sources auto-skip the optimization endpoint
-* and are served directly, matching Next.js behavior.
-* When true, .svg sources are routed through the optimizer (served as-is
-* with security headers).
-*/
-const __dangerouslyAllowSVG = process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_SVG === "true";
-/**
-* Whether dangerouslyAllowLocalIP is enabled in next.config.js.
-* When false (default), remote image URLs with literal private-IP hostnames
-* are blocked to mitigate SSRF risk.
-*/
-const __dangerouslyAllowLocalIP = process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP === "true";
-const __globallyUnoptimized = process.env.__VINEXT_IMAGE_UNOPTIMIZED === "true";
-/**
-* Validate that a remote URL is allowed by the configured remote patterns.
-* Returns true if the URL is allowed, false otherwise.
-*
-* When no remotePatterns/domains are configured, all remote URLs are allowed
-* (backwards-compatible — user hasn't opted into restriction).
-*
-* When patterns ARE configured, only matching URLs are allowed.
-* In development, non-matching URLs produce a console warning.
-* In production, non-matching URLs are blocked (src replaced with empty string).
 *
-* Private-IP hostnames are additionally rejected unless dangerouslyAllowLocalIP
-* is set, mirroring Next.js's fetchExternalImage guard.
+* Prop building lives in the server-safe `image-props.ts`. In the RSC
+* environment, next/image resolves to a server entry that exports
+* `getImageProps` from there and this module's Image as a client reference.
 */
-function validateRemoteUrl(src) {
-	let url;
-	try {
-		url = new URL(src, "http://n");
-	} catch {
-		return {
-			allowed: false,
-			reason: `Invalid URL: ${src}`
-		};
-	}
-	if (!__dangerouslyAllowLocalIP && isPrivateIp(url.hostname)) return {
-		allowed: false,
-		reason: `Image URL "${src}" resolved to private IP. If this is expected and you understand SSRF risk, use images.dangerouslyAllowLocalIP = true to continue.`
-	};
-	if (!__hasImageConfig) return { allowed: true };
-	if (hasRemoteMatch(__imageDomains, __imageRemotePatterns, url)) return { allowed: true };
-	return {
-		allowed: false,
-		reason: `Image URL "${src}" is not configured in images.remotePatterns or images.domains in next.config.js. See: https://nextjs.org/docs/messages/next-image-unconfigured-host`
-	};
-}
 /**
 * A version of useLayoutEffect that doesn't warn during SSR.
 * Do not rename this to "isomorphic layout effect". There is no such thing as
@@ -167,110 +69,6 @@ function createSyntheticLoadEvent(img) {
 		}
 	};
 }
-/**
-* Sanitize a blurDataURL to prevent CSS injection.
-*
-* A crafted data URL containing `)` can break out of the `url()` CSS function,
-* allowing injection of arbitrary CSS properties or rules. Characters like `{`,
-* `}`, and `\` can also assist in crafting injection payloads.
-*
-* This validates the URL starts with `data:image/` and rejects characters that
-* could escape the `url()` context. Semicolons are allowed since they're part
-* of valid data URLs (`data:image/png;base64,...`) and harmless inside `url()`.
-*
-* Returns undefined for invalid URLs, which causes the blur placeholder to be
-* skipped gracefully.
-*/
-function sanitizeBlurDataURL(url) {
-	if (!url.startsWith("data:image/")) return void 0;
-	if (/[)(}{\\'"\n\r]/.test(url)) return void 0;
-	return url;
-}
-/**
-* Determine if a src is a remote URL (CDN-optimizable) or local.
-*/
-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",
-		inset: 0,
-		width: "100%",
-		height: "100%",
-		objectFit: "cover",
-		...backgroundStyle,
-		...style
-	};
-}
-/**
-* Resolve src, width, height, blurDataURL from Image props (string or StaticImageData).
-* Shared by the Image component and getImageProps to keep behavior in sync.
-*/
-function resolveImageSource(v) {
-	const staticData = typeof v.src === "object" && "default" in v.src ? v.src.default : v.src;
-	const src = typeof staticData === "string" ? staticData : staticData.src;
-	const sourceWidth = v.width ?? (typeof staticData === "object" ? staticData.width : void 0);
-	const sourceHeight = v.height ?? (typeof staticData === "object" ? staticData.height : void 0);
-	return {
-		src,
-		width: typeof sourceWidth === "string" ? Number(sourceWidth) : sourceWidth,
-		height: typeof sourceHeight === "string" ? Number(sourceHeight) : sourceHeight,
-		blurDataURL: v.blurDataURL ?? (typeof staticData === "object" ? staticData.blurDataURL : void 0)
-	};
-}
-/**
-* Responsive image widths matching Next.js's device sizes config.
-* These are the breakpoints used for srcSet generation.
-* Configurable via `images.deviceSizes` in next.config.js.
-*/
-const RESPONSIVE_WIDTHS = [...__imageDeviceSizes].sort((left, right) => left - right);
-const ALL_IMAGE_WIDTHS = [...RESPONSIVE_WIDTHS, ...__imageSizes].sort((left, right) => left - right);
-function extractLocalDeploymentId(src) {
-	let deploymentId = getDeploymentId();
-	if (!src.startsWith("/") || src.startsWith("//")) return {
-		src,
-		deploymentId
-	};
-	const queryIndex = src.indexOf("?");
-	if (queryIndex === -1) return {
-		src,
-		deploymentId
-	};
-	const params = new URLSearchParams(src.slice(queryIndex + 1));
-	const sourceDeploymentId = params.get("dpl");
-	if (!sourceDeploymentId) return {
-		src,
-		deploymentId
-	};
-	deploymentId = sourceDeploymentId;
-	params.delete("dpl");
-	const remainingQuery = params.toString();
-	return {
-		src: src.slice(0, queryIndex) + (remainingQuery ? `?${remainingQuery}` : ""),
-		deploymentId
-	};
-}
-const __imageEndpoint = `${process.env.__NEXT_ROUTER_BASEPATH ?? ""}/_next/image${process.env.__VINEXT_TRAILING_SLASH === "true" ? "/" : ""}`;
-/**
-* Build a `/_next/image` optimization URL.
-*
-* In production (Cloudflare Workers), the worker intercepts this path and uses
-* the Images binding to resize/transcode on the fly. In dev, the Vite dev
-* server handles it as a passthrough (serves the original file).
-*/
-function imageOptimizationUrl(src, width, quality = 75) {
-	const source = extractLocalDeploymentId(src);
-	const deploymentQuery = source.src.startsWith("/") && source.deploymentId ? `&dpl=${source.deploymentId}` : "";
-	return `${__imageEndpoint}?url=${encodeURIComponent(source.src)}&w=${width}&q=${quality}${deploymentQuery}`;
-}
 function preloadImageResource(input) {
 	if (!input.shouldPreload) return;
 	if (typeof ReactDOM.preload !== "function") return;
@@ -281,31 +79,6 @@ function preloadImageResource(input) {
 		fetchPriority: input.fetchPriority
 	});
 }
-/**
-* Generate a srcSet string for responsive images.
-*
-* Each width points to the `/_next/image` optimization endpoint so the
-* server can resize and transcode the image.
-*/
-function getImageWidths(width) {
-	return [...new Set([width, width * 2].map((targetWidth) => ALL_IMAGE_WIDTHS.find((configuredWidth) => configuredWidth >= targetWidth) ?? ALL_IMAGE_WIDTHS[ALL_IMAGE_WIDTHS.length - 1]))];
-}
-function generateImageAttributes(src, width, quality = 75, sizes) {
-	if (sizes) {
-		const viewportPercentages = Array.from(sizes.matchAll(/(^|\s)(1?\d?\d)vw/g), (match) => Number.parseInt(match[2], 10));
-		const minimumWidth = viewportPercentages.length > 0 ? RESPONSIVE_WIDTHS[0] * (Math.min(...viewportPercentages) * .01) : 0;
-		const candidates = ALL_IMAGE_WIDTHS.filter((candidateWidth) => candidateWidth >= minimumWidth);
-		return {
-			src: imageOptimizationUrl(src, candidates[candidates.length - 1], quality),
-			srcSet: candidates.map((candidateWidth) => `${imageOptimizationUrl(src, candidateWidth, quality)} ${candidateWidth}w`).join(", ")
-		};
-	}
-	const widths = getImageWidths(width);
-	return {
-		src: imageOptimizationUrl(src, widths[widths.length - 1], quality),
-		srcSet: widths.map((candidateWidth, index) => `${imageOptimizationUrl(src, candidateWidth, quality)} ${index + 1}x`).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, loading, ...rest }, ref) {
 	const lastLoadedSrcRef = useRef(void 0);
 	const lastErrorSrcRef = useRef(void 0);
@@ -562,93 +335,5 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 		...rest
 	});
 });
-/**
-* getImageProps — for advanced use cases (picture elements, background images).
-* 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, loading, ...rest } = props;
-	const { src, width: imgWidth, height: imgHeight, blurDataURL: imgBlurDataURL } = resolveImageSource({
-		src: srcProp,
-		width,
-		height,
-		blurDataURL: blurDataURLProp
-	});
-	const shouldPreload = _preload === true || priority === true;
-	if (_unoptimized === true || __globallyUnoptimized) {
-		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;
-		const imageProps = {
-			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,
-			style: fill ? getFillStyle(style, blurStyle) : {
-				...blurStyle,
-				...style
-			},
-			...rest,
-			sizes: sizes ?? (fill ? "100vw" : void 0),
-			srcSet: void 0
-		};
-		return { props: Object.assign(imageProps, { "data-nimg": fill ? "fill" : "1" }) };
-	}
-	let blockedInProd = false;
-	if (isRemoteUrl(src)) {
-		const validation = validateRemoteUrl(src);
-		if (!validation.allowed) {
-			if (__isDev) console.warn(`[next/image] ${validation.reason}`);
-			else {
-				console.error(`[next/image] ${validation.reason}`);
-				blockedInProd = true;
-			}
-		}
-	}
-	const imgQuality = typeof _quality === "string" ? Number(_quality) : _quality ?? 75;
-	const resolvedSrc = blockedInProd ? "" : loader ? loader({
-		src,
-		width: imgWidth ?? 0,
-		quality: imgQuality
-	}) : src;
-	const skipOpt = isSvgUrl(resolvedSrc) && !__dangerouslyAllowSVG || blockedInProd || !!loader || isRemoteUrl(resolvedSrc);
-	const optimizedAttributes = imgWidth && !fill && !skipOpt ? generateImageAttributes(resolvedSrc, imgWidth, imgQuality, sizes) : null;
-	const optimizedSrc = skipOpt ? resolvedSrc : optimizedAttributes ? optimizedAttributes.src : imageOptimizationUrl(resolvedSrc, RESPONSIVE_WIDTHS[0], imgQuality);
-	const srcSet = optimizedAttributes?.srcSet;
-	const sanitizedBlurURL = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
-	const blurStyle = placeholder === "blur" && sanitizedBlurURL ? {
-		backgroundImage: `url(${sanitizedBlurURL})`,
-		backgroundSize: "cover",
-		backgroundRepeat: "no-repeat",
-		backgroundPosition: "center"
-	} : void 0;
-	const imageProps = {
-		src: optimizedSrc,
-		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",
-		srcSet,
-		sizes: sizes ?? (fill ? "100vw" : void 0),
-		className,
-		style: fill ? getFillStyle(style, blurStyle) : {
-			...blurStyle,
-			...style
-		},
-		...rest
-	};
-	return { props: Object.assign(imageProps, { "data-nimg": fill ? "fill" : "1" }) };
-}
 //#endregion
 export { Image as default, getImageProps, imageOptimizationUrl };

package/dist/shims/internal/headers-state.d.ts

@@ -57,10 +57,17 @@ export declare function isRenderDynamicLatched(): boolean;
  * already latched; check `isRenderDynamicLatched()` first.
  */
 export declare function onRenderDynamicLatched(listener: () => void): () => void;
+/**
+ * Record an invalid dynamic API use on `state`, keeping the first one, like
+ * Next.js's `workStore.invalidDynamicUsageError ??= error`.
+ */
+export declare function recordInvalidDynamicUsageError(state: VinextHeadersShimState, error: unknown): void;
 export declare function markRenderRequestApiUsage(kind: RenderRequestApiKind): void;
 export declare function throwIfStaticGenerationAccessError(): void;
 /** Whether work is executing inside a cache boundary that owns its reuse. */
 export declare function isInsideAnyCacheScope(): boolean;
+/** The error a dynamic request API throws inside a public "use cache". */
+export declare function createUseCacheAccessError(apiName: string): Error;
 /**
  * Throw if the current execution is inside a "use cache" or unstable_cache()
  * scope. Called by dynamic request APIs (headers, cookies, connection) to

package/dist/shims/internal/headers-state.js

@@ -87,6 +87,14 @@ function propagateInvalidDynamicUsageError(state, error) {
 		if (target.invalidDynamicUsageError == null) target.invalidDynamicUsageError = error;
 	});
 }
+/**
+* Record an invalid dynamic API use on `state`, keeping the first one, like
+* Next.js's `workStore.invalidDynamicUsageError ??= error`.
+*/
+function recordInvalidDynamicUsageError(state, error) {
+	state.invalidDynamicUsageError ??= error;
+	propagateInvalidDynamicUsageError(state, error);
+}
 function markRenderRequestApiUsage(kind) {
 	getHeadersShimState().renderRequestApiUsage.add(kind);
 }
@@ -121,6 +129,10 @@ function _isInsideUnstableCache() {
 function isInsideAnyCacheScope() {
 	return _getUseCacheGuardContext() !== null || _isInsideUnstableCache();
 }
+/** The error a dynamic request API throws inside a public "use cache". */
+function createUseCacheAccessError(apiName) {
+	return /* @__PURE__ */ new Error(`\`${apiName}\` cannot be called inside "use cache". If you need this data inside a cached function, call \`${apiName}\` outside and pass the required data as an argument.`);
+}
 /**
 * Throw if the current execution is inside a "use cache" or unstable_cache()
 * scope. Called by dynamic request APIs (headers, cookies, connection) to
@@ -130,7 +142,7 @@ function isInsideAnyCacheScope() {
 */
 function throwIfInsideCacheScope(apiName) {
 	if (_isInsidePublicUseCache()) {
-		const error = /* @__PURE__ */ new Error(`\`${apiName}\` cannot be called inside "use cache". If you need this data inside a cached function, call \`${apiName}\` outside and pass the required data as an argument.`);
+		const error = createUseCacheAccessError(apiName);
 		try {
 			const cacheCtx = _getUseCacheGuardContext();
 			if (cacheCtx) cacheCtx.invalidDynamicUsageError = error;
@@ -154,4 +166,4 @@ function getHeadersAccessPhase() {
 	return getHeadersShimState().phase;
 }
 //#endregion
-export { createRenderDynamicLatch, getHeadersAccessPhase, getHeadersShimState, headersShimAls, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { createRenderDynamicLatch, createUseCacheAccessError, getHeadersAccessPhase, getHeadersShimState, headersShimAls, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, recordInvalidDynamicUsageError, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/internal/hybrid-client-route-owner-direct.d.ts

@@ -3,16 +3,19 @@ import { VinextLinkPrefetchRoute, VinextPagesLinkPrefetchRoute } from "../../cli
 export type HybridClientOwner = "app" | "document" | "pages";
 type HybridClientRouteMatches = {
   appMatch: VinextLinkPrefetchRoute | null;
+  /** A Pages Router URL under `/api`, which only API routes serve. */
+  pagesApiRequest: boolean;
   pagesMatch: VinextPagesLinkPrefetchRoute | null;
 };
 declare global {
   interface Window {
+    __VINEXT_APP_ROUTE_HANDLERS__?: VinextLinkPrefetchRoute[];
     __VINEXT_LINK_PREFETCH_ROUTES__?: VinextLinkPrefetchRoute[];
     __VINEXT_PAGES_LINK_PREFETCH_ROUTES__?: VinextPagesLinkPrefetchRoute[];
   }
 }
 export declare function resolveSameOriginAppPathname(href: string, basePath: string): string | null;
 export declare function matchDirectHybridClientRoutes(href: string, basePath: string): HybridClientRouteMatches;
-export declare function resolveMatchedHybridClientRouteOwner({ appMatch, pagesMatch }: HybridClientRouteMatches): HybridClientOwner | null;
+export declare function resolveMatchedHybridClientRouteOwner({ appMatch, pagesApiRequest, pagesMatch }: HybridClientRouteMatches): HybridClientOwner | null;
 export declare function resolveDirectHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
 //#endregion

package/dist/shims/internal/hybrid-client-route-owner-direct.js

@@ -1,12 +1,12 @@
-import { compareHybridRoutePatterns } from "../../routing/utils.js";
 import { stripBasePath } from "../../utils/base-path.js";
+import { compareHybridRoutePatterns } from "../../routing/utils.js";
 import { createRouteTrieCache, matchRouteWithTrie } from "../../routing/route-matching.js";
 import { getLocalePathPrefix } from "../../utils/domain-locale.js";
+import { hashRoutePathname } from "../../routing/hashed-route-patterns.js";
 //#region src/shims/internal/hybrid-client-route-owner-direct.ts
 const appRouteTrieCache = createRouteTrieCache();
+const appRouteHandlerTrieCache = createRouteTrieCache();
 const pagesRouteTrieCache = createRouteTrieCache();
-const pagesPageRoutesCache = /* @__PURE__ */ new WeakMap();
-const pagesApiRoutesCache = /* @__PURE__ */ new WeakMap();
 function patternFromParts(parts) {
 	return "/" + parts.join("/");
 }
@@ -32,34 +32,51 @@ function resolveSameOriginPathnames(href, basePath) {
 function resolveSameOriginAppPathname(href, basePath) {
 	return resolveSameOriginPathnames(href, basePath)?.appPathname ?? null;
 }
-function selectPagesRoutes(routes, apiRequest) {
-	const cache = apiRequest ? pagesApiRoutesCache : pagesPageRoutesCache;
-	let selected = cache.get(routes);
-	if (!selected) {
-		selected = routes.filter((route) => Boolean(route.documentOnly) === apiRequest);
-		cache.set(routes, selected);
+function patternPartRank(part) {
+	if (part === void 0) return 0;
+	if (!part.startsWith(":")) return 1;
+	if (part.endsWith("+")) return 3;
+	if (part.endsWith("*")) return 4;
+	return 2;
+}
+/**
+* The route the App router picks when both match the same URL: the first part
+* whose kind differs decides, static > dynamic > catch-all > optional
+* catch-all, as in `routing/route-trie.ts`.
+*/
+function preferredAppRoute(page, handler) {
+	if (page === null || handler === null) return page ?? handler;
+	const length = Math.max(page.patternParts.length, handler.patternParts.length);
+	for (let index = 0; index < length; index++) {
+		const pageRank = patternPartRank(page.patternParts[index]);
+		const handlerRank = patternPartRank(handler.patternParts[index]);
+		if (pageRank !== handlerRank) return pageRank < handlerRank ? page : handler;
 	}
-	return selected;
+	return page;
 }
 function matchDirectHybridClientRoutes(href, basePath) {
 	const pathnames = resolveSameOriginPathnames(href, basePath);
 	if (pathnames === null) return {
 		appMatch: null,
+		pagesApiRequest: false,
 		pagesMatch: null
 	};
 	const appRoutes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
+	const appRouteHandlers = window.__VINEXT_APP_ROUTE_HANDLERS__;
 	const pagesRoutes = window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__;
 	return {
-		appMatch: appRoutes ? matchRouteWithTrie(pathnames.appPathname, appRoutes, appRouteTrieCache)?.route ?? null : null,
-		pagesMatch: pagesRoutes ? matchRouteWithTrie(pathnames.pagesPathname, selectPagesRoutes(pagesRoutes, pathnames.pagesApiRequest), pagesRouteTrieCache)?.route ?? null : null
+		appMatch: preferredAppRoute(appRoutes ? matchRouteWithTrie(pathnames.appPathname, appRoutes, appRouteTrieCache)?.route ?? null : null, appRouteHandlers?.length ? matchRouteWithTrie(hashRoutePathname(pathnames.appPathname), appRouteHandlers, appRouteHandlerTrieCache)?.route ?? null : null),
+		pagesApiRequest: pathnames.pagesApiRequest,
+		pagesMatch: pagesRoutes && !pathnames.pagesApiRequest ? matchRouteWithTrie(pathnames.pagesPathname, pagesRoutes, pagesRouteTrieCache)?.route ?? null : null
 	};
 }
-function resolveMatchedHybridClientRouteOwner({ appMatch, pagesMatch }) {
+function resolveMatchedHybridClientRouteOwner({ appMatch, pagesApiRequest, pagesMatch }) {
+	if (pagesApiRequest) return appMatch?.isDynamic === false && !appMatch.documentOnly ? "app" : "document";
 	if (appMatch === null && pagesMatch === null) return null;
 	if (pagesMatch === null) return appMatch.documentOnly ? "document" : "app";
-	if (appMatch === null) return pagesMatch.documentOnly ? "document" : "pages";
+	if (appMatch === null) return "pages";
 	const owner = compareHybridRoutePatterns(patternFromParts(pagesMatch.patternParts), pagesMatch.isDynamic, patternFromParts(appMatch.patternParts), appMatch.isDynamic);
-	return (owner === "app" ? appMatch : pagesMatch).documentOnly ? "document" : owner;
+	return owner === "app" && appMatch.documentOnly ? "document" : owner;
 }
 function resolveDirectHybridClientRouteOwner(href, basePath) {
 	if (typeof window === "undefined") return null;

package/dist/shims/internal/hybrid-client-route-owner.js

@@ -1,4 +1,5 @@
 import { parseCookies } from "../../config/request-context.js";
+import "../../config/config-matchers.js";
 import { matchDirectHybridClientRoutes, resolveMatchedHybridClientRouteOwner, resolveSameOriginAppPathname } from "./hybrid-client-route-owner-direct.js";
 import { mergeRewriteQuery } from "../../utils/query.js";
 import { matchClientRewrite } from "../../client/client-rewrite-matcher.js";
@@ -63,23 +64,23 @@ function resolveHybridClientRewriteHref(href, basePath) {
 		didRewrite = true;
 	}
 	let matches = matchDirectHybridClientRoutes(currentHref, basePath);
-	if ((matches.appMatch === null || matches.appMatch.isDynamic) && (matches.pagesMatch === null || matches.pagesMatch.isDynamic)) for (const rewrite of rewrites.afterFiles) {
+	if (!matches.pagesApiRequest && (matches.appMatch === null || matches.appMatch.isDynamic) && (matches.pagesMatch === null || matches.pagesMatch.isDynamic)) for (const rewrite of rewrites.afterFiles) {
 		const afterFilesRewrite = resolveClientRewrite(currentHref, basePath, [rewrite]);
 		if (afterFilesRewrite?.kind === "document") return didRewrite ? currentHref : null;
 		if (afterFilesRewrite?.kind !== "rewrite") continue;
 		currentHref = afterFilesRewrite.href;
 		didRewrite = true;
 		matches = matchDirectHybridClientRoutes(currentHref, basePath);
-		if (matches.appMatch || matches.pagesMatch) break;
+		if (matches.pagesApiRequest || matches.appMatch || matches.pagesMatch) break;
 	}
-	if (matches.appMatch === null && matches.pagesMatch === null) for (const rewrite of rewrites.fallback) {
+	if (!matches.pagesApiRequest && matches.appMatch === null && matches.pagesMatch === null) for (const rewrite of rewrites.fallback) {
 		const fallbackRewrite = resolveClientRewrite(currentHref, basePath, [rewrite]);
 		if (fallbackRewrite?.kind === "document") return didRewrite ? currentHref : null;
 		if (fallbackRewrite?.kind !== "rewrite") continue;
 		currentHref = fallbackRewrite.href;
 		didRewrite = true;
 		matches = matchDirectHybridClientRoutes(currentHref, basePath);
-		if (matches.appMatch || matches.pagesMatch) break;
+		if (matches.pagesApiRequest || matches.appMatch || matches.pagesMatch) break;
 	}
 	return didRewrite ? currentHref : null;
 }
@@ -104,21 +105,21 @@ function resolveHybridClientRouteOwner(href, basePath) {
 		if (beforeFilesRewrite?.kind === "rewrite") href = beforeFilesRewrite.href;
 	}
 	let matches = matchDirectHybridClientRoutes(href, basePath);
-	if (rewrites && (matches.appMatch === null || matches.appMatch.isDynamic) && (matches.pagesMatch === null || matches.pagesMatch.isDynamic)) for (const rewrite of rewrites.afterFiles) {
+	if (rewrites && !matches.pagesApiRequest && (matches.appMatch === null || matches.appMatch.isDynamic) && (matches.pagesMatch === null || matches.pagesMatch.isDynamic)) for (const rewrite of rewrites.afterFiles) {
 		const afterFilesRewrite = resolveClientRewrite(href, basePath, [rewrite]);
 		if (afterFilesRewrite?.kind === "document") return "document";
 		if (afterFilesRewrite?.kind !== "rewrite") continue;
 		href = afterFilesRewrite.href;
 		matches = matchDirectHybridClientRoutes(href, basePath);
-		if (matches.appMatch || matches.pagesMatch) break;
+		if (matches.pagesApiRequest || matches.appMatch || matches.pagesMatch) break;
 	}
-	if (rewrites && matches.appMatch === null && matches.pagesMatch === null) for (const rewrite of rewrites.fallback) {
+	if (rewrites && !matches.pagesApiRequest && matches.appMatch === null && matches.pagesMatch === null) for (const rewrite of rewrites.fallback) {
 		const fallbackRewrite = resolveClientRewrite(href, basePath, [rewrite]);
 		if (fallbackRewrite?.kind === "document") return "document";
 		if (fallbackRewrite?.kind !== "rewrite") continue;
 		href = fallbackRewrite.href;
 		matches = matchDirectHybridClientRoutes(href, basePath);
-		if (matches.appMatch || matches.pagesMatch) break;
+		if (matches.pagesApiRequest || matches.appMatch || matches.pagesMatch) break;
 	}
 	return resolveMatchedHybridClientRouteOwner(matches);
 }

package/dist/shims/link-prefetch.js

@@ -1,5 +1,5 @@
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
+import { collapseLeadingSlashes, isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
 //#region src/shims/link-prefetch.ts
 function canLinkPrefetch(input) {
 	return input.nodeEnv === "production" && input.prefetch !== false && !input.isDangerous;
@@ -32,9 +32,10 @@ function getLinkPrefetchHref(input) {
 		const current = new URL(currentOrigin);
 		const parsed = href.startsWith("//") ? new URL(href, current.origin) : new URL(href);
 		if (parsed.origin !== current.origin) return null;
-		if (!basePath) return parsed.pathname + parsed.search + parsed.hash;
-		if (!hasBasePath(parsed.pathname, basePath)) return null;
-		return stripBasePath(parsed.pathname, basePath) + parsed.search + parsed.hash;
+		const pathname = collapseLeadingSlashes(parsed.pathname);
+		if (!basePath) return pathname + parsed.search + parsed.hash;
+		if (!hasBasePath(pathname, basePath)) return null;
+		return collapseLeadingSlashes(stripBasePath(pathname, basePath)) + parsed.search + parsed.hash;
 	} catch {
 		return null;
 	}

package/dist/shims/link.js

@@ -11,7 +11,7 @@ import { formatUrlObject, formatUrlObjectWithValidation } from "./internal/forma
 import { normalizeRouterHref, resolvePagesRouterHref } from "./internal/normalize-router-href.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
-import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { getNavigationRuntime, hasAppNavigationRuntime, loadNavigationRuntimeRouteManifest, 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";
 import { getI18nContext } from "./i18n-context.js";
@@ -139,15 +139,17 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 		(async () => {
 			if (hasAppNavigationRuntime()) {
 				if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
-				const [navigation, { AppElementsWire }, rscCacheBusting, { resolveAppPrefetchRscRequest }, { 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, routeManifestLoaded] = 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
+					HAS_PAGES_ROUTER || HAS_CLIENT_REWRITES ? loadHybridClientRouteOwnerModule() : null,
+					loadNavigationRuntimeRouteManifest()
 				]);
+				if (routeManifestLoaded === false) return;
 				if (navigationEpoch !== linkPrefetchNavigationEpoch) return;
 				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, createAppPrefetchRequestHeaders, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, hasFreshLearningOnlyPrefetchCacheEntry, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, prefetchRscResponse, prepareNavigationPrefetchSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL } = navigation;
 				const { createRscRequestUrl } = rscCacheBusting;
@@ -317,7 +319,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 async function promotePrefetchEntriesForNavigation(href) {
 	if (typeof window === "undefined") return;
 	if (!hasAppNavigationRuntime()) return;
-	const [{ getPrefetchCache }, { stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([loadNavigationModule(), import("../server/app-rsc-cache-busting.js")]);
+	const [{ getPrefetchCache }, { parseRscRequestPath, stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([loadNavigationModule(), import("../server/app-rsc-cache-busting.js")]);
 	let target;
 	try {
 		target = new URL(toCanonicalBrowserNavigationHref(href, window.location.href, __basePath, __trailingSlash), window.location.href);
@@ -330,7 +332,7 @@ async function promotePrefetchEntriesForNavigation(href) {
 		const [rscUrl] = cacheKey.split("\0", 1);
 		let cached;
 		try {
-			cached = new URL(rscUrl, window.location.href);
+			cached = parseRscRequestPath(rscUrl);
 		} catch {
 			continue;
 		}

package/dist/shims/navigation.d.ts

@@ -86,7 +86,7 @@ export type PrefetchCacheEntry = {
   timestamp: number;
 };
 export declare function getCurrentInterceptionContext(): string | null;
-export declare function getPrefetchInterceptionContext(targetHref: string): string | null;
+export declare function getPrefetchInterceptionContext(targetHref: string, currentPathname?: string): string | null;
 export declare function getCurrentNextUrl(): string;
 export declare function createAppPrefetchRequestHeaders(options: {
   fetchPriority: "auto" | "high" | "low";