vinext 1.0.0-beta.9 → 1.0.1

package/dist/shims/error.js

@@ -13,9 +13,9 @@ import React from "react";
 * Used by apps that import `import Error from 'next/error'` for
 * custom error handling in getServerSideProps or API routes.
 *
-* Also re-exports the unstable App Router error-boundary HOC
-* (`unstable_catchError`) and its `ErrorInfo` type, mirroring
-* `next/error`'s public surface.
+* Also exports the App Router error-boundary HOC (`catchError`, plus its
+* former unstable name) and its `ErrorInfo` type, mirroring `next/error`'s
+* public surface.
 */
 const statusCodes = {
 	400: "Bad Request",
@@ -83,7 +83,7 @@ var ErrorComponent = class extends React.Component {
 const _CatchErrorAppRouterContext = AppRouterContext ?? React.createContext(null);
 var _CatchError = class extends React.Component {
 	static contextType = _CatchErrorAppRouterContext;
-	static displayName = "unstable_catchError(Next.CatchError)";
+	static displayName = "catchError(Next.CatchError)";
 	constructor(props) {
 		super(props);
 		this.state = {
@@ -108,19 +108,24 @@ var _CatchError = class extends React.Component {
 	reset = () => {
 		this.setState({ error: null });
 	};
-	unstable_retry = () => {
-		if (this.props.isPagesRouter) throw new Error("`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.");
+	retry = () => {
+		if (this.props.isPagesRouter) throw new Error("`retry()` can only be used in the App Router. Use `reset()` in the Pages Router.");
 		React.startTransition(() => {
 			this.context?.refresh();
 			this.reset();
 		});
 	};
+	unstable_retry = () => {
+		if (this.props.isPagesRouter) throw new Error("`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.");
+		this.retry();
+	};
 	render() {
 		if (this.state.error) {
 			const Fallback = this.props.fallback;
 			const errorInfo = {
-				error: this.state.error.thrownValue instanceof Error ? this.state.error.thrownValue : new Error(String(this.state.error.thrownValue)),
+				error: this.state.error.thrownValue,
 				reset: this.reset,
+				retry: this.retry,
 				unstable_retry: this.unstable_retry
 			};
 			return React.createElement(Fallback, {
@@ -139,7 +144,7 @@ var _CatchError = class extends React.Component {
 * Ported from Next.js:
 *   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/catch-error.tsx
 */
-function unstable_catchError(fallback) {
+function createCatchError(fallback) {
 	const Fallback = ({ props, errorInfo }) => fallback(props, errorInfo);
 	Fallback.displayName = fallback.name || "CatchErrorFallback";
 	function CatchErrorBoundary(allProps) {
@@ -154,8 +159,10 @@ function unstable_catchError(fallback) {
 			props: forwardedProps
 		}, children);
 	}
-	CatchErrorBoundary.displayName = `unstable_catchError(${fallback.name || "CatchErrorFallback"})`;
+	CatchErrorBoundary.displayName = `catchError(${fallback.name || "CatchErrorFallback"})`;
 	return CatchErrorBoundary;
 }
+const catchError = createCatchError;
+const unstable_catchError = createCatchError;
 //#endregion
-export { ErrorComponent as default, unstable_catchError };
+export { catchError, ErrorComponent as default, unstable_catchError };

package/dist/shims/error.react-server.d.ts

@@ -1,9 +1,6 @@
+import { ErrorInfo } from "./error.js";
 //#region src/shims/error.react-server.d.ts
-type ErrorInfo = {
-  error: unknown;
-  reset: () => void;
-  unstable_retry: () => void;
-};
-declare function unstable_catchError(): never;
+export declare function unstable_catchError(): never;
+export declare function catchError(): never;
 //#endregion
-export { ErrorInfo, unstable_catchError };
+export type { ErrorInfo };

package/dist/shims/error.react-server.js

@@ -2,5 +2,8 @@
 function unstable_catchError() {
 	throw new Error("`unstable_catchError` can only be used in Client Components.");
 }
+function catchError() {
+	throw new Error("`catchError` can only be used in Client Components.");
+}
 //#endregion
-export { unstable_catchError };
+export { catchError, unstable_catchError };

package/dist/shims/fetch-cache.d.ts

@@ -34,8 +34,8 @@ declare global {
   }
 }
 /** @internal Reset dedup state — exposed for test isolation only. */
-declare function _resetPendingRefetches(): void;
-type FetchCacheState = {
+export declare function _resetPendingRefetches(): void;
+export type FetchCacheState = {
   cacheableFetchUrls: Set<string>;
   currentRequestTags: string[];
   currentFetchSoftTags: string[];
@@ -46,17 +46,18 @@ type FetchCacheState = {
   refreshStaleFetchesInForeground: boolean;
   isFetchDedupeActive: boolean;
   currentFetchDedupeEntries: Map<string, FetchDedupeEntry[]>;
+  nextFetchId: number;
 };
-type FetchCacheMode = "auto" | "default-cache" | "default-no-store" | "force-cache" | "force-no-store" | "only-cache" | "only-no-store";
-declare function peekCacheableFetchObservations(): string[];
-declare function peekDynamicFetchObservations(): string[];
-declare function consumeDynamicFetchObservations(): string[];
+export type FetchCacheMode = "auto" | "default-cache" | "default-no-store" | "force-cache" | "force-no-store" | "only-cache" | "only-no-store";
+export declare function peekCacheableFetchObservations(): string[];
+export declare function peekDynamicFetchObservations(): string[];
+export declare function consumeDynamicFetchObservations(): string[];
 /**
  * Get tags collected during the current render pass.
  * Useful for associating page-level cache entries with all the
  * fetch tags used during rendering.
  */
-declare function getCollectedFetchTags(): string[];
+export declare function getCollectedFetchTags(): string[];
 /**
  * Append cache tags to the current request's collected tags.
  *
@@ -69,7 +70,7 @@ declare function getCollectedFetchTags(): string[];
  * (issue #1453). Tags are already encoded by the caller; deduped to match the
  * tagged-fetch path. A no-op for empty input.
  */
-declare function addCollectedRequestTags(tags: readonly string[]): void;
+export declare function addCollectedRequestTags(tags: readonly string[]): void;
 /**
  * Set path-derived implicit tags for fetch cache reads in the current render.
  *
@@ -77,7 +78,7 @@ declare function addCollectedRequestTags(tags: readonly string[]): void;
  * `softTags`: `revalidatePath()` should make a fetch miss while rendering the
  * affected route, without permanently coupling a shared fetch entry to one path.
  */
-declare function setCurrentFetchSoftTags(tags: string[]): void;
+export declare function setCurrentFetchSoftTags(tags: string[]): void;
 /**
  * Read the path-derived soft tags for the current render.
  *
@@ -85,11 +86,11 @@ declare function setCurrentFetchSoftTags(tags: string[]): void;
  * so that `revalidatePath()` invalidates "use cache" entries during the
  * affected route's next request, even when the entry carries no hard tags.
  */
-declare function getCurrentFetchSoftTags(): string[];
-declare function setCurrentFetchCacheMode(mode: FetchCacheMode | null): void;
-declare function setCurrentFetchRevalidate(revalidate: number | null): void;
-declare function setCurrentForceDynamicFetchDefault(enabled: boolean): void;
-declare function setRefreshStaleFetchesInForeground(enabled: boolean): void;
+export declare function getCurrentFetchSoftTags(): string[];
+export declare function setCurrentFetchCacheMode(mode: FetchCacheMode | null): void;
+export declare function setCurrentFetchRevalidate(revalidate: number | null): void;
+export declare function setCurrentForceDynamicFetchDefault(enabled: boolean): void;
+export declare function setRefreshStaleFetchesInForeground(enabled: boolean): void;
 /**
  * Install the patched fetch and reset per-request tag state.
  * Returns a cleanup function that clears tags.
@@ -101,13 +102,13 @@ declare function setRefreshStaleFetchesInForeground(enabled: boolean): void;
  *   const cleanup = withFetchCache();
  *   try { await render(); } finally { cleanup(); }
  */
-declare function withFetchCache(): () => void;
+export declare function withFetchCache(): () => void;
 /**
  * Run an async function with patched fetch caching enabled.
  * Uses `AsyncLocalStorage.run()` for proper per-request isolation
  * of collected fetch tags in concurrent server environments.
  */
-declare function runWithFetchCache<T>(fn: () => Promise<T>): Promise<T>;
+export declare function runWithFetchCache<T>(fn: () => Promise<T>): Promise<T>;
 /**
  * Activate per-render fetch memoization without resetting request fetch tags.
  * Next.js request memoization is scoped to React render work, not the whole
@@ -120,8 +121,8 @@ declare function runWithFetchCache<T>(fn: () => Promise<T>): Promise<T>;
  * the parent already activated dedupe (the common dispatch case) but means
  * standalone callers must keep the dedupe scope alive across consumption.
  */
-declare function runWithFetchDedupe<T>(fn: () => T): T;
-declare function runWithFetchDedupe<T>(fn: () => Promise<T>): Promise<T>;
+export declare function runWithFetchDedupe<T>(fn: () => T): T;
+export declare function runWithFetchDedupe<T>(fn: () => Promise<T>): Promise<T>;
 /**
  * Install the patched fetch without creating a standalone ALS scope.
  *
@@ -130,11 +131,10 @@ declare function runWithFetchDedupe<T>(fn: () => Promise<T>): Promise<T>;
  * that isolation itself via `currentRequestTags`, so callers inside
  * `runWithRequestContext()` only need the process-global fetch monkey-patch.
  */
-declare function ensureFetchPatch(): void;
+export declare function ensureFetchPatch(): void;
 /**
  * Get the original (unpatched) fetch function.
  * Useful for internal code that should bypass caching.
  */
-declare function getOriginalFetch(): typeof globalThis.fetch;
-//#endregion
-export { FetchCacheMode, FetchCacheState, _resetPendingRefetches, addCollectedRequestTags, consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, getCurrentFetchSoftTags, getOriginalFetch, peekCacheableFetchObservations, peekDynamicFetchObservations, runWithFetchCache, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchRevalidate, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, setRefreshStaleFetchesInForeground, withFetchCache };
+export declare function getOriginalFetch(): typeof globalThis.fetch;
+//#endregion

package/dist/shims/fetch-cache.js

@@ -3,7 +3,9 @@ import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation }
 import { getRequestExecutionContext } from "./request-context.js";
 import { getDataCacheHandler } from "./cache-handler.js";
 import { encodeCacheTags } from "../utils/encode-cache-tag.js";
-import { getHeadersContext, isInsideAnyCacheScope, markDynamicUsage } from "./headers.js";
+import { traceAppFetch } from "../server/app-fetch-tracing.js";
+import { isInsideAnyCacheScope, markDynamicUsage } from "./internal/headers-state.js";
+import { getHeadersContext } from "./headers.js";
 import { _hasPendingRevalidatedTag, _setRequestScopedCacheLife } from "./cache-request-state.js";
 import { Buffer } from "node:buffer";
 //#region src/shims/fetch-cache.ts
@@ -34,7 +36,7 @@ import { Buffer } from "node:buffer";
 */
 const HEADER_BLOCKLIST = ["traceparent", "tracestate"];
 const CACHE_KEY_PREFIX = "v5";
-const MAX_CACHE_KEY_BODY_BYTES = 1024 * 1024;
+const MAX_CACHE_KEY_BODY_BYTES = 1048576;
 const ONE_YEAR_SECONDS = 31536e3;
 var BodyTooLargeForCacheKeyError = class extends Error {
 	constructor() {
@@ -350,7 +352,8 @@ const _fallbackState = _g[_FALLBACK_KEY] ??= {
 	dynamicFetchUrls: /* @__PURE__ */ new Set(),
 	refreshStaleFetchesInForeground: false,
 	isFetchDedupeActive: false,
-	currentFetchDedupeEntries: /* @__PURE__ */ new Map()
+	currentFetchDedupeEntries: /* @__PURE__ */ new Map(),
+	nextFetchId: 1
 };
 function _getState() {
 	if (isInsideUnifiedScope()) return getRequestContext();
@@ -371,6 +374,7 @@ function _resetFallbackState(isFetchDedupeActive) {
 	_fallbackState.refreshStaleFetchesInForeground = false;
 	_fallbackState.isFetchDedupeActive = isFetchDedupeActive;
 	_fallbackState.currentFetchDedupeEntries = /* @__PURE__ */ new Map();
+	_fallbackState.nextFetchId = 1;
 }
 function getFetchObservationUrl(input) {
 	return typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
@@ -655,45 +659,61 @@ function dedupeFetch(input, init) {
 * 5. Respects `next.tags` for tag-based invalidation via revalidateTag()
 */
 function createPatchedFetch() {
-	return async function patchedFetch(input, init) {
+	const patchedFetch = async function patchedFetch(input, init, span) {
 		const nextOpts = init?.next;
-		const cacheDirective = resolveSegmentCacheDirective(getFetchCacheDirective(input, init), nextOpts, _getState().currentFetchCacheMode, _getState().currentForceDynamicFetchDefault);
+		const state = _getState();
+		const fetchIdx = isInsideUnifiedScope() || _als.getStore() !== void 0 || _fallbackState.isFetchDedupeActive ? (state.nextFetchId ?? 1) + 1 : void 0;
+		if (fetchIdx !== void 0) state.nextFetchId = fetchIdx;
+		const recordFetchOutcome = (response, cacheStatus, cacheReason) => {
+			if (fetchIdx !== void 0) span?.setAttributes({
+				"next.fetch.idx": fetchIdx,
+				"next.fetch.cache_status": cacheStatus,
+				"next.fetch.cache_reason": cacheReason
+			});
+			return response;
+		};
+		const fetchCacheMode = state.currentFetchCacheMode;
+		const cacheDirective = resolveSegmentCacheDirective(getFetchCacheDirective(input, init), nextOpts, fetchCacheMode, state.currentForceDynamicFetchDefault);
+		const skipReason = fetchCacheMode === "force-no-store" || fetchCacheMode === "only-no-store" || fetchCacheMode === "default-no-store" ? `fetchCache = ${fetchCacheMode}` : cacheDirective === "no-store" || cacheDirective === "no-cache" ? `cache: ${cacheDirective}` : nextOpts?.revalidate === 0 ? "revalidate: 0" : "auto no cache";
 		if (!nextOpts && !cacheDirective) {
 			recordDynamicFetchObservation(input);
-			return dedupeFetch(input, init);
+			return recordFetchOutcome(await dedupeFetch(input, init), "skip", "auto no cache");
 		}
 		if (cacheDirective === "no-store" || cacheDirective === "no-cache" || nextOpts?.revalidate === 0) {
 			const cleanInit = stripNextFromInit(init, cacheDirective);
 			markUncachedFetchForPageOutput(input);
-			return dedupeFetch(input, cleanInit);
+			return recordFetchOutcome(await dedupeFetch(input, cleanInit), "skip", skipReason);
 		}
 		if (!(cacheDirective === "force-cache" || nextOpts?.revalidate === false || typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0) && hasAuthHeaders(input, init)) {
 			const cleanInit = stripNextFromInit(init, cacheDirective);
 			recordDynamicFetchObservation(input);
-			return dedupeFetch(input, cleanInit);
+			return recordFetchOutcome(await dedupeFetch(input, cleanInit), "skip", "auto no cache");
 		}
+		const tags = encodeCacheTags(nextOpts?.tags ?? []);
 		let revalidateSeconds;
 		if (cacheDirective === "force-cache") revalidateSeconds = nextOpts?.revalidate && typeof nextOpts.revalidate === "number" ? nextOpts.revalidate : ONE_YEAR_SECONDS;
 		else if (nextOpts?.revalidate === false) revalidateSeconds = ONE_YEAR_SECONDS;
 		else if (typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0) revalidateSeconds = nextOpts.revalidate;
-		else if (nextOpts?.tags && nextOpts.tags.length > 0) {
+		else if (tags.length > 0) {
 			const routeRevalidate = _getState().currentFetchRevalidate;
 			if (routeRevalidate === 0) {
 				const cleanInit = stripNextFromInit(init, cacheDirective);
 				markUncachedFetchForPageOutput(input);
-				return dedupeFetch(input, cleanInit);
+				return recordFetchOutcome(await dedupeFetch(input, cleanInit), "skip", "revalidate: 0");
 			}
 			revalidateSeconds = routeRevalidate === null || routeRevalidate === Infinity ? ONE_YEAR_SECONDS : routeRevalidate;
 		} else {
 			const cleanInit = stripNextFromInit(init, cacheDirective);
 			recordDynamicFetchObservation(input);
-			return dedupeFetch(input, cleanInit);
+			return recordFetchOutcome(await dedupeFetch(input, cleanInit), "skip", "auto no cache");
 		}
+		const cacheReason = fetchCacheMode === "force-cache" || fetchCacheMode === "default-cache" ? `fetchCache = ${fetchCacheMode}` : `revalidate: ${nextOpts?.revalidate === false || cacheDirective === "force-cache" ? 4294967294 : revalidateSeconds}`;
 		recordCacheableFetchObservation(input);
-		if (typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0) lowerCurrentFetchRevalidate(nextOpts.revalidate);
-		recordFiniteFetchRevalidate(revalidateSeconds);
+		if (typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0) {
+			lowerCurrentFetchRevalidate(nextOpts.revalidate);
+			recordFiniteFetchRevalidate(nextOpts.revalidate);
+		}
 		const reqTags = _getState().currentRequestTags;
-		const tags = encodeCacheTags(nextOpts?.tags ?? []);
 		if (tags.length > 0) {
 			for (const tag of tags) if (!reqTags.includes(tag)) reqTags.push(tag);
 		}
@@ -707,7 +727,7 @@ function createPatchedFetch() {
 			if (err instanceof BodyTooLargeForCacheKeyError || err instanceof SkipCacheKeyGenerationError) {
 				fetchInit = stripNextFromInit(fetchInit, cacheDirective);
 				recordDynamicFetchObservation(input);
-				return dedupeFetch(input, fetchInit);
+				return recordFetchOutcome(await dedupeFetch(input, fetchInit), "miss", cacheReason);
 			}
 			throw err;
 		}
@@ -731,13 +751,13 @@ function createPatchedFetch() {
 			if (cached?.value && cached.value.kind === "FETCH" && cached.cacheState !== "stale") {
 				await lowerFetchCacheRevalidateIfNeeded(handler, cacheKey, cached.value, tags, revalidateSeconds);
 				const cachedData = cached.value.data;
-				return buildCachedFetchResponse(cachedData, input);
+				return recordFetchOutcome(buildCachedFetchResponse(cachedData, input), "hit", cacheReason);
 			}
 			if (cached?.value && cached.value.kind === "FETCH" && cached.cacheState === "stale") {
 				if (shouldRefreshStaleFetchInForeground()) {
 					const freshResponse = await dedupeFetch(input, fetchInit);
 					await writeFetchCacheResponse(handler, cacheKey, freshResponse, tags, revalidateSeconds);
-					return freshResponse;
+					return recordFetchOutcome(freshResponse, "miss", cacheReason);
 				}
 				const staleData = cached.value.data;
 				if (!pendingRefetches.has(cacheKey)) {
@@ -756,7 +776,7 @@ function createPatchedFetch() {
 					}, DEDUP_TIMEOUT_MS);
 					getRequestExecutionContext()?.waitUntil(refetchPromise);
 				}
-				return buildCachedFetchResponse(staleData, input);
+				return recordFetchOutcome(buildCachedFetchResponse(staleData, input), "hit", cacheReason);
 			}
 		} catch (cacheErr) {
 			console.error("[vinext] fetch cache read error:", cacheErr);
@@ -770,8 +790,12 @@ function createPatchedFetch() {
 		}).catch((err) => {
 			console.error("[vinext] fetch cache write error:", err);
 		});
-		return response;
+		return recordFetchOutcome(response, "miss", cacheReason);
 	};
+	return ((input, init) => {
+		if ((init?.next)?.internal === true) return originalFetch(input, init);
+		return traceAppFetch(input, init, (span) => patchedFetch(input, init, span));
+	});
 }
 /**
 * Strip the `next` property from RequestInit before passing to real fetch.
@@ -824,6 +848,7 @@ async function runWithFetchCache(fn) {
 		uCtx.refreshStaleFetchesInForeground = false;
 		uCtx.isFetchDedupeActive = true;
 		uCtx.currentFetchDedupeEntries = /* @__PURE__ */ new Map();
+		uCtx.nextFetchId = 1;
 	}, fn);
 	return _als.run({
 		cacheableFetchUrls: /* @__PURE__ */ new Set(),
@@ -835,7 +860,8 @@ async function runWithFetchCache(fn) {
 		dynamicFetchUrls: /* @__PURE__ */ new Set(),
 		refreshStaleFetchesInForeground: false,
 		isFetchDedupeActive: true,
-		currentFetchDedupeEntries: /* @__PURE__ */ new Map()
+		currentFetchDedupeEntries: /* @__PURE__ */ new Map(),
+		nextFetchId: 1
 	}, fn);
 }
 function runWithFetchDedupe(fn) {

package/dist/shims/font-google-base.d.ts

@@ -1,7 +1,7 @@
 import { FontStyle } from "./font-utils.js";
 //#region src/shims/font-google-base.d.ts
 type CssVariable = `--${string}`;
-type FontOptions<T extends CssVariable | undefined = CssVariable | undefined> = {
+export type FontOptions<T extends CssVariable | undefined = CssVariable | undefined> = {
   weight?: string | string[];
   style?: string | string[];
   subsets?: string[];
@@ -12,7 +12,7 @@ type FontOptions<T extends CssVariable | undefined = CssVariable | undefined> =
   variable?: T;
   axes?: string[];
 };
-type FontResult = {
+export type FontResult = {
   className: string;
   style: FontStyle;
   variable?: string;
@@ -54,25 +54,25 @@ type FontLoaderOptions<T extends CssVariable | undefined = CssVariable | undefin
  * given, which makes Google return the default static face (200) instead
  * of the broken `:wght@100..900` URL that issue #885 reports.
  */
-declare function buildGoogleFontsUrl(family: string, options: FontOptions): string;
+export declare function buildGoogleFontsUrl(family: string, options: FontOptions): string;
 /**
  * Get collected SSR font class styles (used by the renderer).
  * Note: We don't clear the arrays because fonts are loaded at module import
  * time and need to persist across all requests in the Workers environment.
  */
-declare function getSSRFontStyles(): string[];
+export declare function getSSRFontStyles(): string[];
 /**
  * Get collected SSR font URLs (used by the renderer).
  * Note: We don't clear the arrays because fonts are loaded at module import
  * time and need to persist across all requests in the Workers environment.
  */
-declare function getSSRFontLinks(): string[];
+export declare function getSSRFontLinks(): string[];
 /**
  * Get collected SSR font preload data (used by the renderer).
  * Returns an array of { href, type } objects for emitting
  * <link rel="preload" as="font" ...> tags.
  */
-declare function getSSRFontPreloads(): Array<{
+export declare function getSSRFontPreloads(): Array<{
   href: string;
   type: string;
 }>;
@@ -82,8 +82,8 @@ type NextFont = Omit<FontResult, "variable"> & {
 type NextFontWithVariable = Omit<NextFont, "variable"> & {
   variable: string;
 };
-type FontLoader = <T extends CssVariable | undefined = undefined>(options?: FontLoaderOptions<T>) => T extends undefined ? NextFont : NextFontWithVariable;
-declare function createFontLoader(family: string): FontLoader;
+export type FontLoader = <T extends CssVariable | undefined = undefined>(options?: FontLoaderOptions<T>) => T extends undefined ? NextFont : NextFontWithVariable;
+export declare function createFontLoader(family: string): FontLoader;
 declare const googleFonts: Record<string, FontLoader>;
 //#endregion
-export { FontLoader, FontOptions, FontResult, buildGoogleFontsUrl, createFontLoader, googleFonts as default, getSSRFontLinks, getSSRFontPreloads, getSSRFontStyles };
+export { googleFonts as default };

package/dist/shims/font-google-base.js

@@ -117,8 +117,9 @@ function buildGoogleFontsUrl(family, options) {
 	const hasNormal = styles.includes("normal");
 	const ital = hasItalic ? [...hasNormal ? ["0"] : [], "1"] : void 0;
 	const normalizedWeights = weights.length === 1 && weights[0] === "variable" ? [] : weights;
+	const wght = normalizedWeights.length > 0 ? normalizedWeights : ital ? ["400"] : void 0;
 	return buildGoogleFontsUrl$1(family, {
-		wght: normalizedWeights.length > 0 ? normalizedWeights : ital ? ["400"] : void 0,
+		wght,
 		ital
 	}, options.display ?? "swap");
 }

package/dist/shims/font-local.d.ts

@@ -41,16 +41,16 @@ type NextFontWithVariable = Omit<NextFont, "variable"> & {
  * Note: We don't clear the arrays because fonts are loaded at module import
  * time and need to persist across all requests in the Workers environment.
  */
-declare function getSSRFontStyles(): string[];
+export declare function getSSRFontStyles(): string[];
 /**
  * Get collected SSR font preload data (used by the renderer).
  * Returns an array of { href, type } objects for emitting
  * <link rel="preload" as="font" ...> tags.
  */
-declare function getSSRFontPreloads(): Array<{
+export declare function getSSRFontPreloads(): Array<{
   href: string;
   type: string;
 }>;
 declare function localFont<T extends CssVariable | undefined = undefined>(options: LocalFontOptions<T>): T extends undefined ? NextFont : NextFontWithVariable;
 //#endregion
-export { localFont as default, getSSRFontPreloads, getSSRFontStyles };
+export { localFont as default };

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

@@ -1,10 +1,10 @@
 //#region src/shims/font-utils.d.ts
-type FontStyle = {
+export type FontStyle = {
   fontFamily: string;
   fontWeight?: number;
   fontStyle?: string;
 };
-type FontFaceStyleInput = {
+export type FontFaceStyleInput = {
   fontFamily: string;
   weight?: string | string[];
   style?: string | string[];
@@ -20,7 +20,7 @@ type FontFaceStyleInput = {
  *
  * Used by font-google-base.ts, font-local.ts, and fallback-metrics.ts.
  */
-declare function escapeCSSString(value: string): string;
+export declare function escapeCSSString(value: string): string;
 /**
  * Validate a CSS custom property name (e.g. `--font-inter`).
  *
@@ -30,7 +30,7 @@ declare function escapeCSSString(value: string): string;
  *
  * Returns the name if valid, undefined otherwise.
  */
-declare function sanitizeCSSVarName(name: string): string | undefined;
+export declare function sanitizeCSSVarName(name: string): string | undefined;
 /**
  * Sanitize a CSS font-family fallback name.
  *
@@ -38,19 +38,18 @@ declare function sanitizeCSSVarName(name: string): string | undefined;
  * Named families are wrapped in escaped quotes. This prevents injection via
  * crafted fallback values like `); } body { color: red; } .x {`.
  */
-declare function sanitizeFallback(name: string): string;
-declare function singleFontOptionValue(value: string | string[] | undefined): string | undefined;
-declare function sanitizeFontDescriptorValue(value: string): string | undefined;
-declare function resolveFontWeight(weight: string | string[] | undefined): number | undefined;
-declare function resolveFontStyle(style: string | string[] | undefined): string | undefined;
-declare function resolveGoogleFontStyle(style: string | string[] | undefined): string | undefined;
-declare function resolveSingleFaceStyle(input: FontFaceStyleInput): FontStyle;
-declare function formatFontClassRule(className: string, style: FontStyle): string;
+export declare function sanitizeFallback(name: string): string;
+export declare function singleFontOptionValue(value: string | string[] | undefined): string | undefined;
+export declare function sanitizeFontDescriptorValue(value: string): string | undefined;
+export declare function resolveFontWeight(weight: string | string[] | undefined): number | undefined;
+export declare function resolveFontStyle(style: string | string[] | undefined): string | undefined;
+export declare function resolveGoogleFontStyle(style: string | string[] | undefined): string | undefined;
+export declare function resolveSingleFaceStyle(input: FontFaceStyleInput): FontStyle;
+export declare function formatFontClassRule(className: string, style: FontStyle): string;
 /**
  * Determine the MIME type for a font file based on its extension.
  * Uses endsWith() only to avoid false positives from substring matches
  * (e.g. ".woff" matching ".woff2").
  */
-declare function getFontMimeType(pathOrUrl: string): string;
-//#endregion
-export { FontFaceStyleInput, FontStyle, escapeCSSString, formatFontClassRule, getFontMimeType, resolveFontStyle, resolveFontWeight, resolveGoogleFontStyle, resolveSingleFaceStyle, sanitizeCSSVarName, sanitizeFallback, sanitizeFontDescriptorValue, singleFontOptionValue };
+export declare function getFontMimeType(pathOrUrl: string): string;
+//#endregion

package/dist/shims/form.d.ts

@@ -1,7 +1,7 @@
 import { FormHTMLAttributes, useActionState } from "react";
 //#region src/shims/form.d.ts
 type FormSubmitter = HTMLButtonElement | HTMLInputElement;
-declare function createFormSubmitDestinationUrl(action: string, form: HTMLFormElement, submitter: FormSubmitter | null): string;
+export declare function createFormSubmitDestinationUrl(action: string, form: HTMLFormElement, submitter: FormSubmitter | null): string;
 declare const Form: import("react").ForwardRefExoticComponent<{
   /** Target URL for GET forms, or server action for POST forms */
   action: string | ((formData: FormData) => void | Promise<void>);
@@ -20,4 +20,4 @@ declare const Form: import("react").ForwardRefExoticComponent<{
   prefetch?: false | null;
 } & Omit<FormHTMLAttributes<HTMLFormElement>, "encType" | "method" | "target"> & import("react").RefAttributes<HTMLFormElement>>;
 //#endregion
-export { createFormSubmitDestinationUrl, Form as default, useActionState };
+export { Form as default, useActionState };

package/dist/shims/form.js

@@ -1,11 +1,12 @@
 "use client";
-import { VINEXT_MOUNTED_SLOTS_HEADER } from "../server/headers.js";
+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";
-import { AppElementsWire } from "../server/app-elements-wire.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
+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";
@@ -127,9 +128,10 @@ const Form = forwardRef(function Form(props, ref) {
 		delete cleanRest[key];
 	}
 	const formRef = useRef(null);
-	const setRefs = useMergedRef(useCallback((node) => {
+	const setFormRef = useCallback((node) => {
 		formRef.current = node;
-	}, []), ref ?? null);
+	}, []);
+	const setRefs = useMergedRef(setFormRef, ref ?? null);
 	const actionHref = typeof action === "string" ? withBasePath(action, __basePath) : "";
 	useEffect(() => {
 		if (typeof action !== "string") return;
@@ -156,12 +158,13 @@ const Form = forwardRef(function Form(props, ref) {
 					if (prefetched.has(cacheKey)) return;
 					if (hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader)) return;
 					prefetched.add(cacheKey);
-					prefetchRscResponse(rscUrl, fetch(rscUrl, {
+					const fetchPromise = fetch(rscUrl, {
 						headers,
 						credentials: "include",
 						priority: "low",
 						purpose: "prefetch"
-					}), interceptionContext, mountedSlotsHeader, void 0, {
+					});
+					prefetchRscResponse(rscUrl, fetchPromise, interceptionContext, mountedSlotsHeader, void 0, {
 						cacheForNavigation: false,
 						optimisticRouteShell: true
 					});

package/dist/shims/hash-scroll.d.ts

@@ -1,10 +1,9 @@
 //#region src/shims/hash-scroll.d.ts
-declare function decodeHashFragment(fragment: string): string;
-declare function scrollToHashTarget(hash: string): void;
-declare function scrollToHashTargetOnNextFrame(hash: string, shouldScroll?: () => boolean): void;
-declare function retryScrollTo(x: number, y: number, opts?: {
+export declare function decodeHashFragment(fragment: string): string;
+export declare function scrollToHashTarget(hash: string): void;
+export declare function scrollToHashTargetOnNextFrame(hash: string, shouldScroll?: () => boolean): void;
+export declare function retryScrollTo(x: number, y: number, opts?: {
   minFrames?: number;
   shouldContinue?: () => boolean;
 }): void;
-//#endregion
-export { decodeHashFragment, retryScrollTo, scrollToHashTarget, scrollToHashTargetOnNextFrame };
+//#endregion

package/dist/shims/head-state.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 //#region src/shims/head-state.d.ts
-type HeadState = {
+export type HeadState = {
   ssrHeadChildren: React.ReactNode[];
   documentInitialHead: React.ReactNode[];
 };
@@ -9,7 +9,6 @@ type HeadState = {
  * Ensures per-request isolation for Pages Router <Head> elements
  * on concurrent runtimes.
  */
-declare function runWithHeadState<T>(fn: () => Promise<T>): Promise<T>;
-declare function runWithHeadState<T>(fn: () => T | Promise<T>): T | Promise<T>;
-//#endregion
-export { HeadState, runWithHeadState };
+export declare function runWithHeadState<T>(fn: () => Promise<T>): Promise<T>;
+export declare function runWithHeadState<T>(fn: () => T | Promise<T>): T | Promise<T>;
+//#endregion