archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Jiachi Liu 2022-12-06 15:41:29 +01:00 committed by GitHub
parent efe1742668
commit a19f04c5a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/next/client/components/react-dev-overlay/internal/container/RootLayoutError.tsx
View file

@ -14,7 +14,7 @@ export type RootLayoutErrorProps = { missingTags: string[] }
export const RootLayoutError: React.FC<RootLayoutErrorProps> =
function BuildError({ missingTags }) {
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${
missingTags.length === 1 ? '' : 's'
}: ` +

7
packages/next/server/node-web-streams-helper.ts
View file

@ -288,19 +288,15 @@ export function createRootLayoutValidatorStream(
getTree: () => FlightRouterState
): TransformStream<Uint8Array, Uint8Array> {
let foundHtml = false
let foundHead = false
let foundBody = false
return new TransformStream({
async transform(chunk, controller) {
if (!foundHtml || !foundHead || !foundBody) {
if (!foundHtml || !foundBody) {
const content = decodeText(chunk)
if (!foundHtml && content.includes('<html')) {
foundHtml = true
}
if (!foundHead && content.includes('<head')) {
foundHead = true
}
if (!foundBody && content.includes('<body')) {
foundBody = true
}
@ -310,7 +306,6 @@ export function createRootLayoutValidatorStream(
flush(controller) {
const missingTags = [
foundHtml ? null : 'html',
foundHead ? null : 'head',
foundBody ? null : 'body',
].filter(nonNullable)

12
test/e2e/app-dir/root-layout.test.ts
View file

@ -40,9 +40,9 @@ describe('app-dir root layout', () => {
expect(await hasRedbox(browser, true)).toBe(true)
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', () => {
expect(await hasRedbox(browser, true)).toBe(true)
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', () => {
expect(await hasRedbox(browser, true)).toBe(true)
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"
`)
})
})

3
test/e2e/app-dir/root-layout/app/(required-tags)/has-tags/layout.js
View file

@ -4,9 +4,6 @@ export const revalidate = 0
export default function Root({ children }) {
return (
<html>
<head>
<title>Hello World</title>
</head>
<body>{children}</body>
</html>
)