@qzsy/vinext 0.1.12 → 0.1.80

package/dist/shims/headers.js

@@ -1,7 +1,8 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { MIDDLEWARE_SET_COOKIE_HEADER } from "../server/headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "../server/middleware-request-headers.js";
+import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
+import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { serializeSetCookie, validateCookieAttributeValue, validateCookieName } from "./internal/cookie-serialize.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
@@ -117,6 +118,10 @@ function markDynamicUsage() {
 function markRenderRequestApiUsage(kind) {
 	_getState().renderRequestApiUsage.add(kind);
 }
+function throwIfStaticGenerationAccessError() {
+	const accessError = _getState().headersContext?.accessError;
+	if (accessError) throw accessError;
+}
 async function runWithConnectionProbe(fn) {
 	const state = _getState();
 	const previousProbe = state.connectionProbe;
@@ -468,7 +473,13 @@ function _getReadonlyCookies(ctx) {
 	return ctx.readonlyCookies;
 }
 function _getReadonlyHeaders(ctx) {
-	if (!ctx.readonlyHeaders) ctx.readonlyHeaders = _sealHeaders(ctx.headers);
+	if (!ctx.readonlyHeaders) {
+		const cleaned = new Headers(ctx.headers);
+		for (const header of FLIGHT_HEADERS) cleaned.delete(header);
+		cleaned.delete(NEXT_REQUEST_ID_HEADER);
+		cleaned.delete(NEXT_HTML_REQUEST_ID_HEADER);
+		ctx.readonlyHeaders = _sealHeaders(cleaned);
+	}
 	return ctx.readonlyHeaders;
 }
 /**
@@ -599,6 +610,19 @@ function isDraftModeRequest(request, draftModeSecret) {
 	if (!cookieHeader) return false;
 	return parseEdgeRequestCookieHeader(cookieHeader).get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(draftModeSecret);
 }
+/**
+* Read the active request's draft-mode state without recording request API usage.
+* Internal cache implementations use this to bypass persistent reads and writes,
+* matching Next.js's request-level `workStore.isDraftMode` guard.
+*/
+function isDraftModeEnabled() {
+	const context = _getState().headersContext;
+	if (!context) return false;
+	if (context.draftModeEnabled !== void 0) return context.draftModeEnabled;
+	const secret = context.draftModeSecret;
+	if (secret === void 0) return false;
+	return context.cookies.get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(secret);
+}
 function draftModeCookieAttributes() {
 	if (typeof process !== "undefined" && process.env?.NODE_ENV === "development") return "Path=/; HttpOnly; SameSite=Lax";
 	return "Path=/; HttpOnly; SameSite=None; Secure";
@@ -631,16 +655,16 @@ async function draftMode() {
 	const state = _getState();
 	const context = state.headersContext;
 	if (!context) throw createDraftModeScopeError("draftMode()");
-	if (context.accessError) throw context.accessError;
 	const secret = ensureContextDraftModeSecret(context);
 	return {
 		get isEnabled() {
-			return context.cookies.get(DRAFT_MODE_COOKIE) === secret;
+			return context.draftModeEnabled ?? context.cookies.get(DRAFT_MODE_COOKIE) === secret;
 		},
 		enable() {
 			throwIfInsideCacheScope("draftMode().enable()");
 			const activeContext = requireActiveDraftModeContext(state, context, "draftMode().enable()");
 			markDynamicUsage();
+			activeContext.draftModeEnabled = true;
 			activeContext.cookies.set(DRAFT_MODE_COOKIE, secret);
 			state.draftModeCookieHeader = `${DRAFT_MODE_COOKIE}=${secret}; ${draftModeCookieAttributes()}`;
 		},
@@ -648,6 +672,7 @@ async function draftMode() {
 			throwIfInsideCacheScope("draftMode().disable()");
 			const activeContext = requireActiveDraftModeContext(state, context, "draftMode().disable()");
 			markDynamicUsage();
+			activeContext.draftModeEnabled = false;
 			activeContext.cookies.delete(DRAFT_MODE_COOKIE);
 			state.draftModeCookieHeader = `${DRAFT_MODE_COOKIE}=; ${draftModeCookieAttributes()}; Expires=${DRAFT_MODE_EXPIRED_DATE}`;
 		}
@@ -751,4 +776,4 @@ var RequestCookies = class {
 	}
 };
 //#endregion
-export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope };
+export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/image-optimization-url.d.ts

@@ -4,6 +4,10 @@
  *
  * Shared by the next/image shim and the default image loader module so
  * `images.loaderFile` aliasing does not create a circular import.
+ *
+ * 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).
  */
 declare function imageOptimizationUrl(src: string, width: number, quality?: number): string;
 //#endregion

package/dist/shims/image-optimization-url.js

@@ -1,12 +1,44 @@
+import { getDeploymentId } from "../utils/deployment-id.js";
 //#region src/shims/image-optimization-url.ts
+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
+	};
+}
 /**
 * Build a `/_next/image` optimization URL.
 *
 * Shared by the next/image shim and the default image loader module so
 * `images.loaderFile` aliasing does not create a circular import.
+*
+* 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) {
-	return `/_next/image?url=${encodeURIComponent(src)}&w=${width}&q=${quality}`;
+	const source = extractLocalDeploymentId(src);
+	const deploymentQuery = source.src.startsWith("/") && source.deploymentId ? `&dpl=${source.deploymentId}` : "";
+	return `/_next/image?url=${encodeURIComponent(source.src)}&w=${width}&q=${quality}${deploymentQuery}`;
 }
 //#endregion
 export { imageOptimizationUrl };

package/dist/shims/image.js

@@ -56,6 +56,22 @@ const __imageDeviceSizes = (() => {
 		];
 	}
 })();
+const __imageSizes = (() => {
+	try {
+		return JSON.parse(process.env.__VINEXT_IMAGE_SIZES ?? "[16,32,48,64,96,128,256,384]");
+	} catch {
+		return [
+			16,
+			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
@@ -78,6 +94,7 @@ function resolveEffectiveLoader(loader) {
 	if (typeof defaultImageLoader !== "function") throw new Error("images.loaderFile detected but the file is missing default export.\nRead more: https://nextjs.org/docs/messages/invalid-images-config");
 	return defaultImageLoader;
 }
+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.
@@ -220,7 +237,8 @@ function resolveImageSource(v) {
 * These are the breakpoints used for srcSet generation.
 * Configurable via `images.deviceSizes` in next.config.js.
 */
