vinext 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/shims/headers.js

@@ -3,7 +3,7 @@ import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation }
 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 { serializeSetCookie, validateCookieAttributeValue, validateCookieName } from "./internal/cookie-serialize.js";
+import { serializeSetCookie, validateCookieName } from "./internal/cookie-serialize.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
 //#region src/shims/headers.ts
@@ -29,7 +29,6 @@ const _fallbackState = _g[_FALLBACK_KEY] ??= {
 	draftModeCookieHeader: null,
 	phase: "render"
 };
-const EXPIRED_COOKIE_DATE = (/* @__PURE__ */ new Date(0)).toUTCString();
 function splitMiddlewareSetCookieHeader(value) {
 	const cookies = [];
 	let start = 0;
@@ -114,6 +113,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 +168,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 +185,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 +268,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 +277,7 @@ function throwIfInsideCacheScope(apiName) {
 		try {
 			const ctx = getRequestContext();
 			if (ctx) ctx.invalidDynamicUsageError = error;
+			propagateInvalidDynamicUsageError(_getState(), error);
 		} catch {}
 		throw error;
 	}
@@ -251,6 +319,7 @@ function peekDynamicUsage() {
 }
 function _setStatePhase(state, phase) {
 	const previous = state.phase;
+	if (previous === "action" && phase === "render") state.headersContext?.mutableCookies?.[SYNCHRONIZE_REQUEST_COOKIES]();
 	state.phase = phase;
 	return previous;
 }
@@ -465,7 +534,7 @@ function _sealCookies(cookies) {
 	} });
 }
 function _getMutableCookies(ctx) {
-	if (!ctx.mutableCookies) ctx.mutableCookies = _wrapMutableCookies(new RequestCookies(ctx.cookies));
+	if (!ctx.mutableCookies) ctx.mutableCookies = _wrapMutableCookies(new RequestCookies(ctx.cookies, true));
 	return ctx.mutableCookies;
 }
 function _getReadonlyCookies(ctx) {
@@ -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().
@@ -581,7 +653,6 @@ function getAndClearPendingCookies() {
 	return cookies;
 }
 const DRAFT_MODE_COOKIE = "__prerender_bypass";
-const DRAFT_MODE_EXPIRED_DATE = (/* @__PURE__ */ new Date(0)).toUTCString();
 /**
 * Get any Set-Cookie header generated by draftMode().enable()/disable().
 * Called by the framework after rendering to attach the header to the response.
@@ -613,21 +684,25 @@ 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);
 }
-function draftModeCookieAttributes() {
-	if (typeof process !== "undefined" && process.env?.NODE_ENV === "development") return "Path=/; HttpOnly; SameSite=Lax";
-	return "Path=/; HttpOnly; SameSite=None; Secure";
+/**
+* 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 createDraftModeScopeError(expression) {
 	return /* @__PURE__ */ new Error(`${expression} can only be called from a Server Component, Route Handler, or Server Action.`);
@@ -666,26 +741,38 @@ async function draftMode() {
 			throwIfInsideCacheScope("draftMode().enable()");
 			const activeContext = requireActiveDraftModeContext(state, context, "draftMode().enable()");
 			markDynamicUsage();
+			const cookie = createDraftModeCookie(secret);
+			const serialized = serializeMutableCookie(cookie);
+			_getMutableCookies(activeContext)[APPLY_RESPONSE_COOKIE](cookie);
 			activeContext.draftModeEnabled = true;
-			activeContext.cookies.set(DRAFT_MODE_COOKIE, secret);
-			state.draftModeCookieHeader = `${DRAFT_MODE_COOKIE}=${secret}; ${draftModeCookieAttributes()}`;
+			state.draftModeCookieHeader = serialized;
 		},
 		disable() {
 			throwIfInsideCacheScope("draftMode().disable()");
 			const activeContext = requireActiveDraftModeContext(state, context, "draftMode().disable()");
 			markDynamicUsage();
+			const cookie = createDraftModeCookie("", /* @__PURE__ */ new Date(0));
+			const serialized = serializeMutableCookie(cookie);
+			_getMutableCookies(activeContext)[APPLY_RESPONSE_COOKIE](cookie);
 			activeContext.draftModeEnabled = false;
-			activeContext.cookies.delete(DRAFT_MODE_COOKIE);
-			state.draftModeCookieHeader = `${DRAFT_MODE_COOKIE}=; ${draftModeCookieAttributes()}; Expires=${DRAFT_MODE_EXPIRED_DATE}`;
+			state.draftModeCookieHeader = serialized;
 		}
 	};
 }
+const APPLY_RESPONSE_COOKIE = Symbol("vinext.apply-response-cookie");
+const SYNCHRONIZE_REQUEST_COOKIES = Symbol("vinext.synchronize-request-cookies");
 var RequestCookies = class {
 	_cookies;
-	constructor(cookies) {
+	_responseCookies;
+	constructor(cookies, mutable = false) {
 		this._cookies = cookies;
+		this._responseCookies = mutable ? new Map(Array.from(cookies, ([name, value]) => [name, normalizeMutableCookie({
+			name,
+			value
+		})])) : null;
 	}
 	get(name) {
+		if (this._responseCookies) return this._responseCookies.get(name);
 		const value = this._cookies.get(name);
 		if (value === void 0) return void 0;
 		return {
@@ -695,6 +782,10 @@ var RequestCookies = class {
 	}
 	getAll(nameOrOptions) {
 		const name = typeof nameOrOptions === "string" ? nameOrOptions : nameOrOptions?.name;
+		if (this._responseCookies) {
+			const responseCookies = [...this._responseCookies.values()];
+			return name === void 0 ? responseCookies : responseCookies.filter((cookie) => cookie.name === name);
+		}
 		const result = [];
 		for (const [cookieName, value] of this._cookies) if (name === void 0 || cookieName === name) result.push({
 			name: cookieName,
@@ -703,12 +794,8 @@ var RequestCookies = class {
 		return result;
 	}
 	has(name) {
-		return this._cookies.has(name);
+		return this._responseCookies?.has(name) ?? 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;
@@ -723,59 +810,81 @@ var RequestCookies = class {
 			opts = nameOrOptions;
 		}
 		validateCookieName(cookieName);
-		this._cookies.set(cookieName, cookieValue);
-		_getState().pendingSetCookies.push(serializeSetCookie(cookieName, cookieValue, opts));
+		const responseCookie = normalizeMutableCookie({
+			name: cookieName,
+			value: cookieValue,
+			...opts
+		});
+		const serialized = serializeMutableCookie(responseCookie);
+		this[APPLY_RESPONSE_COOKIE](responseCookie);
+		_getState().pendingSetCookies.push(serialized);
 		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 ?? "/";
-		const domain = typeof nameOrOptions === "string" ? void 0 : nameOrOptions.domain;
 		validateCookieName(name);
-		validateCookieAttributeValue(path, "Path");
-		if (domain) validateCookieAttributeValue(domain, "Domain");
-		this._cookies.delete(name);
-		const parts = [`${name}=`, `Path=${path}`];
-		if (domain) parts.push(`Domain=${domain}`);
-		parts.push(`Expires=${EXPIRED_COOKIE_DATE}`);
-		_getState().pendingSetCookies.push(parts.join("; "));
+		const responseCookie = normalizeMutableCookie({
+			...typeof nameOrOptions === "string" ? void 0 : nameOrOptions,
+			name,
+			value: "",
+			expires: /* @__PURE__ */ new Date(0)
+		});
+		const serialized = serializeMutableCookie(responseCookie);
+		this[APPLY_RESPONSE_COOKIE](responseCookie);
+		_getState().pendingSetCookies.push(serialized);
 		return this;
 	}
 	get size() {
-		return this._cookies.size;
+		return this._responseCookies?.size ?? 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(this.getAll().map((cookie) => [cookie.name, cookie])).entries();
 	}
 	toString() {
+		if (this._responseCookies) return [...this._responseCookies.values()].map(serializeMutableCookie).join("; ");
 		const parts = [];
-		for (const [name, value] of this._cookies) parts.push(`${name}=${value}`);
+		for (const [name, value] of this._cookies) parts.push(`${name}=${encodeURIComponent(value)}`);
 		return parts.join("; ");
 	}
+	_ensureResponseCookies() {
+		if (!this._responseCookies) this._responseCookies = new Map(Array.from(this._cookies, ([name, value]) => [name, normalizeMutableCookie({
+			name,
+			value
+		})]));
+		return this._responseCookies;
+	}
+	[APPLY_RESPONSE_COOKIE](cookie) {
+		this._ensureResponseCookies().set(cookie.name, cookie);
+	}
+	[SYNCHRONIZE_REQUEST_COOKIES]() {
+		this._cookies.clear();
+		for (const cookie of this._ensureResponseCookies().values()) this._cookies.set(cookie.name, cookie.value);
+	}
 };
+function createDraftModeCookie(value, expires) {
+	const isDevelopment = typeof process !== "undefined" && process.env?.NODE_ENV === "development";
+	return normalizeMutableCookie({
+		name: DRAFT_MODE_COOKIE,
+		value,
+		...expires === void 0 ? {} : { expires },
+		httpOnly: true,
+		sameSite: isDevelopment ? "lax" : "none",
+		secure: !isDevelopment,
+		path: "/"
+	});
+}
+function normalizeMutableCookie(cookie) {
+	const normalized = { ...cookie };
+	if (typeof normalized.expires === "number") normalized.expires = new Date(normalized.expires);
+	if (normalized.maxAge) normalized.expires = new Date(Date.now() + normalized.maxAge * 1e3);
+	if (normalized.path == null) normalized.path = "/";
+	return normalized;
+}
+function serializeMutableCookie(cookie) {
+	return serializeSetCookie(cookie.name, cookie.value, {
+		...cookie,
+		expires: typeof cookie.expires === "number" ? new Date(cookie.expires) : cookie.expires
+	});
+}
 //#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

@@ -1,11 +1,11 @@
 //#region src/shims/internal/cookie-serialize.d.ts
 /**
- * Shared Set-Cookie serialization for the next/headers and next/server shims.
+ * Set-Cookie serialization for the mutable next/headers shim.
  *
- * Two call sites — `cookies().set()` in headers.ts and `ResponseCookies.set()`
- * in server.ts — produce identical Set-Cookie header strings. Keep the
- * encoding, attribute order, and validation in one place so subtle RFC 6265
- * details (escaping, attribute ordering, etc.) cannot drift between them.
+ * `ResponseCookies` in server.ts deliberately uses the exact
+ * @edge-runtime/cookies serialization order and casing instead. It also has to
+ * preserve the absence of a default path when parsing an existing Set-Cookie
+ * header, while this helper always defaults new mutable cookies to `Path=/`.
  *
  * Note: this is a value-encoding helper for response cookies only. The
  * request `Cookie:` header serialization in `RequestCookies._serialize`
@@ -20,7 +20,9 @@ type SerializeSetCookieOptions = {
   expires?: Date;
   httpOnly?: boolean;
   secure?: boolean;
-  sameSite?: "Strict" | "Lax" | "None";
+  sameSite?: true | false | "strict" | "lax" | "none" | "Strict" | "Lax" | "None";
+  partitioned?: boolean;
+  priority?: "low" | "medium" | "high";
 };
 declare function validateCookieName(name: string): void;
 /**
@@ -34,12 +36,13 @@ declare function validateCookieAttributeValue(value: string, attributeName: stri
  * - Encodes the value with `encodeURIComponent`.
  * - 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.
+ * - Emits attributes in the same order and casing as Next.js's compiled
+ *   `@edge-runtime/cookies` serializer: Path, Expires, Max-Age, Domain,
+ *   Secure, HttpOnly, SameSite, Partitioned, Priority.
  *
  * The caller is responsible for validating the cookie name (typically before
  * mutating any internal state) via `validateCookieName`.
  */
-declare function serializeSetCookie(name: string, value: string, options?: SerializeSetCookieOptions): string;
+declare function serializeSetCookie(name: string, value: string | null | undefined, options?: SerializeSetCookieOptions): string;
 //#endregion
 export { serializeSetCookie, validateCookieAttributeValue, validateCookieName };