Fix rstatic opt of routes generation for static metadata files

packages/next/src/lib/metadata/get-metadata-route.ts

@@ -1,4 +1,4 @@
-import { isMetadataRoute } from './is-metadata-route'
+import { isMetadataRoute, isMetadataRouteFile } from './is-metadata-route'
 import path from '../../shared/lib/isomorphic/path'
 import { djb2Hash } from '../../shared/lib/hash'
 
@@ -32,7 +32,8 @@ export function normalizeMetadataRoute(page: string) {
   let route = page
   if (isMetadataRoute(page)) {
     // Remove the file extension, e.g. /route-path/robots.txt -> /route-path
-    const pathnamePrefix = page.slice(0, -(path.basename(page).length + 1))
+    const { dir, name: baseName, ext } = path.parse(page)
+    const pathnamePrefix = page.slice(0, -(baseName.length + 1))
     const suffix = getMetadataRouteSuffix(pathnamePrefix)
 
     if (route === '/sitemap') {
@@ -47,16 +48,17 @@ export function normalizeMetadataRoute(page: string) {
     // Support both /<metadata-route.ext> and custom routes /<metadata-route>/route.ts.
     // If it's a metadata file route, we need to append /[id]/route to the page.
     if (!route.endsWith('/route')) {
-      const { dir, name, ext } = path.parse(route)
+      const isStaticMetadataFile = isMetadataRouteFile(page, [], true)
+
       const isSingleRoute =
         page.startsWith('/sitemap') ||
         page.startsWith('/robots') ||
         page.startsWith('/manifest') ||
-        page === '/favicon.ico'
+        isStaticMetadataFile
 
       route = path.join(
         dir,
-        `${name}${suffix ? `-${suffix}` : ''}${ext}`,
+        `${baseName}${suffix ? `-${suffix}` : ''}${ext}`,
         isSingleRoute ? '' : '[[...__metadata_id__]]',
         'route'
       )

test/.gitignore

@@ -1,2 +1,4 @@
 !node_modules
 .vscode
+
+e2e/**/tsconfig.json

test/e2e/app-dir/metadata/metadata.test.ts

@@ -782,6 +782,28 @@ createNextDescribe(
       }
     })
 
+    if (isNextStart) {
+      describe('static optimization', () => {
+        it('should build static files into static route', async () => {
+          expect(
+            await next.hasFile(
+              '.next/server/app/opengraph/static/opengraph-image.png.meta'
+            )
+          ).toBe(true)
+          expect(
+            await next.hasFile(
+              '.next/server/app/opengraph/static/opengraph-image.png.body'
+            )
+          ).toBe(true)
+          expect(
+            await next.hasFile(
+              '.next/server/app/opengraph/static/opengraph-image.png/[[...__metadata_id__]]/route.js'
+            )
+          ).toBe(false)
+        })
+      })
+    }
+
     describe('react cache', () => {
       it('should have same title and page value on initial load', async () => {
         const browser = await next.browser('/cache-deduping')

test/lib/next-modes/base.ts

@@ -384,6 +384,9 @@ export class NextInstance {
   }
 
   // TODO: block these in deploy mode
+  public async hasFile(filename: string) {
+    return fs.pathExists(path.join(this.testDir, filename))
+  }
   public async readFile(filename: string) {
     return fs.readFile(path.join(this.testDir, filename), 'utf8')
   }