Commit e0574188 authored by Zack Tanner's avatar Zack Tanner

fix: web manifest should always be emitted in head

parent efac8e2c
...@@ -34,7 +34,15 @@ function resolveViewportLayout(viewport: Viewport) { ...@@ -34,7 +34,15 @@ function resolveViewportLayout(viewport: Viewport) {
return resolved 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([ return MetaFilter([
<meta charSet="utf-8" />, <meta charSet="utf-8" />,
Meta({ name: 'viewport', content: resolveViewportLayout(viewport) }), Meta({ name: 'viewport', content: resolveViewportLayout(viewport) }),
...@@ -48,14 +56,23 @@ export function ViewportMeta({ viewport }: { viewport: ResolvedViewport }) { ...@@ -48,14 +56,23 @@ export function ViewportMeta({ viewport }: { viewport: ResolvedViewport }) {
) )
: []), : []),
Meta({ name: 'color-scheme', content: viewport.colorScheme }), 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 }) { export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) {
const manifestOrigin = metadata.manifest
? getOrigin(metadata.manifest)
: undefined
return MetaFilter([ return MetaFilter([
metadata.title !== null && metadata.title.absolute ? ( metadata.title !== null && metadata.title.absolute ? (
<title>{metadata.title.absolute}</title> <title>{metadata.title.absolute}</title>
...@@ -70,19 +87,6 @@ export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) { ...@@ -70,19 +87,6 @@ export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) {
Meta({ name: 'author', content: author.name }), 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: 'generator', content: metadata.generator }),
Meta({ name: 'keywords', content: metadata.keywords?.join(',') }), Meta({ name: 'keywords', content: metadata.keywords?.join(',') }),
Meta({ name: 'referrer', content: metadata.referrer }), Meta({ name: 'referrer', content: metadata.referrer }),
......
...@@ -382,8 +382,13 @@ async function renderViewport( ...@@ -382,8 +382,13 @@ async function renderViewport(
workStore workStore
) )
const elements: Array<React.ReactNode> = // Get manifest from static metadata
createViewportElements(resolvedViewport) const manifestUrl = tree[2].metadata?.manifest
const elements: Array<React.ReactNode> = createViewportElements(
resolvedViewport,
manifestUrl
)
return ( return (
<> <>
{elements.map((el, index) => { {elements.map((el, index) => {
...@@ -410,6 +415,6 @@ function createMetadataElements(metadata: ResolvedMetadata) { ...@@ -410,6 +415,6 @@ function createMetadataElements(metadata: ResolvedMetadata) {
]) ])
} }
function createViewportElements(viewport: ResolvedViewport) { function createViewportElements(viewport: ResolvedViewport, manifest?: string) {
return MetaFilter([ViewportMeta({ viewport: viewport })]) return MetaFilter([ViewportMeta({ viewport: viewport, manifest })])
} }
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',
},
],
}
}
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>
)
}
...@@ -737,6 +737,36 @@ describe('app dir - metadata', () => { ...@@ -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) { if (isNextStart) {
it('should build favicon.ico as a custom route', async () => { it('should build favicon.ico as a custom route', async () => {
const appPathsManifest = JSON.parse( const appPathsManifest = JSON.parse(
......
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