Commit 8e9f6505 authored by Josh Story's avatar Josh Story

Remove MetadataContext type and construct isStaticMetadataRouteFile inside resolveMetadata

MetadataContext was a single-field object ({ isStaticMetadataRouteFile: boolean }) that was threaded from createMetadataComponents through the entire metadata resolution chain — six layers of function calls deep — even though every external caller always passed false. The only place that ever set it to true was mergeStaticMetadata, internally.

Instead of threading a constant through the closure and across the call stack, resolveMetadata now constructs the default false value internally. The field is replaced with a plain boolean parameter that only appears in functions that actually distinguish between static and non-static metadata routes.

Deletes metadata-context.tsx and the MetadataContext type.
parent 84c944c4
import type { MetadataContext } from './types/resolvers'
export function createMetadataContext(): MetadataContext {
return {
isStaticMetadataRouteFile: false,
}
}
...@@ -13,7 +13,6 @@ import type { ...@@ -13,7 +13,6 @@ import type {
ResolvedViewport, ResolvedViewport,
} from './types/metadata-interface' } from './types/metadata-interface'
import { isHTTPAccessFallbackError } from '../../client/components/http-access-fallback/http-access-fallback' 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 { createServerSearchParamsForMetadata } from '../../server/request/search-params'
import { createServerPathnameForMetadata } from '../../server/request/pathname' import { createServerPathnameForMetadata } from '../../server/request/pathname'
import { isPostpone } from '../../server/lib/router-utils/is-postpone' import { isPostpone } from '../../server/lib/router-utils/is-postpone'
...@@ -42,7 +41,6 @@ export function createMetadataComponents({ ...@@ -42,7 +41,6 @@ export function createMetadataComponents({
tree, tree,
pathname, pathname,
parsedQuery, parsedQuery,
metadataContext,
interpolatedParams, interpolatedParams,
errorType, errorType,
serveStreamingMetadata, serveStreamingMetadata,
...@@ -51,7 +49,6 @@ export function createMetadataComponents({ ...@@ -51,7 +49,6 @@ export function createMetadataComponents({
tree: LoaderTree tree: LoaderTree
pathname: string pathname: string
parsedQuery: SearchParams parsedQuery: SearchParams
metadataContext: MetadataContext
interpolatedParams: Params interpolatedParams: Params
errorType?: MetadataErrorType | 'redirect' errorType?: MetadataErrorType | 'redirect'
serveStreamingMetadata: boolean serveStreamingMetadata: boolean
...@@ -137,7 +134,6 @@ export function createMetadataComponents({ ...@@ -137,7 +134,6 @@ export function createMetadataComponents({
pathnameForMetadata, pathnameForMetadata,
searchParams, searchParams,
interpolatedParams, interpolatedParams,
metadataContext,
isRuntimePrefetchable, isRuntimePrefetchable,
errorType errorType
).catch((metadataErr) => { ).catch((metadataErr) => {
...@@ -153,7 +149,6 @@ export function createMetadataComponents({ ...@@ -153,7 +149,6 @@ export function createMetadataComponents({
pathnameForMetadata, pathnameForMetadata,
searchParams, searchParams,
interpolatedParams, interpolatedParams,
metadataContext,
isRuntimePrefetchable isRuntimePrefetchable
).catch(() => null) ).catch(() => null)
} }
...@@ -194,7 +189,6 @@ export function createMetadataComponents({ ...@@ -194,7 +189,6 @@ export function createMetadataComponents({
pathnameForMetadata, pathnameForMetadata,
searchParams, searchParams,
interpolatedParams, interpolatedParams,
metadataContext,
isRuntimePrefetchable, isRuntimePrefetchable,
errorType errorType
), ),
...@@ -234,7 +228,6 @@ async function getResolvedMetadataImpl( ...@@ -234,7 +228,6 @@ async function getResolvedMetadataImpl(
pathname: Promise<string>, pathname: Promise<string>,
searchParams: Promise<ParsedUrlQuery>, searchParams: Promise<ParsedUrlQuery>,
interpolatedParams: Params, interpolatedParams: Params,
metadataContext: MetadataContext,
isRuntimePrefetchable: boolean, isRuntimePrefetchable: boolean,
errorType?: MetadataErrorType | 'redirect' errorType?: MetadataErrorType | 'redirect'
): Promise<React.ReactNode> { ): Promise<React.ReactNode> {
...@@ -244,7 +237,6 @@ async function getResolvedMetadataImpl( ...@@ -244,7 +237,6 @@ async function getResolvedMetadataImpl(
pathname, pathname,
searchParams, searchParams,
interpolatedParams, interpolatedParams,
metadataContext,
isRuntimePrefetchable, isRuntimePrefetchable,
errorConvention errorConvention
) )
...@@ -256,7 +248,6 @@ async function getNotFoundMetadataImpl( ...@@ -256,7 +248,6 @@ async function getNotFoundMetadataImpl(
pathname: Promise<string>, pathname: Promise<string>,
searchParams: Promise<ParsedUrlQuery>, searchParams: Promise<ParsedUrlQuery>,
interpolatedParams: Params, interpolatedParams: Params,
metadataContext: MetadataContext,
isRuntimePrefetchable: boolean isRuntimePrefetchable: boolean
): Promise<React.ReactNode> { ): Promise<React.ReactNode> {
const notFoundErrorConvention = 'not-found' const notFoundErrorConvention = 'not-found'
...@@ -265,7 +256,6 @@ async function getNotFoundMetadataImpl( ...@@ -265,7 +256,6 @@ async function getNotFoundMetadataImpl(
pathname, pathname,
searchParams, searchParams,
interpolatedParams, interpolatedParams,
metadataContext,
isRuntimePrefetchable, isRuntimePrefetchable,
notFoundErrorConvention notFoundErrorConvention
) )
...@@ -311,7 +301,6 @@ async function renderMetadata( ...@@ -311,7 +301,6 @@ async function renderMetadata(
pathname: Promise<string>, pathname: Promise<string>,
searchParams: Promise<ParsedUrlQuery>, searchParams: Promise<ParsedUrlQuery>,
interpolatedParams: Params, interpolatedParams: Params,
metadataContext: MetadataContext,
isRuntimePrefetchable: boolean, isRuntimePrefetchable: boolean,
errorConvention?: MetadataErrorType errorConvention?: MetadataErrorType
) { ) {
...@@ -321,7 +310,6 @@ async function renderMetadata( ...@@ -321,7 +310,6 @@ async function renderMetadata(
searchParams, searchParams,
errorConvention, errorConvention,
interpolatedParams, interpolatedParams,
metadataContext,
isRuntimePrefetchable isRuntimePrefetchable
) )
return <>{createMetadataElements(resolvedMetadata)}</> return <>{createMetadataElements(resolvedMetadata)}</>
......
...@@ -20,9 +20,7 @@ function accumulateMetadata(metadataItems: MetadataItems) { ...@@ -20,9 +20,7 @@ function accumulateMetadata(metadataItems: MetadataItems) {
]) ])
const route = '/test' const route = '/test'
const pathname = Promise.resolve('/test') const pathname = Promise.resolve('/test')
return originAccumulateMetadata(route, fullMetadataItems, pathname, { return originAccumulateMetadata(route, fullMetadataItems, pathname, false)
isStaticMetadataRouteFile: false,
})
} }
function accumulateViewport(viewportExports: Viewport[]) { function accumulateViewport(viewportExports: Viewport[]) {
......
...@@ -12,7 +12,6 @@ import { getSegmentParam } from '../../shared/lib/router/utils/get-segment-param ...@@ -12,7 +12,6 @@ import { getSegmentParam } from '../../shared/lib/router/utils/get-segment-param
import type { Twitter } from './types/twitter-types' import type { Twitter } from './types/twitter-types'
import type { OpenGraph } from './types/opengraph-types' import type { OpenGraph } from './types/opengraph-types'
import type { AppDirModules } from '../../build/webpack/loaders/next-app-loader' 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 { LoaderTree } from '../../server/lib/app-dir-module'
import type { import type {
AbsoluteTemplateString, AbsoluteTemplateString,
...@@ -162,7 +161,6 @@ async function mergeStaticMetadata( ...@@ -162,7 +161,6 @@ async function mergeStaticMetadata(
source: Metadata | null, source: Metadata | null,
target: ResolvedMetadata, target: ResolvedMetadata,
staticFilesMetadata: StaticMetadata, staticFilesMetadata: StaticMetadata,
metadataContext: MetadataContext,
titleTemplates: TitleTemplates, titleTemplates: TitleTemplates,
leafSegmentStaticIcons: StaticIcons, leafSegmentStaticIcons: StaticIcons,
pathname: Promise<string> pathname: Promise<string>
...@@ -181,10 +179,11 @@ async function mergeStaticMetadata( ...@@ -181,10 +179,11 @@ async function mergeStaticMetadata(
// file based metadata is specified and current level metadata twitter.images is not specified // file based metadata is specified and current level metadata twitter.images is not specified
if (twitter && !source?.twitter?.hasOwnProperty('images')) { if (twitter && !source?.twitter?.hasOwnProperty('images')) {
const isStaticFile = true
const resolvedTwitter = resolveTwitter( const resolvedTwitter = resolveTwitter(
{ ...target.twitter, images: twitter } as Twitter, { ...target.twitter, images: twitter } as Twitter,
metadataBase, metadataBase,
{ ...metadataContext, isStaticMetadataRouteFile: true }, isStaticFile,
titleTemplates.twitter titleTemplates.twitter
) )
target.twitter = convertUrlsToStrings(resolvedTwitter) target.twitter = convertUrlsToStrings(resolvedTwitter)
...@@ -192,11 +191,12 @@ async function mergeStaticMetadata( ...@@ -192,11 +191,12 @@ async function mergeStaticMetadata(
// file based metadata is specified and current level metadata openGraph.images is not specified // file based metadata is specified and current level metadata openGraph.images is not specified
if (openGraph && !source?.openGraph?.hasOwnProperty('images')) { if (openGraph && !source?.openGraph?.hasOwnProperty('images')) {
const isStaticFile = true
const resolvedOpenGraph = await resolveOpenGraph( const resolvedOpenGraph = await resolveOpenGraph(
{ ...target.openGraph, images: openGraph } as OpenGraph, { ...target.openGraph, images: openGraph } as OpenGraph,
metadataBase, metadataBase,
pathname, pathname,
{ ...metadataContext, isStaticMetadataRouteFile: true }, isStaticFile,
titleTemplates.openGraph titleTemplates.openGraph
) )
target.openGraph = convertUrlsToStrings(resolvedOpenGraph) target.openGraph = convertUrlsToStrings(resolvedOpenGraph)
...@@ -219,7 +219,7 @@ async function mergeMetadata( ...@@ -219,7 +219,7 @@ async function mergeMetadata(
resolvedMetadata, resolvedMetadata,
staticFilesMetadata, staticFilesMetadata,
titleTemplates, titleTemplates,
metadataContext, isStaticMetadataRouteFile,
buildState, buildState,
leafSegmentStaticIcons, leafSegmentStaticIcons,
}: { }: {
...@@ -227,7 +227,7 @@ async function mergeMetadata( ...@@ -227,7 +227,7 @@ async function mergeMetadata(
resolvedMetadata: ResolvedMetadata resolvedMetadata: ResolvedMetadata
staticFilesMetadata: StaticMetadata staticFilesMetadata: StaticMetadata
titleTemplates: TitleTemplates titleTemplates: TitleTemplates
metadataContext: MetadataContext isStaticMetadataRouteFile: boolean
buildState: BuildState buildState: BuildState
leafSegmentStaticIcons: StaticIcons leafSegmentStaticIcons: StaticIcons
} }
...@@ -253,12 +253,7 @@ async function mergeMetadata( ...@@ -253,12 +253,7 @@ async function mergeMetadata(
} }
case 'alternates': { case 'alternates': {
newResolvedMetadata.alternates = convertUrlsToStrings( newResolvedMetadata.alternates = convertUrlsToStrings(
await resolveAlternates( await resolveAlternates(metadata.alternates, metadataBase, pathname)
metadata.alternates,
metadataBase,
pathname,
metadataContext
)
) )
break break
} }
...@@ -268,7 +263,7 @@ async function mergeMetadata( ...@@ -268,7 +263,7 @@ async function mergeMetadata(
metadata.openGraph, metadata.openGraph,
metadataBase, metadataBase,
pathname, pathname,
metadataContext, isStaticMetadataRouteFile,
titleTemplates.openGraph titleTemplates.openGraph
) )
) )
...@@ -279,7 +274,7 @@ async function mergeMetadata( ...@@ -279,7 +274,7 @@ async function mergeMetadata(
resolveTwitter( resolveTwitter(
metadata.twitter, metadata.twitter,
metadataBase, metadataBase,
metadataContext, isStaticMetadataRouteFile,
titleTemplates.twitter titleTemplates.twitter
) )
) )
...@@ -331,8 +326,7 @@ async function mergeMetadata( ...@@ -331,8 +326,7 @@ async function mergeMetadata(
newResolvedMetadata[key] = await resolveItunes( newResolvedMetadata[key] = await resolveItunes(
metadata.itunes, metadata.itunes,
metadataBase, metadataBase,
pathname, pathname
metadataContext
) )
break break
} }
...@@ -340,8 +334,7 @@ async function mergeMetadata( ...@@ -340,8 +334,7 @@ async function mergeMetadata(
newResolvedMetadata.pagination = await resolvePagination( newResolvedMetadata.pagination = await resolvePagination(
metadata.pagination, metadata.pagination,
metadataBase, metadataBase,
pathname, pathname
metadataContext
) )
break break
} }
...@@ -439,7 +432,6 @@ async function mergeMetadata( ...@@ -439,7 +432,6 @@ async function mergeMetadata(
metadata, metadata,
newResolvedMetadata, newResolvedMetadata,
staticFilesMetadata, staticFilesMetadata,
metadataContext,
titleTemplates, titleTemplates,
leafSegmentStaticIcons, leafSegmentStaticIcons,
pathname pathname
...@@ -938,7 +930,7 @@ function postProcessMetadata( ...@@ -938,7 +930,7 @@ function postProcessMetadata(
metadata: ResolvedMetadata, metadata: ResolvedMetadata,
favicon: any, favicon: any,
titleTemplates: TitleTemplates, titleTemplates: TitleTemplates,
metadataContext: MetadataContext isStaticMetadataRouteFile: boolean
): ResolvedMetadata { ): ResolvedMetadata {
const { openGraph, twitter } = metadata const { openGraph, twitter } = metadata
...@@ -971,7 +963,7 @@ function postProcessMetadata( ...@@ -971,7 +963,7 @@ function postProcessMetadata(
const partialTwitter = resolveTwitter( const partialTwitter = resolveTwitter(
autoFillProps, autoFillProps,
normalizeMetadataBase(metadata.metadataBase), normalizeMetadataBase(metadata.metadataBase),
metadataContext, isStaticMetadataRouteFile,
titleTemplates.twitter titleTemplates.twitter
) )
if (metadata.twitter) { if (metadata.twitter) {
...@@ -1114,7 +1106,7 @@ export async function accumulateMetadata( ...@@ -1114,7 +1106,7 @@ export async function accumulateMetadata(
route: string, route: string,
metadataItems: MetadataItems, metadataItems: MetadataItems,
pathname: Promise<string>, pathname: Promise<string>,
metadataContext: MetadataContext isStaticMetadataRouteFile: boolean
): Promise<ResolvedMetadata> { ): Promise<ResolvedMetadata> {
let resolvedMetadata = createDefaultMetadata() let resolvedMetadata = createDefaultMetadata()
...@@ -1173,7 +1165,7 @@ export async function accumulateMetadata( ...@@ -1173,7 +1165,7 @@ export async function accumulateMetadata(
resolvedMetadata = await mergeMetadata(route, pathname, { resolvedMetadata = await mergeMetadata(route, pathname, {
resolvedMetadata, resolvedMetadata,
metadata, metadata,
metadataContext, isStaticMetadataRouteFile,
staticFilesMetadata, staticFilesMetadata,
titleTemplates, titleTemplates,
buildState, buildState,
...@@ -1220,7 +1212,7 @@ export async function accumulateMetadata( ...@@ -1220,7 +1212,7 @@ export async function accumulateMetadata(
resolvedMetadata, resolvedMetadata,
favicon, favicon,
titleTemplates, titleTemplates,
metadataContext isStaticMetadataRouteFile
) )
} }
...@@ -1267,7 +1259,6 @@ export async function resolveMetadata( ...@@ -1267,7 +1259,6 @@ export async function resolveMetadata(
searchParams: Promise<ParsedUrlQuery>, searchParams: Promise<ParsedUrlQuery>,
errorConvention: MetadataErrorType | undefined, errorConvention: MetadataErrorType | undefined,
interpolatedParams: Params, interpolatedParams: Params,
metadataContext: MetadataContext,
isRuntimePrefetchable: boolean isRuntimePrefetchable: boolean
): Promise<ResolvedMetadata> { ): Promise<ResolvedMetadata> {
const metadataItems = await resolveMetadataItems( const metadataItems = await resolveMetadataItems(
...@@ -1281,11 +1272,15 @@ export async function resolveMetadata( ...@@ -1281,11 +1272,15 @@ export async function resolveMetadata(
if (!workStore) { if (!workStore) {
throw new InvariantError('Expected workStore to be initialized') 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( return accumulateMetadata(
workStore.route, workStore.route,
metadataItems, metadataItems,
pathname, pathname,
metadataContext isStaticMetadataRouteFile
) )
} }
......
...@@ -8,7 +8,6 @@ import type { ResolvedVerification } from '../types/metadata-types' ...@@ -8,7 +8,6 @@ import type { ResolvedVerification } from '../types/metadata-types'
import type { import type {
FieldResolver, FieldResolver,
AsyncFieldResolverExtraArgs, AsyncFieldResolverExtraArgs,
MetadataContext,
} from '../types/resolvers' } from '../types/resolvers'
import { resolveAsArrayOrUndefined } from '../generate/utils' import { resolveAsArrayOrUndefined } from '../generate/utils'
import { import {
...@@ -19,8 +18,7 @@ import { ...@@ -19,8 +18,7 @@ import {
function resolveAlternateUrl( function resolveAlternateUrl(
url: string | URL, url: string | URL,
metadataBase: MetadataBaseURL, metadataBase: MetadataBaseURL,
pathname: string, pathname: string
metadataContext: MetadataContext
) { ) {
// If alter native url is an URL instance, // If alter native url is an URL instance,
// we treat it as a URL base and resolve with current pathname // we treat it as a URL base and resolve with current pathname
...@@ -31,12 +29,7 @@ function resolveAlternateUrl( ...@@ -31,12 +29,7 @@ function resolveAlternateUrl(
) )
url = newUrl url = newUrl
} }
return resolveAbsoluteUrlWithPathname( return resolveAbsoluteUrlWithPathname(url, metadataBase, pathname)
url,
metadataBase,
pathname,
metadataContext
)
} }
export const resolveThemeColor: FieldResolver<'themeColor', Viewport> = ( export const resolveThemeColor: FieldResolver<'themeColor', Viewport> = (
...@@ -67,8 +60,7 @@ async function resolveUrlValuesOfObject( ...@@ -67,8 +60,7 @@ async function resolveUrlValuesOfObject(
| null | null
| undefined, | undefined,
metadataBase: MetadataBaseURL, metadataBase: MetadataBaseURL,
pathname: Promise<string>, pathname: Promise<string>
metadataContext: MetadataContext
): Promise<null | Record<string, AlternateLinkDescriptor[]>> { ): Promise<null | Record<string, AlternateLinkDescriptor[]>> {
if (!obj) return null if (!obj) return null
...@@ -78,24 +70,14 @@ async function resolveUrlValuesOfObject( ...@@ -78,24 +70,14 @@ async function resolveUrlValuesOfObject(
const pathnameForUrl = await pathname const pathnameForUrl = await pathname
result[key] = [ result[key] = [
{ {
url: resolveAlternateUrl( url: resolveAlternateUrl(value, metadataBase, pathnameForUrl),
value,
metadataBase,
pathnameForUrl,
metadataContext
),
}, },
] ]
} else if (value && value.length) { } else if (value && value.length) {
result[key] = [] result[key] = []
const pathnameForUrl = await pathname const pathnameForUrl = await pathname
value.forEach((item, index) => { value.forEach((item, index) => {
const url = resolveAlternateUrl( const url = resolveAlternateUrl(item.url, metadataBase, pathnameForUrl)
item.url,
metadataBase,
pathnameForUrl,
metadataContext
)
result[key][index] = { result[key][index] = {
url, url,
title: item.title, title: item.title,
...@@ -109,8 +91,7 @@ async function resolveUrlValuesOfObject( ...@@ -109,8 +91,7 @@ async function resolveUrlValuesOfObject(
async function resolveCanonicalUrl( async function resolveCanonicalUrl(
urlOrDescriptor: string | URL | null | AlternateLinkDescriptor | undefined, urlOrDescriptor: string | URL | null | AlternateLinkDescriptor | undefined,
metadataBase: MetadataBaseURL, metadataBase: MetadataBaseURL,
pathname: Promise<string>, pathname: Promise<string>
metadataContext: MetadataContext
): Promise<null | AlternateLinkDescriptor> { ): Promise<null | AlternateLinkDescriptor> {
if (!urlOrDescriptor) return null if (!urlOrDescriptor) return null
...@@ -123,44 +104,35 @@ async function resolveCanonicalUrl( ...@@ -123,44 +104,35 @@ async function resolveCanonicalUrl(
// Return string url because structureClone can't handle URL instance // Return string url because structureClone can't handle URL instance
return { return {
url: resolveAlternateUrl( url: resolveAlternateUrl(url, metadataBase, pathnameForUrl),
url,
metadataBase,
pathnameForUrl,
metadataContext
),
} }
} }
export const resolveAlternates: AsyncFieldResolverExtraArgs< export const resolveAlternates: AsyncFieldResolverExtraArgs<
'alternates', 'alternates',
[MetadataBaseURL, Promise<string>, MetadataContext] [MetadataBaseURL, Promise<string>]
> = async (alternates, metadataBase, pathname, context) => { > = async (alternates, metadataBase, pathname) => {
if (!alternates) return null if (!alternates) return null
const canonical = await resolveCanonicalUrl( const canonical = await resolveCanonicalUrl(
alternates.canonical, alternates.canonical,
metadataBase, metadataBase,
pathname, pathname
context
) )
const languages = await resolveUrlValuesOfObject( const languages = await resolveUrlValuesOfObject(
alternates.languages, alternates.languages,
metadataBase, metadataBase,
pathname, pathname
context
) )
const media = await resolveUrlValuesOfObject( const media = await resolveUrlValuesOfObject(
alternates.media, alternates.media,
metadataBase, metadataBase,
pathname, pathname
context
) )
const types = await resolveUrlValuesOfObject( const types = await resolveUrlValuesOfObject(
alternates.types, alternates.types,
metadataBase, metadataBase,
pathname, pathname
context
) )
return { return {
...@@ -274,18 +246,13 @@ export const resolveAppLinks: FieldResolver<'appLinks'> = (appLinks) => { ...@@ -274,18 +246,13 @@ export const resolveAppLinks: FieldResolver<'appLinks'> = (appLinks) => {
export const resolveItunes: AsyncFieldResolverExtraArgs< export const resolveItunes: AsyncFieldResolverExtraArgs<
'itunes', 'itunes',
[MetadataBaseURL, Promise<string>, MetadataContext] [MetadataBaseURL, Promise<string>]
> = async (itunes, metadataBase, pathname, context) => { > = async (itunes, metadataBase, pathname) => {
if (!itunes) return null if (!itunes) return null
return { return {
appId: itunes.appId, appId: itunes.appId,
appArgument: itunes.appArgument appArgument: itunes.appArgument
? resolveAlternateUrl( ? resolveAlternateUrl(itunes.appArgument, metadataBase, await pathname)
itunes.appArgument,
metadataBase,
await pathname,
context
)
: undefined, : undefined,
} }
} }
...@@ -300,24 +267,14 @@ export const resolveFacebook: FieldResolver<'facebook'> = (facebook) => { ...@@ -300,24 +267,14 @@ export const resolveFacebook: FieldResolver<'facebook'> = (facebook) => {
export const resolvePagination: AsyncFieldResolverExtraArgs< export const resolvePagination: AsyncFieldResolverExtraArgs<
'pagination', 'pagination',
[MetadataBaseURL, Promise<string>, MetadataContext] [MetadataBaseURL, Promise<string>]
> = async (pagination, metadataBase, pathname, context) => { > = async (pagination, metadataBase, pathname) => {
return { return {
previous: pagination?.previous previous: pagination?.previous
? resolveAlternateUrl( ? resolveAlternateUrl(pagination.previous, metadataBase, await pathname)
pagination.previous,
metadataBase,
await pathname,
context
)
: null, : null,
next: pagination?.next next: pagination?.next
? resolveAlternateUrl( ? resolveAlternateUrl(pagination.next, metadataBase, await pathname)
pagination.next,
metadataBase,
await pathname,
context
)
: null, : null,
} }
} }
...@@ -51,9 +51,7 @@ describe('resolveOpenGraph', () => { ...@@ -51,9 +51,7 @@ describe('resolveOpenGraph', () => {
{ type: 'article', authors: '' }, { type: 'article', authors: '' },
null, null,
pathname, pathname,
{ false,
isStaticMetadataRouteFile: false,
},
'' ''
) )
).toEqual({ ).toEqual({
...@@ -74,9 +72,7 @@ describe('resolveOpenGraph', () => { ...@@ -74,9 +72,7 @@ describe('resolveOpenGraph', () => {
{ type: 'article', authors: null }, { type: 'article', authors: null },
null, null,
pathname, pathname,
{ false,
isStaticMetadataRouteFile: false,
},
'' ''
) )
).toEqual({ ).toEqual({
......
...@@ -7,7 +7,6 @@ import type { ...@@ -7,7 +7,6 @@ import type {
import type { import type {
FieldResolverExtraArgs, FieldResolverExtraArgs,
AsyncFieldResolverExtraArgs, AsyncFieldResolverExtraArgs,
MetadataContext,
} from '../types/resolvers' } from '../types/resolvers'
import type { ResolvedTwitterMetadata, Twitter } from '../types/twitter-types' import type { ResolvedTwitterMetadata, Twitter } from '../types/twitter-types'
import { resolveArray, resolveAsArrayOrUndefined } from '../generate/utils' import { resolveArray, resolveAsArrayOrUndefined } from '../generate/utils'
...@@ -160,12 +159,12 @@ function getFieldsByOgType(ogType: OpenGraphType | undefined) { ...@@ -160,12 +159,12 @@ function getFieldsByOgType(ogType: OpenGraphType | undefined) {
export const resolveOpenGraph: AsyncFieldResolverExtraArgs< export const resolveOpenGraph: AsyncFieldResolverExtraArgs<
'openGraph', 'openGraph',
[MetadataBaseURL, Promise<string>, MetadataContext, string | null] [MetadataBaseURL, Promise<string>, boolean, string | null]
> = async ( > = async (
openGraph, openGraph,
metadataBase, metadataBase,
pathname, pathname,
metadataContext, isStaticMetadataRouteFile,
titleTemplate titleTemplate
) => { ) => {
if (!openGraph) return null if (!openGraph) return null
...@@ -184,7 +183,7 @@ export const resolveOpenGraph: AsyncFieldResolverExtraArgs< ...@@ -184,7 +183,7 @@ export const resolveOpenGraph: AsyncFieldResolverExtraArgs<
target.images = resolveImages( target.images = resolveImages(
og.images, og.images,
metadataBase, metadataBase,
metadataContext.isStaticMetadataRouteFile isStaticMetadataRouteFile
) )
} }
...@@ -198,8 +197,7 @@ export const resolveOpenGraph: AsyncFieldResolverExtraArgs< ...@@ -198,8 +197,7 @@ export const resolveOpenGraph: AsyncFieldResolverExtraArgs<
? resolveAbsoluteUrlWithPathname( ? resolveAbsoluteUrlWithPathname(
openGraph.url, openGraph.url,
metadataBase, metadataBase,
await pathname, await pathname
metadataContext
) )
: null : null
...@@ -216,8 +214,8 @@ const TwitterBasicInfoKeys = [ ...@@ -216,8 +214,8 @@ const TwitterBasicInfoKeys = [
export const resolveTwitter: FieldResolverExtraArgs< export const resolveTwitter: FieldResolverExtraArgs<
'twitter', 'twitter',
[MetadataBaseURL, MetadataContext, string | null] [MetadataBaseURL, boolean, string | null]
> = (twitter, metadataBase, metadataContext, titleTemplate) => { > = (twitter, metadataBase, isStaticMetadataRouteFile, titleTemplate) => {
if (!twitter) return null if (!twitter) return null
let card = 'card' in twitter ? twitter.card : undefined let card = 'card' in twitter ? twitter.card : undefined
const resolved = { const resolved = {
...@@ -231,7 +229,7 @@ export const resolveTwitter: FieldResolverExtraArgs< ...@@ -231,7 +229,7 @@ export const resolveTwitter: FieldResolverExtraArgs<
resolved.images = resolveImages( resolved.images = resolveImages(
twitter.images, twitter.images,
metadataBase, metadataBase,
metadataContext.isStaticMetadataRouteFile isStaticMetadataRouteFile
) )
card = card || (resolved.images?.length ? 'summary_large_image' : 'summary') card = card || (resolved.images?.length ? 'summary_large_image' : 'summary')
......
...@@ -52,16 +52,13 @@ describe('resolveAbsoluteUrlWithPathname', () => { ...@@ -52,16 +52,13 @@ describe('resolveAbsoluteUrlWithPathname', () => {
describe('trailingSlash is false', () => { describe('trailingSlash is false', () => {
const metadataBase = new URL('https://example.com/') const metadataBase = new URL('https://example.com/')
const pathname = '/' const pathname = '/'
const opts = {
isStaticMetadataRouteFile: false,
}
beforeEach(() => { beforeEach(() => {
setNextInvariantsForTest({ trailingSlash: false }) setNextInvariantsForTest({ trailingSlash: false })
}) })
const resolver = (url: string | URL) => const resolver = (url: string | URL) =>
resolveAbsoluteUrlWithPathname(url, metadataBase, pathname, opts) resolveAbsoluteUrlWithPathname(url, metadataBase, pathname)
it('should resolve absolute internal url', () => { it('should resolve absolute internal url', () => {
expect(resolver('https://example.com/foo')).toBe( expect(resolver('https://example.com/foo')).toBe(
'https://example.com/foo' 'https://example.com/foo'
...@@ -78,16 +75,13 @@ describe('resolveAbsoluteUrlWithPathname', () => { ...@@ -78,16 +75,13 @@ describe('resolveAbsoluteUrlWithPathname', () => {
describe('trailingSlash is true', () => { describe('trailingSlash is true', () => {
const metadataBase = new URL('https://example.com/') const metadataBase = new URL('https://example.com/')
const pathname = '/' const pathname = '/'
const opts = {
isStaticMetadataRouteFile: false,
}
beforeEach(() => { beforeEach(() => {
setNextInvariantsForTest({ trailingSlash: true }) setNextInvariantsForTest({ trailingSlash: true })
}) })
const resolver = (url: string | URL) => const resolver = (url: string | URL) =>
resolveAbsoluteUrlWithPathname(url, metadataBase, pathname, opts) resolveAbsoluteUrlWithPathname(url, metadataBase, pathname)
it('should add trailing slash to relative url', () => { it('should add trailing slash to relative url', () => {
expect(resolver('/foo')).toBe('https://example.com/foo/') expect(resolver('/foo')).toBe('https://example.com/foo/')
}) })
......
import path from '../../../shared/lib/isomorphic/path' import path from '../../../shared/lib/isomorphic/path'
import type { MetadataContext } from '../types/resolvers'
export type MetadataBaseURL = URL | null export type MetadataBaseURL = URL | null
...@@ -103,8 +102,7 @@ function isFilePattern(pathname: string): boolean { ...@@ -103,8 +102,7 @@ function isFilePattern(pathname: string): boolean {
function resolveAbsoluteUrlWithPathname( function resolveAbsoluteUrlWithPathname(
url: string | URL, url: string | URL,
metadataBase: MetadataBaseURL, metadataBase: MetadataBaseURL,
pathname: string, pathname: string
_metadataContext: MetadataContext
): string { ): string {
// Resolve url with pathname that always starts with `/` // Resolve url with pathname that always starts with `/`
url = resolveRelativeUrl(url, pathname) url = resolveRelativeUrl(url, pathname)
......
...@@ -19,7 +19,3 @@ export type AsyncFieldResolverExtraArgs< ...@@ -19,7 +19,3 @@ export type AsyncFieldResolverExtraArgs<
Data = Metadata, Data = Metadata,
ResolvedData = ResolvedMetadataWithURLs, ResolvedData = ResolvedMetadataWithURLs,
> = (T: Data[Key], ...args: ExtraArgs) => Promise<ResolvedData[Key]> > = (T: Data[Key], ...args: ExtraArgs) => Promise<ResolvedData[Key]>
export type MetadataContext = {
isStaticMetadataRouteFile: boolean
}
...@@ -57,7 +57,6 @@ import { ...@@ -57,7 +57,6 @@ import {
NEXT_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER,
NEXT_HTML_REQUEST_ID_HEADER, NEXT_HTML_REQUEST_ID_HEADER,
} from '../../client/components/app-router-headers' } from '../../client/components/app-router-headers'
import { createMetadataContext } from '../../lib/metadata/metadata-context'
import { createRequestStoreForRender } from '../async-storage/request-store' import { createRequestStoreForRender } from '../async-storage/request-store'
import { createWorkStore } from '../async-storage/work-store' import { createWorkStore } from '../async-storage/work-store'
import { import {
...@@ -551,7 +550,6 @@ async function generateDynamicRSCPayload( ...@@ -551,7 +550,6 @@ async function generateDynamicRSCPayload(
tree: loaderTree, tree: loaderTree,
parsedQuery: query, parsedQuery: query,
pathname: url.pathname, pathname: url.pathname,
metadataContext: createMetadataContext(),
interpolatedParams: ctx.interpolatedParams, interpolatedParams: ctx.interpolatedParams,
serveStreamingMetadata, serveStreamingMetadata,
isRuntimePrefetchable: metadataIsRuntimePrefetchable, isRuntimePrefetchable: metadataIsRuntimePrefetchable,
...@@ -1449,7 +1447,6 @@ async function getRSCPayload( ...@@ -1449,7 +1447,6 @@ async function getRSCPayload(
errorType: is404 && !hasGlobalNotFound ? 'not-found' : undefined, errorType: is404 && !hasGlobalNotFound ? 'not-found' : undefined,
parsedQuery: query, parsedQuery: query,
pathname: url.pathname, pathname: url.pathname,
metadataContext: createMetadataContext(),
interpolatedParams: ctx.interpolatedParams, interpolatedParams: ctx.interpolatedParams,
serveStreamingMetadata, serveStreamingMetadata,
isRuntimePrefetchable: metadataIsRuntimePrefetchable, isRuntimePrefetchable: metadataIsRuntimePrefetchable,
...@@ -1571,7 +1568,6 @@ async function getErrorRSCPayload( ...@@ -1571,7 +1568,6 @@ async function getErrorRSCPayload(
tree, tree,
parsedQuery: query, parsedQuery: query,
pathname: url.pathname, pathname: url.pathname,
metadataContext: createMetadataContext(),
errorType, errorType,
interpolatedParams: ctx.interpolatedParams, interpolatedParams: ctx.interpolatedParams,
serveStreamingMetadata: serveStreamingMetadata, serveStreamingMetadata: serveStreamingMetadata,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment