fix lint

vercel · Jan 20, 2023 · dd4b939 · dd4b939
1 parent ae53488
commit dd4b939
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/packages/next/src/lib/metadata/generate/icons.tsx b/packages/next/src/lib/metadata/generate/icons.tsx
@@ -7,7 +7,7 @@ import { resolveAsArrayOrUndefined } from './utils'
 const resolveUrl = (url: string | URL) =>
   typeof url === 'string' ? url : url.toString()
 
-function IconDescriptor({ icon }: { icon: IconDescriptor }) {
+function IconDescriptorLink({ icon }: { icon: IconDescriptor }) {
   const { url, rel = 'icon', ...props } = icon
 
   if (process.env.NODE_ENV !== 'production') {
@@ -22,7 +22,7 @@ function IconDescriptor({ icon }: { icon: IconDescriptor }) {
 function IconLink({ rel, icon }: { rel?: string; icon: Icon }) {
   if (typeof icon === 'object' && !(icon instanceof URL)) {
     if (rel) icon.rel = rel
-    return <IconDescriptor icon={icon} />
+    return <IconDescriptorLink icon={icon} />
   } else {
     const href = resolveUrl(icon)
     return <link rel={rel} href={href} />

diff --git a/packages/next/src/lib/metadata/resolve-metadata.ts b/packages/next/src/lib/metadata/resolve-metadata.ts
@@ -48,6 +48,42 @@ type Item =
       path?: string
     }
 
+function resolveViewport(
+  viewport: Metadata['viewport']
+): ResolvedMetadata['viewport'] {
+  let resolved: ResolvedMetadata['viewport'] = null
+
+  if (typeof viewport === 'string') {
+    resolved = viewport
+  } else if (viewport) {
+    resolved = ''
+    for (const viewportKey_ in viewPortKeys) {
+      const viewportKey = viewportKey_ as keyof Viewport
+      if (viewport[viewportKey]) {
+        if (resolved) resolved += ', '
+        resolved += `${viewPortKeys[viewportKey]}=${viewport[viewportKey]}`
+      }
+    }
+  }
+  return resolved
+}
+
+function resolveIcons(icons: Metadata['icons']): ResolvedMetadata['icons'] {
+  let resolved: ResolvedMetadata['icons'] = null
+  if (icons == null) {
+    resolved = null
+  } else {
+    if (Array.isArray(icons) || typeof icons === 'string') {
+      resolved = {
+        icon: icons,
+      }
+    } else {
+      resolved = icons
+    }
+  }
+  return resolved
+}
+
 // Merge the source metadata into the resolved target metadata.
 function merge(
   target: ResolvedMetadata,
@@ -111,42 +147,6 @@ function merge(
   }
 }
 
-function resolveViewport(
-  viewport: Metadata['viewport']
-): ResolvedMetadata['viewport'] {
-  let resolved: ResolvedMetadata['viewport'] = null
-
-  if (typeof viewport === 'string') {
-    resolved = viewport
-  } else if (viewport) {
-    resolved = ''
-    for (const viewportKey_ in viewPortKeys) {
-      const viewportKey = viewportKey_ as keyof Viewport
-      if (viewport[viewportKey]) {
-        if (resolved) resolved += ', '
-        resolved += `${viewPortKeys[viewportKey]}=${viewport[viewportKey]}`
-      }
-    }
-  }
-  return resolved
-}
-
-function resolveIcons(icons: Metadata['icons']): ResolvedMetadata['icons'] {
-  let resolved: ResolvedMetadata['icons'] = null
-  if (icons == null) {
-    resolved = null
-  } else {
-    if (Array.isArray(icons) || typeof icons === 'string') {
-      resolved = {
-        icon: icons,
-      }
-    } else {
-      resolved = icons
-    }
-  }
-  return resolved
-}
-
 export async function resolveMetadata(metadataItems: Item[]) {
   const resolvedMetadata = createDefaultMetadata()