fix: skip collecting metadata for app-error in webpack (#85892)

huozhi · web-flow · commit 1752d79c59c7 · 2025-11-07T22:52:06.000+01:00
diff --git a/packages/next/src/build/webpack/loaders/next-app-loader/index.ts b/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
@@ -38,6 +38,7 @@ import { PARALLEL_ROUTE_DEFAULT_PATH } from '../../../../client/components/built
 import type { Compilation } from 'webpack'
 import { createAppRouteCode } from './create-app-route-code'
 import { MissingDefaultParallelRouteError } from '../../../../shared/lib/errors/missing-default-parallel-route-error'
+import { normalizePathSep } from '../../../../shared/lib/page-path/normalize-path-sep'
 
 export type AppLoaderOptions = {
   name: string
@@ -87,7 +88,7 @@ const PARALLEL_VIRTUAL_SEGMENT = 'slot$'
 const defaultGlobalErrorPath =
   'next/dist/client/components/builtin/global-error.js'
 const defaultNotFoundPath = 'next/dist/client/components/builtin/not-found.js'
-const defaultEmptyStubPath = 'next/dist/client/components/builtin/empty-stub'
+const defaultEmptyStubPath = 'next/dist/client/components/builtin/empty-stub.js'
 const defaultLayoutPath = 'next/dist/client/components/builtin/layout.js'
 const defaultGlobalNotFoundPath =
   'next/dist/client/components/builtin/global-not-found.js'
@@ -176,9 +177,7 @@ async function createTreeCodeFromPath(
   async function resolveAdjacentParallelSegments(
     segmentPath: string
   ): Promise<string[]> {
-    const absoluteSegmentPath = await resolveDir(
-      `${appDirPrefix}${segmentPath}`
-    )
+    const absoluteSegmentPath = resolveDir(`${appDirPrefix}${segmentPath}`)
 
     if (!absoluteSegmentPath) {
       return []
@@ -232,7 +231,11 @@ async function createTreeCodeFromPath(
     const routerDirPath = `${appDirPrefix}${segmentPath}`
     const resolvedRouteDir = resolveDir(routerDirPath)
 
-    if (resolvedRouteDir) {
+    if (
+      resolvedRouteDir &&
+      // Do not collect metadata for app-error route as it's for generating pure static 500.html
+      !normalizePathSep(pagePath).endsWith(appErrorPath)
+    ) {
       metadata = await createStaticMetadataFromRoute(resolvedRouteDir, {
         basePath,
         segment: segmentPath,
diff --git a/test/production/app-dir/metadata-base-warning/app/layout.tsx b/test/production/app-dir/metadata-base-warning/app/layout.tsx
@@ -0,0 +1,19 @@
+import type { Metadata } from 'next'
+
+export const metadata: Metadata = {
+  title: 'my title',
+  description: 'my description',
+  metadataBase: 'https://my-domain.com/',
+}
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/production/app-dir/metadata-base-warning/app/opengraph-image.png b/test/production/app-dir/metadata-base-warning/app/opengraph-image.png
diff --git a/test/production/app-dir/metadata-base-warning/app/page.tsx b/test/production/app-dir/metadata-base-warning/app/page.tsx
@@ -0,0 +1,7 @@
+export default function Home() {
+  return (
+    <div>
+      <h1>Hello World</h1>
+    </div>
+  )
+}
diff --git a/test/production/app-dir/metadata-base-warning/metadata-base-warning.test.ts b/test/production/app-dir/metadata-base-warning/metadata-base-warning.test.ts
@@ -0,0 +1,13 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('metadata-base-warning', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it('should not warn metadataBase for static image when metadataBase is set', async () => {
+    expect(next.cliOutput).not.toContain(
+      'metadataBase property in metadata export is not set for resolving social open graph or twitter images'
+    )
+  })
+})
diff --git a/test/production/app-dir/metadata-base-warning/next.config.js b/test/production/app-dir/metadata-base-warning/next.config.js
@@ -0,0 +1,6 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {}
+
+module.exports = nextConfig
