vinext 0.0.44 → 0.0.46

package/dist/shims/internal/make-hanging-promise.d.ts

@@ -0,0 +1,16 @@
+//#region src/shims/internal/make-hanging-promise.d.ts
+/**
+ * makeHangingPromise — returns a promise that never resolves during prerendering.
+ *
+ * When prerendering, `unstable_io()` must return a hanging promise to prevent
+ * React from executing past the IO boundary. The promise never resolves—it only
+ * rejects if the render signal is aborted (e.g., due to a dynamic error or
+ * cache-fill completion).
+ *
+ * Ported from Next.js: packages/next/src/server/dynamic-rendering-utils.ts
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/dynamic-rendering-utils.ts
+ */
+declare function makeHangingPromise<T>(signal: AbortSignal, route: string, expression: string): Promise<T>;
+//#endregion
+export { makeHangingPromise };
+//# sourceMappingURL=make-hanging-promise.d.ts.map

package/dist/shims/internal/make-hanging-promise.js

@@ -0,0 +1,46 @@
+//#region src/shims/internal/make-hanging-promise.ts
+/**
+* makeHangingPromise — returns a promise that never resolves during prerendering.
+*
+* When prerendering, `unstable_io()` must return a hanging promise to prevent
+* React from executing past the IO boundary. The promise never resolves—it only
+* rejects if the render signal is aborted (e.g., due to a dynamic error or
+* cache-fill completion).
+*
+* Ported from Next.js: packages/next/src/server/dynamic-rendering-utils.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/server/dynamic-rendering-utils.ts
+*/
+var HangingPromiseRejectionError = class extends Error {
+	constructor(route, expression) {
+		super(`Route ${route} used ${expression} during prerendering but the render was aborted. This is expected when prerendering is cut short (e.g. due to a dynamic access).`);
+		this.name = "HangingPromiseRejectionError";
+	}
+};
+const abortListenersBySignal = /* @__PURE__ */ new WeakMap();
+function suppressUnhandledRejection() {}
+function makeHangingPromise(signal, route, expression) {
+	if (signal.aborted) {
+		const rejected = Promise.reject(new HangingPromiseRejectionError(route, expression));
+		rejected.catch(suppressUnhandledRejection);
+		return rejected;
+	}
+	const hangingPromise = new Promise((_, reject) => {
+		const boundRejection = reject.bind(null, new HangingPromiseRejectionError(route, expression));
+		const currentListeners = abortListenersBySignal.get(signal);
+		if (currentListeners) currentListeners.push(boundRejection);
+		else {
+			const listeners = [boundRejection];
+			abortListenersBySignal.set(signal, listeners);
+			signal.addEventListener("abort", () => {
+				for (let i = 0; i < listeners.length; i++) listeners[i]();
+				listeners.length = 0;
+			}, { once: true });
+		}
+	});
+	hangingPromise.catch(suppressUnhandledRejection);
+	return hangingPromise;
+}
+//#endregion
+export { makeHangingPromise };
+
+//# sourceMappingURL=make-hanging-promise.js.map

