vinext 1.0.0-beta.9 → 1.0.1

package/dist/shims/headers.js

@@ -1,11 +1,11 @@
-import { getOrCreateAls } from "./internal/als-registry.js";
-import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
+import { ensureRenderDynamicLatch, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
-import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
+import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
 import { serializeSetCookie, validateCookieName } from "./internal/cookie-serialize.js";
 import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
+import { createRenderDynamicLatch, getHeadersAccessPhase, getHeadersShimState, headersShimAls, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "./internal/headers-state.js";
 //#region src/shims/headers.ts
 /**
 * next/headers shim
@@ -16,19 +16,6 @@ import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
 * In Next.js 15+, cookies() and headers() return Promises (async).
 * We support both the sync (legacy) and async patterns.
 */
-const _FALLBACK_KEY = Symbol.for("vinext.nextHeadersShim.fallback");
-const _g = globalThis;
-const _als = getOrCreateAls("vinext.nextHeadersShim.als");
-const _fallbackState = _g[_FALLBACK_KEY] ??= {
-	headersContext: null,
-	dynamicUsageDetected: false,
-	renderRequestApiUsage: /* @__PURE__ */ new Set(),
-	connectionProbe: null,
-	invalidDynamicUsageError: null,
-	pendingSetCookies: [],
-	draftModeCookieHeader: null,
-	phase: "render"
-};
 function splitMiddlewareSetCookieHeader(value) {
 	const cookies = [];
 	let start = 0;
@@ -96,41 +83,6 @@ function mergeMiddlewareSetCookies(ctx, rawHeader) {
 	}
 	return merged;
 }
-function _getState() {
-	if (isInsideUnifiedScope()) return getRequestContext();
-	return _als.getStore() ?? _fallbackState;
-}
-/**
-* Dynamic usage flag — set when a component calls connection(), cookies(),
-* headers(), or noStore() during rendering. When true, ISR caching is
-* bypassed and the response gets Cache-Control: no-store.
-*/
-/**
-* Mark the current render as requiring dynamic (uncached) rendering.
-* Called by connection(), cookies(), headers(), and noStore().
-*/
-function markDynamicUsage() {
-	const state = _getState();
-	if (state.headersContext?.forceStatic) return;
-	state.dynamicUsageDetected = true;
-	forEachConnectionProbeTarget(state, (target) => {
-		target.dynamicUsageDetected = true;
-	});
-}
-function forEachConnectionProbeTarget(state, visit) {
-	let target = state.connectionProbe?.dynamicUsageTarget ?? null;
-	const seen = /* @__PURE__ */ new Set([state]);
-	while (target && !seen.has(target)) {
-		seen.add(target);
-		visit(target);
-		target = target.connectionProbe?.dynamicUsageTarget ?? null;
-	}
-}
-function propagateInvalidDynamicUsageError(state, error) {
-	forEachConnectionProbeTarget(state, (target) => {
-		if (target.invalidDynamicUsageError == null) target.invalidDynamicUsageError = error;
-	});
-}
 /**
 * Measure dynamic usage in a child async scope without clearing the parent.
 * Concurrent work that already belongs to the request (such as deferred
@@ -154,21 +106,16 @@ async function runWithIsolatedDynamicUsage(fn) {
 			return runInChildState(childState);
 		});
 	}
+	const parentState = getHeadersShimState();
 	const childState = {
-		..._getState(),
+		...parentState,
+		renderDynamicLatch: ensureRenderDynamicLatch(parentState),
 		dynamicUsageDetected: false
 	};
-	return await _als.run(childState, () => runInChildState(childState));
-}
-function markRenderRequestApiUsage(kind) {
-	_getState().renderRequestApiUsage.add(kind);
-}
-function throwIfStaticGenerationAccessError() {
-	const accessError = _getState().headersContext?.accessError;
-	if (accessError) throw accessError;
+	return await headersShimAls.run(childState, () => runInChildState(childState));
 }
 async function runWithConnectionProbe(fn) {
-	const parentState = _getState();
+	const parentState = getHeadersShimState();
 	const parentInvalidDynamicUsageError = parentState.invalidDynamicUsageError;
 	let interruptProbe = () => {};
 	const interrupted = new Promise((resolve) => {
@@ -211,81 +158,26 @@ async function runWithConnectionProbe(fn) {
 	}
 	const childState = {
 		...parentState,
+		renderDynamicLatch: ensureRenderDynamicLatch(parentState),
 		connectionProbe: probe
 	};
-	return await _als.run(childState, () => runInChildState(childState));
+	return await headersShimAls.run(childState, () => runInChildState(childState));
 }
 function suspendConnectionProbe() {
-	const probe = _getState().connectionProbe;
+	const probe = getHeadersShimState().connectionProbe;
 	if (!probe?.active) return null;
 	probe.interrupt();
 	return probe.pending;
 }
 function peekRenderRequestApiUsage() {
-	return [..._getState().renderRequestApiUsage].sort();
+	return [...getHeadersShimState().renderRequestApiUsage].sort();
 }
 function consumeRenderRequestApiUsage() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const observed = [...state.renderRequestApiUsage].sort();
 	state.renderRequestApiUsage = /* @__PURE__ */ new Set();
 	return observed;
 }
-/** Symbol used by cache-runtime.ts to store the "use cache" ALS on globalThis */
-const _USE_CACHE_ALS_KEY = Symbol.for("vinext.cacheRuntime.contextAls");
-/** Symbol used by cache.ts to store the unstable_cache ALS on globalThis */
-const _UNSTABLE_CACHE_ALS_KEY = Symbol.for("vinext.unstableCache.als");
-function _getGlobalCacheScopeStore(key) {
-	const value = Reflect.get(globalThis, key);
-	if (!value || typeof value !== "object") return null;
-	const getStore = Reflect.get(value, "getStore");
-	if (typeof getStore !== "function") return null;
-	return getStore.call(value);
-}
-function _getUseCacheGuardContext() {
-	const store = _getGlobalCacheScopeStore(_USE_CACHE_ALS_KEY);
-	if (!store || typeof store !== "object") return null;
-	return store;
-}
-function _isInsidePublicUseCache() {
-	const ctx = _getUseCacheGuardContext();
-	return ctx !== null && ctx.variant !== "private";
-}
-function _isInsideUnstableCache() {
-	return _getGlobalCacheScopeStore(_UNSTABLE_CACHE_ALS_KEY) === true;
-}
-/** Whether work is executing inside a cache boundary that owns its reuse. */
-function isInsideAnyCacheScope() {
-	return _getUseCacheGuardContext() !== null || _isInsideUnstableCache();
-}
-/**
-* Throw if the current execution is inside a "use cache" or unstable_cache()
-* scope. Called by dynamic request APIs (headers, cookies, connection) to
-* prevent request-specific data from being frozen into cached results.
-*
-* @param apiName - The name of the API being called (e.g. "connection()")
-*/
-function throwIfInsideCacheScope(apiName) {
-	if (_isInsidePublicUseCache()) {
-		const error = /* @__PURE__ */ new Error(`\`${apiName}\` cannot be called inside "use cache". If you need this data inside a cached function, call \`${apiName}\` outside and pass the required data as an argument.`);
-		try {
-			const cacheCtx = _getUseCacheGuardContext();
-			if (cacheCtx) cacheCtx.invalidDynamicUsageError = error;
-			const ctx = getRequestContext();
-			if (ctx) ctx.invalidDynamicUsageError = error;
-			propagateInvalidDynamicUsageError(_getState(), error);
-		} catch {}
-		throw error;
-	}
-	if (_isInsideUnstableCache()) {
-		const error = /* @__PURE__ */ new Error(`\`${apiName}\` cannot be called inside a function cached with \`unstable_cache()\`. If you need this data inside a cached function, call \`${apiName}\` outside and pass the required data as an argument.`);
-		try {
-			const ctx = getRequestContext();
-			if (ctx) ctx.invalidDynamicUsageError = error;
-			propagateInvalidDynamicUsageError(_getState(), error);
-		} catch {}
-		throw error;
-	}
-}
 /**
 * Check, consume, and return any invalid dynamic usage error recorded during
 * the render (e.g. cookies() called inside "use cache"). This error persists
@@ -296,7 +188,7 @@ function throwIfInsideCacheScope(apiName) {
 * https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689
 */
 function consumeInvalidDynamicUsageError() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const err = state.invalidDynamicUsageError;
 	state.invalidDynamicUsageError = null;
 	return err;
@@ -306,7 +198,7 @@ function consumeInvalidDynamicUsageError() {
 * Called by the server after rendering to decide on caching.
 */
 function consumeDynamicUsage() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const used = state.dynamicUsageDetected;
 	state.dynamicUsageDetected = false;
 	return used;
@@ -319,7 +211,7 @@ function consumeDynamicUsage() {
 * that leave no other observable trace.
 */
 function peekDynamicUsage() {
-	return _getState().dynamicUsageDetected;
+	return getHeadersShimState().dynamicUsageDetected;
 }
 function _setStatePhase(state, phase) {
 	const previous = state.phase;
@@ -328,14 +220,11 @@ function _setStatePhase(state, phase) {
 	return previous;
 }
 function _areCookiesMutableInCurrentPhase() {
-	const phase = _getState().phase;
+	const phase = getHeadersShimState().phase;
 	return phase === "action" || phase === "route-handler";
 }
 function setHeadersAccessPhase(phase) {
-	return _setStatePhase(_getState(), phase);
-}
-function getHeadersAccessPhase() {
-	return _getState().phase;
+	return _setStatePhase(getHeadersShimState(), phase);
 }
 /**
 * Set the headers/cookies context for the current RSC render.
@@ -352,13 +241,60 @@ function getHeadersAccessPhase() {
 * request context for afterFiles/fallback rewrite has/missing evaluation.
 */
 function getHeadersContext() {
-	return _getState().headersContext;
+	return getHeadersShimState().headersContext;
+}
+/** Serialize the effective request-cookie view, including middleware Set-Cookie overlays. */
+function getEffectiveRequestCookieHeader() {
+	const context = getHeadersContext();
+	if (!context || context.cookies.size === 0) return null;
+	return [...context.cookies].map(([name, value]) => `${name}=${encodeURIComponent(value)}`).join("; ");
+}
+function hasEffectiveRequestCookieChanges(cookieHeader) {
+	const effective = getHeadersContext()?.cookies;
+	if (!effective) return false;
+	const original = parseEdgeRequestCookieHeader(cookieHeader ?? "");
+	if (effective.size !== original.size) return true;
+	for (const [name, value] of effective) if (original.get(name) !== value) return true;
+	return false;
+}
+/**
+* Replace only the request-cookie view for the active request scope.
+*
+* Middleware Set-Cookie mutations are visible through `cookies()` during the
+* same request in Next.js, but they do not rewrite the raw `Cookie` value
+* returned by `headers()`. The staged App renderer uses this seam to restore
+* that split view without changing the request Headers object.
+*/
+function applyEffectiveRequestCookieHeader(cookieHeader) {
+	const context = getHeadersShimState().headersContext;
+	if (!context) return;
+	rebuildCookiesFromHeader(context, cookieHeader);
+	context.readonlyCookies = void 0;
+	context.mutableCookies = void 0;
+}
+/** Restore a middleware draft-mode transition inside a staged render scope. */
+function restoreDraftModeTransition(cookieHeader) {
+	const state = getHeadersShimState();
+	const context = state.headersContext;
+	if (!context) return;
+	const entry = setCookieNameValue(cookieHeader);
+	if (!entry || entry.name !== DRAFT_MODE_COOKIE) return;
+	context.cookies.set(entry.name, entry.value);
+	context.readonlyCookies = void 0;
+	context.mutableCookies = void 0;
+	context.draftModeEnabled = entry.value === validateDraftModeSecret(context.draftModeSecret ?? "");
+	state.draftModeCookieHeader = cookieHeader;
+}
+/** Replace request API inputs while retaining dynamic usage and pending mutations. */
+function replaceHeadersContext(ctx) {
+	getHeadersShimState().headersContext = ctx;
 }
 function setHeadersContext(ctx) {
-	const state = _getState();
+	const state = getHeadersShimState();
 	if (ctx !== null) {
 		state.headersContext = ctx;
 		state.dynamicUsageDetected = false;
+		state.renderDynamicLatch = createRenderDynamicLatch();
 		state.renderRequestApiUsage = /* @__PURE__ */ new Set();
 		state.pendingSetCookies = [];
 		state.draftModeCookieHeader = null;
@@ -372,6 +308,7 @@ function runWithHeadersContext(ctx, fn) {
 	if (isInsideUnifiedScope()) return runWithUnifiedStateMutation((uCtx) => {
 		uCtx.headersContext = ctx;
 		uCtx.dynamicUsageDetected = false;
+		uCtx.renderDynamicLatch = createRenderDynamicLatch();
 		uCtx.renderRequestApiUsage = /* @__PURE__ */ new Set();
 		uCtx.connectionProbe = null;
 		uCtx.pendingSetCookies = [];
@@ -381,6 +318,7 @@ function runWithHeadersContext(ctx, fn) {
 	const state = {
 		headersContext: ctx,
 		dynamicUsageDetected: false,
+		renderDynamicLatch: createRenderDynamicLatch(),
 		renderRequestApiUsage: /* @__PURE__ */ new Set(),
 		connectionProbe: null,
 		invalidDynamicUsageError: null,
@@ -388,7 +326,7 @@ function runWithHeadersContext(ctx, fn) {
 		draftModeCookieHeader: null,
 		phase: "render"
 	};
-	return _als.run(state, fn);
+	return headersShimAls.run(state, fn);
 }
 /**
 * Apply middleware-forwarded request headers to the current headers context.
@@ -410,7 +348,7 @@ function runWithHeadersContext(ctx, fn) {
 * middleware-modified view.
 */
 function applyMiddlewareRequestHeaders(middlewareResponseHeaders) {
-	const state = _getState();
+	const state = getHeadersShimState();
 	if (!state.headersContext) return;
 	const ctx = state.headersContext;
 	const previousCookieHeader = ctx.headers.get("cookie");
@@ -590,7 +528,8 @@ function headersContextFromRequest(request, options) {
 	let _cookies = null;
 	function getCookies() {
 		if (_cookies) return _cookies;
-		_cookies = parseEdgeRequestCookieHeader(headersProxy.get("cookie") || "");
+		const cookieHeader = headersProxy.get("cookie") || "";
+		_cookies = parseEdgeRequestCookieHeader(cookieHeader);
 		return _cookies;
 	}
 	return {
@@ -613,7 +552,7 @@ function headers() {
 	} catch (error) {
 		return _decorateRejectedRequestApiPromise(error);
 	}
-	const state = _getState();
+	const state = getHeadersShimState();
 	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();
@@ -633,7 +572,7 @@ function cookiesImpl() {
 	} catch (error) {
 		return _decorateRejectedRequestApiPromise(error);
 	}
-	const state = _getState();
+	const state = getHeadersShimState();
 	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();
@@ -651,7 +590,7 @@ function cookies() {
 * Called by the framework after rendering to attach headers to the response.
 */
 function getAndClearPendingCookies() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const cookies = state.pendingSetCookies;
 	state.pendingSetCookies = [];
 	return cookies;
@@ -661,8 +600,12 @@ const DRAFT_MODE_COOKIE = "__prerender_bypass";
 * Get any Set-Cookie header generated by draftMode().enable()/disable().
 * Called by the framework after rendering to attach the header to the response.
 */
+/** Check a pending draft transition without consuming its outgoing cookie. */
+function hasDraftModeCookieHeader() {
+	return getHeadersShimState().draftModeCookieHeader !== null;
+}
 function getDraftModeCookieHeader() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const header = state.draftModeCookieHeader;
 	state.draftModeCookieHeader = null;
 	return header;
@@ -693,7 +636,7 @@ function isDraftModeRequest(request, draftModeSecret) {
 * callers fall back to an explicitly supplied request when needed.
 */
 function getActiveDraftModeState() {
-	const context = _getState().headersContext;
+	const context = getHeadersShimState().headersContext;
 	if (!context) return null;
 	if (context.draftModeEnabled !== void 0) return context.draftModeEnabled;
 	const secret = context.draftModeSecret;
@@ -733,7 +676,7 @@ function requireActiveDraftModeContext(state, expectedContext, expression) {
 */
 async function draftMode() {
 	markRenderRequestApiUsage("draftMode");
-	const state = _getState();
+	const state = getHeadersShimState();
 	const context = state.headersContext;
 	if (!context) throw createDraftModeScopeError("draftMode()");
 	const secret = ensureContextDraftModeSecret(context);
@@ -821,7 +764,7 @@ var RequestCookies = class {
 		});
 		const serialized = serializeMutableCookie(responseCookie);
 		this[APPLY_RESPONSE_COOKIE](responseCookie);
-		_getState().pendingSetCookies.push(serialized);
+		getHeadersShimState().pendingSetCookies.push(serialized);
 		return this;
 	}
 	delete(nameOrOptions) {
@@ -835,7 +778,7 @@ var RequestCookies = class {
 		});
 		const serialized = serializeMutableCookie(responseCookie);
 		this[APPLY_RESPONSE_COOKIE](responseCookie);
-		_getState().pendingSetCookies.push(serialized);
+		getHeadersShimState().pendingSetCookies.push(serialized);
 		return this;
 	}
 	get size() {
@@ -891,4 +834,4 @@ function serializeMutableCookie(cookie) {
 	});
 }
 //#endregion
-export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { applyEffectiveRequestCookieHeader, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, createRenderDynamicLatch, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersAccessPhase, getHeadersContext, hasDraftModeCookieHeader, hasEffectiveRequestCookieChanges, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, peekDynamicUsage, peekRenderRequestApiUsage, replaceHeadersContext, restoreDraftModeTransition, runWithConnectionProbe, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

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

@@ -1,6 +1,6 @@
 import { DomainLocale } from "../utils/domain-locale.js";
 //#region src/shims/i18n-context.d.ts
-type I18nContext = {
+export type I18nContext = {
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
@@ -11,11 +11,10 @@ type I18nContext = {
  * Register ALS-backed accessors. Called by i18n-state.ts on import.
  * @internal
  */
-declare function _registerI18nStateAccessors(accessors: {
+export declare function _registerI18nStateAccessors(accessors: {
   getI18nContext: () => I18nContext | null;
   setI18nContext: (ctx: I18nContext | null) => void;
 }): void;
-declare function getI18nContext(): I18nContext | null;
-declare function setI18nContext(ctx: I18nContext | null): void;
-//#endregion
-export { I18nContext, _registerI18nStateAccessors, getI18nContext, setI18nContext };
+export declare function getI18nContext(): I18nContext | null;
+export declare function setI18nContext(ctx: I18nContext | null): void;
+//#endregion

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

@@ -1,13 +1,12 @@
 import { I18nContext } from "./i18n-context.js";
 //#region src/shims/i18n-state.d.ts
-type I18nState = {
+export type I18nState = {
   i18nContext: I18nContext | null;
 };
 /**
  * Run a function within an i18n state ALS scope.
  * Ensures per-request isolation for i18n context on concurrent runtimes.
  */
-declare function runWithI18nState<T>(fn: () => Promise<T>): Promise<T>;
-declare function runWithI18nState<T>(fn: () => T | Promise<T>): T | Promise<T>;
-//#endregion
-export { I18nState, runWithI18nState };
+export declare function runWithI18nState<T>(fn: () => Promise<T>): Promise<T>;
+export declare function runWithI18nState<T>(fn: () => T | Promise<T>): T | Promise<T>;
+//#endregion

package/dist/shims/image-config.d.ts

@@ -12,7 +12,7 @@
  * - `**` matches any number of segments
  * - protocol, port, and search are matched exactly when specified
  */
-type RemotePattern = {
+export type RemotePattern = {
   protocol?: string;
   hostname: string;
   port?: string;
@@ -23,11 +23,11 @@ type RemotePattern = {
  * Check whether a URL matches a single remote pattern.
  * Follows the same semantics as Next.js's matchRemotePattern().
  */
-declare function matchRemotePattern(pattern: RemotePattern, url: URL): boolean;
+export declare function matchRemotePattern(pattern: RemotePattern, url: URL): boolean;
 /**
  * Check whether a URL matches any configured remote pattern or legacy domain.
  */
-declare function hasRemoteMatch(domains: string[], remotePatterns: RemotePattern[], url: URL): boolean;
+export declare function hasRemoteMatch(domains: string[], remotePatterns: RemotePattern[], url: URL): boolean;
 /**
  * Determine whether a string is a private (non-routable) IP address.
  * Works for IPv4 and IPv6, including bracketed and IPv4-mapped forms.
@@ -40,6 +40,5 @@ declare function hasRemoteMatch(domains: string[], remotePatterns: RemotePattern
  *
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/is-private-ip.ts
  */
-declare function isPrivateIp(ip: string): boolean;
-//#endregion
-export { RemotePattern, hasRemoteMatch, isPrivateIp, matchRemotePattern };
+export declare function isPrivateIp(ip: string): boolean;
+//#endregion

package/dist/shims/image-config.js

@@ -59,6 +59,7 @@ function matchRemotePattern(pattern, url) {
 function hasRemoteMatch(domains, remotePatterns, url) {
 	return domains.some((domain) => url.hostname === domain) || remotePatterns.some((p) => matchRemotePattern(p, url));
 }
+const IPV4_LITERAL_CHARS_RE = /^[0-9a-fA-FxX.]+$/;
 /**
 * Determine whether a string is a private (non-routable) IP address.
 * Works for IPv4 and IPv6, including bracketed and IPv4-mapped forms.
@@ -73,6 +74,7 @@ function hasRemoteMatch(domains, remotePatterns, url) {
 */
 function isPrivateIp(ip) {
 	if (ip.startsWith("[") && ip.endsWith("]")) ip = ip.slice(1, -1);
+	if (!ip.includes(":") && !IPV4_LITERAL_CHARS_RE.test(ip)) return false;
 	try {
 		const parsed = ipaddr.parse(ip);
 		if (parsed instanceof ipaddr.IPv6 && parsed.isIPv4MappedAddress()) return parsed.toIPv4Address().range() !== "unicast";

package/dist/shims/image.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
 import { ImageLoader, ImageProps as ImageProps$1, ImgProps, StaticImageData, StaticImport, StaticRequire } from "@vinext/types/next/upstream/dist/shared/lib/get-img-props";
 //#region src/shims/image.d.ts
-type ImageLoaderProps = Parameters<ImageLoader>[0];
-type ImageProps = ImageProps$1;
+export type ImageLoaderProps = Parameters<ImageLoader>[0];
+export type ImageProps = ImageProps$1;
 /**
  * Build a `/_next/image` optimization URL.
  *
@@ -10,7 +10,7 @@ type ImageProps = ImageProps$1;
  * the Images binding to resize/transcode on the fly. In dev, the Vite dev
  * server handles it as a passthrough (serves the original file).
  */
-declare function imageOptimizationUrl(src: string, width: number, quality?: number): string;
+export declare function imageOptimizationUrl(src: string, width: number, quality?: number): string;
 declare const Image: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, "alt" | "height" | "loading" | "ref" | "src" | "srcSet" | "width"> & {
   src: string | StaticImport;
   alt: string;
@@ -37,8 +37,8 @@ declare const Image: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProp
  * getImageProps — for advanced use cases (picture elements, background images).
  * Returns the props that would be passed to the underlying <img> element.
  */
-declare function getImageProps(props: ImageProps): {
+export declare function getImageProps(props: ImageProps): {
   props: ImgProps;
 };
 //#endregion
-export { type ImageLoader, ImageLoaderProps, ImageProps, type StaticImageData, type StaticRequire, Image as default, getImageProps, imageOptimizationUrl };
+export { type ImageLoader, type StaticImageData, type StaticRequire, Image as default };

package/dist/shims/image.js

@@ -453,10 +453,12 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 	}
 	if (isRemoteUrl(src)) {
 		const validation = validateRemoteUrl(src);
-		if (!validation.allowed) if (__isDev) console.warn(`[next/image] ${validation.reason}`);
-		else {
-			console.error(`[next/image] ${validation.reason}`);
-			return null;
+		if (!validation.allowed) {
+			if (__isDev) console.warn(`[next/image] ${validation.reason}`);
+			else {
+				console.error(`[next/image] ${validation.reason}`);
+				return null;
+			}
 		}
 		const sanitizedBlur = imgBlurDataURL ? sanitizeBlurDataURL(imgBlurDataURL) : void 0;
 		const showBlur = !blurComplete && placeholder === "blur" && sanitizedBlur;
@@ -603,10 +605,12 @@ function getImageProps(props) {
 	let blockedInProd = false;
 	if (isRemoteUrl(src)) {
 		const validation = validateRemoteUrl(src);
-		if (!validation.allowed) if (__isDev) console.warn(`[next/image] ${validation.reason}`);
-		else {
-			console.error(`[next/image] ${validation.reason}`);
-			blockedInProd = true;
+		if (!validation.allowed) {
+			if (__isDev) console.warn(`[next/image] ${validation.reason}`);
+			else {
+				console.error(`[next/image] ${validation.reason}`);
+				blockedInProd = true;
+			}
 		}
 	}
 	const imgQuality = typeof _quality === "string" ? Number(_quality) : _quality ?? 75;

package/dist/shims/internal/als-registry.d.ts

@@ -8,7 +8,7 @@ import { AsyncLocalStorage } from "node:async_hooks";
  * @param key - String key fed to `Symbol.for(...)`. By convention vinext
  *   shims use a dotted namespace such as `"vinext.cache.als"`.
  */
-declare function getOrCreateAls<T>(key: string): AsyncLocalStorage<T>;
+export declare function getOrCreateAls<T>(key: string): AsyncLocalStorage<T>;
 /**
  * Enrol an ALS that is *not* created through `getOrCreateAls` into the
  * scope-exit set. For stores that must stay module-local for identity reasons
@@ -19,7 +19,7 @@ declare function getOrCreateAls<T>(key: string): AsyncLocalStorage<T>;
  * keeps importing nothing but `node:async_hooks` and stays safe to evaluate in
  * client bundles where that resolves to a constructor-less stub.
  */
-declare function registerAlsForScopeExit(als: AsyncLocalStorage<never>): void;
+export declare function registerAlsForScopeExit(als: AsyncLocalStorage<never>): void;
 /**
  * Run `fn` — and every async continuation it starts — outside every
  * request-scoped AsyncLocalStorage vinext installs, so the callback observes no
@@ -38,6 +38,5 @@ declare function registerAlsForScopeExit(als: AsyncLocalStorage<never>): void;
  * the unified store is absent, so a partial exit would enable that path rather
  * than close it.
  */
-declare function runOutsideRequestScopes<T>(fn: () => T): T;
-//#endregion
-export { getOrCreateAls, registerAlsForScopeExit, runOutsideRequestScopes };
+export declare function runOutsideRequestScopes<T>(fn: () => T): T;
+//#endregion

package/dist/shims/internal/api-utils.d.ts

@@ -4,11 +4,10 @@
  *
  * Used by: @clerk/nextjs (type-only import of NextApiRequestCookies).
  */
-type NextApiRequestCookies = Partial<{
+export type NextApiRequestCookies = Partial<{
   [key: string]: string;
 }>;
-type NextApiRequestQuery = Partial<{
+export type NextApiRequestQuery = Partial<{
   [key: string]: string | string[];
 }>;
-//#endregion
-export { NextApiRequestCookies, NextApiRequestQuery };
+//#endregion

package/dist/shims/internal/app-page-props-cache-key.d.ts

@@ -1,5 +1,33 @@
 //#region src/shims/internal/app-page-props-cache-key.d.ts
-declare function markAppPagePropsForUseCache<T extends object>(props: T): T;
-declare function isMarkedAppPagePropsObject(value: object): boolean;
-//#endregion
-export { isMarkedAppPagePropsObject, markAppPagePropsForUseCache };
+/**
+ * Enumerable page marker, matching Next.js's `$$isPage` prop. It must be an
+ * ordinary string key: React's createElement drops symbol and non-enumerable
+ * props before a server component is invoked.
+ */
+export declare const APP_PAGE_USE_CACHE_MARKER = "$$isPage";
+export declare function markAppPagePropsForUseCache<T extends object>(props: T): T;
+export declare function isMarkedAppPagePropsObject(value: object): boolean;
+/**
+ * Whether `fn` is a transformed `"use cache"` function, including a bound
+ * one. Like Next.js's `isUseCacheFunction`, this survives `.bind()`: React's
+ * server-reference `bind` copies `$$typeof`/`$$id` to the bound function but
+ * not vinext's own marker symbol.
+ */
+export declare function isUseCacheFunctionReference(fn: unknown): boolean;
+/**
+ * Add Next.js's `$$isPage` marker when `fn` is a `"use cache"` function
+ * invoked as a page component or as a page's generateMetadata/generateViewport
+ * (create-component-tree.tsx, resolve-metadata.ts `createSegmentProps`). The
+ * cache wrapper reads and removes it, so page semantics follow the invocation
+ * even when the cached function is defined in (or re-exported from) another
+ * module, or bound.
+ */
+export declare function withUseCachePageMarker<T extends Record<string, unknown>>(fn: unknown, props: T): T;
+/**
+ * Whether `value` is page props carrying the `$$isPage` marker. Only plain
+ * objects qualify: the framework always passes a plain props object, and
+ * reading the marker through a thenable params/searchParams proxy would be
+ * observed as a param access.
+ */
+export declare function hasUseCachePageMarker(value: unknown): value is Record<string, unknown>;
+//#endregion