vinext 1.2.0 → 1.3.0

package/dist/shims/navigation.js

@@ -1,7 +1,7 @@
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { isExternalUrl } from "../utils/external-url.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "../server/app-rsc-vary.js";
+import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "../server/app-rsc-vary.js";
 import { NEXT_ROUTER_STALE_TIME_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER, VINEXT_STALE_TIME_PENDING_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
@@ -17,9 +17,9 @@ import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessor
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, formatRscRequestPath, parseRscRequestPath, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
-import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
+import { getNavigationRuntime, hasAppNavigationRuntime, loadNavigationRuntimeRouteManifest } from "../client/navigation-runtime.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import { PUBLIC_INITIAL_BFCACHE_ID } from "../server/app-bfcache-id.js";
 import { resolveManifestNavigationInterceptionContext } from "../server/app-browser-interception-context.js";
@@ -117,7 +117,7 @@ function getCurrentInterceptionContext() {
 	if (isServer) return null;
 	return stripBasePath(window.location.pathname, __basePath);
 }
-function getPrefetchInterceptionContext(targetHref) {
+function getPrefetchInterceptionContext(targetHref, currentPathname) {
 	if (isServer) return null;
 	let targetUrl;
 	try {
@@ -127,7 +127,7 @@ function getPrefetchInterceptionContext(targetHref) {
 	}
 	return resolveManifestNavigationInterceptionContext({
 		basePath: __basePath,
-		currentPathname: window.location.pathname,
+		currentPathname: currentPathname ?? window.location.pathname,
 		routeManifest: getNavigationRuntime()?.bootstrap.routeManifest ?? null,
 		targetPathname: targetUrl.pathname
 	});
@@ -236,7 +236,7 @@ function resolvePrefetchCacheEntryMountedSlotsHeader(entry) {
 }
 function normalizeRscCacheLookupUrl(rscUrl) {
 	try {
-		const url = new URL(rscUrl, "http://vinext.local");
+		const url = parseRscRequestPath(rscUrl);
 		stripRscCacheBustingSearchParam(url);
 		return `${url.pathname}${url.search}`;
 	} catch {
@@ -245,7 +245,7 @@ function normalizeRscCacheLookupUrl(rscUrl) {
 }
 function normalizeRscCacheLookupPathname(rscUrl) {
 	try {
-		const url = new URL(rscUrl, "http://vinext.local");
+		const url = parseRscRequestPath(rscUrl);
 		return stripRscSuffix(url.pathname);
 	} catch {
 		return null;
@@ -435,8 +435,7 @@ function toAppPrefetchDestination(href) {
 	}
 	const browserHref = toCanonicalBrowserNavigationHref(localHref, window.location.href, __basePath, __trailingSlash);
 	try {
-		const url = new URL(browserHref, window.location.href);
-		return `${url.pathname}${url.search}`;
+		return formatRscRequestPath(new URL(browserHref, window.location.href));
 	} catch {
 		return browserHref.split("#", 1)[0];
 	}
@@ -1466,6 +1465,11 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 		const fullHref = toCanonicalBrowserNavigationHref(normalizedHref, window.location.href, __basePath, __trailingSlash);
 		notifyAppRouterTransitionStart(fullHref, mode);
 		if (mode === "push") saveScrollPosition();
+		const mpaNavigate = getNavigationRuntime()?.functions.navigateExternal;
+		if (mpaNavigate) {
+			await mpaNavigate(fullHref, mode);
+			return;
+		}
 		hardNavigateTo(fullHref, mode);
 		await new Promise(() => {});
 		return;
@@ -1608,7 +1612,8 @@ const _appRouter = {
 		if (prefetchHref == null) return;
 		const fullHref = toAppPrefetchDestination(prefetchHref);
 		if (fullHref === null) return;
-		const interceptionContext = getPrefetchInterceptionContext(fullHref);
+		const currentPathname = window.location.pathname;
+		let interceptionContext = getPrefetchInterceptionContext(fullHref, currentPathname);
 		const mountedSlotsHeader = getMountedSlotsHeader();
 		const headers = createAppPrefetchRequestHeaders({
 			fetchPriority: "low",
@@ -1617,6 +1622,12 @@ const _appRouter = {
 		});
 		const setup = beginPrefetchSetup(fullHref);
 		(async () => {
+			const routeManifestLoad = loadNavigationRuntimeRouteManifest();
+			if (routeManifestLoad !== null) {
+				if (!await routeManifestLoad || setup.cancelled) return;
+				interceptionContext = getPrefetchInterceptionContext(fullHref, currentPathname);
+				if (interceptionContext !== null) headers.set(VINEXT_INTERCEPTION_CONTEXT_HEADER, interceptionContext);
+			}
 			if (HAS_CLIENT_REWRITES) await preloadHybridClientRouteOwner();
 			const hybridOwner = resolveHybridClientRouteOwner(fullHref);
 			if (hybridOwner === "pages" || hybridOwner === "document") return;

package/dist/shims/og.js

@@ -1,4 +1,6 @@
+import { shareIsolatePromise } from "../server/isolate-shared-promise.js";
 //#region src/shims/og.tsx
+let vercelOg;
 const CACHE_HEADERS = {
 	noCache: "no-cache, no-store",
 	revalidate: "public, max-age=0, must-revalidate"
@@ -13,21 +15,43 @@ const CACHE_HEADERS = {
 var ImageResponse = class extends Response {
 	static displayName = "ImageResponse";
 	constructor(element, options) {
+		let startRendering;
+		const constructed = new Promise((resolve) => {
+			startRendering = resolve;
+		});
 		const readable = new ReadableStream({ async start(controller) {
-			const { ImageResponse: VercelImageResponse } = await import("@vercel/og");
-			const imageResponse = new VercelImageResponse(element, options);
-			if (!imageResponse.body) {
-				controller.close();
-				return;
+			await constructed;
+			if (options === null) throw new TypeError("Cannot read properties of null (reading 'headers')");
+			let settleInitialization;
+			if (!vercelOg) {
+				const loading = import("@vercel/og");
+				vercelOg = loading;
+				loading.catch(() => {
+					if (vercelOg === loading) vercelOg = void 0;
+				});
+				shareIsolatePromise(new Promise((resolve) => {
+					settleInitialization = resolve;
+				}));
 			}
-			const reader = imageResponse.body.getReader();
-			while (true) {
-				const { done, value } = await reader.read();
-				if (done) {
+			try {
+				const { ImageResponse: VercelImageResponse } = await vercelOg;
+				const imageResponse = new VercelImageResponse(element, options);
+				if (!imageResponse.body) {
 					controller.close();
 					return;
 				}
-				controller.enqueue(value);
+				const reader = imageResponse.body.getReader();
+				while (true) {
+					const { done, value } = await reader.read();
+					settleInitialization?.();
+					if (done) {
+						controller.close();
+						return;
+					}
+					controller.enqueue(value);
+				}
+			} finally {
+				settleInitialization?.();
 			}
 		} });
 		const headers = new Headers({
@@ -42,6 +66,7 @@ var ImageResponse = class extends Response {
 			status: options?.status,
 			statusText: options?.statusText
 		});
+		startRendering();
 	}
 };
 //#endregion

package/dist/shims/request-context.d.ts

@@ -38,6 +38,19 @@ export type ExecutionContextLike = {
   cache?: unknown;
   /** Server-owned origin for credential-bearing Pages revalidation loopbacks. */
   trustedRevalidateOrigin?: string;
+  /**
+   * Node production server signal that aborts when the client disconnects
+   * before the response finishes. Its Request only follows this signal, so the
+   * App RSC handler takes it from here (UnifiedRequestContext.requestSignal).
+   */
+  requestSignal?: AbortSignal;
+  /**
+   * Server-owned origin middleware runs against. Set by the Node production
+   * server, whose request URL comes from the client's Host header. Without it
+   * middleware uses the request URL's origin, which Workers can trust because
+   * the platform routes by hostname.
+   */
+  middlewareOrigin?: string;
   /** Worker-owned in-process dispatcher for authenticated Pages revalidation. */
   dispatchPagesRevalidate?: (request: Request) => Promise<Response>;
   /** Marks a request currently executing through the internal revalidation dispatcher. */

package/dist/shims/router.js

@@ -1,9 +1,10 @@
 import { isUnknownRecord } from "../utils/record.js";
+import { execConfigSource } from "../config/config-source.js";
 import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { substituteDestinationParams } from "../config/destination-params.js";
 import { sortRoutes, splitPathSegments } from "../routing/utils.js";
-import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
 import { addLocalePrefix, getDomainLocaleUrl, getLocalePathPrefix } from "../utils/domain-locale.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
@@ -28,6 +29,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 { clientRewriteAppendsParams } from "../client/client-rewrite-params.js";
 import { Component, Fragment, StrictMode, createElement, useContext, useEffect, useLayoutEffect, useMemo, useState } from "react";
 //#region src/shims/router.ts
 /**
@@ -935,7 +937,6 @@ function isAppComponent(value) {
 function resolveSameOriginRedirectedUrl(responseUrl) {
 	const appPath = toSameOriginAppPath(responseUrl, __basePath);
 	if (appPath === null) return null;
-	if (appPath.startsWith("//")) return normalizePathTrailingSlash(responseUrl, __trailingSlash);
 	return normalizePathTrailingSlash(appPath, __trailingSlash);
 }
 function stripLocalePrefixForApiRedirect(appPath) {
@@ -957,19 +958,13 @@ function resolveLocalRedirectUrl(location) {
 	let appPath;
 	if (location.startsWith("/") && !location.startsWith("//")) try {
 		const parsed = new URL(location, "http://vinext.local");
-		appPath = stripBasePath(parsed.pathname, __basePath) + parsed.search + parsed.hash;
+		const pathname = stripBasePath(parsed.pathname, __basePath);
+		appPath = pathname.startsWith("//") ? toSameOriginAppPath(new URL(location, window.location.href).href, __basePath) : pathname + parsed.search + parsed.hash;
 	} catch {
 		appPath = location;
 	}
 	else appPath = toSameOriginAppPath(location, __basePath);
 	if (appPath === null) return null;
-	if (appPath.startsWith("//")) try {
-		const browserUrl = new URL(location, window.location.href);
-		if (browserUrl.origin !== getWindowOrigin()) return null;
-		return normalizePathTrailingSlash(browserUrl.href, __trailingSlash);
-	} catch {
-		return null;
-	}
 	return normalizePathTrailingSlash(stripLocalePrefixForApiRedirect(appPath), __trailingSlash);
 }
 function hasClientRewriteRules() {
@@ -982,7 +977,8 @@ function hasClientRedirectRules() {
 }
 function hasClientAppRouteManifest() {
 	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
-	return Array.isArray(routes) && routes.length > 0;
+	const routeHandlers = window.__VINEXT_APP_ROUTE_HANDLERS__;
+	return Array.isArray(routes) && routes.length > 0 || Array.isArray(routeHandlers) && routeHandlers.length > 0;
 }
 function getClientConfigRouteContext(href) {
 	let parsed;
@@ -1036,40 +1032,14 @@ function shouldEvaluateClientConfigRule(ruleBasePath, state) {
 	if (!state.basePath) return true;
 	return ruleBasePath === false ? !state.hadBasePath : state.hadBasePath;
 }
-function matchSimpleClientConfigPattern(pathname, source) {
-	if (source.includes("(") || source.includes("\\") || /:[\w-]+[*+][^/]/.test(source)) return;
-	const sourceParts = removeTrailingSlash(source).split("/");
-	const pathParts = removeTrailingSlash(pathname).split("/");
-	const params = {};
-	let pathIndex = 0;
-	for (let sourceIndex = 0; sourceIndex < sourceParts.length; sourceIndex++) {
-		const sourcePart = sourceParts[sourceIndex];
-		const pathPart = pathParts[pathIndex];
-		if (sourcePart.startsWith(":")) {
-			const catchAll = sourcePart.match(/^:([\w-]+)([*+])$/);
-			if (catchAll) {
-				const rest = pathParts.slice(pathIndex).join("/");
-				if (catchAll[2] === "+" && rest === "") return null;
-				params[catchAll[1]] = rest;
-				return sourceIndex === sourceParts.length - 1 ? params : void 0;
-			}
-			if (pathPart === void 0) return null;
-			params[sourcePart.slice(1)] = pathPart;
-			pathIndex++;
-			continue;
-		}
-		if (pathPart !== sourcePart) return null;
-		pathIndex++;
+function isSerializedRewriteDestination(destination) {
+	if (!destination.startsWith("/") || destination.startsWith("//")) return true;
+	try {
+		const parsed = new URL(destination, "http://n");
+		return parsed.pathname + parsed.search + parsed.hash === destination;
+	} catch {
+		return false;
 	}
-	return pathIndex === pathParts.length ? params : null;
-}
-function simpleClientConfigSourceCouldMatch(pathname, source) {
-	const wildcardIndex = source.search(/[:(\\*+?]/);
-	const literalPrefix = wildcardIndex === -1 ? source : source.slice(0, wildcardIndex);
-	const normalizedPrefix = removeTrailingSlash(literalPrefix);
-	if (!normalizedPrefix || normalizedPrefix === "/") return true;
-	const normalizedPathname = removeTrailingSlash(pathname);
-	return normalizedPathname === normalizedPrefix || normalizedPathname.startsWith(`${normalizedPrefix}/`);
 }
 function isExternalClientConfigUrl(url) {
 	return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
@@ -1081,8 +1051,7 @@ function clientConfigRedirectCouldMatch(href) {
 	if (!routeContext) return false;
 	for (const redirect of redirects) {
 		if (!shouldEvaluateClientConfigRule(redirect.basePath, routeContext.basePathState)) continue;
-		if (!simpleClientConfigSourceCouldMatch(routeContext.pathname, redirect.source)) continue;
-		if (matchSimpleClientConfigPattern(routeContext.pathname, redirect.source) !== null) return true;
+		if (execConfigSource(routeContext.pathname, redirect.source) !== null) return true;
 	}
 	return false;
 }
@@ -1095,12 +1064,15 @@ function resolveClientConfigRewriteSync(href) {
 		const routeContext = getClientConfigRouteContext(currentHref);
 		if (!routeContext) return null;
 		if (!shouldEvaluateClientConfigRule(rewrite.basePath, routeContext.basePathState)) continue;
-		if (!simpleClientConfigSourceCouldMatch(routeContext.pathname, rewrite.source)) continue;
+		const match = execConfigSource(routeContext.pathname, rewrite.source);
+		if (match === null) continue;
 		if (rewrite.has || rewrite.requiresServerEvaluation) return void 0;
-		const params = matchSimpleClientConfigPattern(routeContext.pathname, rewrite.source);
-		if (params === void 0) return void 0;
-		if (params === null) continue;
+		if (match.unmatched.length > 0) return void 0;
+		const { params } = match;
+		if (!isSerializedRewriteDestination(rewrite.destination)) return void 0;
+		if (clientRewriteAppendsParams(rewrite.destination, params)) return void 0;
 		const rewritten = substituteDestinationParams(rewrite.destination, params, "rewrite");
+		if (!/^(?:https?:\/\/|\/(?![\\/\t\n\r]))/.test(rewritten)) return void 0;
 		if (isExternalClientConfigUrl(rewritten)) return { kind: "document" };
 		currentHref = mergeRewriteQuery(currentHref, rewritten);
 		matched = true;
@@ -1816,6 +1788,10 @@ async function performNavigation(url, as, options, mode, onStateUpdate, redirect
 	const absoluteHistoryUrl = sameOriginPath === null ? void 0 : origin && inputHref.startsWith(origin) ? inputHref.slice(origin.length) : sameOriginPath;
 	const currentRoute = window.__NEXT_DATA__?.page ?? stripBasePath(window.location.pathname, __basePath);
 	const currentAs = stripBasePath(window.location.pathname, __basePath) + window.location.search;
+	const resolveRelativeRoutePath = (href) => href === "" || /^[/?#]/.test(href) || isAbsoluteUrl(href) ? href : resolvePagesRouterHref(href, {
+		pathname: currentRoute,
+		asPath: currentAs
+	}, __basePath);
 	const preparedHistoryHref = (isAbsoluteUrl(inputHref) ? toSameOriginAppPath(inputHref, __basePath) : null) ?? absoluteHistoryUrl ?? resolvePagesRouterHref(inputHref, {
 		pathname: currentRoute,
 		asPath: currentAs
@@ -1825,12 +1801,12 @@ async function performNavigation(url, as, options, mode, onStateUpdate, redirect
 	const replaceInheritedLocale = options?.locale !== void 0 && (!as ? urlInheritsCurrentPath || typeof url !== "string" && inheritsVisiblePath(url) : typeof as !== "string" && inheritsVisiblePath(as));
 	const credentialedHistoryHref = credentialedSameOriginHref(url);
 	const credentialedDisplayHref = credentialedSameOriginHref(as) ?? (!as ? credentialedHistoryHref : void 0);
-	as = as ? resolveUrl(as, true) : void 0;
+	as = as ? resolveRelativeRoutePath(resolveUrl(as, true)) : void 0;
 	assertSafeNavigationUrl(resolveUrl(url));
 	if (as !== void 0) assertSafeNavigationUrl(as);
 	const isHydrationQueryUpdate = options?._h === 1;
 	const navigationLocale = resolveTransitionLocale(options?.locale);
-	const unlocalizedRouteHref = resolveUrl(isQueryOnlyString ? `${stripBasePath(window.location.pathname, __basePath)}${url}` : url);
+	const unlocalizedRouteHref = resolveRelativeRoutePath(resolveUrl(isQueryOnlyString ? `${stripBasePath(window.location.pathname, __basePath)}${url}` : url));
 	const localRouteHref = isExternalUrl(unlocalizedRouteHref) ? toSameOriginAppPath(unlocalizedRouteHref, __basePath) : unlocalizedRouteHref;
 	const implicitDynamicRoute = !isHydrationQueryUpdate && as === void 0 && localRouteHref !== null ? resolveDynamicRouteHref(localRouteHref) : null;
 	const routeForNavigation = implicitDynamicRoute?.as ?? unlocalizedRouteHref;

package/dist/shims/server.d.ts

@@ -28,6 +28,11 @@ export type RequestInit = globalThis.RequestInit & {
     trailingSlash?: boolean;
     skipTrailingSlashRedirect?: boolean;
   };
+  /**
+   * vinext-internal: the host the request was made to, when the URL carries
+   * the server's own origin instead. It picks the i18n domain locale.
+   */
+  requestHost?: string;
   signal?: AbortSignal;
   duplex?: "half";
 };
@@ -42,13 +47,20 @@ export declare class NextRequest extends Request {
   get page(): void;
   get ua(): void;
   /**
-   * Client IP address. Prefers Cloudflare's trusted CF-Connecting-IP header
-   * over the spoofable X-Forwarded-For. Returns undefined if unavailable.
+   * Client IP address. Next.js removed `ip` in v15; vinext keeps it as an
+   * extension. Returns undefined unless the value comes from a trusted source.
+   *
+   * On Cloudflare Workers (the request carries `cf` metadata), Cloudflare's
+   * edge sets `CF-Connecting-IP`. Elsewhere these headers are client-supplied
+   * and are only honored behind a trusted proxy (`VINEXT_TRUST_PROXY` /
+   * `VINEXT_TRUSTED_HOSTS`), matching the `X-Forwarded-*` policy.
    */
   get ip(): string | undefined;
   /**
-   * Geolocation data. Platform-dependent (e.g., Cloudflare, Vercel).
-   * Returns undefined if not available.
+   * Geolocation data. Next.js removed `geo` in v15; vinext keeps it as an
+   * extension. Read from Cloudflare's `request.cf` metadata on Workers, or
+   * from platform geo headers behind a trusted proxy. Returns undefined
+   * otherwise, because any client can send these headers.
    */
   get geo(): {
     city?: string;
@@ -93,6 +105,11 @@ export declare class NextResponse<_Body = unknown> extends Response {
 }
 export type NextURLConfig = {
   basePath?: string;
+  /**
+   * Request headers. As in Next.js's `getHostname`, a Host header decides the
+   * domain locale before the URL's own hostname.
+   */
+  headers?: Record<string, string | string[] | undefined>;
   nextConfig?: {
     i18n?: {
       locales: string[];
@@ -139,6 +156,12 @@ export declare class NextURL {
   private _locales;
   private _domains;
   private _domainLocale;
+  private _headers;
+  private _buildId;
+  /** First page segment of a raw data pathname, where its locale sits. */
+  private _dataPathSegment;
+  /** The locale parsed from that segment, if it is one. */
+  private _dataPathLocale;
   constructor(input: string | URL, base?: string | URL, config?: NextURLConfig);
   /**
    * With `skipTrailingSlashRedirect`, take the slash from the parsed pathname
@@ -157,9 +180,20 @@ export declare class NextURL {
    * middleware-base-path's "should execute from absolute paths" case.
    */
   private _stripBasePath;
+  /**
+   * Take the build ID from a raw `/_next/data/<buildId>/….json` pathname, as
+   * getNextPathnameInfo does. Middleware only sees one when proxy URL
+   * normalization is skipped; the pathname is left as is.
+   */
+  private _parseBuildId;
   /** Extract locale from pathname, stripping it from the internal URL. */
   private _detectPathnameLocale;
   private _analyzeI18n;
+  /**
+   * A raw data pathname keeps its locale segment, replaced by the current
+   * locale once it has been changed.
+   */
+  private _formatDataPathLocale;
   /**
    * Reconstruct the full pathname with basePath + locale prefix and apply
    * the configured trailingSlash policy.
@@ -207,10 +241,10 @@ export declare class NextURL {
   toString(): string;
   toJSON(): string;
   /**
-   * The build ID of the Next.js application.
-   * Set from `generateBuildId` in next.config.js, or a random UUID if not configured.
-   * Can be used in middleware to detect deployment skew between client and server.
-   * Matches the Next.js API: `request.nextUrl.buildId`.
+   * Matches the Next.js API: `request.nextUrl.buildId`. Next.js derives it
+   * from the URL (only `/_next/data/<buildId>/…` paths carry one) and never
+   * from the deployment, so a Client Component reads the same value on the
+   * server and in the browser.
    */
   get buildId(): string | undefined;
 }