package/dist/shims/internal/make-hanging-promise.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"make-hanging-promise.js","names":[],"sources":["../../../src/shims/internal/make-hanging-promise.ts"],"sourcesContent":["/**\n * makeHangingPromise — returns a promise that never resolves during prerendering.\n *\n * When prerendering, `unstable_io()` must return a hanging promise to prevent\n * React from executing past the IO boundary. The promise never resolves—it only\n * rejects if the render signal is aborted (e.g., due to a dynamic error or\n * cache-fill completion).\n *\n * Ported from Next.js: packages/next/src/server/dynamic-rendering-utils.ts\n * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/dynamic-rendering-utils.ts\n */\n\nclass HangingPromiseRejectionError extends Error {\n  constructor(route: string, expression: string) {\n    super(\n      `Route ${route} used ${expression} during prerendering but the render was aborted. ` +\n        `This is expected when prerendering is cut short (e.g. due to a dynamic access).`,\n    );\n    this.name = \"HangingPromiseRejectionError\";\n  }\n}\n\nconst abortListenersBySignal = new WeakMap<AbortSignal, (() => void)[]>();\n\nfunction suppressUnhandledRejection(): void {\n  // intentionally empty — suppresses \"unhandled rejection\" warnings\n}\n\nexport function makeHangingPromise<T>(\n  signal: AbortSignal,\n  route: string,\n  expression: string,\n): Promise<T> {\n  if (signal.aborted) {\n    const rejected = Promise.reject(new HangingPromiseRejectionError(route, expression));\n    rejected.catch(suppressUnhandledRejection);\n    return rejected;\n  }\n  const hangingPromise = new Promise<T>((_, reject) => {\n    const boundRejection = reject.bind(null, new HangingPromiseRejectionError(route, expression));\n    const currentListeners = abortListenersBySignal.get(signal);\n    if (currentListeners) {\n      currentListeners.push(boundRejection);\n    } else {\n      const listeners = [boundRejection];\n      abortListenersBySignal.set(signal, listeners);\n      signal.addEventListener(\n        \"abort\",\n        () => {\n          for (let i = 0; i < listeners.length; i++) {\n            listeners[i]();\n          }\n          listeners.length = 0;\n        },\n        { once: true },\n      );\n    }\n  });\n  // Suppress unhandled rejection — the promise is expected to be used with\n  // React's use() which handles rejections. If never awaited, the abort\n  // rejection is a no-op cleanup.\n  hangingPromise.catch(suppressUnhandledRejection);\n  return hangingPromise;\n}\n"],"mappings":";;;;;;;;;;;;AAYA,IAAM,+BAAN,cAA2C,MAAM;CAC/C,YAAY,OAAe,YAAoB;AAC7C,QACE,SAAS,MAAM,QAAQ,WAAW,kIAEnC;AACD,OAAK,OAAO;;;AAIhB,MAAM,yCAAyB,IAAI,SAAsC;AAEzE,SAAS,6BAAmC;AAI5C,SAAgB,mBACd,QACA,OACA,YACY;AACZ,KAAI,OAAO,SAAS;EAClB,MAAM,WAAW,QAAQ,OAAO,IAAI,6BAA6B,OAAO,WAAW,CAAC;AACpF,WAAS,MAAM,2BAA2B;AAC1C,SAAO;;CAET,MAAM,iBAAiB,IAAI,SAAY,GAAG,WAAW;EACnD,MAAM,iBAAiB,OAAO,KAAK,MAAM,IAAI,6BAA6B,OAAO,WAAW,CAAC;EAC7F,MAAM,mBAAmB,uBAAuB,IAAI,OAAO;AAC3D,MAAI,iBACF,kBAAiB,KAAK,eAAe;OAChC;GACL,MAAM,YAAY,CAAC,eAAe;AAClC,0BAAuB,IAAI,QAAQ,UAAU;AAC7C,UAAO,iBACL,eACM;AACJ,SAAK,IAAI,IAAI,GAAG,IAAI,UAAU,QAAQ,IACpC,WAAU,IAAI;AAEhB,cAAU,SAAS;MAErB,EAAE,MAAM,MAAM,CACf;;GAEH;AAIF,gBAAe,MAAM,2BAA2B;AAChD,QAAO"}

package/dist/shims/internal/work-unit-async-storage.d.ts

@@ -1,8 +1,31 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/shims/internal/work-unit-async-storage.d.ts
-declare const workUnitAsyncStorage: AsyncLocalStorage<unknown>;
-declare const requestAsyncStorage: AsyncLocalStorage<unknown>;
+type RequestStore = {
+  readonly type: "request";
+};
+type PrerenderStore = {
+  readonly type: "prerender" | "prerender-client" | "prerender-runtime"; /** AbortSignal that fires when the prerender is cancelled or completed. */
+  readonly renderSignal: AbortSignal; /** Optional route identifier for debugging and error messages. */
+  readonly route?: string;
+};
+type CacheStore = {
+  readonly type: "cache" | "private-cache" | "unstable-cache";
+};
+type GenerateStaticParamsStore = {
+  readonly type: "generate-static-params";
+};
+type PrerenderLegacyStore = {
+  readonly type: "prerender-legacy";
+};
+/**
+ * Discriminated union of all known work unit types.
+ * Matches Next.js's WorkUnitStore: packages/next/src/server/app-render/work-unit-async-storage.external.ts
+ */
+type WorkUnitStore = RequestStore | PrerenderStore | CacheStore | GenerateStaticParamsStore | PrerenderLegacyStore;
+type WorkUnitAsyncStorage = AsyncLocalStorage<WorkUnitStore>;
+declare const workUnitAsyncStorage: WorkUnitAsyncStorage;
+declare const requestAsyncStorage: WorkUnitAsyncStorage;
 //#endregion
-export { requestAsyncStorage, workUnitAsyncStorage };
+export { CacheStore, GenerateStaticParamsStore, PrerenderLegacyStore, PrerenderStore, RequestStore, WorkUnitAsyncStorage, WorkUnitStore, requestAsyncStorage, workUnitAsyncStorage };
 //# sourceMappingURL=work-unit-async-storage.d.ts.map

package/dist/shims/internal/work-unit-async-storage.js

@@ -4,9 +4,12 @@ import { AsyncLocalStorage } from "node:async_hooks";
 * Shim for next/dist/server/app-render/work-unit-async-storage.external
 * and next/dist/client/components/request-async-storage.external
 *
-* Used by: @sentry/nextjs (runtime resolve for request context injection).
-* Provides a minimal AsyncLocalStorage-like export that Sentry can detect
-* and use without crashing.
+* Tracks the current rendering context type so that dynamic APIs
+* (unstable_io, headers, cookies, etc.) can branch on whether they're
+* inside a request, prerender, cache scope, or other context.
+*
+* Used by: @sentry/nextjs (runtime resolve for request context injection),
+* unstable_io() for hanging-promise behavior during prerendering.
 */
 const workUnitAsyncStorage = new AsyncLocalStorage();
 const requestAsyncStorage = workUnitAsyncStorage;

