Unverified Commit f0bf674e authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Remove `experimental.strictNextHead` (#81882)

parent 186d169e
...@@ -254,8 +254,6 @@ export function getDefineEnv({ ...@@ -254,8 +254,6 @@ export function getDefineEnv({
config.experimental.scrollRestoration ?? false, config.experimental.scrollRestoration ?? false,
...getImageConfig(config, dev), ...getImageConfig(config, dev),
'process.env.__NEXT_ROUTER_BASEPATH': config.basePath, 'process.env.__NEXT_ROUTER_BASEPATH': config.basePath,
'process.env.__NEXT_STRICT_NEXT_HEAD':
config.experimental.strictNextHead ?? true,
'process.env.__NEXT_HAS_REWRITES': hasRewrites, 'process.env.__NEXT_HAS_REWRITES': hasRewrites,
'process.env.__NEXT_CONFIG_OUTPUT': config.output, 'process.env.__NEXT_CONFIG_OUTPUT': config.output,
'process.env.__NEXT_I18N_SUPPORT': !!config.i18n, 'process.env.__NEXT_I18N_SUPPORT': !!config.i18n,
......
...@@ -144,7 +144,6 @@ async function requestHandler( ...@@ -144,7 +144,6 @@ async function requestHandler(
ComponentMod: pageMod, ComponentMod: pageMod,
pageConfig: pageMod.pageConfig, pageConfig: pageMod.pageConfig,
routeModule: pageMod.routeModule, routeModule: pageMod.routeModule,
strictNextHead: nextConfig.experimental.strictNextHead ?? true,
canonicalBase: nextConfig.amp.canonicalBase || '', canonicalBase: nextConfig.amp.canonicalBase || '',
previewProps: prerenderManifest.preview, previewProps: prerenderManifest.preview,
ampOptimizerConfig: nextConfig.experimental.amp?.optimizer, ampOptimizerConfig: nextConfig.experimental.amp?.optimizer,
......
...@@ -293,8 +293,6 @@ export async function handler( ...@@ -293,8 +293,6 @@ export async function handler(
reactLoadableManifest, reactLoadableManifest,
assetPrefix: nextConfig.assetPrefix, assetPrefix: nextConfig.assetPrefix,
strictNextHead:
nextConfig.experimental.strictNextHead ?? true,
previewProps: prerenderManifest.preview, previewProps: prerenderManifest.preview,
images: nextConfig.images as any, images: nextConfig.images as any,
nextConfigOutput: nextConfig.output, nextConfigOutput: nextConfig.output,
......
...@@ -50,10 +50,7 @@ export function isEqualNode(oldTag: Element, newTag: Element) { ...@@ -50,10 +50,7 @@ export function isEqualNode(oldTag: Element, newTag: Element) {
return oldTag.isEqualNode(newTag) return oldTag.isEqualNode(newTag)
} }
let updateElements: (type: string, components: JSX.Element[]) => void function updateElements(type: string, components: JSX.Element[]) {
if (process.env.__NEXT_STRICT_NEXT_HEAD) {
updateElements = (type, components) => {
const headEl = document.querySelector('head') const headEl = document.querySelector('head')
if (!headEl) return if (!headEl) return
...@@ -100,55 +97,6 @@ if (process.env.__NEXT_STRICT_NEXT_HEAD) { ...@@ -100,55 +97,6 @@ if (process.env.__NEXT_STRICT_NEXT_HEAD) {
} }
headEl.appendChild(newTag) headEl.appendChild(newTag)
} }
}
} else {
updateElements = (type, components) => {
const headEl = document.getElementsByTagName('head')[0]
const headCountEl: HTMLMetaElement = headEl.querySelector(
'meta[name=next-head-count]'
) as HTMLMetaElement
if (process.env.NODE_ENV !== 'production') {
if (!headCountEl) {
console.error(
'Warning: next-head-count is missing. https://nextjs.org/docs/messages/next-head-count-missing'
)
return
}
}
const headCount = Number(headCountEl.content)
const oldTags: Element[] = []
for (
let i = 0, j = headCountEl.previousElementSibling;
i < headCount;
i++, j = j?.previousElementSibling || null
) {
if (j?.tagName?.toLowerCase() === type) {
oldTags.push(j)
}
}
const newTags = (components.map(reactElementToDOM) as HTMLElement[]).filter(
(newTag) => {
for (let k = 0, len = oldTags.length; k < len; k++) {
const oldTag = oldTags[k]
if (isEqualNode(oldTag, newTag)) {
oldTags.splice(k, 1)
return false
}
}
return true
}
)
oldTags.forEach((t) => t.parentNode?.removeChild(t))
newTags.forEach((t) => headEl.insertBefore(t, headCountEl))
headCountEl.content = (
headCount -
oldTags.length +
newTags.length
).toString()
}
} }
export default function initHeadManager(): { export default function initHeadManager(): {
......
...@@ -393,7 +393,6 @@ async function exportAppImpl( ...@@ -393,7 +393,6 @@ async function exportAppImpl(
serverActionsManifest, serverActionsManifest,
} }
: {}), : {}),
strictNextHead: nextConfig.experimental.strictNextHead ?? true,
deploymentId: nextConfig.deploymentId, deploymentId: nextConfig.deploymentId,
htmlLimitedBots: nextConfig.htmlLimitedBots.source, htmlLimitedBots: nextConfig.htmlLimitedBots.source,
experimental: { experimental: {
......
...@@ -657,22 +657,12 @@ export class Head extends React.Component<HeadProps> { ...@@ -657,22 +657,12 @@ export class Head extends React.Component<HeadProps> {
child.props['rel'] === 'preload' && child.props['rel'] === 'preload' &&
child.props['as'] === 'style' child.props['as'] === 'style'
) { ) {
if (this.context.strictNextHead) {
cssPreloads.push(
React.cloneElement(child, { 'data-next-head': '' })
)
} else {
cssPreloads.push(child) cssPreloads.push(child)
}
} else { } else {
if (child) { if (child) {
if (this.context.strictNextHead) {
otherHeadElements.push( otherHeadElements.push(
React.cloneElement(child, { 'data-next-head': '' }) React.cloneElement(child, { 'data-next-head': '' })
) )
} else {
otherHeadElements.push(child)
}
} }
} }
}) })
...@@ -811,12 +801,6 @@ export class Head extends React.Component<HeadProps> { ...@@ -811,12 +801,6 @@ export class Head extends React.Component<HeadProps> {
</> </>
)} )}
{head} {head}
{this.context.strictNextHead ? null : (
<meta
name="next-head-count"
content={React.Children.count(head || []).toString()}
/>
)}
{children} {children}
......
...@@ -565,7 +565,6 @@ export default abstract class Server< ...@@ -565,7 +565,6 @@ export default abstract class Server<
supportsDynamicResponse: true, supportsDynamicResponse: true,
trailingSlash: this.nextConfig.trailingSlash, trailingSlash: this.nextConfig.trailingSlash,
deploymentId: this.nextConfig.deploymentId, deploymentId: this.nextConfig.deploymentId,
strictNextHead: this.nextConfig.experimental.strictNextHead ?? true,
poweredByHeader: this.nextConfig.poweredByHeader, poweredByHeader: this.nextConfig.poweredByHeader,
canonicalBase: this.nextConfig.amp.canonicalBase || '', canonicalBase: this.nextConfig.amp.canonicalBase || '',
generateEtags, generateEtags,
......
...@@ -414,7 +414,6 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() => ...@@ -414,7 +414,6 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
algorithm: z.enum(['sha256', 'sha384', 'sha512']).optional(), algorithm: z.enum(['sha256', 'sha384', 'sha512']).optional(),
}) })
.optional(), .optional(),
strictNextHead: z.boolean().optional(),
swcPlugins: z swcPlugins: z
// The specific swc plugin's option is unknown, use z.any() here // The specific swc plugin's option is unknown, use z.any() here
.array(z.tuple([z.string(), z.record(z.string(), z.any())])) .array(z.tuple([z.string(), z.record(z.string(), z.any())]))
......
...@@ -335,8 +335,6 @@ export interface ExperimentalConfig { ...@@ -335,8 +335,6 @@ export interface ExperimentalConfig {
dynamicOnHover?: boolean dynamicOnHover?: boolean
appDocumentPreloading?: boolean appDocumentPreloading?: boolean
preloadEntriesOnStart?: boolean preloadEntriesOnStart?: boolean
/** @default true */
strictNextHead?: boolean
clientRouterFilter?: boolean clientRouterFilter?: boolean
clientRouterFilterRedirects?: boolean clientRouterFilterRedirects?: boolean
/** /**
...@@ -1472,7 +1470,6 @@ export const defaultConfig = Object.freeze({ ...@@ -1472,7 +1470,6 @@ export const defaultConfig = Object.freeze({
devtoolSegmentExplorer: true, devtoolSegmentExplorer: true,
browserDebugInfoInTerminal: false, browserDebugInfoInTerminal: false,
optimizeRouterScrolling: false, optimizeRouterScrolling: false,
strictNextHead: true,
}, },
htmlLimitedBots: undefined, htmlLimitedBots: undefined,
bundlePagesRouterDependencies: false, bundlePagesRouterDependencies: false,
......
...@@ -287,7 +287,6 @@ export type RenderOptsPartial = { ...@@ -287,7 +287,6 @@ export type RenderOptsPartial = {
images: ImageConfigComplete images: ImageConfigComplete
largePageDataBytes?: number largePageDataBytes?: number
isOnDemandRevalidate?: boolean isOnDemandRevalidate?: boolean
strictNextHead: boolean
isPossibleServerAction?: boolean isPossibleServerAction?: boolean
isExperimentalCompile?: boolean isExperimentalCompile?: boolean
isPrefetch?: boolean isPrefetch?: boolean
...@@ -1524,7 +1523,6 @@ export async function renderToHTMLImpl( ...@@ -1524,7 +1523,6 @@ export async function renderToHTMLImpl(
notFoundSrcPage: notFoundSrcPage && dev ? notFoundSrcPage : undefined, notFoundSrcPage: notFoundSrcPage && dev ? notFoundSrcPage : undefined,
}, },
nonce, nonce,
strictNextHead: renderOpts.strictNextHead,
buildManifest: filteredBuildManifest, buildManifest: filteredBuildManifest,
docComponentsRendered, docComponentsRendered,
dangerousAsPath: router.asPath, dangerousAsPath: router.asPath,
......
...@@ -9,7 +9,6 @@ import { createContext, useContext, type JSX } from 'react' ...@@ -9,7 +9,6 @@ import { createContext, useContext, type JSX } from 'react'
export type HtmlProps = { export type HtmlProps = {
__NEXT_DATA__: NEXT_DATA __NEXT_DATA__: NEXT_DATA
nonce?: string nonce?: string
strictNextHead: boolean
dangerousAsPath: string dangerousAsPath: string
docComponentsRendered: { docComponentsRendered: {
Html?: boolean Html?: boolean
......
...@@ -4,12 +4,6 @@ module.exports = { ...@@ -4,12 +4,6 @@ module.exports = {
// Make sure entries are not getting disposed. // Make sure entries are not getting disposed.
maxInactiveAge: 1000 * 60 * 60, maxInactiveAge: 1000 * 60 * 60,
}, },
experimental:
process.env.TEST_STRICT_NEXT_HEAD !== undefined
? {
strictNextHead: process.env.TEST_STRICT_NEXT_HEAD === 'true',
}
: {},
// scroll position can be finicky with the // scroll position can be finicky with the
// indicators showing so hide by default // indicators showing so hide by default
devIndicators: false, devIndicators: false,
......
...@@ -4,16 +4,9 @@ import { waitFor } from 'next-test-utils' ...@@ -4,16 +4,9 @@ import { waitFor } from 'next-test-utils'
import path from 'path' import path from 'path'
import { nextTestSetup } from 'e2e-utils' import { nextTestSetup } from 'e2e-utils'
const isReact18 = parseInt(process.env.NEXT_TEST_REACT_VERSION) === 18 describe('updating <Head /> while client routing', () => {
describe.each([[false], [true]])(
'updating <Head /> with strictNextHead=%s while client routing',
(strictNextHead) => {
const { next } = nextTestSetup({ const { next } = nextTestSetup({
files: path.join(__dirname, 'fixture'), files: path.join(__dirname, 'fixture'),
env: {
TEST_STRICT_NEXT_HEAD: String(strictNextHead),
},
}) })
it.each([true, false])( it.each([true, false])(
...@@ -35,40 +28,20 @@ describe.each([[false], [true]])( ...@@ -35,40 +28,20 @@ describe.each([[false], [true]])(
await browser.waitForElementByCss('h1') await browser.waitForElementByCss('h1')
await waitFor(2000) await waitFor(2000)
expect(Number(await browser.eval('window.__test_async_executions'))).toBe( expect(Number(await browser.eval('window.__test_async_executions'))).toBe(1)
strictNextHead || isReact18 expect(Number(await browser.eval('window.__test_defer_executions'))).toBe(1)
? 1
: // <meta name="next-head-count" /> is floated before <script />.
// head-manager thinks it needs to add these again resulting in another execution.
2
)
expect(Number(await browser.eval('window.__test_defer_executions'))).toBe(
strictNextHead || isReact18
? 1
: // <meta name="next-head-count" /> is floated before <script defer />.
// head-manager thinks it needs to add these again resulting in another execution.
2
)
await browser.elementByCss('#reverseScriptOrder').click() await browser.elementByCss('#reverseScriptOrder').click()
await waitFor(2000) await waitFor(2000)
expect(Number(await browser.eval('window.__test_async_executions'))).toBe( expect(Number(await browser.eval('window.__test_async_executions'))).toBe(1)
strictNextHead || isReact18 ? 1 : 2 expect(Number(await browser.eval('window.__test_defer_executions'))).toBe(1)
)
expect(Number(await browser.eval('window.__test_defer_executions'))).toBe(
strictNextHead || isReact18 ? 1 : 2
)
await browser.elementByCss('#toggleScript').click() await browser.elementByCss('#toggleScript').click()
await waitFor(2000) await waitFor(2000)
expect(Number(await browser.eval('window.__test_async_executions'))).toBe( expect(Number(await browser.eval('window.__test_async_executions'))).toBe(1)
strictNextHead || isReact18 ? 1 : 2 expect(Number(await browser.eval('window.__test_defer_executions'))).toBe(1)
)
expect(Number(await browser.eval('window.__test_defer_executions'))).toBe(
strictNextHead || isReact18 ? 1 : 2
)
}) })
it('should warn when stylesheets or scripts are in head', async () => { it('should warn when stylesheets or scripts are in head', async () => {
...@@ -201,5 +174,4 @@ describe.each([[false], [true]])( ...@@ -201,5 +174,4 @@ describe.each([[false], [true]])(
await browser.elementByCss('button').click() await browser.elementByCss('button').click()
expect(await browser.eval('document.title')).toBe('B') expect(await browser.eval('document.title')).toBe('B')
}) })
} })
)
...@@ -8,17 +8,8 @@ import path from 'path' ...@@ -8,17 +8,8 @@ import path from 'path'
const isReact18 = parseInt(process.env.NEXT_TEST_REACT_VERSION) === 18 const isReact18 = parseInt(process.env.NEXT_TEST_REACT_VERSION) === 18
describe('Client Navigation rendering <Head />', () => { describe('Client Navigation rendering <Head />', () => {
describe.each([[false], [true], [undefined]])(
'with strictNextHead=%s',
(strictNextHead) => {
const { next } = nextTestSetup({ const { next } = nextTestSetup({
files: path.join(__dirname, 'fixture'), files: path.join(__dirname, 'fixture'),
env:
strictNextHead !== undefined
? {
TEST_STRICT_NEXT_HEAD: String(strictNextHead),
}
: {},
}) })
function render( function render(
...@@ -39,87 +30,51 @@ describe('Client Navigation rendering <Head />', () => { ...@@ -39,87 +30,51 @@ describe('Client Navigation rendering <Head />', () => {
// default-head contains an empty <Head />. // default-head contains an empty <Head />.
test('header renders default charset', async () => { test('header renders default charset', async () => {
const html = await render('/default-head') const html = await render('/default-head')
expect(html).toContain( expect(html).toContain('<meta charSet="utf-8" data-next-head=""/>')
strictNextHead !== false
? '<meta charSet="utf-8" data-next-head=""/>'
: '<meta charSet="utf-8"/>'
)
expect(html).toContain('next-head, but only once.') expect(html).toContain('next-head, but only once.')
}) })
test('header renders default viewport', async () => { test('header renders default viewport', async () => {
const html = await render('/default-head') const html = await render('/default-head')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta name="viewport" content="width=device-width" data-next-head=""/>'
? '<meta name="viewport" content="width=device-width" data-next-head=""/>'
: '<meta name="viewport" content="width=device-width"/>'
) )
}) })
test('header helper renders header information', async () => { test('header helper renders header information', async () => {
const html = await render('/head') const html = await render('/head')
expect(html).toContain('<meta charSet="iso-8859-5" data-next-head=""/>')
expect(html).toContain('<meta content="my meta" data-next-head=""/>')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta name="viewport" content="width=device-width,initial-scale=1" data-next-head=""/>'
? '<meta charSet="iso-8859-5" data-next-head=""/>'
: '<meta charSet="iso-8859-5"/>'
)
expect(html).toContain(
strictNextHead !== false
? '<meta content="my meta" data-next-head=""/>'
: '<meta content="my meta"/>'
)
expect(html).toContain(
strictNextHead !== false
? '<meta name="viewport" content="width=device-width,initial-scale=1" data-next-head=""/>'
: '<meta name="viewport" content="width=device-width,initial-scale=1"/>'
) )
expect(html).toContain('I can have meta tags') expect(html).toContain('I can have meta tags')
}) })
test('header helper dedupes tags', async () => { test('header helper dedupes tags', async () => {
const html = await render('/head') const html = await render('/head')
expect(html).toContain('<meta charSet="iso-8859-5" data-next-head=""/>')
expect(html).not.toContain('<meta charSet="utf-8" data-next-head=""/>')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta name="viewport" content="width=device-width,initial-scale=1" data-next-head=""/>'
? '<meta charSet="iso-8859-5" data-next-head=""/>'
: '<meta charSet="iso-8859-5"/>'
)
expect(html).not.toContain(
strictNextHead !== false
? '<meta charSet="utf-8" data-next-head=""/>'
: '<meta charSet="utf-8"/>'
)
expect(html).toContain(
strictNextHead !== false
? '<meta name="viewport" content="width=device-width,initial-scale=1" data-next-head=""/>'
: '<meta name="viewport" content="width=device-width,initial-scale=1"/>'
) )
// Should contain only one viewport // Should contain only one viewport
expect(html.match(/<meta name="viewport" /g).length).toBe(1) expect(html.match(/<meta name="viewport" /g).length).toBe(1)
expect(html).not.toContain( expect(html).not.toContain(
'<meta name="viewport" content="width=device-width"' '<meta name="viewport" content="width=device-width"'
) )
expect(html).toContain('<meta content="my meta" data-next-head=""/>')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<link rel="stylesheet" href="/dup-style.css" data-next-head=""/><link rel="stylesheet" href="/dup-style.css" data-next-head=""/>'
? '<meta content="my meta" data-next-head=""/>'
: '<meta content="my meta"/>'
)
expect(html).toContain(
strictNextHead !== false
? '<link rel="stylesheet" href="/dup-style.css" data-next-head=""/><link rel="stylesheet" href="/dup-style.css" data-next-head=""/>'
: '<link rel="stylesheet" href="/dup-style.css"/><link rel="stylesheet" href="/dup-style.css"/>'
) )
const dedupeLink = const dedupeLink =
strictNextHead !== false '<link rel="stylesheet" href="dedupe-style.css" data-next-head=""/>'
? '<link rel="stylesheet" href="dedupe-style.css" data-next-head=""/>'
: '<link rel="stylesheet" href="dedupe-style.css"/>'
expect(html).toContain(dedupeLink) expect(html).toContain(dedupeLink)
expect( expect(
html.substring(html.indexOf(dedupeLink) + dedupeLink.length) html.substring(html.indexOf(dedupeLink) + dedupeLink.length)
).not.toContain('<link rel="stylesheet" href="dedupe-style.css"') ).not.toContain('<link rel="stylesheet" href="dedupe-style.css"')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<link rel="alternate" hrefLang="en" href="/last/en" data-next-head=""/>'
? '<link rel="alternate" hrefLang="en" href="/last/en" data-next-head=""/>'
: '<link rel="alternate" hrefLang="en" href="/last/en"/>'
) )
expect(html).not.toContain( expect(html).not.toContain(
'<link rel="alternate" hrefLang="en" href="/first/en"' '<link rel="alternate" hrefLang="en" href="/first/en"'
...@@ -132,15 +87,9 @@ describe('Client Navigation rendering <Head />', () => { ...@@ -132,15 +87,9 @@ describe('Client Navigation rendering <Head />', () => {
expect((html.match(/charSet=/g) || []).length).toBe(1) expect((html.match(/charSet=/g) || []).length).toBe(1)
// Expect exactly one `viewport` // Expect exactly one `viewport`
expect((html.match(/name="viewport"/g) || []).length).toBe(1) expect((html.match(/name="viewport"/g) || []).length).toBe(1)
expect(html).toContain('<meta charSet="iso-8859-1" data-next-head=""/>')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta name="viewport" content="width=500" data-next-head=""/>'
? '<meta charSet="iso-8859-1" data-next-head=""/>'
: '<meta charSet="iso-8859-1"/>'
)
expect(html).toContain(
strictNextHead !== false
? '<meta name="viewport" content="width=500" data-next-head=""/>'
: '<meta name="viewport" content="width=500"/>'
) )
}) })
...@@ -148,156 +97,98 @@ describe('Client Navigation rendering <Head />', () => { ...@@ -148,156 +97,98 @@ describe('Client Navigation rendering <Head />', () => {
const html = await render('/head') const html = await render('/head')
console.log(html) console.log(html)
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="article:tag" content="tag1" data-next-head=""/>'
? '<meta property="article:tag" content="tag1" data-next-head=""/>'
: '<meta property="article:tag" content="tag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="article:tag" content="tag2" data-next-head=""/>'
? '<meta property="article:tag" content="tag2" data-next-head=""/>'
: '<meta property="article:tag" content="tag2"/>'
) )
expect(html).not.toContain('<meta property="dedupe:tag" content="tag3"') expect(html).not.toContain('<meta property="dedupe:tag" content="tag3"')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="dedupe:tag" content="tag4" data-next-head=""/>'
? '<meta property="dedupe:tag" content="tag4" data-next-head=""/>'
: '<meta property="dedupe:tag" content="tag4"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image" content="ogImageTag1" data-next-head=""/>'
? '<meta property="og:image" content="ogImageTag1" data-next-head=""/>'
: '<meta property="og:image" content="ogImageTag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image" content="ogImageTag2" data-next-head=""/>'
? '<meta property="og:image" content="ogImageTag2" data-next-head=""/>'
: '<meta property="og:image" content="ogImageTag2"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:alt" content="ogImageAltTag1" data-next-head=""/>'
? '<meta property="og:image:alt" content="ogImageAltTag1" data-next-head=""/>'
: '<meta property="og:image:alt" content="ogImageAltTag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:alt" content="ogImageAltTag2" data-next-head=""/>'
? '<meta property="og:image:alt" content="ogImageAltTag2" data-next-head=""/>'
: '<meta property="og:image:alt" content="ogImageAltTag2"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:width" content="ogImageWidthTag1" data-next-head=""/>'
? '<meta property="og:image:width" content="ogImageWidthTag1" data-next-head=""/>'
: '<meta property="og:image:width" content="ogImageWidthTag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:width" content="ogImageWidthTag2" data-next-head=""/>'
? '<meta property="og:image:width" content="ogImageWidthTag2" data-next-head=""/>'
: '<meta property="og:image:width" content="ogImageWidthTag2"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:height" content="ogImageHeightTag1" data-next-head=""/>'
? '<meta property="og:image:height" content="ogImageHeightTag1" data-next-head=""/>'
: '<meta property="og:image:height" content="ogImageHeightTag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:height" content="ogImageHeightTag2" data-next-head=""/>'
? '<meta property="og:image:height" content="ogImageHeightTag2" data-next-head=""/>'
: '<meta property="og:image:height" content="ogImageHeightTag2"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:type" content="ogImageTypeTag1" data-next-head=""/>'
? '<meta property="og:image:type" content="ogImageTypeTag1" data-next-head=""/>'
: '<meta property="og:image:type" content="ogImageTypeTag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:type" content="ogImageTypeTag2" data-next-head=""/>'
? '<meta property="og:image:type" content="ogImageTypeTag2" data-next-head=""/>'
: '<meta property="og:image:type" content="ogImageTypeTag2"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:secure_url" content="ogImageSecureUrlTag1" data-next-head=""/>'
? '<meta property="og:image:secure_url" content="ogImageSecureUrlTag1" data-next-head=""/>'
: '<meta property="og:image:secure_url" content="ogImageSecureUrlTag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:secure_url" content="ogImageSecureUrlTag2" data-next-head=""/>'
? '<meta property="og:image:secure_url" content="ogImageSecureUrlTag2" data-next-head=""/>'
: '<meta property="og:image:secure_url" content="ogImageSecureUrlTag2"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:url" content="ogImageUrlTag1" data-next-head=""/>'
? '<meta property="og:image:url" content="ogImageUrlTag1" data-next-head=""/>'
: '<meta property="og:image:url" content="ogImageUrlTag1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="og:image:url" content="ogImageUrlTag2" data-next-head=""/>'
? '<meta property="og:image:url" content="ogImageUrlTag2" data-next-head=""/>'
: '<meta property="og:image:url" content="ogImageUrlTag2"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="fb:pages" content="fbpages1" data-next-head=""/>'
? '<meta property="fb:pages" content="fbpages1" data-next-head=""/>'
: '<meta property="fb:pages" content="fbpages1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta property="fb:pages" content="fbpages2" data-next-head=""/>'
? '<meta property="fb:pages" content="fbpages2" data-next-head=""/>'
: '<meta property="fb:pages" content="fbpages2"/>'
) )
}) })
test('header helper avoids dedupe of meta tags with the same name if they use unique keys', async () => { test('header helper avoids dedupe of meta tags with the same name if they use unique keys', async () => {
const html = await render('/head') const html = await render('/head')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta name="citation_author" content="authorName1" data-next-head=""/>'
? '<meta name="citation_author" content="authorName1" data-next-head=""/>'
: '<meta name="citation_author" content="authorName1"/>'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<meta name="citation_author" content="authorName2" data-next-head=""/>'
? '<meta name="citation_author" content="authorName2" data-next-head=""/>'
: '<meta name="citation_author" content="authorName2"/>'
) )
}) })
test('header helper renders Fragment children', async () => { test('header helper renders Fragment children', async () => {
const html = await render('/head') const html = await render('/head')
expect(html).toContain( expect(html).toContain('<title data-next-head="">Fragment title</title>')
strictNextHead !== false expect(html).toContain('<meta content="meta fragment" data-next-head=""/>')
? '<title data-next-head="">Fragment title</title>'
: '<title>Fragment title</title>'
)
expect(html).toContain(
strictNextHead !== false
? '<meta content="meta fragment" data-next-head=""/>'
: '<meta content="meta fragment"/>'
)
}) })
test('header helper renders boolean attributes correctly children', async () => { test('header helper renders boolean attributes correctly children', async () => {
const html = await render('/head') const html = await render('/head')
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<script src="/test-async-false.js" data-next-head="">'
? '<script src="/test-async-false.js" data-next-head="">'
: '<script src="/test-async-false.js">'
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<script src="/test-async-true.js" async="" data-next-head="">'
? '<script src="/test-async-true.js" async="" data-next-head="">'
: ''
) )
expect(html).toContain( expect(html).toContain(
strictNextHead !== false '<script src="/test-defer.js" defer="" data-next-head="">'
? '<script src="/test-defer.js" defer="" data-next-head="">'
: ''
) )
}) })
it('should place charset element at the top of <head>', async () => { it('should place charset element at the top of <head>', async () => {
const html = await render('/head-priority') const html = await render('/head-priority')
const nextHeadElement = const nextHeadElement =
strictNextHead !== false '<meta charSet="iso-8859-5" data-next-head=""/><meta name="viewport" content="width=device-width,initial-scale=1" data-next-head=""/><meta name="title" content="head title" data-next-head=""/>'
? '<meta charSet="iso-8859-5" data-next-head=""/><meta name="viewport" content="width=device-width,initial-scale=1" data-next-head=""/><meta name="title" content="head title" data-next-head=""/>'
: '<meta charSet="iso-8859-5"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="title" content="head title"/><meta name="next-head-count" content="3"/>'
const documentHeadElement = const documentHeadElement =
'<meta name="keywords" content="document head test"/>' '<meta name="keywords" content="document head test"/>'
...@@ -338,6 +229,4 @@ describe('Client Navigation rendering <Head />', () => { ...@@ -338,6 +229,4 @@ describe('Client Navigation rendering <Head />', () => {
.getAttribute('content') .getAttribute('content')
expect(descriptionContent).toBe('Description Content') expect(descriptionContent).toBe('Description Content')
}) })
}
)
}) })
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