Merge branch 'canary' into metadata/auto-metabase

vercel · Feb 20, 2023 · d35aa40 · d35aa40
2 parents ab93407 + 5cb6925
commit d35aa40
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 1 deletion.
diff --git a/packages/next/src/lib/metadata/resolve-metadata.test.ts b/packages/next/src/lib/metadata/resolve-metadata.test.ts
@@ -1,4 +1,5 @@
 import { accumulateMetadata, MetadataItems } from './resolve-metadata'
+import { Metadata } from './types/metadata-interface'
 
 describe('accumulateMetadata', () => {
   describe('typing', () => {
@@ -48,4 +49,64 @@ describe('accumulateMetadata', () => {
       })
     })
   })
+
+  describe('openGraph', () => {
+    it('should convert string or URL images field to array, not only for basic og type', async () => {
+      const items: [Metadata[], Metadata][] = [
+        [
+          [{ openGraph: { type: 'article', images: 'https://test.com' } }],
+          { openGraph: { images: ['https://test.com'] } },
+        ],
+        [
+          [{ openGraph: { type: 'book', images: 'https://test.com' } }],
+          { openGraph: { images: ['https://test.com'] } },
+        ],
+        [
+          [
+            {
+              openGraph: {
+                type: 'music.song',
+                images: new URL('https://test.com'),
+              },
+            },
+          ],
+          { openGraph: { images: [new URL('https://test.com')] } },
+        ],
+        [
+          [
+            {
+              openGraph: {
+                type: 'music.playlist',
+                images: { url: 'https://test.com' },
+              },
+            },
+          ],
+          { openGraph: { images: [{ url: 'https://test.com' }] } },
+        ],
+        [
+          [
+            {
+              openGraph: {
+                type: 'music.radio_station',
+                images: 'https://test.com',
+              },
+            },
+          ],
+          { openGraph: { images: ['https://test.com'] } },
+        ],
+        [
+          [{ openGraph: { type: 'video.movie', images: 'https://test.com' } }],
+          { openGraph: { images: ['https://test.com'] } },
+        ],
+      ]
+
+      items.forEach(async (item) => {
+        const [configuredMetadata, result] = item
+        const metadata = await accumulateMetadata(
+          configuredMetadata.map((m) => [m, null])
+        )
+        expect(metadata).toMatchObject(result)
+      })
+    })
+  })
 })
diff --git a/packages/next/src/lib/metadata/resolvers/resolve-opengraph.ts b/packages/next/src/lib/metadata/resolvers/resolve-opengraph.ts
@@ -20,7 +20,6 @@ const OgTypFields = {
     'phoneNumbers',
     'faxNumbers',
     'alternateLocale',
-    'images',
     'audio',
     'videos',
   ],
@@ -69,6 +68,7 @@ export function resolveOpenGraph(
         }
       }
     }
+
     resolved.images = resolveAsArrayOrUndefined(og.images)?.map((item) => {
       if (isStringOrURL(item))
         return {