Unverified Commit a19f04c5 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Revert "Adding head element checking for root layout" (#43760)

Reverts vercel/next.js#43597

The tests were disabled and currently the checking of these components
are not reliable, it also breaks the hmr. Revert it for now and then
we'll revisit how to re-enable the required tags checking
parent efe17426
...@@ -14,7 +14,7 @@ export type RootLayoutErrorProps = { missingTags: string[] } ...@@ -14,7 +14,7 @@ export type RootLayoutErrorProps = { missingTags: string[] }
export const RootLayoutError: React.FC<RootLayoutErrorProps> = export const RootLayoutError: React.FC<RootLayoutErrorProps> =
function BuildError({ missingTags }) { function BuildError({ missingTags }) {
const message = const message =
'Please make sure to include the following tags in your root layout: <html>, <head>, <body>.\n\n' + 'Please make sure to include the following tags in your root layout: <html>, <body>.\n\n' +
`Missing required root layout tag${ `Missing required root layout tag${
missingTags.length === 1 ? '' : 's' missingTags.length === 1 ? '' : 's'
}: ` + }: ` +
......
...@@ -288,19 +288,15 @@ export function createRootLayoutValidatorStream( ...@@ -288,19 +288,15 @@ export function createRootLayoutValidatorStream(
getTree: () => FlightRouterState getTree: () => FlightRouterState
): TransformStream<Uint8Array, Uint8Array> { ): TransformStream<Uint8Array, Uint8Array> {
let foundHtml = false let foundHtml = false
let foundHead = false
let foundBody = false let foundBody = false
return new TransformStream({ return new TransformStream({
async transform(chunk, controller) { async transform(chunk, controller) {
if (!foundHtml || !foundHead || !foundBody) { if (!foundHtml || !foundBody) {
const content = decodeText(chunk) const content = decodeText(chunk)
if (!foundHtml && content.includes('<html')) { if (!foundHtml && content.includes('<html')) {
foundHtml = true foundHtml = true
} }
if (!foundHead && content.includes('<head')) {
foundHead = true
}
if (!foundBody && content.includes('<body')) { if (!foundBody && content.includes('<body')) {
foundBody = true foundBody = true
} }
...@@ -310,7 +306,6 @@ export function createRootLayoutValidatorStream( ...@@ -310,7 +306,6 @@ export function createRootLayoutValidatorStream(
flush(controller) { flush(controller) {
const missingTags = [ const missingTags = [
foundHtml ? null : 'html', foundHtml ? null : 'html',
foundHead ? null : 'head',
foundBody ? null : 'body', foundBody ? null : 'body',
].filter(nonNullable) ].filter(nonNullable)
......
...@@ -40,9 +40,9 @@ describe('app-dir root layout', () => { ...@@ -40,9 +40,9 @@ describe('app-dir root layout', () => {
expect(await hasRedbox(browser, true)).toBe(true) expect(await hasRedbox(browser, true)).toBe(true)
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(` expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
"Please make sure to include the following tags in your root layout: <html>, <head>, <body>. "Please make sure to include the following tags in your root layout: <html>, <body>.
Missing required root layout tags: html, head, body" Missing required root layout tags: html, body"
`) `)
}) })
...@@ -54,9 +54,9 @@ describe('app-dir root layout', () => { ...@@ -54,9 +54,9 @@ describe('app-dir root layout', () => {
expect(await hasRedbox(browser, true)).toBe(true) expect(await hasRedbox(browser, true)).toBe(true)
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(` expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
"Please make sure to include the following tags in your root layout: <html>, <head>, <body>. "Please make sure to include the following tags in your root layout: <html>, <body>.
Missing required root layout tags: html, head, body" Missing required root layout tags: html, body"
`) `)
}) })
...@@ -67,9 +67,9 @@ describe('app-dir root layout', () => { ...@@ -67,9 +67,9 @@ describe('app-dir root layout', () => {
expect(await hasRedbox(browser, true)).toBe(true) expect(await hasRedbox(browser, true)).toBe(true)
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(` expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
"Please make sure to include the following tags in your root layout: <html>, <head>, <body>. "Please make sure to include the following tags in your root layout: <html>, <body>.
Missing required root layout tags: html, head, body" Missing required root layout tags: html, body"
`) `)
}) })
}) })
......
...@@ -4,9 +4,6 @@ export const revalidate = 0 ...@@ -4,9 +4,6 @@ export const revalidate = 0
export default function Root({ children }) { export default function Root({ children }) {
return ( return (
<html> <html>
<head>
<title>Hello World</title>
</head>
<body>{children}</body> <body>{children}</body>
</html> </html>
) )
......
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