vinext 1.0.0-beta.11 → 1.0.0-beta.13

package/dist/shims/dynamic-preload-chunks.js

@@ -1,6 +1,6 @@
 "use client";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
-import { useScriptNonce } from "./script-nonce-context.js";
+import { useInitialStylesheetHrefs, useScriptNonce } from "./script-nonce-context.js";
 import React from "react";
 import { getPagesClientAssets } from "vinext/server/pages-client-assets";
 //#region src/shims/dynamic-preload-chunks.tsx
@@ -47,18 +47,22 @@ function resolveDynamicPreloadFiles(moduleIds) {
 }
 function DynamicPreloadChunks(props) {
 	const nonce = useScriptNonce();
+	const initialStylesheetHrefs = useInitialStylesheetHrefs();
 	if (typeof window !== "undefined") return null;
 	const files = resolveDynamicPreloadFiles(props.moduleIds);
 	if (files.length === 0) return null;
+	const crossOrigin = getPagesClientAssets().crossOrigin ?? "";
 	const preloadLinks = [];
 	for (const file of files) {
 		const assetHref = dynamicPreloadHref(file);
 		if (assetHref.endsWith(".css")) {
 			const href = appendAssetDeploymentIdQuery(assetHref);
+			if (initialStylesheetHrefs?.has(href)) continue;
 			preloadLinks.push(React.createElement("link", {
 				key: href,
 				rel: "stylesheet",
 				href,
+				crossOrigin,
 				nonce,
 				precedence: "dynamic"
 			}));
@@ -69,7 +73,7 @@ function DynamicPreloadChunks(props) {
 			rel: "modulepreload",
 			href: assetHref,
 			as: "script",
-			crossOrigin: "",
+			crossOrigin,
 			fetchPriority: "low",
 			nonce
 		}));

package/dist/shims/font-local.js

@@ -1,5 +1,5 @@
-import { fnv1a64 } from "../utils/hash.js";
 import { escapeCSSString, formatFontClassRule, getFontMimeType, resolveSingleFaceStyle, sanitizeCSSVarName, sanitizeFallback, sanitizeFontDescriptorValue } from "./font-utils.js";
+import { fnv1a64 } from "../utils/hash.js";
 //#region src/shims/font-local.ts
 /**
 * next/font/local shim

package/dist/shims/form.js

@@ -1,4 +1,5 @@
 "use client";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { VINEXT_MOUNTED_SLOTS_HEADER } from "../server/app-rsc-vary.js";
 import "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
@@ -6,7 +7,6 @@ import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-re
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { withBasePath } from "./url-utils.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { createRscRequestHeaders, createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
 import { hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { getMountedSlotsHeader, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";

package/dist/shims/head.js

@@ -75,7 +75,7 @@ function getSSRHeadHTML() {
 		...defaultHead(),
 		..._getSSRHeadChildren(),
 		..._getDocumentInitialHead()
-	]).map((child) => headChildToHTML(child.type, child.props)).filter(Boolean).join("\n  ");
+	]).map((child) => headChildToHTML(child.type, child.props)).filter(Boolean).join("");
 }
 /**
 * Tags allowed inside <head>. Anything else is silently dropped.

package/dist/shims/headers.js

@@ -1,9 +1,9 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.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 { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
+import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
 import { serializeSetCookie, validateCookieName } from "./internal/cookie-serialize.js";
 import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
 //#region src/shims/headers.ts

package/dist/shims/image-config.js

@@ -59,6 +59,7 @@ function matchRemotePattern(pattern, url) {
 function hasRemoteMatch(domains, remotePatterns, url) {
 	return domains.some((domain) => url.hostname === domain) || remotePatterns.some((p) => matchRemotePattern(p, url));
 }
+const IPV4_LITERAL_CHARS_RE = /^[0-9a-fA-FxX.]+$/;
 /**
 * Determine whether a string is a private (non-routable) IP address.
 * Works for IPv4 and IPv6, including bracketed and IPv4-mapped forms.
@@ -73,6 +74,7 @@ function hasRemoteMatch(domains, remotePatterns, url) {
 */
 function isPrivateIp(ip) {
 	if (ip.startsWith("[") && ip.endsWith("]")) ip = ip.slice(1, -1);
+	if (!ip.includes(":") && !IPV4_LITERAL_CHARS_RE.test(ip)) return false;
 	try {
 		const parsed = ipaddr.parse(ip);
 		if (parsed instanceof ipaddr.IPv6 && parsed.isIPv4MappedAddress()) return parsed.toIPv4Address().range() !== "unicast";

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

@@ -1,4 +1,33 @@
 //#region src/shims/internal/app-page-props-cache-key.d.ts
+/**
+ * Enumerable page marker, matching Next.js's `$$isPage` prop. It must be an
+ * ordinary string key: React's createElement drops symbol and non-enumerable
+ * props before a server component is invoked.
+ */
+export declare const APP_PAGE_USE_CACHE_MARKER = "$$isPage";
 export declare function markAppPagePropsForUseCache<T extends object>(props: T): T;
 export declare function isMarkedAppPagePropsObject(value: object): boolean;
+/**
+ * Whether `fn` is a transformed `"use cache"` function, including a bound
+ * one. Like Next.js's `isUseCacheFunction`, this survives `.bind()`: React's
+ * server-reference `bind` copies `$$typeof`/`$$id` to the bound function but
+ * not vinext's own marker symbol.
+ */
+export declare function isUseCacheFunctionReference(fn: unknown): boolean;
+/**
+ * Add Next.js's `$$isPage` marker when `fn` is a `"use cache"` function
+ * invoked as a page component or as a page's generateMetadata/generateViewport
+ * (create-component-tree.tsx, resolve-metadata.ts `createSegmentProps`). The
+ * cache wrapper reads and removes it, so page semantics follow the invocation
+ * even when the cached function is defined in (or re-exported from) another
+ * module, or bound.
+ */
+export declare function withUseCachePageMarker<T extends Record<string, unknown>>(fn: unknown, props: T): T;
+/**
+ * Whether `value` is page props carrying the `$$isPage` marker. Only plain
+ * objects qualify: the framework always passes a plain props object, and
+ * reading the marker through a thenable params/searchParams proxy would be
+ * observed as a param access.
+ */
+export declare function hasUseCachePageMarker(value: unknown): value is Record<string, unknown>;
 //#endregion

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

@@ -1,5 +1,20 @@
 //#region src/shims/internal/app-page-props-cache-key.ts
 const APP_PAGE_PROPS_CACHE_KEY_MARKER = Symbol.for("vinext.appPagePropsCacheKeyMarker");
+const USE_CACHE_FUNCTION_SYMBOL = Symbol.for("vinext.useCacheFunction");
+const SERVER_REFERENCE_TAG = Symbol.for("react.server.reference");
+/**
+* Server reference ids of transformed cache functions end in the export name
+* the use-cache transform assigns (`secureExportName` in
+* plugins/use-cache-callable.ts): `$$vinext_cache_` plus an HMAC-SHA256 hex
+* digest. `"use server"` actions keep their own export names.
+*/
+const USE_CACHE_SERVER_REFERENCE_ID_RE = /#\$\$vinext_cache_[0-9a-f]{64}$/;
+/**
+* Enumerable page marker, matching Next.js's `$$isPage` prop. It must be an
+* ordinary string key: React's createElement drops symbol and non-enumerable
+* props before a server component is invoked.
+*/
+const APP_PAGE_USE_CACHE_MARKER = "$$isPage";
 function markAppPagePropsForUseCache(props) {
 	Object.defineProperty(props, APP_PAGE_PROPS_CACHE_KEY_MARKER, {
 		configurable: false,
@@ -12,5 +27,42 @@ function markAppPagePropsForUseCache(props) {
 function isMarkedAppPagePropsObject(value) {
 	return Reflect.get(value, APP_PAGE_PROPS_CACHE_KEY_MARKER) === true;
 }
+/**
+* Whether `fn` is a transformed `"use cache"` function, including a bound
+* one. Like Next.js's `isUseCacheFunction`, this survives `.bind()`: React's
+* server-reference `bind` copies `$$typeof`/`$$id` to the bound function but
+* not vinext's own marker symbol.
+*/
+function isUseCacheFunctionReference(fn) {
+	if (typeof fn !== "function") return false;
+	if (Reflect.get(fn, USE_CACHE_FUNCTION_SYMBOL) === true) return true;
+	const reference = fn;
+	return reference.$$typeof === SERVER_REFERENCE_TAG && typeof reference.$$id === "string" && USE_CACHE_SERVER_REFERENCE_ID_RE.test(reference.$$id);
+}
+/**
+* Add Next.js's `$$isPage` marker when `fn` is a `"use cache"` function
+* invoked as a page component or as a page's generateMetadata/generateViewport
+* (create-component-tree.tsx, resolve-metadata.ts `createSegmentProps`). The
+* cache wrapper reads and removes it, so page semantics follow the invocation
+* even when the cached function is defined in (or re-exported from) another
+* module, or bound.
+*/
+function withUseCachePageMarker(fn, props) {
+	return isUseCacheFunctionReference(fn) ? {
+		...props,
+		[APP_PAGE_USE_CACHE_MARKER]: true
+	} : props;
+}
+/**
+* Whether `value` is page props carrying the `$$isPage` marker. Only plain
+* objects qualify: the framework always passes a plain props object, and
+* reading the marker through a thenable params/searchParams proxy would be
+* observed as a param access.
+*/
+function hasUseCachePageMarker(value) {
+	if (value === null || typeof value !== "object") return false;
+	const prototype = Object.getPrototypeOf(value);
+	return (prototype === Object.prototype || prototype === null) && value["$$isPage"] === true;
+}
 //#endregion
-export { isMarkedAppPagePropsObject, markAppPagePropsForUseCache };
+export { APP_PAGE_USE_CACHE_MARKER, hasUseCachePageMarker, isMarkedAppPagePropsObject, isUseCacheFunctionReference, markAppPagePropsForUseCache, withUseCachePageMarker };

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/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-target.d.ts

@@ -35,8 +35,11 @@ export type PagesDataTarget = {
 };
 type PagesDataNavigationTargetOptions = {
   locale?: string | false;
+  /** Force page identity while deriving params and data URLs from browserUrl. */
+  routePattern?: string;
 };
-export 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:

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,13 +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__;
 	const dataPathname = pathnameLocale || !currentLocale || !window.__VINEXT_LOCALES__?.includes(currentLocale) ? pathname : `/${currentLocale}${pathname === "/" ? "" : pathname}`;
-	return buildPagesDataHref(basePath, buildId, dataPathname, parsed.search);
+	return buildPagesDataHref(basePath, buildId, dataPathname, routeSearch);
 }
 /**
 * Decide whether the JSON data-endpoint navigation path is usable for this
@@ -128,7 +121,7 @@ function resolvePagesDataNavigationTarget(browserUrl, basePath, options = {}) {
 	const pagePath = stripBasePath(parsed.pathname, basePath);
 	const locale = getLocalePathPrefix(pagePath, window.__VINEXT_LOCALES__);
 	const pathForMatch = locale ? pagePath.slice(locale.length + 1) || "/" : pagePath;
-	const match = matchPagesPattern(pathForMatch, patterns);
+	const match = matchPagesPattern(pathForMatch, options.routePattern ? [options.routePattern] : patterns);
 	if (!match) return null;
 	const loader = loaders[match.pattern];
 	if (!loader) return null;
@@ -195,4 +188,4 @@ function prefetchMiddlewareRewriteLoader(response) {
 	if (target) target.loader().catch(() => {});
 }
 //#endregion
-export { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget };
+export { getPagesMiddlewareDataHref, matchesPagesMiddlewarePath, prefetchPagesData, resolvePagesDataNavigationTarget };

package/dist/shims/internal/route-pattern-for-warning.d.ts

@@ -13,8 +13,8 @@
  * `installWindowNext()` side effect into every consumer of the Link shim
  * (including the App Router client bundle), clobbering `window.next.router`.
  *
- * On the client (or when no accessor is registered, e.g. App Router) we fall
- * back to `window.location.pathname`, then to `"/"`.
+ * On the client, Pages Router exposes the pattern through `__NEXT_DATA__.page`.
+ * App Router falls back to `window.location.pathname`, then to `"/"`.
  */
 /**
  * Register the server-side route-pattern accessor. Called once by the

package/dist/shims/internal/route-pattern-for-warning.js

@@ -13,8 +13,8 @@
 * `installWindowNext()` side effect into every consumer of the Link shim
 * (including the App Router client bundle), clobbering `window.next.router`.
 *
-* On the client (or when no accessor is registered, e.g. App Router) we fall
-* back to `window.location.pathname`, then to `"/"`.
+* On the client, Pages Router exposes the pattern through `__NEXT_DATA__.page`.
+* App Router falls back to `window.location.pathname`, then to `"/"`.
 */
 const ROUTE_PATTERN_FOR_WARNING_ACCESSOR_KEY = Symbol.for("vinext.router.routePatternForWarningAccessor");
 /**
@@ -34,7 +34,7 @@ function getCurrentRoutePathnameForWarning() {
 		} catch {}
 		return "/";
 	}
-	return window.location?.pathname ?? "/";
+	return window.__NEXT_DATA__?.page ?? window.location?.pathname ?? "/";
 }
 //#endregion
 export { getCurrentRoutePathnameForWarning, registerRoutePatternForWarningAccessor };