vinext 1.0.0-beta.8 → 1.0.0

package/dist/shims/internal/cookie-serialize.d.ts

@@ -24,12 +24,12 @@ type SerializeSetCookieOptions = {
   partitioned?: boolean;
   priority?: "low" | "medium" | "high";
 };
-declare function validateCookieName(name: string): void;
+export declare function validateCookieName(name: string): void;
 /**
  * Validate cookie attribute values (path, domain) to prevent injection
  * via semicolons, newlines, or other control characters.
  */
-declare function validateCookieAttributeValue(value: string, attributeName: string): void;
+export declare function validateCookieAttributeValue(value: string, attributeName: string): void;
 /**
  * Build a Set-Cookie header string from a cookie name, value, and attributes.
  *
@@ -43,6 +43,5 @@ declare function validateCookieAttributeValue(value: string, attributeName: stri
  * The caller is responsible for validating the cookie name (typically before
  * mutating any internal state) via `validateCookieName`.
  */
-declare function serializeSetCookie(name: string, value: string | null | undefined, options?: SerializeSetCookieOptions): string;
-//#endregion
-export { serializeSetCookie, validateCookieAttributeValue, validateCookieName };
+export declare function serializeSetCookie(name: string, value: string | null | undefined, options?: SerializeSetCookieOptions): string;
+//#endregion

package/dist/shims/internal/format-url-object.d.ts

@@ -0,0 +1,7 @@
+import { UrlObject } from "node:url";
+//#region src/shims/internal/format-url-object.d.ts
+/** Format Node's public UrlObject shape with the semantics used by Next.js. */
+export declare function formatUrlObject(url: UrlObject): string;
+/** Format a Pages Router UrlObject and surface Next.js's development diagnostics. */
+export declare function formatUrlObjectWithValidation(url: UrlObject): string;
+//#endregion

package/dist/shims/internal/format-url-object.js

