Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
7a47ed51
Unverified
Commit
7a47ed51
authored
Dec 23, 2024
by
Jiachi Liu
Committed by
GitHub
Dec 23, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[metadata] Merge the metadata resolve apis into one api (#74191)
parent
75a9dfac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
102 additions
and
48 deletions
+102
-48
metadata.tsx
packages/next/src/lib/metadata/metadata.tsx
+59
-44
resolve-metadata.ts
packages/next/src/lib/metadata/resolve-metadata.ts
+43
-4
No files found.
packages/next/src/lib/metadata/metadata.tsx
View file @
7a47ed51
...
...
@@ -21,10 +21,9 @@ import {
}
from
'./generate/opengraph'
import
{
IconsMetadata
}
from
'./generate/icons'
import
{
resolveMetadataItems
,
accumulateMetadata
,
accumulateViewport
,
type
MetadataErrorType
,
resolveMetadata
,
resolveViewport
,
}
from
'./resolve-metadata'
import
{
MetaFilter
}
from
'./generate/meta'
import
type
{
...
...
@@ -196,24 +195,14 @@ async function getResolvedMetadataImpl(
errorType
?:
MetadataErrorType
|
'redirect'
):
Promise
<
React
.
ReactNode
>
{
const
errorConvention
=
errorType
===
'redirect'
?
undefined
:
errorType
const
metadataItems
=
await
resolveMetadataItems
(
return
renderMetadata
(
tree
,
searchParams
,
errorConvention
,
getDynamicParamFromSegment
,
metadataContext
,
createServerParamsForMetadata
,
workStore
)
const
elements
:
Array
<
React
.
ReactNode
>
=
createMetadataElements
(
await
accumulateMetadata
(
metadataItems
,
metadataContext
)
)
return
(
<>
{
elements
.
map
((
el
,
index
)
=>
{
return
cloneElement
(
el
as
React
.
ReactElement
,
{
key
:
index
})
})
}
</>
workStore
,
errorConvention
)
}
...
...
@@ -227,24 +216,14 @@ async function getNotFoundMetadataImpl(
workStore
:
WorkStore
):
Promise
<
React
.
ReactNode
>
{
const
notFoundErrorConvention
=
'not-found'
const
notFoundMetadataItems
=
await
resolveMetadataItems
(
return
renderMetadata
(
tree
,
searchParams
,
notFoundErrorConvention
,
getDynamicParamFromSegment
,
metadataContext
,
createServerParamsForMetadata
,
workStore
)
const
elements
:
Array
<
React
.
ReactNode
>
=
createMetadataElements
(
await
accumulateMetadata
(
notFoundMetadataItems
,
metadataContext
)
)
return
(
<>
{
elements
.
map
((
el
,
index
)
=>
{
return
cloneElement
(
el
as
React
.
ReactElement
,
{
key
:
index
})
})
}
</>
workStore
,
notFoundErrorConvention
)
}
...
...
@@ -258,18 +237,55 @@ async function getResolvedViewportImpl(
errorType
?:
MetadataErrorType
|
'redirect'
):
Promise
<
React
.
ReactNode
>
{
const
errorConvention
=
errorType
===
'redirect'
?
undefined
:
errorType
return
renderViewport
(
tree
,
searchParams
,
getDynamicParamFromSegment
,
createServerParamsForMetadata
,
workStore
,
errorConvention
)
}
const
metadataItems
=
await
resolveMetadataItems
(
const
getNotFoundViewport
=
cache
(
getNotFoundViewportImpl
)
async
function
getNotFoundViewportImpl
(
tree
:
LoaderTree
,
searchParams
:
Promise
<
ParsedUrlQuery
>
,
getDynamicParamFromSegment
:
GetDynamicParamFromSegment
,
createServerParamsForMetadata
:
CreateServerParamsForMetadata
,
workStore
:
WorkStore
):
Promise
<
React
.
ReactNode
>
{
const
notFoundErrorConvention
=
'not-found'
return
renderViewport
(
tree
,
searchParams
,
errorConvention
,
getDynamicParamFromSegment
,
createServerParamsForMetadata
,
workStore
workStore
,
notFoundErrorConvention
)
const
elements
:
Array
<
React
.
ReactNode
>
=
createViewportElements
(
await
accumulateViewport
(
metadataItems
)
}
async
function
renderMetadata
(
tree
:
LoaderTree
,
searchParams
:
Promise
<
ParsedUrlQuery
>
,
getDynamicParamFromSegment
:
GetDynamicParamFromSegment
,
metadataContext
:
MetadataContext
,
createServerParamsForMetadata
:
CreateServerParamsForMetadata
,
workStore
:
WorkStore
,
errorConvention
?:
MetadataErrorType
)
{
const
resolvedMetadata
=
await
resolveMetadata
(
tree
,
searchParams
,
errorConvention
,
getDynamicParamFromSegment
,
createServerParamsForMetadata
,
workStore
,
metadataContext
)
const
elements
:
Array
<
React
.
ReactNode
>
=
createMetadataElements
(
resolvedMetadata
)
return
(
<>
{
elements
.
map
((
el
,
index
)
=>
{
...
...
@@ -279,26 +295,25 @@ async function getResolvedViewportImpl(
)
}
const
getNotFoundViewport
=
cache
(
getNotFoundViewportImpl
)
async
function
getNotFoundViewportImpl
(
async
function
renderViewport
(
tree
:
LoaderTree
,
searchParams
:
Promise
<
ParsedUrlQuery
>
,
getDynamicParamFromSegment
:
GetDynamicParamFromSegment
,
createServerParamsForMetadata
:
CreateServerParamsForMetadata
,
workStore
:
WorkStore
):
Promise
<
React
.
ReactNode
>
{
const
notFoundErrorConvention
=
'not-found'
const
notFound
MetadataItems
=
await
resolveMetadataItems
(
workStore
:
WorkStore
,
errorConvention
?:
MetadataErrorType
)
{
const
notFound
ResolvedViewport
=
await
resolveViewport
(
tree
,
searchParams
,
notFoundE
rrorConvention
,
e
rrorConvention
,
getDynamicParamFromSegment
,
createServerParamsForMetadata
,
workStore
)
const
elements
:
Array
<
React
.
ReactNode
>
=
createViewportElements
(
await
accumulateViewport
(
notFoundMetadataItems
)
notFoundResolvedViewport
)
return
(
<>
...
...
packages/next/src/lib/metadata/resolve-metadata.ts
View file @
7a47ed51
...
...
@@ -470,9 +470,7 @@ async function collectMetadata({
}
}
const
cachedResolveMetadataItems
=
cache
(
resolveMetadataItems
)
export
{
cachedResolveMetadataItems
as
resolveMetadataItems
}
async
function
resolveMetadataItems
(
const
resolveMetadataItems
=
cache
(
async
function
(
tree
:
LoaderTree
,
searchParams
:
Promise
<
ParsedUrlQuery
>
,
errorConvention
:
MetadataErrorType
|
undefined
,
...
...
@@ -496,7 +494,7 @@ async function resolveMetadataItems(
createServerParamsForMetadata
,
workStore
)
}
}
)
async
function
resolveMetadataItemsImpl
(
metadataItems
:
MetadataItems
,
...
...
@@ -901,3 +899,44 @@ export async function accumulateViewport(
}
return
resolvedViewport
}
// Exposed API for metadata component, that directly resolve the loader tree and related context as resolved metadata.
export
async
function
resolveMetadata
(
tree
:
LoaderTree
,
searchParams
:
Promise
<
ParsedUrlQuery
>
,
errorConvention
:
MetadataErrorType
|
undefined
,
getDynamicParamFromSegment
:
GetDynamicParamFromSegment
,
createServerParamsForMetadata
:
CreateServerParamsForMetadata
,
workStore
:
WorkStore
,
metadataContext
:
MetadataContext
):
Promise
<
ResolvedMetadata
>
{
const
metadataItems
=
await
resolveMetadataItems
(
tree
,
searchParams
,
errorConvention
,
getDynamicParamFromSegment
,
createServerParamsForMetadata
,
workStore
)
return
accumulateMetadata
(
metadataItems
,
metadataContext
)
}
// Exposed API for viewport component, that directly resolve the loader tree and related context as resolved viewport.
export
async
function
resolveViewport
(
tree
:
LoaderTree
,
searchParams
:
Promise
<
ParsedUrlQuery
>
,
errorConvention
:
MetadataErrorType
|
undefined
,
getDynamicParamFromSegment
:
GetDynamicParamFromSegment
,
createServerParamsForMetadata
:
CreateServerParamsForMetadata
,
workStore
:
WorkStore
):
Promise
<
ResolvedViewport
>
{
const
metadataItems
=
await
resolveMetadataItems
(
tree
,
searchParams
,
errorConvention
,
getDynamicParamFromSegment
,
createServerParamsForMetadata
,
workStore
)
return
accumulateViewport
(
metadataItems
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment