vinext 0.1.1 → 0.1.3

package/dist/shims/fetch-cache.js

@@ -1,6 +1,7 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { getRequestExecutionContext } from "./request-context.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
@@ -32,6 +33,7 @@ import { getDataCacheHandler } from "./cache.js";
 const HEADER_BLOCKLIST = ["traceparent", "tracestate"];
 const CACHE_KEY_PREFIX = "v3";
 const MAX_CACHE_KEY_BODY_BYTES = 1024 * 1024;
+const ONE_YEAR_SECONDS = 31536e3;
 var BodyTooLargeForCacheKeyError = class extends Error {
 	constructor() {
 		super("Fetch body too large for cache key generation");
@@ -292,6 +294,7 @@ const _fallbackState = _g[_FALLBACK_KEY] ??= {
 	currentRequestTags: [],
 	currentFetchSoftTags: [],
 	currentFetchCacheMode: null,
+	currentForceDynamicFetchDefault: false,
 	dynamicFetchUrls: /* @__PURE__ */ new Set(),
 	isFetchDedupeActive: false,
 	currentFetchDedupeEntries: /* @__PURE__ */ new Map()
@@ -309,6 +312,7 @@ function _resetFallbackState(isFetchDedupeActive) {
 	_fallbackState.currentRequestTags = [];
 	_fallbackState.currentFetchSoftTags = [];
 	_fallbackState.currentFetchCacheMode = null;
+	_fallbackState.currentForceDynamicFetchDefault = false;
 	_fallbackState.dynamicFetchUrls = /* @__PURE__ */ new Set();
 	_fallbackState.isFetchDedupeActive = isFetchDedupeActive;
 	_fallbackState.currentFetchDedupeEntries = /* @__PURE__ */ new Map();
@@ -319,6 +323,10 @@ function getFetchObservationUrl(input) {
 function recordDynamicFetchObservation(input) {
 	_getState().dynamicFetchUrls.add(getFetchObservationUrl(input));
 }
+function markUncachedFetchForPageOutput(input) {
+	recordDynamicFetchObservation(input);
+	markDynamicUsage();
+}
 function recordCacheableFetchObservation(input) {
 	_getState().cacheableFetchUrls.add(getFetchObservationUrl(input));
 }
@@ -369,19 +377,36 @@ function addCollectedRequestTags(tags) {
 function setCurrentFetchSoftTags(tags) {
 	_getState().currentFetchSoftTags = [...tags];
 }
+/**
+* Read the path-derived soft tags for the current render.
+*
+* Used by the "use cache" runtime to pass soft tags to the cache handler
+* so that `revalidatePath()` invalidates "use cache" entries during the
+* affected route's next request, even when the entry carries no hard tags.
+*/
+function getCurrentFetchSoftTags() {
+	return _getState().currentFetchSoftTags;
+}
 function setCurrentFetchCacheMode(mode) {
 	_getState().currentFetchCacheMode = mode;
 }
+function setCurrentForceDynamicFetchDefault(enabled) {
+	_getState().currentForceDynamicFetchDefault = enabled;
+}
 function isNoStoreFetch(cacheDirective, nextOpts) {
-	return cacheDirective === "no-store" || cacheDirective === "no-cache" || nextOpts?.revalidate === false || nextOpts?.revalidate === 0;
+	return cacheDirective === "no-store" || cacheDirective === "no-cache" || nextOpts?.revalidate === 0;
 }
 function isCacheableFetch(cacheDirective, nextOpts) {
-	return cacheDirective === "force-cache" || typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0;
+	return cacheDirective === "force-cache" || nextOpts?.revalidate === false || typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0;
 }
 function hasExplicitRevalidateValue(nextOpts) {
 	return nextOpts?.revalidate !== void 0;
 }
-function resolveSegmentCacheDirective(cacheDirective, nextOpts, mode) {
+function isFalsyRevalidate(nextOpts) {
+	return !nextOpts?.revalidate;
+}
+function resolveSegmentCacheDirective(cacheDirective, nextOpts, mode, forceDynamicFetchDefault) {
+	if (forceDynamicFetchDefault && (!mode || mode === "auto") && (cacheDirective === void 0 || cacheDirective === "default") && isFalsyRevalidate(nextOpts)) return "no-store";
 	if (!mode || mode === "auto") return cacheDirective;
 	switch (mode) {
 		case "force-cache": return "force-cache";
@@ -447,6 +472,20 @@ function cloneDedupeResponse(response) {
 	const [body1, body2] = response.body.tee();
 	return [buildDedupeClone(body1, response), buildDedupeClone(body2, response)];
 }
+function buildCachedFetchResponse(data, input) {
+	const response = new Response(data.body, {
+		status: data.status ?? 200,
+		headers: data.headers
+	});
+	Object.defineProperty(response, "url", {
+		value: data.url ?? getFetchObservationUrl(input),
+		configurable: true,
+		enumerable: true,
+		writable: false
+	});
+	if (_responseBodyRegistry && response.body) _responseBodyRegistry.register(response, new WeakRef(response.body));
+	return response;
+}
 function dedupeFetch(input, init) {
 	const state = _getState();
 	if (!state.isFetchDedupeActive) return originalFetch(input, init);
@@ -497,25 +536,26 @@ function dedupeFetch(input, init) {
 function createPatchedFetch() {
 	return async function patchedFetch(input, init) {
 		const nextOpts = init?.next;
-		const cacheDirective = resolveSegmentCacheDirective(getFetchCacheDirective(input, init), nextOpts, _getState().currentFetchCacheMode);
+		const cacheDirective = resolveSegmentCacheDirective(getFetchCacheDirective(input, init), nextOpts, _getState().currentFetchCacheMode, _getState().currentForceDynamicFetchDefault);
 		if (!nextOpts && !cacheDirective) {
 			recordDynamicFetchObservation(input);
 			return dedupeFetch(input, init);
 		}
-		if (cacheDirective === "no-store" || cacheDirective === "no-cache" || nextOpts?.revalidate === false || nextOpts?.revalidate === 0) {
+		if (cacheDirective === "no-store" || cacheDirective === "no-cache" || nextOpts?.revalidate === 0) {
 			const cleanInit = stripNextFromInit(init, cacheDirective);
-			recordDynamicFetchObservation(input);
+			markUncachedFetchForPageOutput(input);
 			return dedupeFetch(input, cleanInit);
 		}
-		if (!(cacheDirective === "force-cache" || typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0) && hasAuthHeaders(input, init)) {
+		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);
 		}
 		let revalidateSeconds;
-		if (cacheDirective === "force-cache") revalidateSeconds = nextOpts?.revalidate && typeof nextOpts.revalidate === "number" ? nextOpts.revalidate : 31536e3;
+		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) revalidateSeconds = 31536e3;
+		else if (nextOpts?.tags && nextOpts.tags.length > 0) revalidateSeconds = ONE_YEAR_SECONDS;
 		else {
 			const cleanInit = stripNextFromInit(init, cacheDirective);
 			recordDynamicFetchObservation(input);
@@ -550,10 +590,7 @@ function createPatchedFetch() {
 			});
 			if (cached?.value && cached.value.kind === "FETCH" && cached.cacheState !== "stale") {
 				const cachedData = cached.value.data;
-				return new Response(cachedData.body, {
-					status: cachedData.status ?? 200,
-					headers: cachedData.headers
-				});
+				return buildCachedFetchResponse(cachedData, input);
 			}
 			if (cached?.value && cached.value.kind === "FETCH" && cached.cacheState === "stale") {
 				const staleData = cached.value.data;
@@ -571,7 +608,7 @@ function createPatchedFetch() {
 							data: {
 								headers: freshHeaders,
 								body: freshBody,
-								url: typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url,
+								url: freshResp.url,
 								status: freshResp.status
 							},
 							tags,
@@ -595,10 +632,7 @@ function createPatchedFetch() {
 					}, DEDUP_TIMEOUT_MS);
 					getRequestExecutionContext()?.waitUntil(refetchPromise);
 				}
-				return new Response(staleData.body, {
-					status: staleData.status ?? 200,
-					headers: staleData.headers
-				});
+				return buildCachedFetchResponse(staleData, input);
 			}
 		} catch (cacheErr) {
 			console.error("[vinext] fetch cache read error:", cacheErr);
@@ -617,7 +651,7 @@ function createPatchedFetch() {
 				data: {
 					headers,
 					body,
-					url: typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url,
+					url: response.url,
 					status: cloned.status
 				},
 				tags,
@@ -690,6 +724,7 @@ async function runWithFetchCache(fn) {
 		currentRequestTags: [],
 		currentFetchSoftTags: [],
 		currentFetchCacheMode: null,
+		currentForceDynamicFetchDefault: false,
 		dynamicFetchUrls: /* @__PURE__ */ new Set(),
 		isFetchDedupeActive: true,
 		currentFetchDedupeEntries: /* @__PURE__ */ new Map()
@@ -728,4 +763,4 @@ function getOriginalFetch() {
 	return originalFetch;
 }
 //#endregion
-export { _resetPendingRefetches, addCollectedRequestTags, consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, getOriginalFetch, peekCacheableFetchObservations, peekDynamicFetchObservations, runWithFetchCache, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, withFetchCache };
+export { _resetPendingRefetches, addCollectedRequestTags, consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, getCurrentFetchSoftTags, getOriginalFetch, peekCacheableFetchObservations, peekDynamicFetchObservations, runWithFetchCache, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, withFetchCache };

package/dist/shims/hash-scroll.js

@@ -17,7 +17,12 @@ function scrollToHashTarget(hash) {
 		idElement.scrollIntoView({ behavior: "auto" });
 		return;
 	}
-	document.getElementsByName(fragment)[0]?.scrollIntoView({ behavior: "auto" });
+	const namedElement = document.getElementsByName(fragment)[0];
+	if (namedElement) {
+		namedElement.scrollIntoView({ behavior: "auto" });
+		return;
+	}
+	window.scrollTo(0, 0);
 }
 function scrollToHashTargetOnNextFrame(hash) {
 	requestAnimationFrame(() => {

package/dist/shims/head.js

@@ -104,6 +104,10 @@ const SELF_CLOSING_HEAD_TAGS = new Set([
 ]);
 /** Tags whose content is raw text — closing-tag sequences must be escaped during SSR. */
 const RAW_CONTENT_TAGS = new Set(["script", "style"]);
+const INLINE_CLOSE_TAG_RES = {
+	script: /<\/(script)/gi,
+	style: /<\/(style)/gi
+};
 function warnDisallowedHeadTag(tag) {
 	if (process.env.NODE_ENV !== "production") console.warn(`[vinext] <Head> ignoring disallowed tag <${tag}>. Only ${ALLOWED_HEAD_TAGS_LIST} are allowed.`);
 }
@@ -247,7 +251,8 @@ function escapeAttr(s) {
 * context but prevents the HTML parser from seeing a closing tag.
 */
 function escapeInlineContent(content, tag) {
-	const pattern = new RegExp(`<\\/(${tag})`, "gi");
+	const pattern = INLINE_CLOSE_TAG_RES[tag];
+	if (!pattern) return content;
 	return content.replace(pattern, "<\\/$1");
 }
 function getDangerouslySetInnerHTML(value) {

package/dist/shims/headers.d.ts

@@ -18,12 +18,24 @@ type HeadersAccessPhase = "render" | "action" | "route-handler";
 type VinextHeadersShimState = {
   headersContext: HeadersContext | null;
   dynamicUsageDetected: boolean;
-  renderRequestApiUsage: Set<RenderRequestApiKind>; /** Error recorded by throwIfInsideCacheScope for dev diagnostics, persists even if caught by user code. */
+  renderRequestApiUsage: Set<RenderRequestApiKind>;
+  connectionProbe: ConnectionProbeState | null; /** Error recorded by throwIfInsideCacheScope for dev diagnostics, persists even if caught by user code. */
   invalidDynamicUsageError: unknown;
   pendingSetCookies: string[];
   draftModeCookieHeader: string | null;
   phase: HeadersAccessPhase;
 };
+type ConnectionProbeState = {
+  interrupted: boolean;
+  interrupt: () => void;
+  pending: Promise<never>;
+};
+type ConnectionProbeResult<T> = {
+  completed: true;
+  result: T;
+} | {
+  completed: false;
+};
 /**
  * Dynamic usage flag — set when a component calls connection(), cookies(),
  * headers(), or noStore() during rendering. When true, ISR caching is
@@ -35,6 +47,8 @@ type VinextHeadersShimState = {
  */
 declare function markDynamicUsage(): void;
 declare function markRenderRequestApiUsage(kind: RenderRequestApiKind): void;
+declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
+declare function suspendConnectionProbe(): Promise<never> | null;
 declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
 declare function consumeRenderRequestApiUsage(): RenderRequestApiKind[];
 /**
@@ -236,4 +250,4 @@ declare class RequestCookies {
   toString(): string;
 }
 //#endregion
-export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, throwIfInsideCacheScope };
+export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope };

package/dist/shims/headers.js

@@ -3,7 +3,8 @@ import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation }
 import { MIDDLEWARE_SET_COOKIE_HEADER } from "../server/headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../server/middleware-request-headers.js";
 import { serializeSetCookie, validateCookieAttributeValue, validateCookieName } from "./internal/cookie-serialize.js";
-import { parseCookieHeader } from "./internal/parse-cookie-header.js";
+import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
+import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
 //#region src/shims/headers.ts
 /**
 * next/headers shim
@@ -21,6 +22,7 @@ const _fallbackState = _g[_FALLBACK_KEY] ??= {
 	headersContext: null,
 	dynamicUsageDetected: false,
 	renderRequestApiUsage: /* @__PURE__ */ new Set(),
+	connectionProbe: null,
 	invalidDynamicUsageError: null,
 	pendingSetCookies: [],
 	draftModeCookieHeader: null,
@@ -80,7 +82,7 @@ function setCookieNameValue(setCookie) {
 function rebuildCookiesFromHeader(ctx, cookieHeader) {
 	ctx.cookies.clear();
 	if (cookieHeader === null) return;
-	const nextCookies = parseCookieHeader(cookieHeader);
+	const nextCookies = parseEdgeRequestCookieHeader(cookieHeader);
 	for (const [name, value] of nextCookies) ctx.cookies.set(name, value);
 }
 function mergeMiddlewareSetCookies(ctx, rawHeader) {
@@ -115,6 +117,39 @@ function markDynamicUsage() {
 function markRenderRequestApiUsage(kind) {
 	_getState().renderRequestApiUsage.add(kind);
 }
+async function runWithConnectionProbe(fn) {
+	const state = _getState();
+	const previousProbe = state.connectionProbe;
+	let interruptProbe = () => {};
+	const interrupted = new Promise((resolve) => {
+		interruptProbe = () => resolve({ completed: false });
+	});
+	const probe = {
+		interrupted: false,
+		interrupt() {
+			if (probe.interrupted) return;
+			probe.interrupted = true;
+			interruptProbe();
+		},
+		pending: new Promise(() => {})
+	};
+	state.connectionProbe = probe;
+	try {
+		const completed = Promise.resolve().then(fn).then((result) => ({
+			completed: true,
+			result
+		}));
+		return await Promise.race([completed, interrupted]);
+	} finally {
+		state.connectionProbe = previousProbe;
+	}
+}
+function suspendConnectionProbe() {
+	const probe = _getState().connectionProbe;
+	if (!probe) return null;
+	probe.interrupt();
+	return probe.pending;
+}
 function peekRenderRequestApiUsage() {
 	return [..._getState().renderRequestApiUsage].sort();
 }
@@ -260,6 +295,7 @@ function runWithHeadersContext(ctx, fn) {
 		uCtx.headersContext = ctx;
 		uCtx.dynamicUsageDetected = false;
 		uCtx.renderRequestApiUsage = /* @__PURE__ */ new Set();
+		uCtx.connectionProbe = null;
 		uCtx.pendingSetCookies = [];
 		uCtx.draftModeCookieHeader = null;
 		uCtx.phase = "render";
@@ -268,6 +304,7 @@ function runWithHeadersContext(ctx, fn) {
 		headersContext: ctx,
 		dynamicUsageDetected: false,
 		renderRequestApiUsage: /* @__PURE__ */ new Set(),
+		connectionProbe: null,
 		invalidDynamicUsageError: null,
 		pendingSetCookies: [],
 		draftModeCookieHeader: null,
@@ -378,6 +415,26 @@ function _decorateRejectedRequestApiPromise(error) {
 		throw normalizedError;
 	} }));
 }
+function _decorateSuspendingRequestApiPromise(promise) {
+	return new Proxy(promise, {
+		get(promiseTarget, prop) {
+			if (prop === "then" || prop === "catch" || prop === "finally") {
+				const value = Reflect.get(promiseTarget, prop, promiseTarget);
+				return typeof value === "function" ? value.bind(promiseTarget) : value;
+			}
+			throw promise;
+		},
+		getOwnPropertyDescriptor() {
+			throw promise;
+		},
+		has() {
+			throw promise;
+		},
+		ownKeys() {
+			throw promise;
+		}
+	});
+}
 function _sealHeaders(headers) {
 	return new Proxy(headers, { get(target, prop) {
 		if (typeof prop === "string" && _HEADERS_MUTATING_METHODS.has(prop)) throw new ReadonlyHeadersError();
@@ -449,7 +506,7 @@ function headersContextFromRequest(request, options) {
 	let _cookies = null;
 	function getCookies() {
 		if (_cookies) return _cookies;
-		_cookies = parseCookieHeader(headersProxy.get("cookie") || "");
+		_cookies = parseEdgeRequestCookieHeader(headersProxy.get("cookie") || "");
 		return _cookies;
 	}
 	return {
@@ -476,6 +533,8 @@ function headers() {
 	if (!state.headersContext) return _decorateRejectedRequestApiPromise(/* @__PURE__ */ new Error("headers() can only be called from a Server Component, Route Handler, or Server Action. Make sure you're not calling it from a Client Component."));
 	if (state.headersContext.accessError) return _decorateRejectedRequestApiPromise(state.headersContext.accessError);
 	markDynamicUsage();
+	const fallbackShellPromise = createPprFallbackShellSuspensePromise("`headers()`");
+	if (fallbackShellPromise) return _decorateSuspendingRequestApiPromise(fallbackShellPromise);
 	return _getOrCreateDecoratedRequestApiPromise(_decoratedHeadersPromises, _getReadonlyHeaders(state.headersContext));
 }
 /**
@@ -493,6 +552,8 @@ function cookies() {
 	if (!state.headersContext) return _decorateRejectedRequestApiPromise(/* @__PURE__ */ new Error("cookies() can only be called from a Server Component, Route Handler, or Server Action."));
 	if (state.headersContext.accessError) return _decorateRejectedRequestApiPromise(state.headersContext.accessError);
 	markDynamicUsage();
+	const fallbackShellPromise = createPprFallbackShellSuspensePromise("`cookies()`");
+	if (fallbackShellPromise) return _decorateSuspendingRequestApiPromise(fallbackShellPromise);
 	return _getOrCreateDecoratedRequestApiPromise(_decoratedCookiesPromises, _areCookiesMutableInCurrentPhase() ? _getMutableCookies(state.headersContext) : _getReadonlyCookies(state.headersContext));
 }
 /** Accumulated Set-Cookie headers from cookies().set() / .delete() calls */
@@ -536,7 +597,7 @@ function ensureContextDraftModeSecret(ctx) {
 function isDraftModeRequest(request, draftModeSecret) {
 	const cookieHeader = request.headers.get("cookie");
 	if (!cookieHeader) return false;
-	return parseCookieHeader(cookieHeader).get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(draftModeSecret);
+	return parseEdgeRequestCookieHeader(cookieHeader).get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(draftModeSecret);
 }
 function draftModeCookieAttributes() {
 	if (typeof process !== "undefined" && process.env?.NODE_ENV === "development") return "Path=/; HttpOnly; SameSite=Lax";
@@ -690,4 +751,4 @@ var RequestCookies = class {
 	}
 };
 //#endregion
-export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, throwIfInsideCacheScope };
+export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope };

package/dist/shims/image-config.js

@@ -1,5 +1,6 @@
 import ipaddr from "ipaddr.js";
 //#region src/shims/image-config.ts
+const globRegexCache = /* @__PURE__ */ new Map();
 /**
 * Convert a glob pattern (with `*` and `**`) to a RegExp.
 *
@@ -14,6 +15,9 @@ import ipaddr from "ipaddr.js";
 * Literal characters are escaped for regex safety.
 */
 function globToRegex(pattern, separator) {
+	const key = `${separator}\0${pattern}`;
+	const cached = globRegexCache.get(key);
+	if (cached !== void 0) return cached;
 	let regexStr = "^";
 	const doubleStar = separator === "." ? ".+" : ".*";
 	const singleStar = separator === "." ? "[^.]+" : "[^/]+";
@@ -27,7 +31,9 @@ function globToRegex(pattern, separator) {
 		}
 	}
 	regexStr += "$";
-	return new RegExp(regexStr);
+	const re = new RegExp(regexStr);
+	globRegexCache.set(key, re);
+	return re;
 }
 /**
 * Check whether a URL matches a single remote pattern.

package/dist/shims/internal/als-registry.js

@@ -38,6 +38,33 @@ import { AsyncLocalStorage } from "node:async_hooks";
 */
 const _g = globalThis;
 /**
+* No-op AsyncLocalStorage used when the runtime does not provide a usable
+* `AsyncLocalStorage` constructor.
+*
+* In browser/client bundles `node:async_hooks` can resolve to a stub without a
+* usable constructor (e.g. Vite's `__vite-browser-external`). Constructing such
+* a value with `new` throws `TypeError: AsyncLocalStorage is not a constructor`
+* at module-eval time, crashing every client-reachable shim that calls
+* `getOrCreateAls` on import (request-context, headers, cache, …).
+*
+* Mirrors Next.js' `FakeAsyncLocalStorage` (and this repo's
+* `async-hooks-stub.ts` client virtual module): `getStore()` returns
+* `undefined` so shims fall back to their non-ALS code path, and the mutating
+* methods are best-effort no-ops that still invoke the callback.
+* See: https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/async-local-storage.ts
+*/
+var NoopAsyncLocalStorage = class {
+	getStore() {}
+	run(_store, fn, ...args) {
+		return fn(...args);
+	}
+	exit(fn, ...args) {
+		return fn(...args);
+	}
+	enterWith(_store) {}
+	disable() {}
+};
+/**
 * Get (or lazily create) the AsyncLocalStorage registered on `globalThis`
 * under `Symbol.for(key)`. Multiple callers — including callers in different
 * module instances — that pass the same `key` receive the same ALS instance.
@@ -47,7 +74,7 @@ const _g = globalThis;
 */
 function getOrCreateAls(key) {
 	const sym = Symbol.for(key);
-	return _g[sym] ??= new AsyncLocalStorage();
+	return _g[sym] ??= typeof AsyncLocalStorage === "function" ? new AsyncLocalStorage() : new NoopAsyncLocalStorage();
 }
 //#endregion
 export { getOrCreateAls };

package/dist/shims/internal/app-route-detection.d.ts

@@ -27,9 +27,12 @@ declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;
  * Pages Router map when the href matches an App Router route. No-op when the
  * manifest is absent, the URL is external, or no app route matches.
  *
- * `pathname` is the basePath-stripped path — matching Next.js's
- * `router.components[urlPathname]` key (see the source link in this file's
- * leading comment).
+ * `pathname` is the basePath-stripped, trailing-slash-stripped path —
+ * matching Next.js's `removeTrailingSlash(removeBasePath(pathname))` key used
+ * at read time (router.ts:1442). Stripping here ensures the write and read
+ * keys agree regardless of whether the caller normalised trailing slashes
+ * first (e.g. `link.tsx` normalises to match `trailingSlash` config before
+ * calling, while `router.prefetch()` passes the raw user-supplied URL).
  */
 declare function markAppRouteDetectedOnPrefetch(href: string, basePath: string): void;
 //#endregion

package/dist/shims/internal/app-route-detection.js

@@ -1,7 +1,7 @@
-import { stripBasePath } from "../../utils/base-path.js";
-import { createRouteTrieCache, matchRouteWithTrie } from "../../routing/route-matching.js";
+import { removeTrailingSlash, stripBasePath } from "../../utils/base-path.js";
+import { getLocalePathPrefix } from "../../utils/domain-locale.js";
+import { resolveHybridClientRouteOwner } from "./hybrid-client-route-owner.js";
 //#region src/shims/internal/app-route-detection.ts
-const appRouteTrieCache = createRouteTrieCache();
 const _COMPONENTS_KEY = Symbol.for("vinext.pagesRouter.components");
 /**
 * Get-or-create the Pages Router `components` map. Returns the same object
@@ -32,35 +32,30 @@ function resolveSameOriginPathname(href, basePath) {
 		return null;
 	}
 	if (url.origin !== window.location.origin) return null;
-	return stripBasePath(url.pathname, basePath);
-}
-/**
-* Returns true when the prefetch href matches any route in the App Router
-* prefetch manifest (static or dynamic). Returns false when the manifest is
-* absent (Pages-Router-only build), the URL is external, or no route matches.
-*/
-function matchesAppRoute(href, basePath) {
-	if (typeof window === "undefined") return false;
-	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
-	if (!routes || routes.length === 0) return false;
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return false;
-	return matchRouteWithTrie(pathname, routes, appRouteTrieCache) !== null;
+	const pathname = stripBasePath(url.pathname, basePath);
+	const locale = getLocalePathPrefix(pathname, window.__VINEXT_LOCALES__);
+	if (!locale) return pathname;
+	const localePrefixLength = locale.length + 1;
+	return pathname.length === localePrefixLength ? "/" : pathname.slice(localePrefixLength);
 }
 /**
 * Record `components[pathname] = { __appRouter: true }` on the shared
 * Pages Router map when the href matches an App Router route. No-op when the
 * manifest is absent, the URL is external, or no app route matches.
 *
-* `pathname` is the basePath-stripped path — matching Next.js's
-* `router.components[urlPathname]` key (see the source link in this file's
-* leading comment).
+* `pathname` is the basePath-stripped, trailing-slash-stripped path —
+* matching Next.js's `removeTrailingSlash(removeBasePath(pathname))` key used
+* at read time (router.ts:1442). Stripping here ensures the write and read
+* keys agree regardless of whether the caller normalised trailing slashes
+* first (e.g. `link.tsx` normalises to match `trailingSlash` config before
+* calling, while `router.prefetch()` passes the raw user-supplied URL).
 */
 function markAppRouteDetectedOnPrefetch(href, basePath) {
 	if (typeof window === "undefined") return;
-	if (!matchesAppRoute(href, basePath)) return;
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return;
+	if (resolveHybridClientRouteOwner(href, basePath) !== "app") return;
+	const rawPathname = resolveSameOriginPathname(href, basePath);
+	if (rawPathname === null) return;
+	const pathname = removeTrailingSlash(rawPathname);
 	getPagesRouterComponentsMap()[pathname] = { __appRouter: true };
 }
 //#endregion

package/dist/shims/internal/app-router-context.d.ts

@@ -16,6 +16,11 @@ type AppRouterInstance = {
   push(href: string, options?: NavigateOptions): void;
   replace(href: string, options?: NavigateOptions): void;
   prefetch(href: string, options?: PrefetchOptions): void;
+  /**
+   * Perform an experimental gesture transition navigation.
+   * Only available when experimental.gestureTransition is enabled.
+   */
+  experimental_gesturePush?(href: string, options?: NavigateOptions): void;
 };
 declare const AppRouterContext: React$1.Context<AppRouterInstance | null> | null;
 declare const GlobalLayoutRouterContext: React$1.Context<unknown> | null;

package/dist/shims/internal/hybrid-client-route-owner.d.ts

@@ -0,0 +1,31 @@
+import { NextRewrite } from "../../config/next-config.js";
+import { VinextLinkPrefetchRoute, VinextPagesLinkPrefetchRoute } from "../../client/vinext-next-data.js";
+
+//#region src/shims/internal/hybrid-client-route-owner.d.ts
+type HybridClientOwner = "app" | "document" | "pages";
+declare global {
+  interface Window {
+    __VINEXT_LINK_PREFETCH_ROUTES__?: VinextLinkPrefetchRoute[];
+    __VINEXT_PAGES_LINK_PREFETCH_ROUTES__?: VinextPagesLinkPrefetchRoute[];
+    __VINEXT_CLIENT_REWRITES__?: {
+      afterFiles: NextRewrite[];
+      beforeFiles: NextRewrite[];
+      fallback: NextRewrite[];
+    };
+  }
+}
+/**
+ * Decide which router should own a soft-navigated URL. Returns:
+ *   - "app"    → the App Router runtime handles the navigation (RSC fetch).
+ *   - "pages"  → Pages owns the URL; the caller must hard-navigate instead.
+ *   - null     → no router matched (preserves the existing 404 path).
+ *
+ * `basePath` must match what the page uses (typically `process.env.__NEXT_ROUTER_BASEPATH`).
+ *
+ * The lookup uses the App and Pages manifests on `window` so the same
+ * matcher trie produces the same result the server will see when the
+ * request lands.
+ */
+declare function resolveHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
+//#endregion
+export { HybridClientOwner, resolveHybridClientRouteOwner };