vinext 1.0.0-beta.2 → 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;
@@ -320,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;
 }
@@ -534,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) {
@@ -653,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.
@@ -705,10 +704,6 @@ function getActiveDraftModeState() {
 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";
-}
 function createDraftModeScopeError(expression) {
 	return /* @__PURE__ */ new Error(`${expression} can only be called from a Server Component, Route Handler, or Server Action.`);
 }
@@ -746,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 {
@@ -775,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,
@@ -783,7 +794,7 @@ var RequestCookies = class {
 		return result;
 	}
 	has(name) {
-		return this._cookies.has(name);
+		return this._responseCookies?.has(name) ?? this._cookies.has(name);
 	}
 	set(nameOrOptions, value, options) {
 		let cookieName;
@@ -799,43 +810,81 @@ var RequestCookies = class {
 			opts = nameOrOptions;
 		}
 		validateCookieName(cookieName);
-		this._cookies.set(cookieName, cookieValue);
-		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
-		}));
+		const responseCookie = normalizeMutableCookie({
+			name: cookieName,
+			value: cookieValue,
+			...opts
+		});
+		const serialized = serializeMutableCookie(responseCookie);
+		this[APPLY_RESPONSE_COOKIE](responseCookie);
+		_getState().pendingSetCookies.push(serialized);
 		return this;
 	}
 	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]() {
-		return new Map(Array.from(this._cookies, ([name, value]) => [name, {
-			name,
-			value
-		}])).entries();
+		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, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

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,7 @@ 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";
 };
@@ -36,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, Partitioned, Priority.
+ * - 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 };

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

@@ -23,28 +23,29 @@ function validateCookieAttributeValue(value, attributeName) {
 * - 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, Partitioned, Priority.
+* - 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`.
 */
 function serializeSetCookie(name, value, options) {
-	const parts = [`${name}=${encodeURIComponent(value)}`];
+	const parts = [`${name}=${encodeURIComponent(value ?? "")}`];
 	const path = options?.path ?? "/";
 	validateCookieAttributeValue(path, "Path");
-	parts.push(`Path=${path}`);
+	if (path) parts.push(`Path=${path}`);
+	if (options?.expires) parts.push(`Expires=${options.expires.toUTCString()}`);
+	if (options?.maxAge !== void 0) parts.push(`Max-Age=${options.maxAge}`);
 	if (options?.domain) {
 		validateCookieAttributeValue(options.domain, "Domain");
 		parts.push(`Domain=${options.domain}`);
 	}
-	if (options?.maxAge !== void 0) parts.push(`Max-Age=${options.maxAge}`);
-	if (options?.expires) parts.push(`Expires=${options.expires.toUTCString()}`);
-	if (options?.httpOnly) parts.push("HttpOnly");
 	if (options?.secure) parts.push("Secure");
+	if (options?.httpOnly) parts.push("HttpOnly");
 	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)}`);
+	if (options?.priority) parts.push(`Priority=${options.priority}`);
 	return parts.join("; ");
 }
 //#endregion

package/dist/shims/internal/interpolate-as.d.ts

@@ -14,6 +14,10 @@ type DynamicRouteHrefProjection = {
   query: ParsedUrlQuery;
   routePathname: string;
 };
+type DynamicRouteHrefResolution = {
+  /** Route-pattern URL passed to the Pages Router. */href: string; /** Interpolated URL rendered in the anchor and displayed in the browser. */
+  as: string;
+};
 /**
  * Resolve a bracket-pattern route href against its displayed href. Query
  * values can be supplied directly (object-form hrefs) or parsed from the route
@@ -21,5 +25,15 @@ type DynamicRouteHrefProjection = {
  * query delimiter.
  */
 declare function interpolateDynamicRouteHref(routeHref: string, asHref: string, queryInput?: UrlQuery): DynamicRouteHrefProjection | null;
+/**
+ * Resolve the two URLs that Next.js' Pages Router derives from a dynamic
+ * href: the original route-pattern URL used to load the page and the
+ * interpolated browser URL. Dynamic params are consumed from the latter's
+ * query string while unrelated query values and the hash are retained.
+ *
+ * Mirrors `resolveHref(router, href, true)` from Next.js:
+ * packages/next/src/client/resolve-href.ts.
+ */
+declare function resolveDynamicRouteHref(routeHref: string): DynamicRouteHrefResolution | null;
 //#endregion
