vinext 0.1.4 → 0.1.5

package/dist/shims/cache.js

@@ -1,13 +1,14 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
-import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
+import { getRequestContext, isInsideUnifiedScope } from "./unified-request-context.js";
 import { getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
+import { MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
+import { getCdnCacheAdapter } from "./cdn-cache.js";
+import { fnv1a64 } from "../utils/hash.js";
 import { makeHangingPromise } from "./internal/make-hanging-promise.js";
 import { getHeadersAccessPhase, markDynamicUsage } from "./headers.js";
-import { fnv1a64 } from "../utils/hash.js";
-import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
-import { readCacheControlNumberField } from "../utils/cache-control-metadata.js";
+import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, _consumeRequestScopedCacheLife, _initRequestScopedCacheState, _peekRequestScopedCacheLife, _peekUnstableCacheObservations, _registerCacheContextAccessor, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, getRegisteredCacheContext, markActionRevalidation, recordUnstableCacheObservation, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
 import { encodeCacheTag, encodeCacheTags } from "../utils/encode-cache-tag.js";
-import { getCdnCacheAdapter } from "./cdn-cache.js";
+import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
 //#region src/shims/cache.ts
 /**
 * next/cache shim
@@ -29,239 +30,7 @@ import { getCdnCacheAdapter } from "./cdn-cache.js";
 * deprecated for consumers and retained only as the internal registration
 * target used by the generated cache-adapter module.
 */
-/** @internal Set by cache-runtime.ts on import to avoid circular dependency */
-let _getCacheContextFn = null;
-/**
-* Register the cache context accessor. Called by cache-runtime.ts on load.
-* @internal
-*/
-function _registerCacheContextAccessor(fn) {
-	_getCacheContextFn = fn;
-}
-var NoOpCacheHandler = class {
-	async get(_key, _ctx) {
-		return null;
-	}
-	async set(_key, _data, _ctx) {}
-	async revalidateTag(_tags, _durations) {}
-};
-const DEFAULT_MEMORY_CACHE_MAX_SIZE = 50 * 1024 * 1024;
-const MAX_REVALIDATED_TAG_ENTRIES = 1e4;
-function estimateStringMapSize(map) {
-	if (!map) return 0;
-	let size = 0;
-	for (const [key, value] of Object.entries(map)) {
-		size += key.length;
-		if (Array.isArray(value)) for (const item of value) size += item.length;
-		else size += value.length;
-	}
-	return size;
-}
-function estimateIncrementalCacheValueSize(value) {
-	if (value === null) return 25;
-	switch (value.kind) {
-		case "FETCH": return JSON.stringify(value.data ?? "").length;
-		case "PAGES": return value.html.length + JSON.stringify(value.pageData ?? {}).length + estimateStringMapSize(value.headers);
-		case "APP_PAGE": return value.html.length + (value.rscData?.byteLength ?? 0) + (value.postponed?.length ?? 0) + estimateStringMapSize(value.headers);
-		case "APP_ROUTE": return value.body.byteLength + estimateStringMapSize(value.headers);
-		case "REDIRECT": return JSON.stringify(value.props ?? {}).length;
-		case "IMAGE": return value.buffer.byteLength + value.extension.length + value.etag.length;
-		default: return JSON.stringify(value).length;
-	}
-}
-function resolveMemoryCacheMaxSize(options) {
-	if (typeof options === "number") return options;
-	if (typeof options?.cacheMaxMemorySize === "number") return options.cacheMaxMemorySize;
-	if (typeof options?.maxMemoryCacheSize === "number") return options.maxMemoryCacheSize;
-	return DEFAULT_MEMORY_CACHE_MAX_SIZE;
-}
-function readStringArrayField(ctx, field) {
-	const value = ctx?.[field];
-	if (!Array.isArray(value)) return [];
-	return value.filter((item) => typeof item === "string");
-}
-/**
-* In-memory data cache handler. This is the built-in default — vinext installs
-* it automatically, so consumers should not construct or register it by hand.
-*
-* @deprecated Consumers should not instantiate cache handlers directly.
-* Configure caching declaratively via the `cache` option on the `vinext()`
-* plugin (see {@link setDataCacheHandler}); the in-memory handler is the
-* default when nothing is configured, and its size is tuned via the
-* `cacheMaxMemorySize` plugin option.
-*/
-var MemoryCacheHandler = class {
-	store = /* @__PURE__ */ new Map();
-	tagRevalidatedAt = /* @__PURE__ */ new Map();
-	maxMemoryCacheSize;
-	currentMemoryCacheSize = 0;
-	constructor(options) {
-		this.maxMemoryCacheSize = resolveMemoryCacheMaxSize(options);
-	}
-	estimateEntrySize(entry) {
-		return estimateIncrementalCacheValueSize(entry.value) + entry.tags.reduce((sum, tag) => sum + tag.length, 0) + 64;
-	}
-	deleteEntry(key) {
-		const existing = this.store.get(key);
-		if (!existing) return;
-		this.currentMemoryCacheSize -= this.estimateEntrySize(existing);
-		this.store.delete(key);
-	}
-	touchEntry(key, entry) {
-		this.store.delete(key);
-		this.store.set(key, entry);
-	}
-	evictLeastRecentlyUsed() {
-		while (this.maxMemoryCacheSize > 0 && this.currentMemoryCacheSize > this.maxMemoryCacheSize) {
-			const oldestKey = this.store.keys().next().value;
-			if (oldestKey === void 0) return;
-			this.deleteEntry(oldestKey);
-		}
-	}
-	async get(key, _ctx) {
-		const entry = this.store.get(key);
-		if (!entry) return null;
-		for (const tag of entry.tags) {
-			const revalidatedAt = this.tagRevalidatedAt.get(tag);
-			if (revalidatedAt && revalidatedAt >= entry.lastModified) {
-				this.deleteEntry(key);
-				return null;
-			}
-		}
-		for (const tag of readStringArrayField(_ctx, "softTags")) {
-			const revalidatedAt = this.tagRevalidatedAt.get(tag);
-			if (revalidatedAt && revalidatedAt >= entry.lastModified) return null;
-		}
-		if (entry.expireAt !== null && Date.now() > entry.expireAt) {
-			this.deleteEntry(key);
-			return null;
-		}
-		this.touchEntry(key, entry);
-		if (entry.revalidateAt !== null && Date.now() > entry.revalidateAt) return {
-			lastModified: entry.lastModified,
-			value: entry.value,
-			cacheState: "stale",
-			cacheControl: entry.cacheControl
-		};
-		return {
-			lastModified: entry.lastModified,
-			value: entry.value,
-			cacheControl: entry.cacheControl
-		};
-	}
-	async set(key, data, ctx) {
-		const tagSet = /* @__PURE__ */ new Set();
-		if (data && "tags" in data && Array.isArray(data.tags)) for (const t of data.tags) tagSet.add(t);
-		for (const t of readStringArrayField(ctx, "tags")) tagSet.add(t);
-		const tags = [...tagSet];
-		let effectiveRevalidate;
-		let effectiveExpire;
-		effectiveRevalidate = readCacheControlNumberField(ctx, "revalidate");
-		effectiveExpire = readCacheControlNumberField(ctx, "expire");
-		if (data && "revalidate" in data && typeof data.revalidate === "number") effectiveRevalidate = data.revalidate;
-		if (effectiveRevalidate === 0) return;
-		const now = Date.now();
-		const revalidateAt = typeof effectiveRevalidate === "number" && effectiveRevalidate > 0 ? now + effectiveRevalidate * 1e3 : null;
-		const expireAt = typeof effectiveExpire === "number" && effectiveExpire > 0 ? now + effectiveExpire * 1e3 : null;
-		const cacheControl = typeof effectiveRevalidate === "number" ? effectiveExpire === void 0 ? { revalidate: effectiveRevalidate } : {
-			revalidate: effectiveRevalidate,
-			expire: effectiveExpire
-		} : void 0;
-		if (this.maxMemoryCacheSize === 0) return;
-		const entry = {
-			value: data,
-			tags,
-			lastModified: now,
-			revalidateAt,
-			expireAt,
-			cacheControl
-		};
-		const entrySize = this.estimateEntrySize(entry);
-		if (entrySize > this.maxMemoryCacheSize) {
-			this.deleteEntry(key);
-			return;
-		}
-		this.deleteEntry(key);
-		this.store.set(key, entry);
-		this.currentMemoryCacheSize += entrySize;
-		this.evictLeastRecentlyUsed();
-	}
-	async revalidateTag(tags, _durations) {
-		const tagList = Array.isArray(tags) ? tags : [tags];
-		const now = Date.now();
-		for (const tag of tagList) {
-			this.tagRevalidatedAt.set(tag, now);
-			while (this.tagRevalidatedAt.size > MAX_REVALIDATED_TAG_ENTRIES) {
-				const oldest = this.tagRevalidatedAt.keys().next().value;
-				if (oldest === void 0) break;
-				this.tagRevalidatedAt.delete(oldest);
-			}
-		}
-	}
-	resetRequestCache() {}
-};
-const _HANDLER_KEY = Symbol.for("vinext.cacheHandler");
-const _gHandler = globalThis;
-function _getActiveHandler() {
-	return _gHandler[_HANDLER_KEY] ?? (_gHandler[_HANDLER_KEY] = new MemoryCacheHandler());
-}
-function configureMemoryCacheHandler(options) {
-	const current = _gHandler[_HANDLER_KEY];
-	if (current && !(current instanceof MemoryCacheHandler)) return;
-	_gHandler[_HANDLER_KEY] = new MemoryCacheHandler(options);
-}
-/**
-* Set the **data cache** handler. This backs all data-cache concerns —
-* `fetch` caching, `"use cache"`, `unstable_cache` — and is also the default
-* underlying store for page-level ISR (via the default CDN cache adapter).
-*
-* The handler must implement the CacheHandler interface (same shape as
-* Next.js 16's CacheHandler class).
-*
-* @deprecated Don't wire up the data cache imperatively. Configure it
-* declaratively via the `cache.data` option on the `vinext()` plugin in your
-* `vite.config.ts`, using a config-time adapter builder. On Cloudflare Workers:
-*
-* ```ts
-* import { vinext } from "vinext";
-* import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
-*
-* export default defineConfig({
-*   plugins: [vinext({ cache: { data: kvDataAdapter({ binding: "VINEXT_KV_CACHE" }) } })],
-* });
-* ```
-*
-* The plugin defers instantiation to the first request and registers the
-* handler across every runtime/router entry, so you don't have to call this
-* from a worker entry. This setter remains as the internal registration target
-* and for backwards compatibility, but is not the recommended consumer API.
-*/
-function setDataCacheHandler(handler) {
-	_gHandler[_HANDLER_KEY] = handler;
-}
-/**
-* Get the active data cache handler (for internal use or testing).
-*/
-function getDataCacheHandler() {
-	return _getActiveHandler();
-}
-/**
-* @deprecated Don't wire up the data cache imperatively. Configure it
-* declaratively via the `cache.data` option on the `vinext()` plugin (e.g.
-* `kvDataAdapter()` from `@vinext/cloudflare/cache/kv-data-adapter`). See
-* {@link setDataCacheHandler} for the migration example. Retained as a
-* backwards-compatible alias — `setCacheHandler` has always configured the
-* data cache handler.
-*/
-function setCacheHandler(handler) {
-	setDataCacheHandler(handler);
-}
-/**
-* @deprecated Prefer {@link getDataCacheHandler}.
-*/
-function getCacheHandler() {
-	return getDataCacheHandler();
-}
+const _g = globalThis;
 /**
 * Revalidate cached data associated with a specific cache tag.
 *
@@ -281,7 +50,7 @@ async function revalidateTag(tag, profile) {
 		const resolved = cacheLifeProfiles[profile];
 		if (resolved) durations = { expire: resolved.expire };
 	} else if (profile && typeof profile === "object") durations = profile;
-	if (!profile || !durations || durations.expire === 0) markActionRevalidation(ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC);
+	if (!profile || !durations || durations.expire === 0) markActionRevalidation(1);
 	await _invalidateEncodedTag(encodeCacheTag(tag), durations);
 }
 /**
@@ -294,7 +63,7 @@ async function revalidateTag(tag, profile) {
 * let the edge re-fetch and re-cache stale data.
 */
 async function _invalidateEncodedTag(encoded, durations) {
-	await _getActiveHandler().revalidateTag(encoded, durations);
+	await getDataCacheHandler().revalidateTag(encoded, durations);
 	await getCdnCacheAdapter().revalidateTag(encoded, durations);
 }
 /**
@@ -313,7 +82,7 @@ async function _invalidateEncodedTag(encoded, durations) {
 * layout/page hierarchy tags, so only no-type invalidation applies there.
 */
 async function revalidatePath(path, type) {
-	markActionRevalidation(ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC);
+	markActionRevalidation(1);
 	const stem = path.endsWith("/") ? path.slice(0, -1) : path;
 	await _invalidateEncodedTag(encodeCacheTag(type ? `_N_T_${stem}/${type}` : `_N_T_${stem || "/"}`));
 }
@@ -326,7 +95,7 @@ async function revalidatePath(path, type) {
 * response header that the client router already understands.
 */
 function refresh() {
-	markActionRevalidation(ACTION_DID_REVALIDATE_DYNAMIC_ONLY);
+	markActionRevalidation(2);
 }
 /**
 * Expire a cache tag immediately (Next.js 16).
@@ -343,7 +112,7 @@ function refresh() {
 */
 async function updateTag(tag) {
 	if (getHeadersAccessPhase() !== "action") throw new Error("updateTag can only be called from within a Server Action. To invalidate cache tags in Route Handlers or other contexts, use revalidateTag instead. See more info here: https://nextjs.org/docs/app/api-reference/functions/updateTag");
-	markActionRevalidation(ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC);
+	markActionRevalidation(1);
 	await _invalidateEncodedTag(encodeCacheTag(tag));
 }
 /**
@@ -419,138 +188,6 @@ function unstable_io() {
 	return io();
 }
 let _unstableIoWarned = false;
-const _FALLBACK_KEY = Symbol.for("vinext.cache.fallback");
-const _g = globalThis;
-const _cacheAls = getOrCreateAls("vinext.cache.als");
-const _cacheFallbackState = _g[_FALLBACK_KEY] ??= {
-	actionRevalidationKind: 0,
-	requestScopedCacheLife: null,
-	unstableCacheObservations: /* @__PURE__ */ new Map(),
-	unstableCacheRevalidation: "foreground"
-};
-const ACTION_DID_NOT_REVALIDATE = 0;
-const ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC = 1;
-const ACTION_DID_REVALIDATE_DYNAMIC_ONLY = 2;
-function _getCacheState() {
-	if (isInsideUnifiedScope()) return getRequestContext();
-	return _cacheAls.getStore() ?? _cacheFallbackState;
-}
-function _runWithCacheState(fn) {
-	if (isInsideUnifiedScope()) return runWithUnifiedStateMutation((uCtx) => {
-		uCtx.actionRevalidationKind = ACTION_DID_NOT_REVALIDATE;
-		uCtx.requestScopedCacheLife = null;
-		uCtx.unstableCacheObservations = /* @__PURE__ */ new Map();
-		uCtx.unstableCacheRevalidation = "foreground";
-	}, fn);
-	const state = {
-		actionRevalidationKind: ACTION_DID_NOT_REVALIDATE,
-		requestScopedCacheLife: null,
-		unstableCacheObservations: /* @__PURE__ */ new Map(),
-		unstableCacheRevalidation: "foreground"
-	};
-	return _cacheAls.run(state, fn);
-}
-/**
-* Initialize cache ALS for a new request. Call at request entry.
-* Only needed when not using _runWithCacheState() (legacy path).
-* @internal
-*/
-function _initRequestScopedCacheState() {
-	const state = _getCacheState();
-	state.actionRevalidationKind = ACTION_DID_NOT_REVALIDATE;
-	state.requestScopedCacheLife = null;
-	state.unstableCacheObservations = /* @__PURE__ */ new Map();
-}
-function markActionRevalidation(kind) {
-	if (getHeadersAccessPhase() !== "action") return;
-	const state = _getCacheState();
-	state.actionRevalidationKind = state.actionRevalidationKind === ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC ? ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC : kind;
-}
-function getAndClearActionRevalidationKind() {
-	const state = _getCacheState();
-	const kind = state.actionRevalidationKind;
-	state.actionRevalidationKind = ACTION_DID_NOT_REVALIDATE;
-	return kind;
-}
-/**
-* Set a request-scoped cache life config. Called by cacheLife() so the route
-* render can inherit cache policy from file-level and nested "use cache" work.
-* @internal
-*/
-function _setRequestScopedCacheLife(config) {
-	const state = _getCacheState();
-	if (state.requestScopedCacheLife === null) state.requestScopedCacheLife = { ...config };
-	else {
-		if (config.stale !== void 0) state.requestScopedCacheLife.stale = state.requestScopedCacheLife.stale !== void 0 ? Math.min(state.requestScopedCacheLife.stale, config.stale) : config.stale;
-		if (config.revalidate !== void 0) state.requestScopedCacheLife.revalidate = state.requestScopedCacheLife.revalidate !== void 0 ? Math.min(state.requestScopedCacheLife.revalidate, config.revalidate) : config.revalidate;
-		if (config.expire !== void 0) state.requestScopedCacheLife.expire = state.requestScopedCacheLife.expire !== void 0 ? Math.min(state.requestScopedCacheLife.expire, config.expire) : config.expire;
-	}
-}
-/**
-* Read the request-scoped cache life without clearing it. Prerender response
-* shaping needs the metadata before the manifest writer consumes it after the
-* body has been fully rendered.
-* @internal
-*/
-function _peekRequestScopedCacheLife() {
-	const config = _getCacheState().requestScopedCacheLife;
-	return config === null ? null : { ...config };
-}
-/**
-* Consume and reset the request-scoped cache life. Returns null if none was set.
-* @internal
-*/
-function _consumeRequestScopedCacheLife() {
-	const state = _getCacheState();
-	const config = state.requestScopedCacheLife;
-	state.requestScopedCacheLife = null;
-	return config;
-}
-function recordUnstableCacheObservation(observation) {
-	_getCacheState().unstableCacheObservations.set(observation.keyHash, observation);
-}
-function _peekUnstableCacheObservations() {
-	return [..._getCacheState().unstableCacheObservations.values()].sort((a, b) => a.keyHash.localeCompare(b.keyHash));
-}
-/**
-* Built-in cache life profiles matching Next.js 16.
-*/
-const cacheLifeProfiles = {
-	default: {
-		revalidate: 900,
-		expire: 4294967294
-	},
-	seconds: {
-		stale: 30,
-		revalidate: 1,
-		expire: 60
-	},
-	minutes: {
-		stale: 300,
-		revalidate: 60,
-		expire: 3600
-	},
-	hours: {
-		stale: 300,
-		revalidate: 3600,
-		expire: 86400
-	},
-	days: {
-		stale: 300,
-		revalidate: 86400,
-		expire: 604800
-	},
-	weeks: {
-		stale: 300,
-		revalidate: 604800,
-		expire: 2592e3
-	},
-	max: {
-		stale: 300,
-		revalidate: 2592e3,
-		expire: 31536e3
-	}
-};
 /**
 * Set the cache lifetime for a "use cache" function.
 *
@@ -579,7 +216,7 @@ function cacheLife(profile) {
 		};
 	} else return;
 	try {
-		const ctx = _getCacheContextFn?.();
+		const ctx = getRegisteredCacheContext();
 		if (ctx) {
 			ctx.lifeConfigs.push(resolvedConfig);
 			if (resolvedConfig.revalidate !== void 0) ctx.hasExplicitRevalidate = true;
@@ -603,7 +240,7 @@ function cacheLife(profile) {
 */
 function cacheTag(...tags) {
 	try {
-		const ctx = _getCacheContextFn?.();
+		const ctx = getRegisteredCacheContext();
 		if (ctx) ctx.tags.push(...encodeCacheTags(tags));
 	} catch {}
 }
@@ -690,9 +327,6 @@ function getPendingUnstableCacheRevalidations() {
 	_g[_UNSTABLE_CACHE_PENDING_REVALIDATIONS_KEY] = pending;
 	return pending;
 }
-function shouldServeStaleUnstableCacheEntry() {
-	return _getCacheState().unstableCacheRevalidation === "background";
-}
 function waitUntilUnstableCacheRevalidation(promise) {
 	if (!isInsideUnifiedScope()) return;
 	getRequestContext().executionContext?.waitUntil(promise);
@@ -720,7 +354,7 @@ async function refreshUnstableCacheResult(fn, args, cacheKey, tags, revalidateSe
 		tags,
 		revalidate: typeof revalidateSeconds === "number" ? revalidateSeconds : false
 	};
-	await _getActiveHandler().set(cacheKey, cacheValue, {
+	await getDataCacheHandler().set(cacheKey, cacheValue, {
 		fetchCache: true,
 		tags,
 		revalidate: revalidateSeconds
@@ -746,7 +380,7 @@ function unstable_cache(fn, keyParts, options) {
 			tagCount: tags.length,
 			tagHash: tags.length > 0 ? fnv1a64(JSON.stringify(tags)) : null
 		});
-		const existing = await _getActiveHandler().get(cacheKey, {
+		const existing = await getDataCacheHandler().get(cacheKey, {
 			kind: "FETCH",
 			tags
 		});
@@ -764,4 +398,4 @@ function unstable_cache(fn, keyParts, options) {
 	return cachedFn;
 }
 //#endregion
-export { MemoryCacheHandler, NoOpCacheHandler, _consumeRequestScopedCacheLife, _initRequestScopedCacheState, _peekRequestScopedCacheLife, _peekUnstableCacheObservations, _registerCacheContextAccessor, _runWithCacheState, _setRequestScopedCacheLife, cacheLife, cacheLifeProfiles, cacheTag, configureMemoryCacheHandler, getAndClearActionRevalidationKind, getCacheHandler, getDataCacheHandler, getRequestExecutionContext, io, isInsideUnstableCacheScope, unstable_noStore as noStore, unstable_noStore, refresh, revalidatePath, revalidateTag, runWithExecutionContext, setCacheHandler, setDataCacheHandler, unstable_cache, unstable_cacheLife, unstable_cacheTag, unstable_io, updateTag };
+export { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, MemoryCacheHandler, NoOpCacheHandler, _consumeRequestScopedCacheLife, _initRequestScopedCacheState, _peekRequestScopedCacheLife, _peekUnstableCacheObservations, _registerCacheContextAccessor, _runWithCacheState, _setRequestScopedCacheLife, cacheLife, cacheLifeProfiles, cacheTag, configureMemoryCacheHandler, getAndClearActionRevalidationKind, getCacheHandler, getDataCacheHandler, getRegisteredCacheContext, getRequestExecutionContext, io, isInsideUnstableCacheScope, markActionRevalidation, unstable_noStore as noStore, unstable_noStore, recordUnstableCacheObservation, refresh, revalidatePath, revalidateTag, runWithExecutionContext, setCacheHandler, setDataCacheHandler, shouldServeStaleUnstableCacheEntry, unstable_cache, unstable_cacheLife, unstable_cacheTag, unstable_io, updateTag };

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

@@ -1,4 +1,4 @@
-import { CacheHandlerValue, IncrementalCacheValue } from "./cache.js";
+import { CacheHandlerValue, IncrementalCacheValue } from "./cache-handler.js";
 
 //#region src/shims/cdn-cache.d.ts
 /** A map of response header name -> value the adapter wants applied or removed. */

package/dist/shims/cdn-cache.js

@@ -1,5 +1,5 @@
 import { getRequestExecutionContext } from "./request-context.js";
-import { getDataCacheHandler } from "./cache.js";
+import { getDataCacheHandler } from "./cache-handler.js";
 import { CloudflareCdnCacheAdapter } from "../cloudflare/src/cache/cdn-adapter.runtime.js";
 //#region src/shims/cdn-cache.ts
 /**

package/dist/shims/error-boundary-navigation.d.ts

@@ -0,0 +1,7 @@
+import { AppRouterInstance } from "./internal/app-router-context.js";
+
+//#region src/shims/error-boundary-navigation.d.ts
+declare function useErrorBoundaryPathname(): string;
+declare function useErrorBoundaryRouter(): AppRouterInstance;
+//#endregion
+export { useErrorBoundaryPathname, useErrorBoundaryRouter };

package/dist/shims/error-boundary-navigation.js

@@ -0,0 +1,44 @@
+import { stripBasePath } from "../utils/base-path.js";
+import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
+import { AppRouterContext } from "./internal/app-router-context.js";
+import { getNavigationContext } from "./navigation-context-state.js";
+import "./navigation-server.js";
+import * as React$1 from "react";
+//#region src/shims/error-boundary-navigation.ts
+const CLIENT_NAVIGATION_STATE_KEY = Symbol.for("vinext.clientNavigationState");
+const CLIENT_NAVIGATION_RENDER_CONTEXT_KEY = Symbol.for("vinext.clientNavigationRenderContext");
+const BASE_PATH = process.env.__NEXT_ROUTER_BASEPATH ?? "";
+function getClientNavigationState() {
+	return globalThis[CLIENT_NAVIGATION_STATE_KEY];
+}
+function getClientPathnameSnapshot() {
+	return getClientNavigationState()?.cachedPathname ?? stripBasePath(window.location.pathname, BASE_PATH);
+}
+function getServerPathnameSnapshot() {
+	return getNavigationContext()?.pathname ?? "/";
+}
+function subscribeToCommittedPathname(listener) {
+	const state = getClientNavigationState();
+	if (!state) return () => {};
+	state.listeners.add(listener);
+	return () => state.listeners.delete(listener);
+}
+function getClientNavigationRenderContext() {
+	const globalState = globalThis;
+	return globalState[CLIENT_NAVIGATION_RENDER_CONTEXT_KEY] ??= React$1.createContext(null);
+}
+function useErrorBoundaryPathname() {
+	if (typeof window === "undefined") markPprFallbackShellDynamicBoundary();
+	const renderSnapshot = React$1.useContext(getClientNavigationRenderContext());
+	const committedPathname = React$1.useSyncExternalStore(subscribeToCommittedPathname, getClientPathnameSnapshot, getServerPathnameSnapshot);
+	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.pathname;
+	return committedPathname;
+}
+function useErrorBoundaryRouter() {
+	if (!AppRouterContext || typeof React$1.useContext !== "function") throw new Error("invariant expected app router to be mounted");
+	const router = React$1.useContext(AppRouterContext);
+	if (router === null) throw new Error("invariant expected app router to be mounted");
+	return router;
+}
+//#endregion
+export { useErrorBoundaryPathname, useErrorBoundaryRouter };

package/dist/shims/error-boundary.js

@@ -1,7 +1,9 @@
 "use client";
-import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
-import { decodeRedirectError, isRedirectError, usePathname, useRouter } from "./navigation.js";
+import { decodeRedirectError, isRedirectError } from "./navigation-errors.js";
+import "./navigation-server.js";
+import { useErrorBoundaryPathname, useErrorBoundaryRouter } from "./error-boundary-navigation.js";
 import DefaultGlobalError from "./default-global-error.js";
+import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
 import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import React from "react";
@@ -31,7 +33,7 @@ function removeDevErrorRecoveryListener(listener) {
 	window.removeEventListener(VINEXT_DEV_ERROR_RECOVERY_EVENT, listener);
 }
 function HandleRedirect({ redirect, redirectType, reset }) {
-	const router = useRouter();
+	const router = useErrorBoundaryRouter();
 	React.useEffect(() => {
 		React.startTransition(() => {
 			if (redirectType === "push") router.push(redirect);
@@ -146,7 +148,7 @@ var ErrorBoundaryInner = class extends React.Component {
 };
 function ErrorBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children
@@ -154,7 +156,7 @@ function ErrorBoundary({ fallback, children, resetKey }) {
 }
 function GlobalErrorBoundary({ fallback, children }) {
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		fallback,
 		isImplicitRootErrorBoundary: fallback === DefaultGlobalError,
 		children
@@ -208,7 +210,7 @@ var NotFoundBoundaryInner = class extends React.Component {
 */
 function NotFoundBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(NotFoundBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children
@@ -249,7 +251,7 @@ var ForbiddenBoundaryInner = class extends React.Component {
 };
 function ForbiddenBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(ForbiddenBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children
@@ -290,7 +292,7 @@ var UnauthorizedBoundaryInner = class extends React.Component {
 };
 function UnauthorizedBoundary({ fallback, children, resetKey }) {
 	return /* @__PURE__ */ jsx(UnauthorizedBoundaryInner, {
-		pathname: usePathname(),
+		pathname: useErrorBoundaryPathname(),
 		resetKey,
 		fallback,
 		children

package/dist/shims/error.js

@@ -1,6 +1,7 @@
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { RouterContext } from "./internal/router-context.js";
-import { isNextRouterError } from "./navigation.js";
+import { isNextRouterError } from "./navigation-errors.js";
+import "./navigation.js";
 import { useUntrackedPathname } from "./internal/navigation-untracked.js";
 import React from "react";
 //#region src/shims/error.tsx

package/dist/shims/fetch-cache.js

@@ -1,9 +1,9 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { getRequestExecutionContext } from "./request-context.js";
+import { getDataCacheHandler } from "./cache-handler.js";
 import { markDynamicUsage } from "./headers.js";
 import { encodeCacheTags } from "../utils/encode-cache-tag.js";
-import { getDataCacheHandler } from "./cache.js";
 //#region src/shims/fetch-cache.ts
 /**
 * Extended fetch() with Next.js caching semantics.

package/dist/shims/form.js

@@ -4,8 +4,8 @@ import { isDangerousScheme } from "./url-safety.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { toSameOriginPath, withBasePath } from "./url-utils.js";
-import { hasAppNavigationRuntime } from "../client/navigation-runtime.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";
 import { useMergedRef } from "./use-merged-ref.js";
 import { forwardRef, useActionState, useCallback, useEffect, useRef } from "react";