Merge branch 'canary' into fix/invalid-config-exports

vercel · Sep 4, 2020 · 7528984 · 7528984
2 parents 9cf9647 + 3c99206
commit 7528984
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 60 deletions.
diff --git a/examples/with-babel-macros/pages/_document.js b/examples/with-babel-macros/pages/_document.js
@@ -1,17 +1,17 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 
 export default class MyDocument extends Document {
   render() {
     return (
-      <html>
+      <Html>
         <Head>
           <style dangerouslySetInnerHTML={{ __html: this.props.css }} />
         </Head>
         <body>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-cxs/pages/_document.js b/examples/with-cxs/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import cxs from 'cxs/lite'
 
 export default class MyDocument extends Document {
@@ -10,7 +10,7 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html>
+      <Html>
         <Head>
           <style
             id="cxs-style"
@@ -21,7 +21,7 @@ export default class MyDocument extends Document {
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-emotion-11/pages/_document.js b/examples/with-emotion-11/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import { extractCritical } from '@emotion/server'
 
 export default class MyDocument extends Document {
@@ -21,13 +21,13 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html>
+      <Html>
         <Head />
         <body>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-emotion/pages/_document.js b/examples/with-emotion/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import { extractCritical } from 'emotion-server'
 
 export default class MyDocument extends Document {
@@ -21,13 +21,13 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html>
+      <Html>
         <Head />
         <body>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-fela/pages/_document.js b/examples/with-fela/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Main, NextScript } from 'next/document'
+import Document, { Html, Main, NextScript } from 'next/document'
 import { renderToNodeList } from 'react-fela'
 
 import getFelaRenderer from '../getFelaRenderer'
@@ -23,12 +23,12 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html>
+      <Html>
         <body>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-goober/pages/_document.js b/examples/with-goober/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import { extractCss } from 'goober'
 
 export default class MyDocument extends Document {
@@ -11,7 +11,7 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html>
+      <Html>
         <Head>
           <style
             id={'_goober'}
@@ -23,7 +23,7 @@ export default class MyDocument extends Document {
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-google-analytics-amp/pages/_document.js b/examples/with-google-analytics-amp/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Main, NextScript } from 'next/document'
+import Document, { Html, Main, NextScript } from 'next/document'
 import { useAmp } from 'next/amp'
 
 import { GA_TRACKING_ID } from '../lib/gtag'
@@ -13,7 +13,7 @@ function AmpWrap({ ampOnly, nonAmp }) {
 export default class MyDocument extends Document {
   render() {
     return (
-      <html>
+      <Html>
         <body>
           <Main />
           <NextScript />
@@ -65,7 +65,7 @@ export default class MyDocument extends Document {
             }
           />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-google-analytics/pages/_document.js b/examples/with-google-analytics/pages/_document.js
@@ -1,11 +1,11 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 
 import { GA_TRACKING_ID } from '../lib/gtag'
 
 export default class MyDocument extends Document {
   render() {
     return (
-      <html>
+      <Html>
         <Head>
           {/* Global Site Tag (gtag.js) - Google Analytics */}
           <script
@@ -30,7 +30,7 @@ export default class MyDocument extends Document {
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-next-less/pages/_document.js b/examples/with-next-less/pages/_document.js
@@ -4,18 +4,18 @@ In production the stylesheet is compiled to .next/static/style.css and served fr
 You have to include it into the page using either next/head or a custom _document.js, as is being done in this file.
 */
 
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 
 export default class MyDocument extends Document {
   render() {
     return (
-      <html>
+      <Html>
         <Head />
         <body>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-next-page-transitions/pages/_document.js b/examples/with-next-page-transitions/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 
 export default class MyDocument extends Document {
   static async getInitialProps(ctx) {
@@ -8,7 +8,7 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html lang="en">
+      <Html lang="en">
         <Head>
           <meta
             name="viewport"
@@ -30,7 +30,7 @@ export default class MyDocument extends Document {
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-portals/pages/_document.js b/examples/with-portals/pages/_document.js
@@ -1,17 +1,17 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 
 export default class MyDocument extends Document {
   render() {
     return (
-      <html>
+      <Html>
         <Head />
         <body>
           <Main />
           {/* Here we will mount our modal portal */}
           <div id="modal" />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-react-helmet/pages/_document.js b/examples/with-react-helmet/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import { Helmet } from 'react-helmet'
 
 export default class MyDocument extends Document {
@@ -28,13 +28,13 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html {...this.helmetHtmlAttrComponents}>
+      <Html {...this.helmetHtmlAttrComponents}>
         <Head>{this.helmetHeadComponents}</Head>
         <body {...this.helmetBodyAttrComponents}>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-react-native-web/pages/_document.js b/examples/with-react-native-web/pages/_document.js
@@ -1,5 +1,5 @@
 import { Children } from 'react'
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import { AppRegistry } from 'react-native'
 import config from '../app.json'
 // Force Next-generated DOM elements to fill their parent's height
@@ -25,13 +25,13 @@ export default class MyDocument extends Document {
 
   render() {
     return (
-      <html style={{ height: '100%' }}>
+      <Html style={{ height: '100%' }}>
         <Head />
         <body style={{ height: '100%', overflow: 'hidden' }}>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-rebass/pages/_document.js b/examples/with-rebass/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import { ServerStyleSheet } from 'styled-components'
 
 export default class MyDocument extends Document {
@@ -8,13 +8,13 @@ export default class MyDocument extends Document {
     const styleTags = sheet.getStyleElement()
 
     return (
-      <html>
+      <Html>
         <Head>{styleTags}</Head>
         <body>
           <div className="root">{main}</div>
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-strict-csp/pages/_document.js b/examples/with-strict-csp/pages/_document.js
@@ -1,5 +1,5 @@
 import crypto from 'crypto'
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 
 const cspHashOf = (text) => {
   const hash = crypto.createHash('sha256')
@@ -18,15 +18,15 @@ export default class MyDocument extends Document {
     }
 
     return (
-      <html>
+      <Html>
         <Head>
           <meta httpEquiv="Content-Security-Policy" content={csp} />
         </Head>
         <body>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-style-sheet/pages/_document.js b/examples/with-style-sheet/pages/_document.js
@@ -1,9 +1,9 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 
 export default class MyDocument extends Document {
   render() {
     return (
-      <html>
+      <Html>
         <Head>
           <style>{`body { margin: 0 }`}</style>
           <link
@@ -16,7 +16,7 @@ export default class MyDocument extends Document {
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }
diff --git a/examples/with-styled-components-rtl/pages/_document.js b/examples/with-styled-components-rtl/pages/_document.js
@@ -1,4 +1,4 @@
-import Document, { Head, Main, NextScript } from 'next/document'
+import Document, { Html, Head, Main, NextScript } from 'next/document'
 import { ServerStyleSheet, StyleSheetManager } from 'styled-components'
 import stylisRTLPlugin from 'stylis-plugin-rtl'
 
@@ -20,13 +20,13 @@ export default class MyDocument extends Document {
   }
   render() {
     return (
-      <html>
+      <Html>
         <Head>{this.props.styleTags}</Head>
         <body>
           <Main />
           <NextScript />
         </body>
-      </html>
+      </Html>
     )
   }
 }