vinext 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/shims/headers.js

@@ -114,6 +114,52 @@ 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
+* metadata) keeps writing to the parent state and therefore remains visible
+* to the final cache policy.
+*/
+async function runWithIsolatedDynamicUsage(fn) {
+	const runInChildState = async (childState) => {
+		return {
+			result: await fn(),
+			dynamicDetected: childState.dynamicUsageDetected
+		};
+	};
+	if (isInsideUnifiedScope()) {
+		let childState = null;
+		return await runWithUnifiedStateMutation((context) => {
+			context.dynamicUsageDetected = false;
+			childState = context;
+		}, () => {
+			if (!childState) throw new Error("Dynamic usage scope was not initialized");
+			return runInChildState(childState);
+		});
+	}
+	const childState = {
+		..._getState(),
+		dynamicUsageDetected: false
+	};
+	return await _als.run(childState, () => runInChildState(childState));
 }
 function markRenderRequestApiUsage(kind) {
 	_getState().renderRequestApiUsage.add(kind);
@@ -123,13 +169,15 @@ function throwIfStaticGenerationAccessError() {
 	if (accessError) throw accessError;
 }
 async function runWithConnectionProbe(fn) {
-	const state = _getState();
-	const previousProbe = state.connectionProbe;
+	const parentState = _getState();
+	const parentInvalidDynamicUsageError = parentState.invalidDynamicUsageError;
 	let interruptProbe = () => {};
 	const interrupted = new Promise((resolve) => {
 		interruptProbe = () => resolve({ completed: false });
 	});
 	const probe = {
+		active: true,
+		dynamicUsageTarget: parentState,
 		interrupted: false,
 		interrupt() {
 			if (probe.interrupted) return;
@@ -138,20 +186,39 @@ async function runWithConnectionProbe(fn) {
 		},
 		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;
+	const runInChildState = async (childState) => {
+		try {
+			const completed = Promise.resolve().then(fn).then((result) => ({
+				completed: true,
+				result
+			}));
+			return await Promise.race([completed, interrupted]);
+		} finally {
+			probe.active = false;
+			childState.connectionProbe = parentState.connectionProbe ?? probe;
+			if (childState.dynamicUsageDetected) parentState.dynamicUsageDetected = true;
+			if (childState.invalidDynamicUsageError !== parentInvalidDynamicUsageError && parentState.invalidDynamicUsageError === parentInvalidDynamicUsageError) parentState.invalidDynamicUsageError = childState.invalidDynamicUsageError;
+		}
+	};
+	if (isInsideUnifiedScope()) {
+		let childState = null;
+		return await runWithUnifiedStateMutation((context) => {
+			context.connectionProbe = probe;
+			childState = context;
+		}, () => {
+			if (!childState) throw new Error("Connection probe scope was not initialized");
+			return runInChildState(childState);
+		});
 	}
+	const childState = {
+		...parentState,
+		connectionProbe: probe
+	};
+	return await _als.run(childState, () => runInChildState(childState));
 }
 function suspendConnectionProbe() {
 	const probe = _getState().connectionProbe;
-	if (!probe) return null;
+	if (!probe?.active) return null;
 	probe.interrupt();
 	return probe.pending;
 }
@@ -202,6 +269,7 @@ function throwIfInsideCacheScope(apiName) {
 			if (cacheCtx) cacheCtx.invalidDynamicUsageError = error;
 			const ctx = getRequestContext();
 			if (ctx) ctx.invalidDynamicUsageError = error;
+			propagateInvalidDynamicUsageError(_getState(), error);
 		} catch {}
 		throw error;
 	}
@@ -210,6 +278,7 @@ function throwIfInsideCacheScope(apiName) {
 		try {
 			const ctx = getRequestContext();
 			if (ctx) ctx.invalidDynamicUsageError = error;
+			propagateInvalidDynamicUsageError(_getState(), error);
 		} catch {}
 		throw error;
 	}
@@ -553,7 +622,7 @@ function headers() {
 * Cookie jar from the incoming request.
 * Returns a ReadonlyRequestCookies-like object.
 */
-function cookies() {
+function cookiesImpl() {
 	markRenderRequestApiUsage("cookies");
 	try {
 		throwIfInsideCacheScope("cookies()");
@@ -569,6 +638,9 @@ function cookies() {
 	const cookieStore = _areCookiesMutableInCurrentPhase() ? _getMutableCookies(state.headersContext) : _getReadonlyCookies(state.headersContext);
 	return _getOrCreateDecoratedRequestApiPromise(_decoratedCookiesPromises, cookieStore);
 }
+function cookies() {
+	return cookiesImpl();
+}
 /** Accumulated Set-Cookie headers from cookies().set() / .delete() calls */
 /**
 * Get and clear all pending Set-Cookie headers generated by cookies().set()/delete().
@@ -613,18 +685,26 @@ function isDraftModeRequest(request, draftModeSecret) {
 	return parseEdgeRequestCookieHeader(cookieHeader).get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(draftModeSecret);
 }
 /**
-* Read the active request's draft-mode state without recording request API usage.
-* Internal cache implementations use this to bypass persistent reads and writes,
-* matching Next.js's request-level `workStore.isDraftMode` guard.
+* Read draft mode from the live request context without recording request API
+* usage. `null` means there is no active request context, which lets framework
+* callers fall back to an explicitly supplied request when needed.
 */
-function isDraftModeEnabled() {
+function getActiveDraftModeState() {
 	const context = _getState().headersContext;
-	if (!context) return false;
+	if (!context) return null;
 	if (context.draftModeEnabled !== void 0) return context.draftModeEnabled;
 	const secret = context.draftModeSecret;
 	if (secret === void 0) return false;
 	return context.cookies.get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(secret);
 }
+/**
+* Read the active request's draft-mode state without recording request API usage.
+* Internal cache implementations use this to bypass persistent reads and writes,
+* matching Next.js's request-level `workStore.isDraftMode` guard.
+*/
+function isDraftModeEnabled() {
+	return getActiveDraftModeState() ?? false;
+}
 function draftModeCookieAttributes() {
 	if (typeof process !== "undefined" && process.env?.NODE_ENV === "development") return "Path=/; HttpOnly; SameSite=Lax";
 	return "Path=/; HttpOnly; SameSite=None; Secure";
@@ -705,10 +785,6 @@ var RequestCookies = class {
 	has(name) {
 		return this._cookies.has(name);
 	}
-	/**
-	* Set a cookie. In Route Handlers and Server Actions, this produces
-	* a Set-Cookie header on the response.
-	*/
 	set(nameOrOptions, value, options) {
 		let cookieName;
 		let cookieValue;
@@ -724,12 +800,14 @@ var RequestCookies = class {
 		}
 		validateCookieName(cookieName);
 		this._cookies.set(cookieName, cookieValue);
-		_getState().pendingSetCookies.push(serializeSetCookie(cookieName, cookieValue, opts));
+		const sameSite = opts?.sameSite === true ? "Strict" : typeof opts?.sameSite === "string" ? opts.sameSite[0].toUpperCase() + opts.sameSite.slice(1) : void 0;
+		_getState().pendingSetCookies.push(serializeSetCookie(cookieName, cookieValue, {
+			...opts,
+			expires: typeof opts?.expires === "number" ? new Date(opts.expires) : opts?.expires,
+			sameSite
+		}));
 		return this;
 	}
-	/**
-	* Delete a cookie by emitting an expired Set-Cookie header.
-	*/
 	delete(nameOrOptions) {
 		const name = typeof nameOrOptions === "string" ? nameOrOptions : nameOrOptions.name;
 		const path = typeof nameOrOptions === "string" ? "/" : nameOrOptions.path ?? "/";
@@ -748,28 +826,10 @@ var RequestCookies = class {
 		return this._cookies.size;
 	}
 	[Symbol.iterator]() {
-		const entries = this._cookies.entries();
-		const iter = {
-			[Symbol.iterator]() {
-				return iter;
-			},
-			next() {
-				const { value, done } = entries.next();
-				if (done) return {
-					value: void 0,
-					done: true
-				};
-				const [name, val] = value;
-				return {
-					value: [name, {
-						name,
-						value: val
-					}],
-					done: false
-				};
-			}
-		};
-		return iter;
+		return new Map(Array.from(this._cookies, ([name, value]) => [name, {
+			name,
+			value
+		}])).entries();
 	}
 	toString() {
 		const parts = [];
@@ -778,4 +838,4 @@ var RequestCookies = class {
 	}
 };
 //#endregion
-export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/image.d.ts

@@ -1,40 +1,9 @@
 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 StaticImageData = {
-  src: string;
-  height: number;
-  width: number;
-  blurDataURL?: string;
-};
-type ImageProps = {
-  src: string | StaticImageData;
-  alt: string;
-  width?: number;
-  height?: number;
-  fill?: boolean;
-  preload?: boolean;
-  priority?: boolean;
-  quality?: number;
-  placeholder?: "blur" | "empty";
-  blurDataURL?: string;
-  loader?: (params: {
-    src: string;
-    width: number;
-    quality?: number;
-  }) => string;
-  sizes?: string;
-  className?: string;
-  style?: React.CSSProperties;
-  onLoad?: React.ReactEventHandler<HTMLImageElement>; /** @deprecated Use onLoad instead. Still supported for migration compat. */
-  onLoadingComplete?: (img: HTMLImageElement) => void;
-  onError?: React.ReactEventHandler<HTMLImageElement>;
-  onClick?: React.MouseEventHandler<HTMLImageElement>;
-  id?: string;
-  unoptimized?: boolean;
-  overrideSrc?: string;
-  loading?: "lazy" | "eager";
-};
+type ImageLoaderProps = Parameters<ImageLoader>[0];
+type ImageProps = ImageProps$1;
 /**
  * Build a `/_next/image` optimization URL.
  *
@@ -43,13 +12,34 @@ type ImageProps = {
  * server handles it as a passthrough (serves the original file).
  */
 declare function imageOptimizationUrl(src: string, width: number, quality?: number): string;
-declare const Image: React.ForwardRefExoticComponent<ImageProps & React.RefAttributes<HTMLImageElement>>;
+declare const Image: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, "alt" | "height" | "loading" | "ref" | "src" | "srcSet" | "width"> & {
+  src: string | StaticImport;
+  alt: string;
+  width?: number | `${number}`;
+  height?: number | `${number}`;
+  fill?: boolean;
+  loader?: ImageLoader;
+  quality?: number | `${number}`;
+  preload?: boolean;
+  priority?: boolean;
+  loading?: "eager" | "lazy" | undefined;
+  placeholder?: import("@vinext/types/next/upstream/dist/shared/lib/get-img-props").PlaceholderValue;
+  blurDataURL?: string;
+  unoptimized?: boolean;
+  overrideSrc?: string;
+  onLoadingComplete?: import("@vinext/types/next/upstream/dist/shared/lib/get-img-props").OnLoadingComplete;
+  layout?: string;
+  objectFit?: string;
+  objectPosition?: string;
+  lazyBoundary?: string;
+  lazyRoot?: string;
+} & React.RefAttributes<HTMLImageElement>>;
 /**
  * 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): {
-  props: React.ImgHTMLAttributes<HTMLImageElement>;
+  props: ImgProps;
 };
 //#endregion
-export { StaticImageData, Image as default, getImageProps, imageOptimizationUrl };
+export { type ImageLoader, ImageLoaderProps, ImageProps, type StaticImageData, type StaticRequire, Image as default, getImageProps, imageOptimizationUrl };

package/dist/shims/image.js

@@ -216,11 +216,15 @@ function getFillStyle(style, backgroundStyle) {
 * Shared by the Image component and getImageProps to keep behavior in sync.
 */
 function resolveImageSource(v) {
+	const staticData = typeof v.src === "object" && "default" in v.src ? v.src.default : v.src;
+	const src = typeof staticData === "string" ? staticData : staticData.src;
+	const sourceWidth = v.width ?? (typeof staticData === "object" ? staticData.width : void 0);
+	const sourceHeight = v.height ?? (typeof staticData === "object" ? staticData.height : void 0);
 	return {
-		src: typeof v.src === "string" ? v.src : v.src.src,
-		width: v.width ?? (typeof v.src === "object" ? v.src.width : void 0),
-		height: v.height ?? (typeof v.src === "object" ? v.src.height : void 0),
-		blurDataURL: v.blurDataURL ?? (typeof v.src === "object" ? v.src.blurDataURL : void 0)
+		src,
+		width: typeof sourceWidth === "string" ? Number(sourceWidth) : sourceWidth,
+		height: typeof sourceHeight === "string" ? Number(sourceHeight) : sourceHeight,
+		blurDataURL: v.blurDataURL ?? (typeof staticData === "object" ? staticData.blurDataURL : void 0)
 	};
 }
 /**
@@ -420,10 +424,11 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 		});
 	}
 	if (loader) {
+		const resolvedQuality = typeof quality === "string" ? Number(quality) : quality ?? 75;
 		const resolvedSrc = loader({
 			src,
 			width: imgWidth ?? 0,
-			quality: quality ?? 75
+			quality: resolvedQuality
 		});
 		preloadImageResource({
 			shouldPreload,
@@ -513,7 +518,7 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 			});
 		}
 	}
-	const imgQuality = quality ?? 75;
+	const imgQuality = typeof quality === "string" ? Number(quality) : quality ?? 75;
 	const skipOptimization = isSvgUrl(src) && !__dangerouslyAllowSVG;
 	const optimizedAttributes = imgWidth && !fill && !skipOptimization ? generateImageAttributes(src, imgWidth, imgQuality, sizes) : void 0;
 	const srcSet = optimizedAttributes ? optimizedAttributes.srcSet : imgWidth && !fill ? RESPONSIVE_WIDTHS.filter((w) => w <= imgWidth * 2).map((w) => `${src} ${w}w`).join(", ") || `${src} ${imgWidth}w` : void 0;
@@ -577,7 +582,7 @@ function getImageProps(props) {
 			backgroundRepeat: "no-repeat",
 			backgroundPosition: "center"
 		} : void 0;
-		return { props: {
+		const imageProps = {
 			src: renderedSrc,
 			alt,
 			width: fill ? void 0 : imgWidth,
@@ -586,13 +591,15 @@ function getImageProps(props) {
 			fetchPriority: priority ? "high" : void 0,
 			decoding: "async",
 			className,
-			"data-nimg": fill ? "fill" : "1",
 			style: fill ? getFillStyle(style, blurStyle) : {
 				...blurStyle,
 				...style
 			},
-			...rest
-		} };
+			...rest,
+			sizes: sizes ?? (fill ? "100vw" : void 0),
+			srcSet: void 0
+		};
+		return { props: Object.assign(imageProps, { "data-nimg": fill ? "fill" : "1" }) };
 	}
 	let blockedInProd = false;
 	if (isRemoteUrl(src)) {
@@ -603,7 +610,7 @@ function getImageProps(props) {
 			blockedInProd = true;
 		}
 	}
-	const imgQuality = _quality ?? 75;
+	const imgQuality = typeof _quality === "string" ? Number(_quality) : _quality ?? 75;
 	const resolvedSrc = blockedInProd ? "" : loader ? loader({
 		src,
 		width: imgWidth ?? 0,
@@ -620,7 +627,7 @@ function getImageProps(props) {
 		backgroundRepeat: "no-repeat",
 		backgroundPosition: "center"
 	} : void 0;
-	return { props: {
+	const imageProps = {
 		src: optimizedSrc,
 		alt,
 		width: fill ? void 0 : imgWidth,
@@ -631,13 +638,13 @@ function getImageProps(props) {
 		srcSet,
 		sizes: sizes ?? (fill ? "100vw" : void 0),
 		className,
-		"data-nimg": fill ? "fill" : "1",
 		style: fill ? getFillStyle(style, blurStyle) : {
 			...blurStyle,
 			...style
 		},
 		...rest
-	} };
+	};
+	return { props: Object.assign(imageProps, { "data-nimg": fill ? "fill" : "1" }) };
 }
 //#endregion
 export { Image as default, getImageProps, imageOptimizationUrl };

package/dist/shims/internal/cookie-serialize.d.ts

@@ -21,6 +21,8 @@ type SerializeSetCookieOptions = {
   httpOnly?: boolean;
   secure?: boolean;
   sameSite?: "Strict" | "Lax" | "None";
+  partitioned?: boolean;
+  priority?: "low" | "medium" | "high";
 };
 declare function validateCookieName(name: string): void;
 /**
@@ -35,7 +37,7 @@ declare function validateCookieAttributeValue(value: string, attributeName: stri
  * - Defaults `Path` to `/` (matching @edge-runtime/cookies and Next.js).
  * - Validates path/domain to reject control characters and semicolons.
  * - Emits attributes in the order: Path, Domain, Max-Age, Expires, HttpOnly,
- *   Secure, SameSite.
+ *   Secure, SameSite, Partitioned, Priority.
  *
  * The caller is responsible for validating the cookie name (typically before
  * mutating any internal state) via `validateCookieName`.

package/dist/shims/internal/cookie-serialize.js

@@ -24,7 +24,7 @@ function validateCookieAttributeValue(value, attributeName) {
 * - Defaults `Path` to `/` (matching @edge-runtime/cookies and Next.js).
 * - Validates path/domain to reject control characters and semicolons.
 * - Emits attributes in the order: Path, Domain, Max-Age, Expires, HttpOnly,
-*   Secure, SameSite.
+*   Secure, SameSite, Partitioned, Priority.
 *
 * The caller is responsible for validating the cookie name (typically before
 * mutating any internal state) via `validateCookieName`.
@@ -43,6 +43,8 @@ function serializeSetCookie(name, value, options) {
 	if (options?.httpOnly) parts.push("HttpOnly");
 	if (options?.secure) parts.push("Secure");
 	if (options?.sameSite) parts.push(`SameSite=${options.sameSite}`);
+	if (options?.partitioned) parts.push("Partitioned");
+	if (options?.priority) parts.push(`Priority=${options.priority[0].toUpperCase()}${options.priority.slice(1)}`);
 	return parts.join("; ");
 }
 //#endregion

package/dist/shims/internal/hybrid-client-route-owner.js

@@ -1,4 +1,6 @@
-import { isExternalUrl, matchRewrite, parseCookies } from "../../config/config-matchers.js";
+import { parseCookies } from "../../config/request-context.js";
+import { isExternalUrl } from "../../utils/external-url.js";
+import { matchRewrite } from "../../config/config-matchers.js";
 import { matchDirectHybridClientRoutes, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname } from "./hybrid-client-route-owner-direct.js";
 import { mergeRewriteQuery } from "../../utils/query.js";
 //#region src/shims/internal/hybrid-client-route-owner.ts

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

@@ -30,11 +30,11 @@ type NEXT_DATA = {
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
-  domainLocales?: Array<{
+  domainLocales?: ReadonlyArray<{
     domain: string;
     defaultLocale: string;
-    locales?: string[];
-    http?: boolean;
+    locales?: readonly string[];
+    http?: true;
   }>;
   scriptLoader?: unknown[];
   isPreview?: boolean;

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

@@ -1,41 +1,7 @@
 import React from "react";
+import { ImageLoader, ImageLoaderProps, ImageProps } from "@vinext/types/next/upstream/dist/client/legacy/image";
 
 //#region src/shims/legacy-image.d.ts
-type LegacyImageProps = {
-  src: string | {
-    src: string;
-    width: number;
-    height: number;
-    blurDataURL?: string;
-  };
-  alt: string;
-  width?: number | string;
-  height?: number | string; /** Legacy layout mode */
-  layout?: "fixed" | "intrinsic" | "responsive" | "fill"; /** CSS object-fit (used with layout="fill") */
-  objectFit?: React.CSSProperties["objectFit"]; /** CSS object-position (used with layout="fill") */
-  objectPosition?: string;
-  priority?: boolean;
-  quality?: number;
-  placeholder?: "blur" | "empty";
-  blurDataURL?: string;
-  loader?: (params: {
-    src: string;
-    width: number;
-    quality?: number;
-  }) => string;
-  sizes?: string;
-  className?: string;
-  style?: React.CSSProperties;
-  onLoad?: React.ReactEventHandler<HTMLImageElement>;
-  onLoadingComplete?: (result: {
-    naturalWidth: number;
-    naturalHeight: number;
-  }) => void;
-  onError?: React.ReactEventHandler<HTMLImageElement>;
-  loading?: "lazy" | "eager";
-  unoptimized?: boolean;
-  id?: string;
-};
-declare const LegacyImage: React.ForwardRefExoticComponent<LegacyImageProps & React.RefAttributes<HTMLImageElement>>;
+declare function LegacyImage(props: ImageProps): React.ReactElement;
 //#endregion
-export { LegacyImage as default };
+export { type ImageLoader, type ImageLoaderProps, type ImageProps, LegacyImage as default };

package/dist/shims/legacy-image.js

@@ -1,19 +1,9 @@
 import Image from "./image.js";
-import { forwardRef } from "react";
+import "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/shims/legacy-image.tsx
-/**
-* next/legacy/image shim
-*
-* Provides the pre-Next.js 13 Image component API with layout prop.
-* Translates legacy props (layout, objectFit, objectPosition) to the
-* modern Image component's fill/style props.
-*
-* This module is used by apps that ran the `next-image-to-legacy-image`
-* codemod when upgrading from Next.js 12.
-*/
-const LegacyImage = forwardRef(function LegacyImage(props, ref) {
-	const { layout = "intrinsic", objectFit, objectPosition, onLoadingComplete, onLoad, width, height, style, ...rest } = props;
+function LegacyImage(props) {
+	const { layout = "intrinsic", objectFit, objectPosition, onLoadingComplete, onLoad, alt, width, height, style, lazyRoot: _lazyRoot, lazyBoundary: _lazyBoundary, ...rest } = props;
 	const modernStyle = { ...style };
 	if (objectFit) modernStyle.objectFit = objectFit;
 	if (objectPosition) modernStyle.objectPosition = objectPosition;
@@ -26,7 +16,7 @@ const LegacyImage = forwardRef(function LegacyImage(props, ref) {
 		onLoad?.(e);
 	} : onLoad;
 	if (layout === "fill") return /* @__PURE__ */ jsx(Image, {
-		ref,
+		alt: alt ?? "",
 		fill: true,
 		style: modernStyle,
 		onLoad: handleLoad,
@@ -37,13 +27,13 @@ const LegacyImage = forwardRef(function LegacyImage(props, ref) {
 		modernStyle.height = "auto";
 	}
 	return /* @__PURE__ */ jsx(Image, {
-		ref,
+		alt: alt ?? "",
 		width: typeof width === "string" ? parseInt(width, 10) : width,
 		height: typeof height === "string" ? parseInt(height, 10) : height,
 		style: modernStyle,
 		onLoad: handleLoad,
 		...rest
 	});
-});
+}
 //#endregion
 export { LegacyImage as default };

package/dist/shims/link.d.ts

@@ -1,20 +1,11 @@
 import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
-import { UrlQuery } from "../utils/query.js";
+import { UrlObject } from "node:url";
 import React, { AnchorHTMLAttributes } from "react";
 
 //#region src/shims/link.d.ts
-type NavigateEvent = {
-  url: URL; /** Call to prevent the Link's default navigation (e.g. for View Transitions). */
-  preventDefault(): void; /** Whether preventDefault() has been called. */
-  defaultPrevented: boolean;
-};
-type LinkProps = {
-  href: string | {
-    pathname?: string;
-    query?: UrlQuery;
-    hash?: string;
-  }; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
-  as?: string; /** Replace the current history entry instead of pushing */
+type LinkProps<_RouteInferType = unknown> = {
+  href: string | UrlObject; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
+  as?: string | UrlObject; /** Replace the current history entry instead of pushing */
   replace?: boolean; /** Prefetch the page in the background (App Router default: auto, Pages Router default: true) */
   prefetch?: boolean | "auto" | null;
   /**
@@ -40,7 +31,10 @@ type LinkProps = {
    */
   shallow?: boolean; /** Locale for i18n (used for locale-prefixed URLs) */
   locale?: string | false; /** Called before navigation happens (Next.js 16). Return value is ignored. */
-  onNavigate?: (event: NavigateEvent) => void;
+  onNavigate?: (event: {
+    preventDefault(): void;
+  }) => void;
+  transitionTypes?: string[];
   children?: React.ReactNode;
 } & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, "href">;
 type LinkPrefetchMode = "disabled" | "auto" | "full" | "full-after-shell";
@@ -66,12 +60,8 @@ declare function resolveAutoAppRoutePrefetch(href: string): {
   shouldPrefetch: boolean;
 };
 declare const Link: React.ForwardRefExoticComponent<{
-  href: string | {
-    pathname?: string;
-    query?: UrlQuery;
-    hash?: string;
-  }; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
-  as?: string; /** Replace the current history entry instead of pushing */
+  href: string | UrlObject; /** URL displayed in the browser (when href is a route pattern like /user/[id]) */
+  as?: string | UrlObject; /** Replace the current history entry instead of pushing */
   replace?: boolean; /** Prefetch the page in the background (App Router default: auto, Pages Router default: true) */
   prefetch?: boolean | "auto" | null;
   /**
@@ -97,8 +87,11 @@ declare const Link: React.ForwardRefExoticComponent<{
    */
   shallow?: boolean; /** Locale for i18n (used for locale-prefixed URLs) */
   locale?: string | false; /** Called before navigation happens (Next.js 16). Return value is ignored. */
-  onNavigate?: (event: NavigateEvent) => void;
+  onNavigate?: (event: {
+    preventDefault(): void;
+  }) => void;
+  transitionTypes?: string[];
   children?: React.ReactNode;
 } & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, "href"> & React.RefAttributes<HTMLAnchorElement>>;
 //#endregion
-export { canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };
+export { LinkProps, canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };