Remove duplicate doctypes (#28089)

* Remove duplicate doctypes * Fix lint * Add test for DOCTYPE * Fix lint
vercel · Aug 14, 2021 · 500b3f6 · 500b3f6
1 parent 73b5d69
commit 500b3f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -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>
   )
 }
 

diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
@@ -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, '/')