Remove MetadataContext type and construct isStaticMetadataRouteFile inside resolveMetadata

packages/next/src/lib/metadata/metadata.tsx

@@ -13,7 +13,6 @@ import type {
   ResolvedViewport,
 } from './types/metadata-interface'
 import { isHTTPAccessFallbackError } from '../../client/components/http-access-fallback/http-access-fallback'
-import type { MetadataContext } from './types/resolvers'
 import { createServerSearchParamsForMetadata } from '../../server/request/search-params'
 import { createServerPathnameForMetadata } from '../../server/request/pathname'
 import { isPostpone } from '../../server/lib/router-utils/is-postpone'
@@ -42,7 +41,6 @@ export function createMetadataComponents({
   tree,
   pathname,
   parsedQuery,
-  metadataContext,
   interpolatedParams,
   errorType,
   serveStreamingMetadata,
@@ -51,7 +49,6 @@ export function createMetadataComponents({
   tree: LoaderTree
   pathname: string
   parsedQuery: SearchParams
-  metadataContext: MetadataContext
   interpolatedParams: Params
   errorType?: MetadataErrorType | 'redirect'
   serveStreamingMetadata: boolean
@@ -137,7 +134,6 @@ export function createMetadataComponents({
       pathnameForMetadata,
       searchParams,
       interpolatedParams,
-      metadataContext,
       isRuntimePrefetchable,
       errorType
     ).catch((metadataErr) => {
@@ -153,7 +149,6 @@ export function createMetadataComponents({
           pathnameForMetadata,
           searchParams,
           interpolatedParams,
-          metadataContext,
           isRuntimePrefetchable
         ).catch(() => null)
       }
@@ -194,7 +189,6 @@ export function createMetadataComponents({
         pathnameForMetadata,
         searchParams,
         interpolatedParams,
-        metadataContext,
         isRuntimePrefetchable,
         errorType
       ),
@@ -234,7 +228,6 @@ async function getResolvedMetadataImpl(
   pathname: Promise<string>,
   searchParams: Promise<ParsedUrlQuery>,
   interpolatedParams: Params,
-  metadataContext: MetadataContext,
   isRuntimePrefetchable: boolean,
   errorType?: MetadataErrorType | 'redirect'
 ): Promise<React.ReactNode> {
@@ -244,7 +237,6 @@ async function getResolvedMetadataImpl(
     pathname,
     searchParams,
     interpolatedParams,
-    metadataContext,
     isRuntimePrefetchable,
     errorConvention
   )
@@ -256,7 +248,6 @@ async function getNotFoundMetadataImpl(
   pathname: Promise<string>,
   searchParams: Promise<ParsedUrlQuery>,
   interpolatedParams: Params,
-  metadataContext: MetadataContext,
   isRuntimePrefetchable: boolean
 ): Promise<React.ReactNode> {
   const notFoundErrorConvention = 'not-found'
@@ -265,7 +256,6 @@ async function getNotFoundMetadataImpl(
     pathname,
     searchParams,
     interpolatedParams,
-    metadataContext,
     isRuntimePrefetchable,
     notFoundErrorConvention
   )
@@ -311,7 +301,6 @@ async function renderMetadata(
   pathname: Promise<string>,
   searchParams: Promise<ParsedUrlQuery>,
   interpolatedParams: Params,
-  metadataContext: MetadataContext,
   isRuntimePrefetchable: boolean,
   errorConvention?: MetadataErrorType
 ) {
@@ -321,7 +310,6 @@ async function renderMetadata(
     searchParams,
     errorConvention,
     interpolatedParams,
-    metadataContext,
     isRuntimePrefetchable
   )
   return <>{createMetadataElements(resolvedMetadata)}</>

packages/next/src/lib/metadata/resolve-metadata.test.ts

@@ -20,9 +20,7 @@ function accumulateMetadata(metadataItems: MetadataItems) {
   ])
   const route = '/test'
   const pathname = Promise.resolve('/test')
-  return originAccumulateMetadata(route, fullMetadataItems, pathname, {
-    isStaticMetadataRouteFile: false,
-  })
+  return originAccumulateMetadata(route, fullMetadataItems, pathname, false)
 }
 
 function accumulateViewport(viewportExports: Viewport[]) {

packages/next/src/lib/metadata/resolve-metadata.ts

@@ -12,7 +12,6 @@ import { getSegmentParam } from '../../shared/lib/router/utils/get-segment-param
 import type { Twitter } from './types/twitter-types'
 import type { OpenGraph } from './types/opengraph-types'
 import type { AppDirModules } from '../../build/webpack/loaders/next-app-loader'
-import type { MetadataContext } from './types/resolvers'
 import type { LoaderTree } from '../../server/lib/app-dir-module'
 import type {
   AbsoluteTemplateString,
@@ -162,7 +161,6 @@ async function mergeStaticMetadata(
   source: Metadata | null,
   target: ResolvedMetadata,
   staticFilesMetadata: StaticMetadata,
-  metadataContext: MetadataContext,
   titleTemplates: TitleTemplates,
   leafSegmentStaticIcons: StaticIcons,
   pathname: Promise<string>
@@ -181,22 +179,24 @@ async function mergeStaticMetadata(
 
   // file based metadata is specified and current level metadata twitter.images is not specified
   if (twitter && !source?.twitter?.hasOwnProperty('images')) {
+    const isStaticFile = true
     const resolvedTwitter = resolveTwitter(
       { ...target.twitter, images: twitter } as Twitter,
       metadataBase,
-      { ...metadataContext, isStaticMetadataRouteFile: true },
+      isStaticFile,
       titleTemplates.twitter
     )
     target.twitter = convertUrlsToStrings(resolvedTwitter)
   }
 
   // file based metadata is specified and current level metadata openGraph.images is not specified
   if (openGraph && !source?.openGraph?.hasOwnProperty('images')) {
+    const isStaticFile = true
     const resolvedOpenGraph = await resolveOpenGraph(
       { ...target.openGraph, images: openGraph } as OpenGraph,
       metadataBase,
       pathname,
-      { ...metadataContext, isStaticMetadataRouteFile: true },
+      isStaticFile,
       titleTemplates.openGraph
     )
     target.openGraph = convertUrlsToStrings(resolvedOpenGraph)
@@ -219,15 +219,15 @@ async function mergeMetadata(
     resolvedMetadata,
     staticFilesMetadata,
     titleTemplates,
-    metadataContext,
+    isStaticMetadataRouteFile,
     buildState,
     leafSegmentStaticIcons,
   }: {
     metadata: Metadata | null
     resolvedMetadata: ResolvedMetadata
     staticFilesMetadata: StaticMetadata
     titleTemplates: TitleTemplates
-    metadataContext: MetadataContext
+    isStaticMetadataRouteFile: boolean
     buildState: BuildState
     leafSegmentStaticIcons: StaticIcons
   }
@@ -253,12 +253,7 @@ async function mergeMetadata(
       }
       case 'alternates': {
         newResolvedMetadata.alternates = convertUrlsToStrings(
-          await resolveAlternates(
-            metadata.alternates,
-            metadataBase,
-            pathname,
-            metadataContext
-          )
+          await resolveAlternates(metadata.alternates, metadataBase, pathname)
         )
         break
       }
@@ -268,7 +263,7 @@ async function mergeMetadata(
             metadata.openGraph,
             metadataBase,
             pathname,
-            metadataContext,
+            isStaticMetadataRouteFile,
             titleTemplates.openGraph
           )
         )
@@ -279,7 +274,7 @@ async function mergeMetadata(
           resolveTwitter(
             metadata.twitter,
             metadataBase,
-            metadataContext,
+            isStaticMetadataRouteFile,
             titleTemplates.twitter
           )
         )
@@ -331,17 +326,15 @@ async function mergeMetadata(
         newResolvedMetadata[key] = await resolveItunes(
           metadata.itunes,
           metadataBase,
-          pathname,
-          metadataContext
+          pathname
         )
         break
       }
       case 'pagination': {
         newResolvedMetadata.pagination = await resolvePagination(
           metadata.pagination,
           metadataBase,
-          pathname,
-          metadataContext
+          pathname
         )
         break
       }
@@ -439,7 +432,6 @@ async function mergeMetadata(
     metadata,
     newResolvedMetadata,
     staticFilesMetadata,
-    metadataContext,
     titleTemplates,
     leafSegmentStaticIcons,
     pathname
@@ -938,7 +930,7 @@ function postProcessMetadata(
   metadata: ResolvedMetadata,
   favicon: any,
   titleTemplates: TitleTemplates,
-  metadataContext: MetadataContext
+  isStaticMetadataRouteFile: boolean
 ): ResolvedMetadata {
   const { openGraph, twitter } = metadata
 
@@ -971,7 +963,7 @@ function postProcessMetadata(
       const partialTwitter = resolveTwitter(
         autoFillProps,
         normalizeMetadataBase(metadata.metadataBase),
-        metadataContext,
+        isStaticMetadataRouteFile,
         titleTemplates.twitter
       )
       if (metadata.twitter) {
@@ -1114,7 +1106,7 @@ export async function accumulateMetadata(
   route: string,
   metadataItems: MetadataItems,
   pathname: Promise<string>,
-  metadataContext: MetadataContext
+  isStaticMetadataRouteFile: boolean
 ): Promise<ResolvedMetadata> {
   let resolvedMetadata = createDefaultMetadata()
 
@@ -1173,7 +1165,7 @@ export async function accumulateMetadata(
     resolvedMetadata = await mergeMetadata(route, pathname, {
       resolvedMetadata,
       metadata,
-      metadataContext,
+      isStaticMetadataRouteFile,
       staticFilesMetadata,
       titleTemplates,
       buildState,
@@ -1220,7 +1212,7 @@ export async function accumulateMetadata(
     resolvedMetadata,
     favicon,
     titleTemplates,
-    metadataContext
+    isStaticMetadataRouteFile
   )
 }
 
@@ -1267,7 +1259,6 @@ export async function resolveMetadata(
   searchParams: Promise<ParsedUrlQuery>,
   errorConvention: MetadataErrorType | undefined,
   interpolatedParams: Params,
-  metadataContext: MetadataContext,
   isRuntimePrefetchable: boolean
 ): Promise<ResolvedMetadata> {
   const metadataItems = await resolveMetadataItems(
@@ -1281,11 +1272,15 @@ export async function resolveMetadata(
   if (!workStore) {
     throw new InvariantError('Expected workStore to be initialized')
   }
+  // isStaticMetadataRouteFile is always false from external callers.
+  // mergeStaticMetadata overrides it to true internally when processing
+  // static metadata route files (opengraph-image, twitter-image, etc.).
+  const isStaticMetadataRouteFile = false
   return accumulateMetadata(
     workStore.route,
     metadataItems,
     pathname,
-    metadataContext
+    isStaticMetadataRouteFile
   )
 }