@@ -0,0 +1,53 @@
+import { urlQueryToSearchParams } from "../../utils/query.js";
+//#region src/shims/internal/format-url-object.ts
+const slashedProtocols = /https?|ftp|gopher|file/;
+const urlObjectKeys = /* @__PURE__ */ new Set([
+	"auth",
+	"hash",
+	"host",
+	"hostname",
+	"href",
+	"path",
+	"pathname",
+	"port",
+	"protocol",
+	"query",
+	"search",
+	"slashes"
+]);
+/** Format Node's public UrlObject shape with the semantics used by Next.js. */
+function formatUrlObject(url) {
+	let { auth, hostname } = url;
+	let protocol = url.protocol || "";
+	let pathname = url.pathname || "";
+	let hash = url.hash || "";
+	let query = url.query || "";
+	let host = false;
+	auth = auth ? `${encodeURIComponent(auth).replace(/%3A/i, ":")}@` : "";
+	if (url.host) host = auth + url.host;
+	else if (hostname) {
+		host = auth + (hostname.includes(":") ? `[${hostname}]` : hostname);
+		if (url.port) host += `:${url.port}`;
+	}
+	if (query && typeof query === "object") query = String(urlQueryToSearchParams(query));
+	let search = url.search || query && `?${query}` || "";
+	if (protocol && !protocol.endsWith(":")) protocol += ":";
+	if (url.slashes || (!protocol || slashedProtocols.test(protocol)) && host !== false) {
+		host = `//${host || ""}`;
+		if (pathname && !pathname.startsWith("/")) pathname = `/${pathname}`;
+	} else if (!host) host = "";
+	if (hash && !hash.startsWith("#")) hash = `#${hash}`;
+	if (search && !search.startsWith("?")) search = `?${search}`;
+	pathname = pathname.replace(/[?#]/g, encodeURIComponent);
+	search = search.replace("#", "%23");
+	return `${protocol}${host}${pathname}${search}${hash}`;
+}
+/** Format a Pages Router UrlObject and surface Next.js's development diagnostics. */
+function formatUrlObjectWithValidation(url) {
+	if (process.env.NODE_ENV === "development") {
+		for (const key of Object.keys(url)) if (!urlObjectKeys.has(key)) console.warn(`Unknown key passed via urlObject into url.format: ${key}`);
+	}
+	return formatUrlObject(url);
+}
+//#endregion
+export { formatUrlObject, formatUrlObjectWithValidation };

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

@@ -1,6 +1,6 @@
 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";
+export type HybridClientOwner = "app" | "document" | "pages";
 type HybridClientRouteMatches = {
   appMatch: VinextLinkPrefetchRoute | null;
   pagesMatch: VinextPagesLinkPrefetchRoute | null;
@@ -11,9 +11,8 @@ declare global {
     __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 };
+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 resolveDirectHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
+//#endregion

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

@@ -5,10 +5,12 @@ import { getLocalePathPrefix } from "../../utils/domain-locale.js";
 //#region src/shims/internal/hybrid-client-route-owner-direct.ts
 const appRouteTrieCache = createRouteTrieCache();
 const pagesRouteTrieCache = createRouteTrieCache();
+const pagesPageRoutesCache = /* @__PURE__ */ new WeakMap();
+const pagesApiRoutesCache = /* @__PURE__ */ new WeakMap();
 function patternFromParts(parts) {
 	return "/" + parts.join("/");
 }
-function resolveSameOriginPathname(href, basePath) {
+function resolveSameOriginPathnames(href, basePath) {
 	if (typeof window === "undefined") return null;
 	let url;
 	try {
@@ -17,23 +19,39 @@ function resolveSameOriginPathname(href, basePath) {
 		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);
+	const appPathname = stripBasePath(url.pathname, basePath);
+	const locale = getLocalePathPrefix(appPathname, window.__VINEXT_LOCALES__);
+	const localePrefixLength = locale ? locale.length + 1 : 0;
+	const pagesPathname = !locale ? appPathname : appPathname.length === localePrefixLength ? "/" : appPathname.slice(localePrefixLength);
+	return {
+		appPathname,
+		pagesApiRequest: appPathname === "/api" || appPathname.startsWith("/api/"),
+		pagesPathname
+	};
+}
+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);
+	}
+	return selected;
 }
 function matchDirectHybridClientRoutes(href, basePath) {
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return {
+	const pathnames = resolveSameOriginPathnames(href, basePath);
+	if (pathnames === 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
+		appMatch: appRoutes ? matchRouteWithTrie(pathnames.appPathname, appRoutes, appRouteTrieCache)?.route ?? null : null,
+		pagesMatch: pagesRoutes ? matchRouteWithTrie(pathnames.pagesPathname, selectPagesRoutes(pagesRoutes, pathnames.pagesApiRequest), pagesRouteTrieCache)?.route ?? null : null
 	};
 }
 function resolveMatchedHybridClientRouteOwner({ appMatch, pagesMatch }) {
@@ -48,4 +66,4 @@ function resolveDirectHybridClientRouteOwner(href, basePath) {
 	return resolveMatchedHybridClientRouteOwner(matchDirectHybridClientRoutes(href, basePath));
 }
 //#endregion
-export { matchDirectHybridClientRoutes, resolveDirectHybridClientRouteOwner, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname };
+export { matchDirectHybridClientRoutes, resolveDirectHybridClientRouteOwner, resolveMatchedHybridClientRouteOwner, resolveSameOriginAppPathname };

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

@@ -1,6 +1,6 @@
 import { HybridClientOwner } from "./hybrid-client-route-owner-direct.js";
 //#region src/shims/internal/hybrid-client-route-owner.d.ts
-declare function resolveHybridClientRewriteHref(href: string, basePath: string): string | null;
+export declare function resolveHybridClientRewriteHref(href: string, basePath: string): string | null;
 /**
  * Decide which router should own a soft-navigated URL. Returns:
  *   - "app"    → the App Router runtime handles the navigation (RSC fetch).
@@ -13,6 +13,6 @@ declare function resolveHybridClientRewriteHref(href: string, basePath: string):
  * matcher trie produces the same result the server will see when the
  * request lands.
  */
-declare function resolveHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
+export declare function resolveHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
 //#endregion
-export { type HybridClientOwner, resolveHybridClientRewriteHref, resolveHybridClientRouteOwner };
+export type { HybridClientOwner };

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

@@ -1,5 +1,5 @@
 import { parseCookies } from "../../config/request-context.js";
-import { matchDirectHybridClientRoutes, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname } from "./hybrid-client-route-owner-direct.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";
 //#region src/shims/internal/hybrid-client-route-owner.ts
@@ -28,16 +28,17 @@ function resolveClientRewrite(href, basePath, rewrites, continueAfterMatch = fal
 	let currentHref = href;
 	let matched = false;
 	for (const rewrite of rewrites) {
-		const pathname = resolveSameOriginPathname(currentHref, basePath);
+		const pathname = resolveSameOriginAppPathname(currentHref, basePath);
 		if (pathname === null) return null;
 		const url = new URL(currentHref, window.location.href);
 		const headers = new Headers({ "user-agent": globalThis.navigator?.userAgent ?? "" });
-		const result = matchClientRewrite(pathname, rewrite, {
+		const context = {
 			cookies: parseCookies(globalThis.document?.cookie ?? ""),
 			headers,
 			host: url.hostname,
 			query: url.searchParams
-		}, basePathState);
+		};
+		const result = matchClientRewrite(pathname, rewrite, context, basePathState);
 		if (result === null) continue;
 		if (result.kind === "server") return { kind: "document" };
 		currentHref = mergeRewriteQuery(currentHref, result.destination);

package/dist/shims/internal/interpolate-as.d.ts

@@ -7,13 +7,13 @@ import { UrlQuery } from "../../utils/query.js";
 type ParsedUrlQuery = {
   [key: string]: string | string[] | undefined;
 };
-type DynamicRouteHrefProjection = {
+export type DynamicRouteHrefProjection = {
   href: string;
   params: string[];
   query: ParsedUrlQuery;
   routePathname: string;
 };
-type DynamicRouteHrefResolution = {
+export type DynamicRouteHrefResolution = {
   /** Route-pattern URL passed to the Pages Router. */
   href: string;
   /** Interpolated URL rendered in the anchor and displayed in the browser. */
@@ -25,7 +25,7 @@ type DynamicRouteHrefResolution = {
  * href (string-form hrefs). A `?` after `#` is part of the fragment, not a
  * query delimiter.
  */
-declare function interpolateDynamicRouteHref(routeHref: string, asHref: string, queryInput?: UrlQuery): DynamicRouteHrefProjection | null;
+export declare function interpolateDynamicRouteHref(routeHref: string, asHref: string, queryInput?: UrlQuery): DynamicRouteHrefProjection | null;
 /**
  * Resolve the two URLs that Next.js' Pages Router derives from a dynamic
  * href: the original route-pattern URL used to load the page and the
@@ -35,6 +35,5 @@ declare function interpolateDynamicRouteHref(routeHref: string, asHref: string,
  * Mirrors `resolveHref(router, href, true)` from Next.js:
  * packages/next/src/client/resolve-href.ts.
  */
-declare function resolveDynamicRouteHref(routeHref: string): DynamicRouteHrefResolution | null;
-//#endregion
-export { DynamicRouteHrefProjection, DynamicRouteHrefResolution, interpolateDynamicRouteHref, resolveDynamicRouteHref };
+export declare function resolveDynamicRouteHref(routeHref: string): DynamicRouteHrefResolution | null;
+//#endregion

package/dist/shims/internal/interpolate-as.js

@@ -132,8 +132,10 @@ function getRouteMatcher({ re, groups }) {
 		const params = {};
 		for (const [key, group] of Object.entries(groups)) {
 			const match = routeMatch[group.pos];
-			if (match !== void 0) if (group.repeat) params[key] = match.split("/").map((entry) => decode(entry));
-			else params[key] = decode(match);
+			if (match !== void 0) {
+				if (group.repeat) params[key] = match.split("/").map((entry) => decode(entry));
+				else params[key] = decode(match);
+			}
 		}
 		return params;
 	};

package/dist/shims/internal/link-status-registry.d.ts

@@ -16,19 +16,19 @@
  * React state model: instead of an optimistic-status dispatcher, we hold the
  * link's `setPending` setter.
  */
-type PendingLinkSetter = (pending: boolean) => void;
+export type PendingLinkSetter = (pending: boolean) => void;
 /**
  * Mark `setter` as the link that started the most recent navigation, resetting
  * the previously-tracked link's pending state to idle so only the last-clicked
  * link shows a pending state.
  */
-declare function setLinkForCurrentNavigation(setter: PendingLinkSetter): void;
+export declare function setLinkForCurrentNavigation(setter: PendingLinkSetter): void;
 /**
  * Stop tracking `setter` if it is the current navigation link. Called when a
  * <Link> finishes its own navigation or unmounts so we never hold a stale
  * reference to an unmounted component's setter.
  */
-declare function clearLinkForCurrentNavigation(setter: PendingLinkSetter): void;
+export declare function clearLinkForCurrentNavigation(setter: PendingLinkSetter): void;
 /**
  * Reset any link that is currently showing a pending state. Invoked at the
  * start of every App Router navigation so that navigations not initiated by the
@@ -38,6 +38,5 @@ declare function clearLinkForCurrentNavigation(setter: PendingLinkSetter): void;
  * `setLinkForCurrentNavigation`; the matching call here consumes that marker and
  * keeps the link pending.
  */
-declare function notifyLinkNavigationStart(): void;
-//#endregion
-export { PendingLinkSetter, clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation };
+export declare function notifyLinkNavigationStart(): void;
+//#endregion

package/dist/shims/internal/make-hanging-promise.d.ts

@@ -10,6 +10,11 @@
  * Ported from Next.js: packages/next/src/server/dynamic-rendering-utils.ts
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/dynamic-rendering-utils.ts
  */
-declare function makeHangingPromise<T>(signal: AbortSignal, route: string, expression: string): Promise<T>;
-//#endregion
-export { makeHangingPromise };
+export declare function makeHangingPromise<T>(signal: AbortSignal, route: string, expression: string): Promise<T>;
+/**
+ * Keep user-visible suspension promises pending while their owning renderer is
+ * aborted after an uncatchable framework bailout. The abort event still reaches
+ * renderer-owned listeners; only these promise rejections are suppressed.
+ */
+export declare function suppressHangingPromiseAbortRejections(signal: AbortSignal): void;
+//#endregion

package/dist/shims/internal/make-hanging-promise.js

@@ -17,9 +17,11 @@ var HangingPromiseRejectionError = class extends Error {
 	}
 };
 const abortListenersBySignal = /* @__PURE__ */ new WeakMap();
+const suppressedAbortRejections = /* @__PURE__ */ new WeakSet();
 function suppressUnhandledRejection() {}
 function makeHangingPromise(signal, route, expression) {
 	if (signal.aborted) {
+		if (suppressedAbortRejections.has(signal)) return new Promise(() => {});
 		const rejected = Promise.reject(new HangingPromiseRejectionError(route, expression));
 		rejected.catch(suppressUnhandledRejection);
 		return rejected;
@@ -32,13 +34,22 @@ function makeHangingPromise(signal, route, expression) {
 			const listeners = [boundRejection];
 			abortListenersBySignal.set(signal, listeners);
 			signal.addEventListener("abort", () => {
-				for (let i = 0; i < listeners.length; i++) listeners[i]();
+				if (!suppressedAbortRejections.has(signal)) for (let i = 0; i < listeners.length; i++) listeners[i]();
 				listeners.length = 0;
+				abortListenersBySignal.delete(signal);
 			}, { once: true });
 		}
 	});
 	hangingPromise.catch(suppressUnhandledRejection);
 	return hangingPromise;
 }
+/**
+* Keep user-visible suspension promises pending while their owning renderer is
+* aborted after an uncatchable framework bailout. The abort event still reaches
+* renderer-owned listeners; only these promise rejections are suppressed.
+*/
+function suppressHangingPromiseAbortRejections(signal) {
+	suppressedAbortRejections.add(signal);
+}
 //#endregion
-export { makeHangingPromise };
+export { makeHangingPromise, suppressHangingPromiseAbortRejections };

package/dist/shims/internal/navigation-untracked.d.ts

@@ -30,6 +30,5 @@
  *
  * @internal
  */
-declare function useUntrackedPathname(): string | null;
-//#endregion
-export { useUntrackedPathname };
+export declare function useUntrackedPathname(): string | null;
+//#endregion

package/dist/shims/internal/normalize-router-href.d.ts

@@ -0,0 +1,15 @@
+//#region src/shims/internal/normalize-router-href.d.ts
+/**
+ * Warn about and normalize repeated path separators like Next.js `resolveHref`.
+ * The protocol separator is preserved and query strings are left untouched.
+ *
+ * Ported from Next.js: packages/next/src/client/resolve-href.ts
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/client/resolve-href.ts
+ */
+export declare function normalizeRouterHref(href: string, routePathname: string): string;
+/** Resolve a Pages Router href against the route state used by Next.js Link. */
+export declare function resolvePagesRouterHref(href: string, router: {
+  pathname: string;
+  asPath: string;
+}, basePath: string): string;
+//#endregion

package/dist/shims/internal/normalize-router-href.js

@@ -0,0 +1,41 @@
+import { hasBasePath } from "../../utils/base-path.js";
+import { getWindowOrigin, isAbsoluteUrl } from "../url-utils.js";
+//#region src/shims/internal/normalize-router-href.ts
+/**
+* Warn about and normalize repeated path separators like Next.js `resolveHref`.
+* The protocol separator is preserved and query strings are left untouched.
+*
+* Ported from Next.js: packages/next/src/client/resolve-href.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/client/resolve-href.ts
+*/
+function normalizeRouterHref(href, routePathname) {
+	const protocol = href.match(/^[a-z][a-z0-9+.-]*:\/\//i)?.[0] ?? "";
+	const withoutProtocol = protocol ? href.slice(protocol.length) : href;
+	if (!/(\/\/|\\)/.test(withoutProtocol.split("?", 1)[0] ?? "")) return href;
+	console.error(`Invalid href '${href}' passed to next/router in page: '${routePathname}'. Repeated forward-slashes (//) or backslashes \\ are not valid in the href.`);
+	const [pathname, ...query] = withoutProtocol.split("?");
+	return protocol + pathname.replace(/\\/g, "/").replace(/\/\/+/g, "/") + (query[0] ? `?${query.join("?")}` : "");
+}
+/** Resolve a Pages Router href against the route state used by Next.js Link. */
+function resolvePagesRouterHref(href, router, basePath) {
+	const normalized = normalizeRouterHref(href, router.pathname);
+	if (isAbsoluteUrl(normalized)) {
+		const origin = getWindowOrigin();
+		if (!origin) return normalized;
+		try {
+			const target = new URL(normalized, origin);
+			if (target.origin !== origin || basePath !== "" && !hasBasePath(target.pathname, basePath)) return normalized;
+		} catch {
+			return normalized;
+		}
+	}
+	try {
+		const base = new URL(normalized.startsWith("#") || normalized.startsWith("?") ? router.asPath : router.pathname, "http://n");
+		const resolved = new URL(normalized, base);
+		return resolved.origin === base.origin ? resolved.href.slice(resolved.origin.length) : resolved.href;
+	} catch {
+		return normalized;
+	}
+}
+//#endregion
+export { normalizeRouterHref, resolvePagesRouterHref };

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

@@ -32,11 +32,11 @@
  * - The map is module-scoped (one per realm). The Pages Router runs in the
  *   browser only, so a single `Map` is sufficient.
  */
-declare function getPagesStaticDataCache(): Record<string, Promise<Response>>;
-declare function fetchCachedPagesData(dataHref: string, init?: RequestInit): Promise<Response>;
-declare function fetchStaticPagesData(dataHref: string, init?: RequestInit): Promise<Response>;
-declare function fetchUncachedPagesData(dataHref: string, init?: RequestInit): Promise<Response>;
-declare function evictPagesDataCache(dataHref: string): void;
+export declare function getPagesStaticDataCache(): Record<string, Promise<Response>>;
+export declare function fetchCachedPagesData(dataHref: string, init?: RequestInit): Promise<Response>;
+export declare function fetchStaticPagesData(dataHref: string, init?: RequestInit): Promise<Response>;
+export declare function fetchUncachedPagesData(dataHref: string, init?: RequestInit): Promise<Response>;
+export declare function evictPagesDataCache(dataHref: string): void;
 /**
  * Dedupe a `fetch()` against the `_next/data` endpoint. Multiple concurrent
  * callers for the same resolved URL and deployment ID share one underlying
@@ -49,11 +49,10 @@ declare function evictPagesDataCache(dataHref: string): void;
  * Errors propagate to every concurrent caller — the in-flight entry is
  * dropped on failure so the next navigation can retry.
  */
-declare function dedupedPagesDataFetch(dataHref: string, init?: RequestInit): Promise<Response>;
+export declare function dedupedPagesDataFetch(dataHref: string, init?: RequestInit): Promise<Response>;
 /**
  * Drop every cached in-flight entry. Intended for tests; production code
  * does not need to call this because entries self-evict on settle.
  */
-declare function clearPagesDataInflight(): void;
-//#endregion
-export { clearPagesDataInflight, dedupedPagesDataFetch, evictPagesDataCache, fetchCachedPagesData, fetchStaticPagesData, fetchUncachedPagesData, getPagesStaticDataCache };
+export declare function clearPagesDataInflight(): void;
+//#endregion

package/dist/shims/internal/pages-data-target.d.ts

@@ -1,5 +1,5 @@
 //#region src/shims/internal/pages-data-target.d.ts
-type PagesDataTarget = {
+export type PagesDataTarget = {
   /** Final fetch URL for the data endpoint, including basePath and search. */
   dataHref: string;
   /** Locale-qualified data endpoint used by Pages Router prefetch. */
@@ -35,8 +35,11 @@ type PagesDataTarget = {
 };
 type PagesDataNavigationTargetOptions = {
   locale?: string | false;
+  /** Force page identity while deriving params and data URLs from browserUrl. */
+  routePattern?: string;
 };
-declare function getPagesMiddlewareDataHref(browserUrl: string, basePath: string, options?: PagesDataNavigationTargetOptions): string | null;
+export declare function matchesPagesMiddlewarePath(pathname: string): boolean;
+export declare function getPagesMiddlewareDataHref(browserUrl: string, basePath: string, options?: PagesDataNavigationTargetOptions, routeUrl?: string): string | null;
 /**
  * Decide whether the JSON data-endpoint navigation path is usable for this
  * browser URL. We require:
@@ -60,7 +63,7 @@ declare function getPagesMiddlewareDataHref(browserUrl: string, basePath: string
  * (`getDataHref`). vinext's equivalent uses an in-memory loader map instead
  * of Next.js' `_buildManifest.js`.
  */
-declare function resolvePagesDataNavigationTarget(browserUrl: string, basePath: string, options?: PagesDataNavigationTargetOptions): PagesDataTarget | null;
+export declare function resolvePagesDataNavigationTarget(browserUrl: string, basePath: string, options?: PagesDataNavigationTargetOptions): PagesDataTarget | null;
 /**
  * Kick off the code-split loader and, for SSG pages, prefetch the data JSON so
  * the chunk and payload are warm by the time the user clicks.
@@ -74,6 +77,5 @@ declare function resolvePagesDataNavigationTarget(browserUrl: string, basePath:
  * paying for a second round trip. Errors are swallowed: prefetch is
  * best-effort and must never break the page.
  */
-declare function prefetchPagesData(target: PagesDataTarget): void;
-//#endregion
-export { PagesDataTarget, getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget };
+export declare function prefetchPagesData(target: PagesDataTarget): void;
+//#endregion

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

@@ -1,6 +1,6 @@
-import { removeTrailingSlash, stripBasePath } from "../../utils/base-path.js";
-import { getLocalePathPrefix } from "../../utils/domain-locale.js";
 import { isUnknownRecord } from "../../utils/record.js";
+import { stripBasePath } from "../../utils/base-path.js";
+import { getLocalePathPrefix } from "../../utils/domain-locale.js";
 import { buildPagesDataHref, matchPagesPattern } from "./pages-data-url.js";
 import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../../utils/deployment-id.js";
 import { fetchStaticPagesData, fetchUncachedPagesData } from "./pages-data-fetch-dedup.js";
@@ -22,10 +22,9 @@ function hasVinextMiddleware(nextData) {
 }
 function isClientMiddlewareMatcherObject(value) {
 	if (!isUnknownRecord(value)) return false;
-	if (typeof value.source !== "string") return false;
+	if (typeof value.regexp !== "string") return false;
+	if (value.flags !== void 0 && typeof value.flags !== "string") return false;
 	if (value.locale !== void 0 && value.locale !== false) return false;
-	if (value.has !== void 0 && !Array.isArray(value.has)) return false;
-	if (value.missing !== void 0 && !Array.isArray(value.missing)) return false;
 	return true;
 }
 function stripLocaleForMiddlewareMatcher(pathname) {
@@ -35,40 +34,28 @@ function stripLocaleForMiddlewareMatcher(pathname) {
 	if (!firstSegment || !locales.includes(firstSegment)) return pathname;
 	return "/" + pathname.split("/").slice(2).join("/");
 }
-function clientMiddlewareSourceMatches(pathname, source) {
-	if (!/[\\():*+?]/.test(source)) return removeTrailingSlash(pathname) === removeTrailingSlash(source);
-	if (source.includes("(") || source.includes("\\")) return true;
-	const sourceParts = source.split("/").filter(Boolean);
-	const pathParts = pathname.split("/").filter(Boolean);
-	let pathIndex = 0;
-	for (const sourcePart of sourceParts) {
-		if (sourcePart.startsWith(":")) {
-			if (sourcePart.endsWith("*")) return true;
-			if (sourcePart.endsWith("+")) return pathIndex < pathParts.length;
-			if (pathIndex >= pathParts.length) return false;
-			pathIndex++;
-			continue;
-		}
-		if (pathParts[pathIndex] !== sourcePart) return false;
-		pathIndex++;
-	}
-	return pathIndex === pathParts.length;
+function localeAwareMiddlewarePathname(pathname) {
+	const locales = window.__VINEXT_LOCALES__;
+	const defaultLocale = window.__VINEXT_DEFAULT_LOCALE__;
+	if (!locales?.includes(defaultLocale ?? "") || getLocalePathPrefix(pathname, locales)) return pathname;
+	return `/${defaultLocale}${pathname === "/" ? "" : pathname}`;
 }
-function clientMiddlewareMatcherMatches(pathname, matcher) {
+function matchesPagesMiddlewarePath(pathname) {
+	const matcher = window.__VINEXT_MIDDLEWARE_MATCHER__;
 	if (matcher === void 0) return true;
-	if (typeof matcher === "string") return clientMiddlewareSourceMatches(stripLocaleForMiddlewareMatcher(pathname), matcher);
 	if (!Array.isArray(matcher)) return true;
 	for (const item of matcher) {
-		if (typeof item === "string") {
-			if (clientMiddlewareSourceMatches(stripLocaleForMiddlewareMatcher(pathname), item)) return true;
-			continue;
-		}
 		if (!isClientMiddlewareMatcherObject(item)) return true;
-		if (clientMiddlewareSourceMatches(item.locale === false ? pathname : stripLocaleForMiddlewareMatcher(pathname), item.source)) return true;
+		const candidate = item.locale === false ? localeAwareMiddlewarePathname(pathname) : stripLocaleForMiddlewareMatcher(pathname);
+		try {
+			if (new RegExp(item.regexp, item.flags).test(candidate)) return true;
+		} catch {
+			return true;
+		}
 	}
 	return false;
 }
-function getPagesMiddlewareDataHref(browserUrl, basePath, options = {}) {
+function getPagesMiddlewareDataHref(browserUrl, basePath, options = {}, routeUrl = browserUrl) {
 	const nextData = window.__NEXT_DATA__;
 	if (!nextData || !hasVinextMiddleware(nextData)) return null;
 	const buildId = nextData.buildId;
@@ -80,12 +67,19 @@ function getPagesMiddlewareDataHref(browserUrl, basePath, options = {}) {
 		return null;
 	}
 	if (parsed.origin !== window.location.origin) return null;
+	let routeSearch = parsed.search;
+	if (routeUrl !== browserUrl) try {
+		routeSearch = new URL(routeUrl, window.location.href).search;
+	} catch {
+		return null;
+	}
 	const pathname = stripBasePath(parsed.pathname, basePath);
-	if (!clientMiddlewareMatcherMatches(pathname, window.__VINEXT_MIDDLEWARE_MATCHER__)) return null;
+	if (!matchesPagesMiddlewarePath(pathname)) return null;
 	const pathnameLocale = getLocalePathPrefix(pathname, window.__VINEXT_LOCALES__);
 	const explicitLocale = options.locale === false ? window.__VINEXT_DEFAULT_LOCALE__ : options.locale;
 	const currentLocale = pathnameLocale ?? explicitLocale ?? window.__VINEXT_LOCALE__;
-	return buildPagesDataHref(basePath, buildId, pathnameLocale || !currentLocale || !window.__VINEXT_LOCALES__?.includes(currentLocale) ? pathname : `/${currentLocale}${pathname === "/" ? "" : pathname}`, parsed.search);
+	const dataPathname = pathnameLocale || !currentLocale || !window.__VINEXT_LOCALES__?.includes(currentLocale) ? pathname : `/${currentLocale}${pathname === "/" ? "" : pathname}`;
+	return buildPagesDataHref(basePath, buildId, dataPathname, routeSearch);
 }
 /**
 * Decide whether the JSON data-endpoint navigation path is usable for this
@@ -126,7 +120,8 @@ function resolvePagesDataNavigationTarget(browserUrl, basePath, options = {}) {
 	if (parsed.origin !== window.location.origin) return null;
 	const pagePath = stripBasePath(parsed.pathname, basePath);
 	const locale = getLocalePathPrefix(pagePath, window.__VINEXT_LOCALES__);
-	const match = matchPagesPattern(locale ? pagePath.slice(locale.length + 1) || "/" : pagePath, patterns);
+	const pathForMatch = locale ? pagePath.slice(locale.length + 1) || "/" : pagePath;
+	const match = matchPagesPattern(pathForMatch, options.routePattern ? [options.routePattern] : patterns);
 	if (!match) return null;
 	const loader = loaders[match.pattern];
 	if (!loader) return null;
@@ -177,7 +172,8 @@ function prefetchPagesData(target) {
 	const deploymentId = getDeploymentId();
 	if (deploymentId) headers[NEXT_DEPLOYMENT_ID_HEADER] = deploymentId;
 	if (target.dataKind === "static") {
-		fetchStaticPagesData(target.middlewareDataHref && target.middlewareDataHref !== target.dataHref ? target.middlewareDataHref : target.prefetchDataHref ?? target.middlewareDataHref ?? target.dataHref, { headers }).then(async (response) => {
+		const dataHref = target.middlewareDataHref && target.middlewareDataHref !== target.dataHref ? target.middlewareDataHref : target.prefetchDataHref ?? target.middlewareDataHref ?? target.dataHref;
+		fetchStaticPagesData(dataHref, { headers }).then(async (response) => {
 			prefetchMiddlewareRewriteLoader(response);
 			await response.arrayBuffer();
 		}).catch(() => {});
@@ -192,4 +188,4 @@ function prefetchMiddlewareRewriteLoader(response) {
 	if (target) target.loader().catch(() => {});
 }
 //#endregion
-export { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget };
+export { getPagesMiddlewareDataHref, matchesPagesMiddlewarePath, prefetchPagesData, resolvePagesDataNavigationTarget };