Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Dec 6, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/client/components/react-dev-overlay/internal/container/RootLayoutError.tsx
View file
Open in desktop
Expand Up @@ -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'
}: ` +
Expand Down
7 changes: 1 addition & 6 deletions packages/next/server/node-web-streams-helper.ts
View file
Open in desktop
Expand Up @@ -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
}
Expand All @@ -310,7 +306,6 @@ export function createRootLayoutValidatorStream(
flush(controller) {
const missingTags = [
foundHtml ? null : 'html',
foundHead ? null : 'head',
foundBody ? null : 'body',
].filter(nonNullable)

Expand Down
12 changes: 6 additions & 6 deletions test/e2e/app-dir/root-layout.test.ts
View file
Open in desktop
Expand Up @@ -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"
`)
})

Expand All @@ -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"
`)
})

Expand All @@ -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"
`)
})
})
Expand Down
3 changes: 0 additions & 3 deletions test/e2e/app-dir/root-layout/app/(required-tags)/has-tags/layout.js
View file
Open in desktop
Expand Up @@ -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>
)
Expand Down