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
e0574188
Commit
e0574188
authored
Aug 29, 2025
by
Zack Tanner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: web manifest should always be emitted in head
parent
efac8e2c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
104 additions
and
22 deletions
+104
-22
basic.tsx
packages/next/src/lib/metadata/generate/basic.tsx
+22
-18
metadata.tsx
packages/next/src/lib/metadata/metadata.tsx
+9
-4
manifest.ts
test/e2e/app-dir/hello-world/app/manifest.ts
+20
-0
page.tsx
...2e/app-dir/metadata/app/async-metadata-streaming/page.tsx
+23
-0
metadata.test.ts
test/e2e/app-dir/metadata/metadata.test.ts
+30
-0
No files found.
packages/next/src/lib/metadata/generate/basic.tsx
View file @
e0574188
...
...
@@ -34,7 +34,15 @@ function resolveViewportLayout(viewport: Viewport) {
return
resolved
}
export
function
ViewportMeta
({
viewport
}:
{
viewport
:
ResolvedViewport
})
{
export
function
StaticMetadata
({
viewport
,
manifest
,
}:
{
viewport
:
ResolvedViewport
manifest
?:
ResolvedMetadata
[
'manifest'
]
})
{
const
manifestOrigin
=
manifest
?
getOrigin
(
manifest
)
:
undefined
return
MetaFilter
([
<
meta
charSet=
"utf-8"
/>,
Meta
({
name
:
'viewport'
,
content
:
resolveViewportLayout
(
viewport
)
}),
...
...
@@ -48,14 +56,23 @@ export function ViewportMeta({ viewport }: { viewport: ResolvedViewport }) {
)
:
[]),
Meta
({
name
:
'color-scheme'
,
content
:
viewport
.
colorScheme
}),
manifest
?
(
<
link
rel=
"manifest"
href=
{
manifest
.
toString
()
}
// If it's same origin, and it's a preview deployment,
// including credentials for manifest request.
crossOrigin=
{
!
manifestOrigin
&&
process
.
env
.
VERCEL_ENV
===
'preview'
?
'use-credentials'
:
undefined
}
/>
)
:
null
,
])
}
export
function
BasicMeta
({
metadata
}:
{
metadata
:
ResolvedMetadata
})
{
const
manifestOrigin
=
metadata
.
manifest
?
getOrigin
(
metadata
.
manifest
)
:
undefined
return
MetaFilter
([
metadata
.
title
!==
null
&&
metadata
.
title
.
absolute
?
(
<
title
>
{
metadata
.
title
.
absolute
}
</
title
>
...
...
@@ -70,19 +87,6 @@ export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) {
Meta
({
name
:
'author'
,
content
:
author
.
name
}),
])
:
[]),
metadata
.
manifest
?
(
<
link
rel=
"manifest"
href=
{
metadata
.
manifest
.
toString
()
}
// If it's same origin, and it's a preview deployment,
// including credentials for manifest request.
crossOrigin=
{
!
manifestOrigin
&&
process
.
env
.
VERCEL_ENV
===
'preview'
?
'use-credentials'
:
undefined
}
/>
)
:
null
,
Meta
({
name
:
'generator'
,
content
:
metadata
.
generator
}),
Meta
({
name
:
'keywords'
,
content
:
metadata
.
keywords
?.
join
(
','
)
}),
Meta
({
name
:
'referrer'
,
content
:
metadata
.
referrer
}),
...
...
packages/next/src/lib/metadata/metadata.tsx
View file @
e0574188
...
...
@@ -382,8 +382,13 @@ async function renderViewport(
workStore
)
const
elements
:
Array
<
React
.
ReactNode
>
=
createViewportElements
(
resolvedViewport
)
// Get manifest from static metadata
const
manifestUrl
=
tree
[
2
].
metadata
?.
manifest
const
elements
:
Array
<
React
.
ReactNode
>
=
createViewportElements
(
resolvedViewport
,
manifestUrl
)
return
(
<>
{
elements
.
map
((
el
,
index
)
=>
{
...
...
@@ -410,6 +415,6 @@ function createMetadataElements(metadata: ResolvedMetadata) {
])
}
function
createViewportElements
(
viewport
:
ResolvedViewport
)
{
return
MetaFilter
([
ViewportMeta
({
viewport
:
viewport
})])
function
createViewportElements
(
viewport
:
ResolvedViewport
,
manifest
?:
string
)
{
return
MetaFilter
([
ViewportMeta
({
viewport
:
viewport
,
manifest
})])
}
test/e2e/app-dir/hello-world/app/manifest.ts
0 → 100644
View file @
e0574188
import
type
{
MetadataRoute
}
from
'next'
export
default
function
manifest
():
MetadataRoute
.
Manifest
{
return
{
name
:
'Next.js App'
,
short_name
:
'Next.js App'
,
description
:
'Next.js App'
,
start_url
:
'/'
,
display
:
'standalone'
,
background_color
:
'#fff'
,
theme_color
:
'#fff'
,
icons
:
[
{
src
:
'/favicon.ico'
,
sizes
:
'any'
,
type
:
'image/x-icon'
,
},
],
}
}
test/e2e/app-dir/metadata/app/async-metadata-streaming/page.tsx
0 → 100644
View file @
e0574188
import
{
connection
}
from
'next/server'
export
async
function
generateMetadata
()
{
await
connection
()
await
new
Promise
((
resolve
)
=>
setTimeout
(
resolve
,
100
))
return
{
title
:
'Async Metadata Page'
,
description
:
'This page has async metadata that should stream'
,
}
}
export
default
function
Page
()
{
return
(
<
div
>
<
h1
>
Async Metadata Streaming Test
</
h1
>
<
p
id=
"async-metadata-page"
>
This page tests that manifest links remain in the head even when
metadata is streamed
</
p
>
</
div
>
)
}
test/e2e/app-dir/metadata/metadata.test.ts
View file @
e0574188
...
...
@@ -737,6 +737,36 @@ describe('app dir - metadata', () => {
})
})
it
(
'should render manifest link in head even with async metadata'
,
async
()
=>
{
const
browser
=
await
next
.
browser
(
'/async-metadata-streaming'
)
const
matchDom
=
createDomMatcher
(
browser
)
// Wait for the page to load and metadata to stream
await
browser
.
waitForElementByCss
(
'#async-metadata-page'
)
// Wait for the title to be set (indicates async metadata has been applied)
await
retry
(
async
()
=>
{
expect
(
await
getTitle
(
browser
)).
toBe
(
'Async Metadata Page'
)
})
// Check that manifest link is in the head with correct href
await
matchDom
(
'link'
,
'rel="manifest"'
,
{
href
:
'/manifest.webmanifest'
,
})
// Verify it's specifically in the head, not the body
const
headHasManifest
=
await
browser
.
eval
(
`
document.head.querySelector('link[rel="manifest"][href="/manifest.webmanifest"]') !== null
`
)
expect
(
headHasManifest
).
toBe
(
true
)
// Ensure no manifest link in the body
const
bodyHasManifest
=
await
browser
.
eval
(
`
document.body.querySelector('link[rel="manifest"]') !== null
`
)
expect
(
bodyHasManifest
).
toBe
(
false
)
})
if
(
isNextStart
)
{
it
(
'should build favicon.ico as a custom route'
,
async
()
=>
{
const
appPathsManifest
=
JSON
.
parse
(
...
...
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