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

Remove duplicate doctypes #28089

Merged
merged 7 commits into from Aug 14, 2021
Merged

Remove duplicate doctypes #28089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
349ee0b
Remove duplicate doctypes
devknoll Aug 13, 2021
e6bc3ef
Fix lint
devknoll Aug 13, 2021
79a5a46
Add test for DOCTYPE
devknoll Aug 13, 2021
9825986
Fix lint
devknoll Aug 13, 2021
5ffa191
Merge branch 'canary' into fix-duplicate-doctypes
devknoll Aug 13, 2021
a0b64a2
Merge branch 'canary' into fix-duplicate-doctypes
devknoll Aug 13, 2021
4f0ca7a
Merge branch 'canary' into fix-duplicate-doctypes
devknoll Aug 13, 2021
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
15 changes: 6 additions & 9 deletions packages/next/server/render.tsx
View file
Open in desktop
Expand Up @@ -315,15 +315,12 @@ function renderDocument(
styles: docProps.styles,
head: docProps.head,
}
return (
'<!DOCTYPE html>' +
ReactDOMServer.renderToStaticMarkup(
<AmpStateContext.Provider value={ampState}>
<HtmlContext.Provider value={htmlProps}>
<Document {...htmlProps} {...docProps} />
</HtmlContext.Provider>
</AmpStateContext.Provider>
)
return ReactDOMServer.renderToStaticMarkup(
<AmpStateContext.Provider value={ampState}>
<HtmlContext.Provider value={htmlProps}>
<Document {...htmlProps} {...docProps} />
</HtmlContext.Provider>
</AmpStateContext.Provider>
)
}

Expand Down
5 changes: 5 additions & 0 deletions test/integration/production/test/index.test.js
View file
Open in desktop
Expand Up @@ -917,6 +917,11 @@ describe('Production Usage', () => {
expect(missing).toBe(false)
})

it('should only have one DOCTYPE', async () => {
const html = await renderViaHTTP(appPort, '/')
expect(html).toMatch(/^<!DOCTYPE html><html/)
})

if (global.browserName !== 'internet explorer') {
it('should preserve query when hard navigating from page 404', async () => {
const browser = await webdriver(appPort, '/')
Expand Down