package/dist/shims/internal/work-unit-async-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-unit-async-storage.js","names":[],"sources":["../../../src/shims/internal/work-unit-async-storage.ts"],"sourcesContent":["/**\n * Shim for next/dist/server/app-render/work-unit-async-storage.external\n * and next/dist/client/components/request-async-storage.external\n *\n * Used by: @sentry/nextjs (runtime resolve for request context injection).\n * Provides a minimal AsyncLocalStorage-like export that Sentry can detect\n * and use without crashing.\n */\nimport { AsyncLocalStorage } from \"node:async_hooks\";\n\nexport const workUnitAsyncStorage = new AsyncLocalStorage<unknown>();\n\n// Legacy name (Next 13.x–14.x)\nexport const requestAsyncStorage = workUnitAsyncStorage;\n"],"mappings":";;;;;;;;;;AAUA,MAAa,uBAAuB,IAAI,mBAA4B;AAGpE,MAAa,sBAAsB"}
+{"version":3,"file":"work-unit-async-storage.js","names":[],"sources":["../../../src/shims/internal/work-unit-async-storage.ts"],"sourcesContent":["/**\n * Shim for next/dist/server/app-render/work-unit-async-storage.external\n * and next/dist/client/components/request-async-storage.external\n *\n * Tracks the current rendering context type so that dynamic APIs\n * (unstable_io, headers, cookies, etc.) can branch on whether they're\n * inside a request, prerender, cache scope, or other context.\n *\n * Used by: @sentry/nextjs (runtime resolve for request context injection),\n * unstable_io() for hanging-promise behavior during prerendering.\n */\nimport { AsyncLocalStorage } from \"node:async_hooks\";\n\n// ── WorkUnitStore discriminated union ───────────────────────────────────\n\nexport type RequestStore = {\n  readonly type: \"request\";\n};\n\nexport type PrerenderStore = {\n  readonly type: \"prerender\" | \"prerender-client\" | \"prerender-runtime\";\n  /** AbortSignal that fires when the prerender is cancelled or completed. */\n  readonly renderSignal: AbortSignal;\n  /** Optional route identifier for debugging and error messages. */\n  readonly route?: string;\n};\n\nexport type CacheStore = {\n  readonly type: \"cache\" | \"private-cache\" | \"unstable-cache\";\n};\n\nexport type GenerateStaticParamsStore = {\n  readonly type: \"generate-static-params\";\n};\n\nexport type PrerenderLegacyStore = {\n  readonly type: \"prerender-legacy\";\n};\n\n/**\n * Discriminated union of all known work unit types.\n * Matches Next.js's WorkUnitStore: packages/next/src/server/app-render/work-unit-async-storage.external.ts\n */\nexport type WorkUnitStore =\n  | RequestStore\n  | PrerenderStore\n  | CacheStore\n  | GenerateStaticParamsStore\n  | PrerenderLegacyStore;\n\nexport type WorkUnitAsyncStorage = AsyncLocalStorage<WorkUnitStore>;\n\nexport const workUnitAsyncStorage: WorkUnitAsyncStorage = new AsyncLocalStorage();\n\n// Legacy name (Next 13.x–14.x)\nexport const requestAsyncStorage = workUnitAsyncStorage;\n"],"mappings":";;;;;;;;;;;;;AAoDA,MAAa,uBAA6C,IAAI,mBAAmB;AAGjF,MAAa,sBAAsB"}

package/dist/shims/link.js

@@ -1,10 +1,10 @@
 "use client";
