vinext 1.2.1 → 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";
@@ -19,7 +19,7 @@ import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.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
 	});
@@ -1465,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;
@@ -1607,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",
@@ -1616,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,4 +1,5 @@
 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";
@@ -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
 /**
@@ -975,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;
@@ -1029,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("//");
@@ -1074,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;
 }
@@ -1088,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;

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";
 };
@@ -100,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[];
@@ -146,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
@@ -164,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.
@@ -214,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;
 }

package/dist/shims/server.js

@@ -117,7 +117,7 @@ var NextRequest = class extends Request {
 	_cookies;
 	constructor(input, init) {
 		validateURL(typeof input !== "string" && "url" in input ? input.url : String(input));
-		const { nextConfig: _nextConfig, ...plainInit } = init ?? {};
+		const { nextConfig: _nextConfig, requestHost, ...plainInit } = init ?? {};
 		const requestInit = init instanceof Request ? requestInitFromRequest(init) : plainInit;
 		if (input instanceof Request) {
 			super(input, initWithoutInputBody(input, requestInit));
@@ -143,6 +143,7 @@ var NextRequest = class extends Request {
 		} : void 0;
 		const urlConfig = _nextConfig ? {
 			basePath: _nextConfig.basePath,
+			headers: requestHost === void 0 ? void 0 : { host: requestHost },
 			nextConfig: {
 				i18n,
 				trailingSlash: _nextConfig.trailingSlash,
@@ -293,6 +294,9 @@ var NextResponse = class NextResponse extends Response {
 		});
 	}
 };
+function isRawDataPathname(pathname) {
+	return pathname.startsWith("/_next/data/") && pathname.endsWith(".json");
+}
 var NextURL = class NextURL {
 	/** Internal URL stores the pathname WITHOUT basePath or locale prefix. */
 	_url;
