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
0f6b3571
Unverified
Commit
0f6b3571
authored
Apr 25, 2023
by
Jiachi Liu
Committed by
GitHub
Apr 25, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve typing of resolve metadata (#48670)
Improve array resolving in metadata, remove ts comments for errors
parent
9863935f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
15 deletions
+13
-15
utils.ts
packages/next/src/lib/metadata/generate/utils.ts
+7
-10
resolve-metadata.ts
packages/next/src/lib/metadata/resolve-metadata.ts
+5
-4
resolve-basics.ts
packages/next/src/lib/metadata/resolvers/resolve-basics.ts
+1
-1
No files found.
packages/next/src/lib/metadata/generate/utils.ts
View file @
0f6b3571
function
resolveArray
<
T
>
(
value
:
T
):
T
[]
{
function
resolveArray
<
T
>
(
value
:
T
|
T
[]
):
T
[]
{
if
(
Array
.
isArray
(
value
))
{
return
value
return
value
as
any
}
return
[
value
]
return
[
value
]
as
any
}
function
resolveAsArrayOrUndefined
<
T
extends
unknown
|
readonly
unknown
[]
>
(
function
resolveAsArrayOrUndefined
<
T
>
(
value
:
T
|
T
[]
|
undefined
|
null
):
undefined
|
T
[]
{
):
T
extends
undefined
|
null
?
undefined
:
T
[]
{
if
(
typeof
value
===
'undefined'
||
value
===
null
)
{
return
undefined
return
undefined
as
any
}
if
(
Array
.
isArray
(
value
))
{
return
value
}
return
[
value
]
return
resolveArray
(
value
)
as
any
}
export
{
resolveAsArrayOrUndefined
,
resolveArray
}
packages/next/src/lib/metadata/resolve-metadata.ts
View file @
0f6b3571
...
...
@@ -161,11 +161,12 @@ function merge({
case
'archives'
:
case
'assets'
:
case
'bookmarks'
:
case
'keywords'
:
case
'keywords'
:
{
target
[
key
]
=
resolveAsArrayOrUndefined
(
source
[
key
])
break
}
case
'authors'
:
{
// FIXME: type inferring
// @ts-ignore
target
[
key
]
=
resolveAsArrayOrUndefined
(
source
[
key
])
||
null
target
[
key
]
=
resolveAsArrayOrUndefined
(
source
.
authors
)
break
}
// directly assign fields that fallback to null
...
...
packages/next/src/lib/metadata/resolvers/resolve-basics.ts
View file @
0f6b3571
...
...
@@ -83,7 +83,7 @@ function resolveUrlValuesOfObject(
if
(
typeof
value
===
'string'
||
value
instanceof
URL
)
{
result
[
key
]
=
[
{
url
:
resolveAlternateUrl
(
value
,
metadataBase
,
pathname
),
// metadataBase ? resolveUrl(value, metadataBase)! : value,
url
:
resolveAlternateUrl
(
value
,
metadataBase
,
pathname
),
},
]
}
else
{
...
...
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