-export { DynamicRouteHrefProjection, interpolateDynamicRouteHref };
+export { DynamicRouteHrefProjection, DynamicRouteHrefResolution, interpolateDynamicRouteHref, resolveDynamicRouteHref };

package/dist/shims/internal/interpolate-as.js

@@ -176,11 +176,11 @@ function interpolateAs(route, asPathname, query) {
 * query delimiter.
 */
 function interpolateDynamicRouteHref(routeHref, asHref, queryInput) {
-	if (!routeHref.includes("[")) return null;
 	const hashIndex = routeHref.indexOf("#");
 	const queryIndex = routeHref.indexOf("?");
 	const pathEnd = [hashIndex, queryIndex].filter((index) => index !== -1).reduce((earliest, index) => Math.min(earliest, index), routeHref.length);
 	const routePathname = routeHref.slice(0, pathEnd);
+	if (!routePathname.includes("[")) return null;
 	const trailing = routeHref.slice(pathEnd);
 	const asPathname = asHref.split(/[?#]/, 1)[0];
 	const query = queryInput ? normalizeQuery(queryInput) : parseRouteHrefQuery(routeHref, queryIndex, hashIndex);
@@ -192,5 +192,30 @@ function interpolateDynamicRouteHref(routeHref, asHref, queryInput) {
 		routePathname
 	};
 }
+/**
+* Resolve the two URLs that Next.js' Pages Router derives from a dynamic
+* href: the original route-pattern URL used to load the page and the
+* interpolated browser URL. Dynamic params are consumed from the latter's
+* query string while unrelated query values and the hash are retained.
+*
+* Mirrors `resolveHref(router, href, true)` from Next.js:
+* packages/next/src/client/resolve-href.ts.
+*/
+function resolveDynamicRouteHref(routeHref) {
+	const projection = interpolateDynamicRouteHref(routeHref, routeHref);
+	if (!projection?.href) return null;
+	const hashIndex = projection.href.indexOf("#");
+	const hash = hashIndex === -1 ? "" : projection.href.slice(hashIndex);
+	const hrefWithoutHash = hashIndex === -1 ? projection.href : projection.href.slice(0, hashIndex);
+	const queryIndex = hrefWithoutHash.indexOf("?");
+	const pathname = queryIndex === -1 ? hrefWithoutHash : hrefWithoutHash.slice(0, queryIndex);
+	const searchParams = new URLSearchParams(queryIndex === -1 ? "" : hrefWithoutHash.slice(queryIndex + 1));
+	for (const param of projection.params) searchParams.delete(param);
+	const search = searchParams.toString();
+	return {
+		href: routeHref,
+		as: `${pathname}${search ? `?${search}` : ""}${hash}`
+	};
+}
 //#endregion
-export { interpolateDynamicRouteHref };
+export { interpolateDynamicRouteHref, resolveDynamicRouteHref };

package/dist/shims/link.js

@@ -2,12 +2,13 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { createRouteTrieCache, matchRouteWithTrie } from "../routing/route-matching.js";
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "./url-safety.js";
+import { RouterContext } from "./internal/router-context.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
 import { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
 import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
 import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
-import { interpolateDynamicRouteHref } from "./internal/interpolate-as.js";
+import { interpolateDynamicRouteHref, resolveDynamicRouteHref } from "./internal/interpolate-as.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
@@ -258,7 +259,6 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 				const isOptimisticRouteShellPrefetch = !autoPrefetch.cacheForNavigation;
 				const hasSearchParams = new URL(fullHref, window.location.href).search !== "";
 				const isAutomaticSearchParamShell = mode === "auto" && isOptimisticRouteShellPrefetch && hasSearchParams;
-				if (isOptimisticRouteShellPrefetch && interceptionContext !== null) return;
 				const hasSearchAgnosticShell = isAutomaticSearchParamShell && hasSearchAgnosticPrefetchShellForRoute(await createRscRequestUrl(fullHref, new Headers()), interceptionContext, mountedSlotsHeader);
 				const headers = createRscRequestHeaders({
 					interceptionContext,
@@ -581,17 +581,29 @@ function resolveConcreteRouteHref(href, as) {
 	return interpolateDynamicRouteHref(typeof href === "string" ? href : resolveHref(href), as, typeof href === "string" || !href.query || typeof href.query === "string" ? void 0 : href.query)?.href || null;
 }
 const Link = forwardRef(function Link({ href, as, replace = false, prefetch: prefetchProp, scroll = true, shallow = false, children: childrenProp, onClick, onMouseEnter, onTouchStart, onNavigate, unstable_dynamicOnHover = false, legacyBehavior = false, passHref = false, transitionTypes: _transitionTypes, ...rest }, forwardedRef) {
+	const pagesRouter = useContext(RouterContext);
 	const asHref = as === void 0 ? void 0 : resolveHref(as);
+	const hrefStr = resolveHref(href);
 	const { locale, ...restWithoutLocale } = rest;
 	let children = childrenProp;
 	if (legacyBehavior && (typeof childrenProp === "string" || typeof childrenProp === "number")) children = React.createElement("a", null, childrenProp);
-	const unresolvedHref = asHref ?? resolveHref(href);
+	const hrefForImplicitInterpolation = isAbsoluteOrProtocolRelativeUrl(hrefStr) ? hrefStr.startsWith("//") ? null : toSameOriginAppPath(hrefStr, __basePath) : hrefStr;
+	const implicitDynamicRouteHref = HAS_PAGES_ROUTER && pagesRouter !== null && asHref === void 0 && hrefForImplicitInterpolation !== null ? resolveDynamicRouteHref(hrefForImplicitInterpolation) : null;
+	const dynamicRouteHref = implicitDynamicRouteHref ? {
+		...implicitDynamicRouteHref,
+		href: hrefStr
+	} : null;
+	const pagesAsHref = asHref ?? dynamicRouteHref?.as;
+	const unresolvedHref = pagesAsHref ?? hrefStr;
 	const rawResolvedHref = typeof unresolvedHref === "string" && unresolvedHref.startsWith("#") ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
-	const routeHrefRaw = (HAS_PAGES_ROUTER ? resolveConcreteRouteHref(href, asHref) : null) ?? (typeof href === "string" ? href : resolveHref(href));
+	const concreteRouteHref = HAS_PAGES_ROUTER ? resolveConcreteRouteHref(dynamicRouteHref ? hrefForImplicitInterpolation ?? href : href, pagesAsHref) : null;
+	const routeHrefRaw = dynamicRouteHref?.href ?? concreteRouteHref ?? hrefStr;
+	const prefetchRouteHrefRaw = concreteRouteHref ?? routeHrefRaw;
+	const hasPagesHrefAsPair = HAS_PAGES_ROUTER && typeof pagesAsHref === "string" && typeof routeHrefRaw === "string" && pagesAsHref !== routeHrefRaw;
 	const resolvedHref = typeof rawResolvedHref === "string" ? warnAndNormalizeRepeatedSlashesInHref(rawResolvedHref) : rawResolvedHref;
 	const isDangerous = typeof resolvedHref === "string" && isDangerousScheme(resolvedHref);
 	const normalizedHref = normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : resolvedHref, locale), __trailingSlash);
-	const normalizedRouteHref = HAS_PAGES_ROUTER && typeof asHref === "string" && typeof routeHrefRaw === "string" && asHref !== routeHrefRaw ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : routeHrefRaw, locale), __trailingSlash) : normalizedHref;
+	const normalizedRouteHref = hasPagesHrefAsPair ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : prefetchRouteHrefRaw, locale), __trailingSlash) : normalizedHref;
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
@@ -713,7 +725,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		e.preventDefault();
 		const hasAppNavigationRuntime = Boolean(getNavigationRuntime()?.functions.navigate);
 		const pagesNavigateHref = HAS_PAGES_ROUTER && resolvedHref.startsWith("?") ? resolvePagesLinkNavigationHref(resolvedHref, locale) : navigateHref;
-		const pagesAsForLink = HAS_PAGES_ROUTER && typeof asHref === "string" && typeof routeHrefRaw === "string" && asHref !== routeHrefRaw ? pagesNavigateHref : void 0;
+		const pagesAsForLink = hasPagesHrefAsPair ? pagesNavigateHref : void 0;
 		const pagesHrefForLink = pagesAsForLink === void 0 ? pagesNavigateHref : routeHrefRaw;
 		const absoluteFullHref = toBrowserNavigationHref(hasAppNavigationRuntime ? navigateHref : pagesNavigateHref, window.location.href, __basePath);
 		if (onNavigate) try {

package/dist/shims/metadata.d.ts

@@ -1,31 +1,21 @@
 import { ThenableParamsObserver } from "./thenable-params.js";
 import React from "react";
+import { ResolvedViewport as ResolvedViewport$1, Viewport as Viewport$1 } from "@vinext/types/next/upstream/dist/lib/metadata/types/metadata-interface";
 
 //#region src/shims/metadata.d.ts
-type Viewport = {
-  /** Viewport width (default: "device-width") */width?: string | number; /** Viewport height */
-  height?: string | number; /** Initial scale */
-  initialScale?: number; /** Minimum scale */
-  minimumScale?: number; /** Maximum scale */
-  maximumScale?: number; /** Whether user can scale */
-  userScalable?: boolean; /** Theme color — single color or array of { media, color } */
-  themeColor?: string | Array<{
-    media?: string;
-    color: string;
-  }>; /** Color scheme: 'light' | 'dark' | 'light dark' | 'normal' */
-  colorScheme?: string;
-};
+type Viewport = Viewport$1;
+type ResolvedViewport = ResolvedViewport$1;
 /**
  * Resolve viewport config from a module. Handles both static `viewport` export
  * and async `generateViewport()` function.
  */
-declare function resolveModuleViewport(mod: Record<string, unknown>, params: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
+declare function resolveModuleViewport(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<ResolvedViewport>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
 /**
  * Merge viewport configs from multiple sources (layouts + page).
  * Later entries override earlier ones.
  */
-declare const DEFAULT_VIEWPORT: Viewport;
-declare function mergeViewport(viewportList: Viewport[]): Viewport;
+declare const DEFAULT_VIEWPORT: ResolvedViewport;
+declare function mergeViewport(viewportList: readonly Viewport[]): ResolvedViewport;
 /**
  * React component that renders viewport meta tags into <head>.
  */
@@ -283,4 +273,4 @@ declare function MetadataHead({
   trailingSlash
 }: MetadataHeadProps): React.JSX.Element;
 //#endregion
-export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };
+export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, ResolvedViewport, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };

package/dist/shims/metadata.js

@@ -9,18 +9,20 @@ import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 * Handles `export const metadata` and `export async function generateMetadata()`.
 * Resolves metadata from layouts and pages (pages override layouts).
 */
+const USE_CACHE_FUNCTION_SYMBOL = Symbol.for("vinext.useCacheFunction");
+const USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL = Symbol.for("vinext.useCacheAcceptsSecondArgument");
 /**
 * Resolve viewport config from a module. Handles both static `viewport` export
 * and async `generateViewport()` function.
 */
-async function resolveModuleViewport(mod, params, searchParams, searchParamsObserver) {
+async function resolveModuleViewport(mod, params = {}, searchParams, parent = Promise.resolve(mergeViewport([])), searchParamsObserver) {
 	if (typeof mod.generateViewport === "function") {
 		const asyncParams = makeThenableParams(params);
 		const props = searchParams === void 0 ? { params: asyncParams } : {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
 		};
-		return await mod.generateViewport(props);
+		return await mod.generateViewport(props, parent);
 	}
 	if (mod.viewport && typeof mod.viewport === "object") return mod.viewport;
 	return null;
@@ -31,47 +33,92 @@ async function resolveModuleViewport(mod, params, searchParams, searchParamsObse
 */
 const DEFAULT_VIEWPORT = {
 	width: "device-width",
-	initialScale: 1
+	initialScale: 1,
+	themeColor: null,
+	colorScheme: null
 };
 function mergeViewport(viewportList) {
 	const merged = { ...DEFAULT_VIEWPORT };
-	for (const vp of viewportList) Object.assign(merged, vp);
+	for (const viewport of viewportList) for (const viewportKey in viewport) switch (viewportKey) {
+		case "themeColor":
+			merged.themeColor = resolveThemeColor(viewport.themeColor);
+			break;
+		case "colorScheme":
+			merged.colorScheme = viewport.colorScheme || null;
+			break;
+		case "width":
+			merged.width = viewport.width;
+			break;
+		case "height":
+			merged.height = viewport.height;
+			break;
+		case "initialScale":
+			merged.initialScale = viewport.initialScale;
+			break;
+		case "minimumScale":
+			merged.minimumScale = viewport.minimumScale;
+			break;
+		case "maximumScale":
+			merged.maximumScale = viewport.maximumScale;
+			break;
+		case "userScalable":
+			merged.userScalable = viewport.userScalable;
+			break;
+		case "viewportFit":
+			merged.viewportFit = viewport.viewportFit;
+			break;
+		case "interactiveWidget":
+			merged.interactiveWidget = viewport.interactiveWidget;
+			break;
+		default:
+	}
 	return merged;
 }
+const VIEWPORT_META_NAMES = {
+	width: "width",
+	height: "height",
+	initialScale: "initial-scale",
+	minimumScale: "minimum-scale",
+	maximumScale: "maximum-scale",
+	userScalable: "user-scalable",
+	viewportFit: "viewport-fit",
+	interactiveWidget: "interactive-widget"
+};
 /**
 * React component that renders viewport meta tags into <head>.
 */
 function ViewportHead({ viewport }) {
+	const resolvedViewport = mergeViewport([viewport]);
 	const elements = [];
 	let key = 0;
 	const parts = [];
-	if (viewport.width !== void 0) parts.push(`width=${viewport.width}`);
-	if (viewport.height !== void 0) parts.push(`height=${viewport.height}`);
-	if (viewport.initialScale !== void 0) parts.push(`initial-scale=${viewport.initialScale}`);
-	if (viewport.minimumScale !== void 0) parts.push(`minimum-scale=${viewport.minimumScale}`);
-	if (viewport.maximumScale !== void 0) parts.push(`maximum-scale=${viewport.maximumScale}`);
-	if (viewport.userScalable !== void 0) parts.push(`user-scalable=${viewport.userScalable ? "yes" : "no"}`);
+	for (const key of Object.keys(VIEWPORT_META_NAMES)) {
+		const value = resolvedViewport[key];
+		if (value == null) continue;
+		parts.push(`${VIEWPORT_META_NAMES[key]}=${key === "userScalable" ? value ? "yes" : "no" : value}`);
+	}
 	if (parts.length > 0) elements.push(/* @__PURE__ */ jsx("meta", {
 		name: "viewport",
 		content: parts.join(", ")
 	}, key++));
-	if (viewport.themeColor) {
-		if (typeof viewport.themeColor === "string") elements.push(/* @__PURE__ */ jsx("meta", {
-			name: "theme-color",
-			content: viewport.themeColor
-		}, key++));
-		else if (Array.isArray(viewport.themeColor)) for (const entry of viewport.themeColor) elements.push(/* @__PURE__ */ jsx("meta", {
-			name: "theme-color",
-			content: entry.color,
-			...entry.media ? { media: entry.media } : {}
-		}, key++));
-	}
-	if (viewport.colorScheme) elements.push(/* @__PURE__ */ jsx("meta", {
+	if (resolvedViewport.themeColor) for (const entry of resolvedViewport.themeColor) elements.push(/* @__PURE__ */ jsx("meta", {
+		name: "theme-color",
+		content: entry.color,
+		...entry.media ? { media: entry.media } : {}
+	}, key++));
+	if (resolvedViewport.colorScheme) elements.push(/* @__PURE__ */ jsx("meta", {
 		name: "color-scheme",
-		content: viewport.colorScheme
+		content: resolvedViewport.colorScheme
 	}, key++));
 	return /* @__PURE__ */ jsx(Fragment$1, { children: elements });
 }
+function resolveThemeColor(themeColor) {
+	if (!themeColor) return null;
+	return (Array.isArray(themeColor) ? themeColor : [themeColor]).map((descriptor) => typeof descriptor === "string" ? { color: descriptor } : {
+		color: descriptor.color,
+		media: descriptor.media
+	});
+}
 /**
 * Merge metadata from multiple sources (layouts + page).
 *
@@ -219,12 +266,15 @@ function mergeMetadataEntries(entries) {
 */
 async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Promise.resolve({}), searchParamsObserver) {
 	if (typeof mod.generateMetadata === "function") {
+		const generateMetadata = mod.generateMetadata;
 		const asyncParams = makeThenableParams(params);
 		const props = searchParams === void 0 ? { params: asyncParams } : {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
 		};
-		return await (mod.generateMetadata.length >= 2 ? mod.generateMetadata(props, parent) : mod.generateMetadata(props));
+		const isUseCacheFunction = Reflect.get(generateMetadata, USE_CACHE_FUNCTION_SYMBOL) === true;
+		const acceptsSecondArgument = Reflect.get(generateMetadata, USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL);
+		return await (!isUseCacheFunction || (typeof acceptsSecondArgument === "boolean" ? acceptsSecondArgument : generateMetadata.length >= 2) ? generateMetadata(props, parent) : generateMetadata(props));
 	}
 	if (mod.metadata && typeof mod.metadata === "object") return mod.metadata;
 	return null;