+import { isDangerousScheme } from "./url-safety.js";
 import { resolveRelativeHref, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
 import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
 import { createAppPayloadCacheKey } from "../server/app-elements.js";
 import { getCurrentInterceptionContext, getMountedSlotsHeader, getPrefetchedUrls, navigateClientSide, prefetchRscResponse, toRscUrl } from "./navigation.js";
-import { isDangerousScheme } from "./url-safety.js";
 import { getI18nContext } from "./i18n-context.js";
 import React, { createContext, forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";

package/dist/shims/metadata.d.ts

@@ -73,11 +73,13 @@ type Metadata = {
       width?: number;
       height?: number;
       alt?: string;
+      type?: string;
     } | Array<string | URL | {
       url: string | URL;
       width?: number;
       height?: number;
       alt?: string;
+      type?: string;
     }>;
     videos?: Array<{
       url: string | URL;
@@ -104,37 +106,20 @@ type Metadata = {
       alt?: string;
       width?: number;
       height?: number;
+      type?: string;
     } | Array<string | URL | {
       url: string | URL;
       alt?: string;
       width?: number;
       height?: number;
+      type?: string;
     }>;
     creator?: string;
     creatorId?: string;
     players?: TwitterPlayerDescriptor | TwitterPlayerDescriptor[];
     app?: TwitterAppDescriptor;
   };
-  icons?: {
-    icon?: string | URL | Array<{
-      url: string | URL;
-      sizes?: string;
-      type?: string;
-      media?: string;
-    }>;
-    shortcut?: string | URL | Array<string | URL>;
-    apple?: string | URL | Array<{
-      url: string | URL;
-      sizes?: string;
-      type?: string;
-    }>;
-    other?: Array<{
-      rel: string;
-      url: string | URL;
-      sizes?: string;
-      type?: string;
-    }>;
-  };
+  icons?: IconsMetadata;
   manifest?: string | URL;
   alternates?: {
     canonical?: string | URL;
@@ -220,6 +205,36 @@ type TwitterAppDescriptor = {
   };
   name?: string;
 };
+type IconDescriptor = {
+  url: string | URL;
+  sizes?: string;
+  type?: string;
+  media?: string;
+};
+type AppleIconDescriptor = {
+  url: string | URL;
+  sizes?: string;
+  type?: string;
+};
+type IconInput = string | URL | IconDescriptor;
+type AppleIconInput = string | URL | AppleIconDescriptor;
+type IconsMap = {
+  icon?: IconInput | IconInput[];
+  shortcut?: string | URL | Array<string | URL>;
+  apple?: AppleIconInput | AppleIconInput[];
+  other?: Array<{
+    rel: string;
+    url: string | URL;
+    sizes?: string;
+    type?: string;
+  }>;
+};
+type IconsMetadata = IconInput | IconInput[] | IconsMap;
+type MetadataMergeEntry = {
+  contributesTitle?: boolean;
+  isPage?: boolean;
+  metadata: Metadata;
+};
 /**
  * Merge metadata from multiple sources (layouts + page).
  *
@@ -232,6 +247,7 @@ type TwitterAppDescriptor = {
  * Shallow merge: later entries override earlier ones (per Next.js docs).
  */
 declare function mergeMetadata(metadataList: Metadata[]): Metadata;
+declare function mergeMetadataEntries(entries: readonly MetadataMergeEntry[]): Metadata;
 /**
  * Resolve metadata from a module. Handles both static `metadata` export
  * and async `generateMetadata()` function.
@@ -242,16 +258,12 @@ declare function mergeMetadata(metadataList: Metadata[]): Metadata;
  *   resolution approach. If not provided, defaults to a promise that resolves
  *   to an empty object (so `await parent` never throws).
  */
-declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string>, parent?: Promise<Metadata>): Promise<Metadata | null>;
-/**
- * React component that renders metadata as HTML head elements.
- * Used by the RSC entry to inject into the <head>.
- */
+declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<Metadata>): Promise<Metadata | null>;
 declare function MetadataHead({
   metadata
 }: {
   metadata: Metadata;
 }): _$react_jsx_runtime0.JSX.Element;
 //#endregion
-export { DEFAULT_VIEWPORT, Metadata, MetadataHead, Viewport, ViewportHead, mergeMetadata, mergeViewport, resolveModuleMetadata, resolveModuleViewport };
+export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, resolveModuleMetadata, resolveModuleViewport };
 //# sourceMappingURL=metadata.d.ts.map

package/dist/shims/metadata.js

@@ -1,15 +1,8 @@
+import { makeThenableParams } from "./thenable-params.js";
 import "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/metadata.tsx
 /**
-* Normalize null-prototype objects from matchPattern() into thenable objects.
-* See entries/app-rsc-entry.ts makeThenableParams() for full explanation.
-*/
-function makeThenableParams(obj) {
-	const plain = { ...obj };
-	return Object.assign(Promise.resolve(plain), plain);
-}
-/**
 * Resolve viewport config from a module. Handles both static `viewport` export
 * and async `generateViewport()` function.
 */