-const RESPONSIVE_WIDTHS = __imageDeviceSizes;
+const RESPONSIVE_WIDTHS = [...__imageDeviceSizes].sort((left, right) => left - right);
+const ALL_IMAGE_WIDTHS = [...RESPONSIVE_WIDTHS, ...__imageSizes].sort((left, right) => left - right);
 function preloadImageResource(input) {
 	if (!input.shouldPreload) return;
 	if (typeof ReactDOM.preload !== "function") return;
@@ -235,13 +253,26 @@ function preloadImageResource(input) {
 * 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. Only includes widths that are
-* <= 2x the original image width to avoid pointless upscaling.
+* server can resize and transcode the image.
 */
-function generateSrcSet(src, originalWidth, quality = 75) {
-	const widths = RESPONSIVE_WIDTHS.filter((w) => w <= originalWidth * 2);
-	if (widths.length === 0) return `${imageOptimizationUrl(src, originalWidth, quality)} ${originalWidth}w`;
-	return widths.map((w) => `${imageOptimizationUrl(src, w, quality)} ${w}w`).join(", ");
+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);
@@ -327,7 +358,7 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 		lastErrorSrcRef.current = src;
 		markBlurComplete();
 	} : void 0;
-	if (_unoptimized === true) {
+	if (_unoptimized === true || __globallyUnoptimized) {
 		const renderedSrc = overrideSrc || src;
 		const sanitizedBlur = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
 		const blurStyle = !blurComplete && placeholder === "blur" && sanitizedBlur ? {
@@ -457,8 +488,9 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 	}
 	const imgQuality = quality ?? 75;
 	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 optimizedAttributes = imgWidth && !fill && !skipOptimization ? generateImageAttributes(src, imgWidth, imgQuality, sizes) : void 0;
+	const srcSet = optimizedAttributes ? optimizedAttributes.srcSet : imgWidth && !fill ? RESPONSIVE_WIDTHS.filter((w) => w <= imgWidth * 2).map((w) => `${src} ${w}w`).join(", ") || `${src} ${imgWidth}w` : void 0;
+	const optimizedSrc = skipOptimization ? src : optimizedAttributes ? optimizedAttributes.src : imageOptimizationUrl(src, RESPONSIVE_WIDTHS[0], imgQuality);
 	const sanitizedLocalBlur = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
 	const blurStyle = !blurComplete && placeholder === "blur" && sanitizedLocalBlur ? {
 		backgroundImage: `url(${sanitizedLocalBlur})`,
@@ -510,7 +542,7 @@ function getImageProps(props) {
 	});
 	const shouldPreload = _preload === true || priority === true;
 	const effectiveLoader = resolveEffectiveLoader(loader);
-	if (_unoptimized === true) {
+	if (_unoptimized === true || __globallyUnoptimized) {
 		const renderedSrc = overrideSrc || src;
 		const sanitizedBlurURL = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
 		const blurStyle = placeholder === "blur" && sanitizedBlurURL ? {
@@ -552,8 +584,9 @@ function getImageProps(props) {
 		quality: imgQuality
 	}) : src;
 	const skipOpt = isSvgUrl(resolvedSrc) && !__dangerouslyAllowSVG || blockedInProd || !!effectiveLoader || isRemoteUrl(resolvedSrc);
-	const optimizedSrc = skipOpt ? resolvedSrc : imgWidth ? imageOptimizationUrl(resolvedSrc, imgWidth, imgQuality) : imageOptimizationUrl(resolvedSrc, RESPONSIVE_WIDTHS[0], imgQuality);
-	const srcSet = imgWidth && !fill && !isRemoteUrl(resolvedSrc) && !effectiveLoader && !skipOpt ? generateSrcSet(resolvedSrc, imgWidth, imgQuality) : void 0;
+	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})`,

package/dist/shims/internal/app-route-detection.d.ts

@@ -1,4 +1,5 @@
 import { VinextLinkPrefetchRoute } from "../../client/vinext-next-data.js";
+import { getPagesRouterComponentsMap } from "./pages-router-components.js";
 
 //#region src/shims/internal/app-route-detection.d.ts
 declare global {
@@ -6,22 +7,6 @@ declare global {
     __VINEXT_LINK_PREFETCH_ROUTES__?: VinextLinkPrefetchRoute[];
   }
 }
-/**
- * Pages Router `components` map shape. Next.js types this loosely (route
- * pattern → `PrivateRouteInfo`), but for the App Router-detected case it
- * stores `{ __appRouter: true }` as a marker (see Next.js source link above).
- * Vinext only writes the marker variant; reads are by test code that checks
- * for `__appRouter: true`.
- */
-type PagesRouterComponentsMap = Record<string, {
-  __appRouter: true;
-} | Record<string, unknown>>;
-/**
- * Get-or-create the Pages Router `components` map. Returns the same object
- * on every call so `router.components` and `window.next.router.components`
- * have referential identity.
- */
-declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;
 /**
  * Record `components[pathname] = { __appRouter: true }` on the shared
  * Pages Router map when the href matches an App Router route. No-op when the
@@ -34,6 +19,6 @@ declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;
  * first (e.g. `link.tsx` normalises to match `trailingSlash` config before
  * calling, while `router.prefetch()` passes the raw user-supplied URL).
  */
-declare function markAppRouteDetectedOnPrefetch(href: string, basePath: string): void;
+declare function markAppRouteDetectedOnPrefetch(href: string, basePath: string): Promise<void>;
 //#endregion
 export { getPagesRouterComponentsMap, markAppRouteDetectedOnPrefetch };

package/dist/shims/internal/app-route-detection.js

@@ -1,22 +1,7 @@
 import { removeTrailingSlash, stripBasePath } from "../../utils/base-path.js";
 import { getLocalePathPrefix } from "../../utils/domain-locale.js";
-import { resolveHybridClientRouteOwner } from "./hybrid-client-route-owner.js";
+import { getPagesRouterComponentsMap } from "./pages-router-components.js";
 //#region src/shims/internal/app-route-detection.ts
-const _COMPONENTS_KEY = Symbol.for("vinext.pagesRouter.components");
-/**
-* Get-or-create the Pages Router `components` map. Returns the same object
-* on every call so `router.components` and `window.next.router.components`
-* have referential identity.
-*/
-function getPagesRouterComponentsMap() {
-	const globalState = globalThis;
-	let components = globalState[_COMPONENTS_KEY];
-	if (!components) {
-		components = {};
-		globalState[_COMPONENTS_KEY] = components;
-	}
-	return components;
-}
 /**
 * Resolve a prefetch href to a same-origin pathname (basePath-stripped),
 * suitable as the key used by Next.js for `router.components[urlPathname]`.
@@ -50,8 +35,10 @@ function resolveSameOriginPathname(href, basePath) {
 * first (e.g. `link.tsx` normalises to match `trailingSlash` config before
 * calling, while `router.prefetch()` passes the raw user-supplied URL).
 */
-function markAppRouteDetectedOnPrefetch(href, basePath) {
+async function markAppRouteDetectedOnPrefetch(href, basePath) {
 	if (typeof window === "undefined") return;
+	if (!window.__VINEXT_LINK_PREFETCH_ROUTES__?.length) return;
+	const { resolveHybridClientRouteOwner } = await import("./hybrid-client-route-owner.js");
 	if (resolveHybridClientRouteOwner(href, basePath) !== "app") return;
 	const rawPathname = resolveSameOriginPathname(href, basePath);
 	if (rawPathname === null) return;

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

@@ -0,0 +1,23 @@
+import { VinextLinkPrefetchRoute, VinextPagesLinkPrefetchRoute } from "../../client/vinext-next-data.js";
+
+//#region src/shims/internal/hybrid-client-route-owner-direct.d.ts
+type HybridClientOwner = "app" | "document" | "pages";
+type HybridClientRouteMatches = {
+  appMatch: VinextLinkPrefetchRoute | null;
+  pagesMatch: VinextPagesLinkPrefetchRoute | null;
+};
+declare global {
+  interface Window {
+    __VINEXT_LINK_PREFETCH_ROUTES__?: VinextLinkPrefetchRoute[];
+    __VINEXT_PAGES_LINK_PREFETCH_ROUTES__?: VinextPagesLinkPrefetchRoute[];
+  }
+}
+declare function resolveSameOriginPathname(href: string, basePath: string): string | null;
+declare function matchDirectHybridClientRoutes(href: string, basePath: string): HybridClientRouteMatches;
+declare function resolveMatchedHybridClientRouteOwner({
+  appMatch,
+  pagesMatch
+}: HybridClientRouteMatches): HybridClientOwner | null;
+declare function resolveDirectHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
+//#endregion
+export { HybridClientOwner, matchDirectHybridClientRoutes, resolveDirectHybridClientRouteOwner, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname };

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

@@ -0,0 +1,51 @@
+import { compareHybridRoutePatterns } from "../../routing/utils.js";
+import { stripBasePath } from "../../utils/base-path.js";
+import { createRouteTrieCache, matchRouteWithTrie } from "../../routing/route-matching.js";
+import { getLocalePathPrefix } from "../../utils/domain-locale.js";
+//#region src/shims/internal/hybrid-client-route-owner-direct.ts
+const appRouteTrieCache = createRouteTrieCache();
+const pagesRouteTrieCache = createRouteTrieCache();
+function patternFromParts(parts) {
+	return "/" + parts.join("/");
+}
+function resolveSameOriginPathname(href, basePath) {
+	if (typeof window === "undefined") return null;
+	let url;
+	try {
+		url = new URL(href, window.location.href);
+	} catch {
+		return null;
+	}
+	if (url.origin !== window.location.origin) return null;
+	const pathname = stripBasePath(url.pathname, basePath);
+	const locale = getLocalePathPrefix(pathname, window.__VINEXT_LOCALES__);
+	if (!locale) return pathname;
+	const localePrefixLength = locale.length + 1;
+	return pathname.length === localePrefixLength ? "/" : pathname.slice(localePrefixLength);
+}
+function matchDirectHybridClientRoutes(href, basePath) {
+	const pathname = resolveSameOriginPathname(href, basePath);
+	if (pathname === null) return {
+		appMatch: null,
+		pagesMatch: null
+	};
+	const appRoutes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
+	const pagesRoutes = window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__;
+	return {
+		appMatch: appRoutes ? matchRouteWithTrie(pathname, appRoutes, appRouteTrieCache)?.route ?? null : null,
+		pagesMatch: pagesRoutes ? matchRouteWithTrie(pathname, pagesRoutes, pagesRouteTrieCache)?.route ?? null : null
+	};
+}
+function resolveMatchedHybridClientRouteOwner({ appMatch, pagesMatch }) {
+	if (appMatch === null && pagesMatch === null) return null;
+	if (pagesMatch === null) return appMatch.documentOnly ? "document" : "app";
+	if (appMatch === null) return pagesMatch.documentOnly ? "document" : "pages";
+	const owner = compareHybridRoutePatterns(patternFromParts(pagesMatch.patternParts), pagesMatch.isDynamic, patternFromParts(appMatch.patternParts), appMatch.isDynamic);
+	return (owner === "app" ? appMatch : pagesMatch).documentOnly ? "document" : owner;
+}
+function resolveDirectHybridClientRouteOwner(href, basePath) {
+	if (typeof window === "undefined") return null;
+	return resolveMatchedHybridClientRouteOwner(matchDirectHybridClientRoutes(href, basePath));
+}
+//#endregion
+export { matchDirectHybridClientRoutes, resolveDirectHybridClientRouteOwner, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname };

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

@@ -1,12 +1,9 @@
 import { NextRewrite } from "../../config/next-config.js";
-import { VinextLinkPrefetchRoute, VinextPagesLinkPrefetchRoute } from "../../client/vinext-next-data.js";
+import { HybridClientOwner } from "./hybrid-client-route-owner-direct.js";
 
 //#region src/shims/internal/hybrid-client-route-owner.d.ts
-type HybridClientOwner = "app" | "document" | "pages";
 declare global {
   interface Window {
-    __VINEXT_LINK_PREFETCH_ROUTES__?: VinextLinkPrefetchRoute[];
-    __VINEXT_PAGES_LINK_PREFETCH_ROUTES__?: VinextPagesLinkPrefetchRoute[];
     __VINEXT_CLIENT_REWRITES__?: {
       afterFiles: NextRewrite[];
       beforeFiles: NextRewrite[];
@@ -28,4 +25,4 @@ declare global {
  */
 declare function resolveHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
 //#endregion
-export { HybridClientOwner, resolveHybridClientRouteOwner };
+export { type HybridClientOwner, resolveHybridClientRouteOwner };

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

@@ -1,8 +1,5 @@
-import { compareHybridRoutePatterns } from "../../routing/utils.js";
-import { stripBasePath } from "../../utils/base-path.js";
-import { createRouteTrieCache, matchRouteWithTrie } from "../../routing/route-matching.js";
 import { isExternalUrl, matchRewrite, parseCookies } from "../../config/config-matchers.js";
-import { getLocalePathPrefix } from "../../utils/domain-locale.js";
+import { matchDirectHybridClientRoutes, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname } from "./hybrid-client-route-owner-direct.js";
 import { mergeRewriteQuery } from "../../utils/query.js";
 //#region src/shims/internal/hybrid-client-route-owner.ts
 /**
@@ -52,45 +49,6 @@ function resolveClientRewrite(href, basePath, rewrites, continueAfterMatch = fal
 		kind: "rewrite"
 	} : null;
 }
-const appRouteTrieCache = createRouteTrieCache();
-const pagesRouteTrieCache = createRouteTrieCache();
-/**
-* Build a `/`-joined pattern from a manifest's `patternParts`. Mirrors the
-* server-side route-graph shape (`{ pattern: string }`) so the
-* `compareHybridRoutePatterns` segment-rank comparator can score both Pages
-* and App patterns. The
-* `patternParts` array never includes an empty string for the static `/`
-* route (the App catch-all handles the bare path), so the simple join is
-* safe for everything the route trie actually matches.
-*/
-function patternFromParts(parts) {
-	return "/" + parts.join("/");
-}
-function resolveSameOriginPathname(href, basePath) {
-	if (typeof window === "undefined") return null;
-	let url;
-	try {
-		url = new URL(href, window.location.href);
-	} catch {
-		return null;
-	}
-	if (url.origin !== window.location.origin) return null;
-	const pathname = stripBasePath(url.pathname, basePath);
-	const locale = getLocalePathPrefix(pathname, window.__VINEXT_LOCALES__);
-	if (!locale) return pathname;
-	const localePrefixLength = locale.length + 1;
-	return pathname.length === localePrefixLength ? "/" : pathname.slice(localePrefixLength);
-}
-function matchAppRoute(href, basePath, routes) {
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return null;
-	return matchRouteWithTrie(pathname, routes, appRouteTrieCache)?.route ?? null;
-}
-function matchPagesRoute(href, basePath, routes) {
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return null;
-	return matchRouteWithTrie(pathname, routes, pagesRouteTrieCache)?.route ?? null;
-}
 /**
 * Decide which router should own a soft-navigated URL. Returns:
 *   - "app"    → the App Router runtime handles the navigation (RSC fetch).
@@ -105,39 +63,30 @@ function matchPagesRoute(href, basePath, routes) {
 */
 function resolveHybridClientRouteOwner(href, basePath) {
 	if (typeof window === "undefined") return null;
-	const appRoutes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
-	const pagesRoutes = window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__;
 	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
 	if (rewrites) {
 		const beforeFilesRewrite = resolveClientRewrite(href, basePath, rewrites.beforeFiles, true);
 		if (beforeFilesRewrite?.kind === "document") return "document";
 		if (beforeFilesRewrite?.kind === "rewrite") href = beforeFilesRewrite.href;
 	}
-	let appMatch = appRoutes ? matchAppRoute(href, basePath, appRoutes) : null;
-	let pagesMatch = pagesRoutes ? matchPagesRoute(href, basePath, pagesRoutes) : null;
-	if (rewrites && (appMatch === null || appMatch.isDynamic) && (pagesMatch === null || pagesMatch.isDynamic)) for (const rewrite of rewrites.afterFiles) {
+	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) {
 		const afterFilesRewrite = resolveClientRewrite(href, basePath, [rewrite]);
 		if (afterFilesRewrite?.kind === "document") return "document";
 		if (afterFilesRewrite?.kind !== "rewrite") continue;
 		href = afterFilesRewrite.href;
-		appMatch = appRoutes ? matchAppRoute(href, basePath, appRoutes) : null;
-		pagesMatch = pagesRoutes ? matchPagesRoute(href, basePath, pagesRoutes) : null;
-		if (appMatch || pagesMatch) break;
+		matches = matchDirectHybridClientRoutes(href, basePath);
+		if (matches.appMatch || matches.pagesMatch) break;
 	}
-	if (rewrites && appMatch === null && pagesMatch === null) for (const rewrite of rewrites.fallback) {
+	if (rewrites && 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;
-		appMatch = appRoutes ? matchAppRoute(href, basePath, appRoutes) : null;
-		pagesMatch = pagesRoutes ? matchPagesRoute(href, basePath, pagesRoutes) : null;
-		if (appMatch || pagesMatch) break;
+		matches = matchDirectHybridClientRoutes(href, basePath);
+		if (matches.appMatch || matches.pagesMatch) break;
 	}
-	if (appMatch === null && pagesMatch === null) return null;
-	if (pagesMatch === null) return appMatch.documentOnly ? "document" : "app";
-	if (appMatch === null) return pagesMatch.documentOnly ? "document" : "pages";
-	const owner = compareHybridRoutePatterns(patternFromParts(pagesMatch.patternParts), pagesMatch.isDynamic, patternFromParts(appMatch.patternParts), appMatch.isDynamic);
-	return (owner === "app" ? appMatch : pagesMatch).documentOnly ? "document" : owner;
+	return resolveMatchedHybridClientRouteOwner(matches);
 }
 //#endregion
 export { resolveHybridClientRouteOwner };

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

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

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

@@ -0,0 +1,13 @@
+//#region src/shims/internal/pages-router-components.ts
+const COMPONENTS_KEY = Symbol.for("vinext.pagesRouter.components");
+function getPagesRouterComponentsMap() {
+	const globalState = globalThis;
+	let components = globalState[COMPONENTS_KEY];
+	if (!components) {
+		components = {};
+		globalState[COMPONENTS_KEY] = components;
+	}
+	return components;
+}
+//#endregion
+export { getPagesRouterComponentsMap };