Merge branch 'canary' into metadata/auto-insert-manifest

vercel · Apr 12, 2023 · 50b6f6a · 50b6f6a
2 parents 0a47c71 + 1d30045
commit 50b6f6a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/packages/next/src/build/webpack/loaders/metadata/discover.ts b/packages/next/src/build/webpack/loaders/metadata/discover.ts
@@ -62,13 +62,13 @@ export async function createStaticMetadataFromRoute(
   {
     segment,
     resolvePath,
-    isRootLayer,
+    isRootLayoutOrRootPage,
     loaderContext,
     pageExtensions,
   }: {
     segment: string
     resolvePath: (pathname: string) => Promise<string>
-    isRootLayer: boolean
+    isRootLayoutOrRootPage: boolean
     loaderContext: webpack.LoaderContext<any>
     pageExtensions: string[]
   }
@@ -147,8 +147,8 @@ export async function createStaticMetadataFromRoute(
     collectIconModuleIfExists('apple'),
     collectIconModuleIfExists('openGraph'),
     collectIconModuleIfExists('twitter'),
-    isRootLayer && collectIconModuleIfExists('favicon'),
-    isRootLayer && collectIconModuleIfExists('manifest'),
+    isRootLayoutOrRootPage && collectIconModuleIfExists('favicon'),
+    isRootLayoutOrRootPage && collectIconModuleIfExists('manifest'),
   ])
 
   return hasStaticMetadataFiles ? staticImagesMetadata : null

diff --git a/packages/next/src/build/webpack/loaders/next-app-loader.ts b/packages/next/src/build/webpack/loaders/next-app-loader.ts
@@ -237,6 +237,7 @@ async function createTreeCodeFromPath(
     // Existing tree are the children of the current segment
     const props: Record<string, string> = {}
     const isRootLayer = segments.length === 0
+    const isRootLayoutOrRootPage = segments.length <= 1
 
     // We need to resolve all parallel routes in this level.
     const parallelSegments: [key: string, segment: string | string[]][] = []
@@ -256,7 +257,7 @@ async function createTreeCodeFromPath(
         metadata = await createStaticMetadataFromRoute(resolvedRouteDir, {
           segment: segmentPath,
           resolvePath,
-          isRootLayer,
+          isRootLayoutOrRootPage,
           loaderContext,
           pageExtensions,
         })

diff --git a/test/e2e/app-dir/metadata/app/icon.svg b/test/e2e/app-dir/metadata/app/icon.svg
diff --git a/test/e2e/app-dir/metadata/metadata.test.ts b/test/e2e/app-dir/metadata/metadata.test.ts
@@ -547,15 +547,18 @@ createNextDescribe(
 
       it('should support root level of favicon.ico', async () => {
         let $ = await next.render$('/')
-        let $icon = $('link[rel="icon"]')
-        expect($icon.attr('href')).toBe('/favicon.ico')
-        expect($icon.attr('type')).toBe('image/x-icon')
-        expect($icon.attr('sizes')).toBe('any')
+        const favIcon = $('link[rel="icon"]')
+        expect(favIcon.attr('href')).toBe('/favicon.ico')
+        expect(favIcon.attr('type')).toBe('image/x-icon')
+        expect(favIcon.attr('sizes')).toBe('any')
+
+        const iconSvg = $('link[rel="icon"][type="image/svg+xml"]')
+        expect(iconSvg.attr('href')).toBe('/icon.svg?90699bff34adba1f')
 
         $ = await next.render$('/basic')
-        $icon = $('link[rel="icon"]')
-        expect($icon.attr('href')).toBe('/favicon.ico')
-        expect($icon.attr('sizes')).toBe('any')
+        const icon = $('link[rel="icon"]')
+        expect(icon.attr('href')).toBe('/favicon.ico')
+        expect(icon.attr('sizes')).toBe('any')
       })
     })