@@ -80,17 +73,25 @@ function ViewportHead({ viewport }) {
 * Shallow merge: later entries override earlier ones (per Next.js docs).
 */
 function mergeMetadata(metadataList) {
-	if (metadataList.length === 0) return {};
+	return mergeMetadataEntries(metadataList.map((metadata, index) => ({
+		isPage: index === metadataList.length - 1,
+		metadata
+	})));
+}
+function mergeMetadataEntries(entries) {
+	if (entries.length === 0) return {};
 	const merged = {};
 	let parentTemplate;
-	for (let i = 0; i < metadataList.length; i++) {
-		const meta = metadataList[i];
-		if (!(i === metadataList.length - 1) && meta.title && typeof meta.title === "object" && meta.title.template) parentTemplate = meta.title.template;
+	for (const entry of entries) {
+		const meta = entry.metadata;
+		const isPage = Boolean(entry.isPage);
+		const contributesTitle = entry.contributesTitle !== false;
+		if (contributesTitle && !isPage && meta.title && typeof meta.title === "object" && meta.title.template) parentTemplate = meta.title.template;
 		for (const key of Object.keys(meta)) {
 			if (key === "title") continue;
 			merged[key] = meta[key];
 		}
-		if (meta.title !== void 0) merged.title = meta.title;
+		if (contributesTitle && meta.title !== void 0) merged.title = meta.title;
 	}
 	const finalTitle = merged.title;
 	if (finalTitle) {
@@ -117,11 +118,11 @@ function mergeMetadata(metadataList) {
 async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Promise.resolve({})) {
 	if (typeof mod.generateMetadata === "function") {
 		const asyncParams = makeThenableParams(params);
-		const asyncSp = makeThenableParams(searchParams ?? {});
-		return await mod.generateMetadata({
+		const props = searchParams === void 0 ? { params: asyncParams } : {
 			params: asyncParams,
-			searchParams: asyncSp
-		}, parent);
+			searchParams: makeThenableParams(searchParams)
+		};
+		return await mod.generateMetadata(props, parent);
 	}
 	if (mod.metadata && typeof mod.metadata === "object") return mod.metadata;
 	return null;
@@ -130,6 +131,23 @@ async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Pr
 * React component that renders metadata as HTML head elements.
 * Used by the RSC entry to inject into the <head>.
 */
+function isIconDescriptor(value) {
+	if (typeof value !== "object" || value === null || value instanceof URL || Array.isArray(value)) return false;
+	const urlValue = Reflect.get(value, "url");
+	return typeof urlValue === "string" || urlValue instanceof URL;
+}
+function isIconsMap(value) {
+	return typeof value === "object" && !(value instanceof URL) && !Array.isArray(value) && !isIconDescriptor(value);
+}
+function normalizeUrlDescriptor(value, createDescriptor) {
+	if (typeof value === "string" || value instanceof URL) return createDescriptor(value);
+	return value;
+}
+function normalizeUrlDescriptorEntries(value, createDescriptor) {
+	if (!value) return [];
+	if (Array.isArray(value)) return value.map((entry) => normalizeUrlDescriptor(entry, createDescriptor));
+	return [normalizeUrlDescriptor(value, createDescriptor)];
+}
 function MetadataHead({ metadata }) {
 	const elements = [];
 	let key = 0;
@@ -289,6 +307,10 @@ function MetadataHead({ metadata }) {
 						property: "og:image:height",
 						content: String(img.height)
 					}, key++));
+					if (img.type) elements.push(/* @__PURE__ */ jsx("meta", {
+						property: "og:image:type",
+						content: img.type
+					}, key++));
 					if (img.alt) elements.push(/* @__PURE__ */ jsx("meta", {
 						property: "og:image:alt",
 						content: img.alt
@@ -353,10 +375,24 @@ function MetadataHead({ metadata }) {
 					name: "twitter:image",
 					content: resolveUrl(imgUrl)
 				}, key++));
-				if (typeof img !== "string" && !(img instanceof URL) && img.alt) elements.push(/* @__PURE__ */ jsx("meta", {
-					name: "twitter:image:alt",
-					content: img.alt
-				}, key++));
+				if (typeof img !== "string" && !(img instanceof URL)) {
+					if (img.type) elements.push(/* @__PURE__ */ jsx("meta", {
+						name: "twitter:image:type",
+						content: img.type
+					}, key++));
+					if (img.width) elements.push(/* @__PURE__ */ jsx("meta", {
+						name: "twitter:image:width",
+						content: String(img.width)
+					}, key++));
+					if (img.height) elements.push(/* @__PURE__ */ jsx("meta", {
+						name: "twitter:image:height",
+						content: String(img.height)
+					}, key++));
+					if (img.alt) elements.push(/* @__PURE__ */ jsx("meta", {
+						name: "twitter:image:alt",
+						content: img.alt
+					}, key++));
+				}
 			}
 		}
 		if (tw.players) {
@@ -408,34 +444,28 @@ function MetadataHead({ metadata }) {
 		}
 	}
 	if (metadata.icons) {
-		const { icon, shortcut, apple, other } = metadata.icons;
-		if (shortcut) {
-			const shortcuts = Array.isArray(shortcut) ? shortcut : [shortcut];
+		const iconEntries = isIconsMap(metadata.icons) ? normalizeUrlDescriptorEntries(metadata.icons.icon, (url) => ({ url })) : normalizeUrlDescriptorEntries(metadata.icons, (url) => ({ url }));
+		if (isIconsMap(metadata.icons) && metadata.icons.shortcut) {
+			const shortcuts = Array.isArray(metadata.icons.shortcut) ? metadata.icons.shortcut : [metadata.icons.shortcut];
 			for (const s of shortcuts) elements.push(/* @__PURE__ */ jsx("link", {
 				rel: "shortcut icon",
 				href: resolveUrl(s)
 			}, key++));
 		}
-		if (icon) {
-			const icons = typeof icon === "string" || icon instanceof URL ? [{ url: icon }] : icon;
-			for (const i of icons) elements.push(/* @__PURE__ */ jsx("link", {
-				rel: "icon",
-				href: resolveUrl(i.url),
-				...i.sizes ? { sizes: i.sizes } : {},
-				...i.type ? { type: i.type } : {},
-				...i.media ? { media: i.media } : {}
-			}, key++));
-		}
-		if (apple) {
-			const apples = typeof apple === "string" || apple instanceof URL ? [{ url: apple }] : apple;
-			for (const a of apples) elements.push(/* @__PURE__ */ jsx("link", {
-				rel: "apple-touch-icon",
-				href: resolveUrl(a.url),
-				...a.sizes ? { sizes: a.sizes } : {},
-				...a.type ? { type: a.type } : {}
-			}, key++));
-		}
-		if (other) for (const o of other) elements.push(/* @__PURE__ */ jsx("link", {
+		if (iconEntries.length > 0) for (const i of iconEntries) elements.push(/* @__PURE__ */ jsx("link", {
+			rel: "icon",
+			href: resolveUrl(i.url),
+			...i.sizes ? { sizes: i.sizes } : {},
+			...i.type ? { type: i.type } : {},
+			...i.media ? { media: i.media } : {}
+		}, key++));
+		if (isIconsMap(metadata.icons) && metadata.icons.apple) for (const a of normalizeUrlDescriptorEntries(metadata.icons.apple, (url) => ({ url }))) elements.push(/* @__PURE__ */ jsx("link", {
+			rel: "apple-touch-icon",
+			href: resolveUrl(a.url),
+			...a.sizes ? { sizes: a.sizes } : {},
+			...a.type ? { type: a.type } : {}
+		}, key++));
+		if (isIconsMap(metadata.icons) && metadata.icons.other) for (const o of metadata.icons.other) elements.push(/* @__PURE__ */ jsx("link", {
 			rel: o.rel,
 			href: resolveUrl(o.url),
 			...o.sizes ? { sizes: o.sizes } : {}
@@ -557,6 +587,6 @@ function MetadataHead({ metadata }) {
 	return /* @__PURE__ */ jsx(Fragment$1, { children: elements });
 }
 //#endregion
-export { DEFAULT_VIEWPORT, MetadataHead, ViewportHead, mergeMetadata, mergeViewport, resolveModuleMetadata, resolveModuleViewport };
+export { DEFAULT_VIEWPORT, MetadataHead, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, resolveModuleMetadata, resolveModuleViewport };
 
 //# sourceMappingURL=metadata.js.map