@@ -312,8 +316,15 @@ var NextURL = class NextURL {
 	_locales;
 	_domains;
 	_domainLocale;
+	_headers;
+	_buildId;
+	/** First page segment of a raw data pathname, where its locale sits. */
+	_dataPathSegment;
+	/** The locale parsed from that segment, if it is one. */
+	_dataPathLocale;
 	constructor(input, base, config) {
 		this._url = new URL(input.toString(), base);
+		this._headers = config?.headers;
 		this._configBasePath = config?.basePath ?? "";
 		this._basePath = this._configBasePath;
 		this._configTrailingSlash = config?.nextConfig?.trailingSlash ?? false;
@@ -321,6 +332,7 @@ var NextURL = class NextURL {
 		this._trailingSlash = this._configTrailingSlash;
 		this._analyzeTrailingSlash();
 		this._stripBasePath();
+		this._parseBuildId();
 		const i18n = config?.nextConfig?.i18n;
 		if (i18n) {
 			this._locales = [...i18n.locales];
@@ -361,6 +373,22 @@ var NextURL = class NextURL {
 		this._basePath = this._configBasePath;
 		this._url.pathname = stripBasePath(this._url.pathname, this._configBasePath);
 	}
+	/**
+	* 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.
+	*/
+	_parseBuildId() {
+		const { pathname } = this._url;
+		if (!isRawDataPathname(pathname)) {
+			this._buildId = void 0;
+			this._dataPathSegment = void 0;
+			return;
+		}
+		const [buildId, pageSegment] = pathname.slice(12, -5).split("/");
+		this._buildId = buildId;
+		this._dataPathSegment = pageSegment === "index" ? void 0 : pageSegment;
+	}
 	/** Extract locale from pathname, stripping it from the internal URL. */
 	_detectPathnameLocale(locales) {
 		const segments = this._url.pathname.split("/");
@@ -372,11 +400,29 @@ var NextURL = class NextURL {
 	_analyzeI18n() {
 		if (!this._locales || !this._configDefaultLocale) return;
 		const detectedLocale = this._detectPathnameLocale(this._locales);
+		this._dataPathLocale = void 0;
+		if (!detectedLocale && this._buildId && this._dataPathSegment) {
+			const candidate = this._dataPathSegment.toLowerCase();
+			this._dataPathLocale = this._locales.find((l) => l.toLowerCase() === candidate);
+		}
 		const detectedLocaleLower = detectedLocale?.toLowerCase();
-		const hostname = this._url.hostname.toLowerCase();
+		const hostHeader = this._headers?.host;
+		const hostname = (typeof hostHeader === "string" && hostHeader ? hostHeader.split(":", 1)[0] : this._url.hostname).toLowerCase();
 		this._domainLocale = this._domains?.find((domain) => domain.domain.split(":", 1)[0].toLowerCase() === hostname || detectedLocaleLower === domain.defaultLocale.toLowerCase() || domain.locales?.some((locale) => locale.toLowerCase() === detectedLocaleLower));
 		this._defaultLocale = this._domainLocale?.defaultLocale ?? this._configDefaultLocale;
-		this._locale = detectedLocale ?? this._defaultLocale;
+		this._locale = detectedLocale ?? this._dataPathLocale ?? this._defaultLocale;
+	}
+	/**
+	* A raw data pathname keeps its locale segment, replaced by the current
+	* locale once it has been changed.
+	*/
+	_formatDataPathLocale(pathname) {
+		if (!this._dataPathLocale || this._locale === this._dataPathLocale) return pathname;
+		if (!this._locale || !isRawDataPathname(pathname)) return pathname;
+		const segments = pathname.slice(12, -5).split("/");
+		if (segments[1]?.toLowerCase() !== this._dataPathLocale.toLowerCase()) return pathname;
+		segments[1] = this._locale;
+		return "/_next/data/" + segments.join("/") + ".json";
 	}
 	/**
 	* Reconstruct the full pathname with basePath + locale prefix and apply
@@ -385,9 +431,9 @@ var NextURL = class NextURL {
 	*/
 	_formatPathname() {
 		let prefix = this._basePath;
-		const inner = this._url.pathname;
+		const inner = this._formatDataPathLocale(this._url.pathname);
 		const innerLower = inner.toLowerCase();
-		if (!(innerLower === "/api" || innerLower.startsWith("/api/")) && this._locale && this._locale !== this._defaultLocale) prefix += "/" + this._locale;
+		if (!(innerLower === "/api" || innerLower.startsWith("/api/")) && !isRawDataPathname(inner) && this._locale && this._locale !== this._defaultLocale) prefix += "/" + this._locale;
 		const composed = !prefix ? inner : inner === "/" ? prefix : prefix + inner;
 		return this._applyTrailingSlash(composed);
 	}
@@ -415,6 +461,7 @@ var NextURL = class NextURL {
 		this._url.href = value;
 		this._analyzeTrailingSlash();
 		this._stripBasePath();
+		this._parseBuildId();
 		this._analyzeI18n();
 	}
 	get origin() {
@@ -526,6 +573,7 @@ var NextURL = class NextURL {
 		} else if (this._trailingSlash) nextConfig.trailingSlash = true;
 		const config = {
 			basePath: this._configBasePath,
+			headers: this._headers,
 			nextConfig: Object.keys(nextConfig).length > 0 ? nextConfig : void 0
 		};
 		return new NextURL(this.href, void 0, config);
@@ -537,13 +585,13 @@ var NextURL = class NextURL {
 		return this.href;
 	}
 	/**
-	* 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() {
-		return process.env.__VINEXT_BUILD_ID ?? void 0;
+		return this._buildId;
 	}
 };
 var RequestCookies = class {

package/dist/shims/thenable-params.d.ts

@@ -3,7 +3,12 @@ import { WellKnownProperty } from "./internal/thenable-well-known-properties.js"
 export type ThenableParams<T extends Record<string, unknown>> = Promise<T> & Omit<T, WellKnownProperty>;
 export type ThenableParamsObserver = Readonly<{
   observeParamAccess: (keys: readonly string[]) => void;
-  observeReactPromiseStatus?: boolean;
+  /**
+   * Runs when `then` is read, and when `catch` or `finally` is called (they
+   * read `then` on a native promise). Throwing here fails the read itself
+   * before React counts any pending work, as Next.js does.
+   */
+  observeThenRead?: () => void;
 }>;
 /** Serialize backing values without reading a framework fallback-key proxy. */
 export declare function getFallbackParamsSnapshot(value: unknown): Promise<Record<string, unknown>> | undefined;

package/dist/shims/thenable-params.js

@@ -117,14 +117,20 @@ function createThenableParams(obj, observer, fallbackShellState) {
 	const params = createThenableParamsProxy(promise, {
 		get(target, prop, receiver) {
 			if (isPromiseContinuation(prop)) {
+				if (prop === "then") observer?.observeThenRead?.();
 				const value = Reflect.get(target, prop, receiver);
 				if (typeof value !== "function") return value;
 				return (...args) => {
-					if (!fallbackParamNames) observeAllParamKeys(observer, plain);
+					if (prop !== "then") observer?.observeThenRead?.();
+					if (!fallbackParamNames) try {
+						observeAllParamKeys(observer, plain);
+					} catch (error) {
+						return Reflect.apply(value, Promise.reject(error), args);
+					}
 					return Reflect.apply(value, target, args);
 				};
 			}
-			if (prop === "status" && observer?.observeReactPromiseStatus === true) observeAllParamKeys(observer, plain);
+			if (prop === "reason" && Object.hasOwn(target, prop)) return Reflect.get(target, prop);
 			if (typeof prop === "string" && !isWellKnownProperty(prop)) observeParamKeys(observer, [prop]);
 			if (!isWellKnownProperty(prop) && hasParamProperty(plain, prop)) {
 				if (isFallbackParam(prop)) {
@@ -164,6 +170,9 @@ function createThenableParams(obj, observer, fallbackShellState) {
 		ownKeys() {
 			observeReadableParamKeys(observer, plain);
 			return Reflect.ownKeys(plain).filter((prop) => !isWellKnownProperty(prop));
+		},
+		set(target, prop, value) {
+			return Reflect.set(target, prop, value);
 		}
 	});
 	paramsState.set(params, {

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

@@ -21,6 +21,11 @@ import "./request-state-types.js";
 export type UnifiedRequestContext = {
   /** Cloudflare Workers ExecutionContext, or null on Node.js dev. */
   executionContext: ExecutionContextLike | null;
+  /**
+   * The host's client-connection signal for the incoming request, before any
+   * clone follows it. Null for requests vinext creates itself (regeneration).
+   */
+  requestSignal: AbortSignal | null;
   /** Per-request cache for cacheForRequest(). Keyed by factory function reference. */
   requestCache: WeakMap<(...args: any[]) => any, unknown>;
   /** Shared lifecycle state for work deferred until the response closes. */

package/dist/shims/unified-request-context.js

@@ -18,6 +18,7 @@ function createRequestContext(opts) {
 		headersContext: null,
 		actionRevalidationKind: 0,
 		cacheLifeSink: null,
+		pendingCdnTagInvalidations: [],
 		pendingRevalidatedTags: /* @__PURE__ */ new Set(),
 		pendingRevalidations: /* @__PURE__ */ new Set(),
 		dynamicUsageDetected: false,
@@ -50,6 +51,7 @@ function createRequestContext(opts) {
 		currentFetchDedupeEntries: /* @__PURE__ */ new Map(),
 		nextFetchId: 1,
 		executionContext: _getInheritedExecutionContext(),
+		requestSignal: null,
 		requestCache: /* @__PURE__ */ new WeakMap(),
 		afterContext: {
 			callbacks: [],

package/dist/utils/asset-prefix.d.ts

@@ -92,4 +92,11 @@ export declare function assetPrefixPathname(assetPrefix: string): string;
  * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/server/lib/router-server.ts
  */
 export declare function isNextStaticPath(pathname: string, basePath: string, assetPathPrefix: string): boolean;
+/**
+ * Whether `pathname` is a build asset under a path `assetPrefix`. Next.js adds
+ * a built-in beforeFiles rewrite from `${assetPrefix}/_next/:path+` into the
+ * basePath (`loadRewrites` in `packages/next/src/lib/load-custom-routes.ts`),
+ * so such a path resolves even when it lies outside the basePath.
+ */
+export declare function isAssetPrefixBuildAsset(pathname: string, assetPathPrefix: string): boolean;
 //#endregion

package/dist/utils/asset-prefix.js

@@ -118,5 +118,14 @@ function isNextStaticPath(pathname, basePath, assetPathPrefix) {
 	if (assetPathPrefix && (p === assetPathPrefix || p.startsWith(assetPathPrefix + "/"))) p = p.slice(assetPathPrefix.length) || "/";
 	return p.startsWith(`/${ASSET_PREFIX_URL_DIR}/`);
 }
+/**
+* Whether `pathname` is a build asset under a path `assetPrefix`. Next.js adds
+* a built-in beforeFiles rewrite from `${assetPrefix}/_next/:path+` into the
+* basePath (`loadRewrites` in `packages/next/src/lib/load-custom-routes.ts`),
+* so such a path resolves even when it lies outside the basePath.
+*/
+function isAssetPrefixBuildAsset(pathname, assetPathPrefix) {
+	return !!assetPathPrefix && (pathname === assetPathPrefix || pathname.startsWith(assetPathPrefix + "/")) && isNextStaticPath(pathname, "", assetPathPrefix);
+}
 //#endregion
-export { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix, isNextStaticPath, resolveAssetUrlPrefix, resolveAssetsDir };
+export { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix, isAssetPrefixBuildAsset, isNextStaticPath, resolveAssetUrlPrefix, resolveAssetsDir };

package/dist/utils/client-build-manifest.js

@@ -19,6 +19,8 @@ function readClientBuildManifest(manifestPath) {
 			const assets = readStringArray(entry.assets);
 			manifest[key] = {
 				file: entry.file,
+				...typeof entry.src === "string" ? { src: entry.src } : {},
+				...typeof entry.name === "string" ? { name: entry.name } : {},
 				...entry.isEntry === true ? { isEntry: true } : {},
 				...entry.isDynamicEntry === true ? { isDynamicEntry: true } : {},
 				...imports ? { imports } : {},
@@ -39,14 +41,19 @@ function findPagesClientEntryFileFromManifest(buildManifest, assetBase) {
 	return findEntryFileFromManifest(buildManifest, assetBase, PAGES_CLIENT_ENTRY_MARKERS, false);
 }
 function findEntryFileFromManifest(buildManifest, assetBase, markers, fallbackToFirstEntry) {
-	const entries = Object.values(buildManifest).filter((entry) => entry.isEntry && entry.file);
-	for (const marker of markers) {
-		const markedEntry = entries.find((entry) => entry.file.includes(marker));
-		if (markedEntry) return manifestFileWithBase(markedEntry.file, assetBase);
+	const entries = Object.entries(buildManifest).filter(([, entry]) => entry.isEntry && entry.file);
+	const matchers = [(marker, key, entry) => entry.name === marker || isVirtualEntryId(key, marker) || entry.src !== void 0 && isVirtualEntryId(entry.src, marker), (marker, _key, entry) => entry.file.includes(marker)];
+	for (const matches of matchers) for (const marker of markers) {
+		const markedEntry = entries.find(([key, entry]) => matches(marker, key, entry));
+		if (markedEntry) return manifestFileWithBase(markedEntry[1].file, assetBase);
 	}
-	const chosen = fallbackToFirstEntry ? entries[0] : void 0;
+	const chosen = fallbackToFirstEntry ? entries[0]?.[1] : void 0;
 	return chosen ? manifestFileWithBase(chosen.file, assetBase) : void 0;
 }
+function isVirtualEntryId(id, marker) {
+	const virtualId = `virtual:${marker}`;
+	return id === virtualId || id.endsWith(`/${virtualId}`);
+}
 function listFilesRecursive(dir) {
 	const out = [];
 	for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {

package/dist/utils/client-runtime-metadata.d.ts

@@ -8,6 +8,7 @@ type ClientRuntimeMetadata = {
   }>;
   lazyChunks?: string[];
   dynamicPreloads?: Record<string, string[]>;
+  sharedChunks?: string[];
 };
 /**
  * Read the client build manifest and compute runtime metadata used by