From 08f241fc3f61d06af7c34575017bd79bcb616d9d Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Fri, 17 Jan 2020 13:20:13 -0500
Subject: [PATCH 1/5] Switch from `defer` to `async` (#10143)

---
 packages/next/pages/_document.tsx              | 12 ++++++------
 test/integration/production/test/index.test.js |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 2134fc9aee8a..5d63deda249b 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -570,7 +570,7 @@ export class NextScript extends Component<OriginProps> {
 
       return (
         <script
-          defer
+          async
           key={bundle.file}
           src={`${assetPrefix}/_next/${encodeURI(
             bundle.file
@@ -611,7 +611,7 @@ export class NextScript extends Component<OriginProps> {
             file
           )}${_devOnlyInvalidateCacheQueryString}`}
           nonce={this.props.nonce}
-          defer
+          async
           crossOrigin={this.props.crossOrigin || process.crossOrigin}
           {...modernProps}
         />
@@ -720,7 +720,7 @@ export class NextScript extends Component<OriginProps> {
 
     const pageScript = [
       <script
-        defer
+        async
         data-next-page={page}
         key={page}
         src={
@@ -734,7 +734,7 @@ export class NextScript extends Component<OriginProps> {
       />,
       process.env.__NEXT_MODERN_BUILD && (
         <script
-          defer
+          async
           data-next-page={page}
           key={`${page}-modern`}
           src={
@@ -753,7 +753,7 @@ export class NextScript extends Component<OriginProps> {
 
     const appScript = [
       <script
-        defer
+        async
         data-next-page="/_app"
         src={
           assetPrefix +
@@ -767,7 +767,7 @@ export class NextScript extends Component<OriginProps> {
       />,
       process.env.__NEXT_MODERN_BUILD && (
         <script
-          defer
+          async
           data-next-page="/_app"
           src={
             assetPrefix +
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
index 4c27b48eb34b..141f96833e5d 100644
--- a/test/integration/production/test/index.test.js
+++ b/test/integration/production/test/index.test.js
@@ -678,13 +678,13 @@ describe('Production Usage', () => {
     }
   })
 
-  it('should have defer on all script tags', async () => {
+  it('should have async on all script tags', async () => {
     const html = await renderViaHTTP(appPort, '/')
     const $ = cheerio.load(html)
     let missing = false
 
     for (const script of $('script').toArray()) {
-      // application/json doesn't need defer
+      // application/json doesn't need async
       if (
         script.attribs.type === 'application/json' ||
         script.attribs.src.includes('polyfills')
@@ -692,7 +692,7 @@ describe('Production Usage', () => {
         continue
       }
 
-      if (script.attribs.async === '' || script.attribs.defer !== '') {
+      if (script.attribs.defer === '' || script.attribs.async !== '') {
         missing = true
       }
     }

From 2fe743581471279497b53ed692ff77c01be73e93 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Fri, 17 Jan 2020 13:20:32 -0500
Subject: [PATCH 2/5] v9.2.1-canary.1

---
 lerna.json                                         | 2 +-
 packages/create-next-app/package.json              | 2 +-
 packages/next-bundle-analyzer/package.json         | 2 +-
 packages/next-mdx/package.json                     | 2 +-
 packages/next-plugin-google-analytics/package.json | 2 +-
 packages/next-plugin-material-ui/package.json      | 2 +-
 packages/next-plugin-sentry/package.json           | 2 +-
 packages/next/package.json                         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9ae06a101bbb..4894d60912ca 100644
--- a/lerna.json
+++ b/lerna.json
@@ -12,5 +12,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.2.1-canary.0"
+  "version": "9.2.1-canary.1"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 046af185ba9c..620e32d321d5 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.2.1-canary.0",
+  "version": "9.2.1-canary.1",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index cf486f3afe96..beaaa00ef740 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.2.1-canary.0",
+  "version": "9.2.1-canary.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index cb6f0061fd52..675de247d266 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.2.1-canary.0",
+  "version": "9.2.1-canary.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
index a17c9ca29b5b..3b961f283bec 100644
--- a/packages/next-plugin-google-analytics/package.json
+++ b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "9.2.1-canary.0",
+  "version": "9.2.1-canary.1",
   "nextjs": {
     "name": "Google Analytics",
     "required-env": [
diff --git a/packages/next-plugin-material-ui/package.json b/packages/next-plugin-material-ui/package.json
index 2a31bb13bcc6..b30b6fa85420 100644
--- a/packages/next-plugin-material-ui/package.json
+++ b/packages/next-plugin-material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-material-ui",
-  "version": "9.2.1-canary.0",
+  "version": "9.2.1-canary.1",
   "nextjs": {
     "name": "Material UI",
     "required-env": []
diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
index a380e07b3afc..a66e7f217683 100644
--- a/packages/next-plugin-sentry/package.json
+++ b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "9.2.1-canary.0",
+  "version": "9.2.1-canary.1",
   "nextjs": {
     "name": "Sentry",
     "required-env": [
diff --git a/packages/next/package.json b/packages/next/package.json
index a97bc1054bee..26f3147b5b32 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.2.1-canary.0",
+  "version": "9.2.1-canary.1",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",

From aa6991f2062c6adae654f53527439bebb1d30237 Mon Sep 17 00:00:00 2001
From: Oleg Filonchuk <34554336+OlegFilonchuk@users.noreply.github.com>
Date: Fri, 17 Jan 2020 21:22:40 +0200
Subject: [PATCH 3/5] update readme.md (#10136)

fixed a little typo
---
 examples/with-sitemap-and-robots-express-server/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-sitemap-and-robots-express-server/README.md b/examples/with-sitemap-and-robots-express-server/README.md
index d7b471b646ce..414e3f368fe2 100644
--- a/examples/with-sitemap-and-robots-express-server/README.md
+++ b/examples/with-sitemap-and-robots-express-server/README.md
@@ -22,7 +22,7 @@ yarn create next-app --example with-sitemap-and-robots-express-server with-sitem
 Download the example:
 
 ```bash
-curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-sitemap-and-robots-expres-server
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-sitemap-and-robots-express-server
 cd with-sitemap-and-robots-express-server
 ```
 

From 5a9a478cc84d013515d62d814f1f746cae5ffdff Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 17 Jan 2020 14:13:51 -0600
Subject: [PATCH 4/5] Fix hydration with custom _app and granular chunks
 (#10144)

* Add failing hydration test

* Add importing of next/router to _app

* Fix type

* Update _app check for windows

* Remove babel fix

* Update to use webpack to require next/router
---
 packages/next/build/entries.ts                | 11 ++++++-
 packages/next/pages/_app.tsx                  |  1 -
 test/integration/hydration/pages/_app.js      |  1 +
 test/integration/hydration/pages/_document.js | 16 +++++++++
 test/integration/hydration/pages/details.js   |  6 ++++
 test/integration/hydration/pages/index.js     |  6 ++++
 test/integration/hydration/test/index.test.js | 33 +++++++++++++++++++
 7 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/hydration/pages/_app.js
 create mode 100644 test/integration/hydration/pages/_document.js
 create mode 100644 test/integration/hydration/pages/details.js
 create mode 100644 test/integration/hydration/pages/index.js
 create mode 100644 test/integration/hydration/test/index.test.js

diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
index f51675d36655..a518b7b9877c 100644
--- a/packages/next/build/entries.ts
+++ b/packages/next/build/entries.ts
@@ -115,10 +115,19 @@ export function createEntrypoints(
     }
 
     if (!isApiRoute) {
-      client[bundlePath] = `next-client-pages-loader?${stringify({
+      const pageLoader = `next-client-pages-loader?${stringify({
         page,
         absolutePagePath,
       })}!`
+
+      // Make sure next/router is a dependency of _app or else granularChunks
+      // might cause the router to not be able to load causing hydration
+      // to fail
+
+      client[bundlePath] =
+        page === '/_app'
+          ? [pageLoader, require.resolve('../client/router')]
+          : pageLoader
     }
   })
 
diff --git a/packages/next/pages/_app.tsx b/packages/next/pages/_app.tsx
index c4041f9613d7..3971441a2433 100644
--- a/packages/next/pages/_app.tsx
+++ b/packages/next/pages/_app.tsx
@@ -7,7 +7,6 @@ import {
   AppPropsType,
 } from '../next-server/lib/utils'
 import { Router } from '../client/router'
-import '../client/router'
 
 export { AppInitialProps }
 
diff --git a/test/integration/hydration/pages/_app.js b/test/integration/hydration/pages/_app.js
new file mode 100644
index 000000000000..e3c005467a16
--- /dev/null
+++ b/test/integration/hydration/pages/_app.js
@@ -0,0 +1 @@
+export default ({ Component, pageProps }) => <Component {...pageProps} />
diff --git a/test/integration/hydration/pages/_document.js b/test/integration/hydration/pages/_document.js
new file mode 100644
index 000000000000..d4d66d494410
--- /dev/null
+++ b/test/integration/hydration/pages/_document.js
@@ -0,0 +1,16 @@
+import Document, { Head, Html, Main, NextScript } from 'next/document'
+import React from 'react'
+
+class WeddingDocument extends Document {
+  render() {
+    return (
+      <Html lang="en-GB">
+        <Head />
+        <Main />
+        <NextScript />
+      </Html>
+    )
+  }
+}
+
+export default WeddingDocument
diff --git a/test/integration/hydration/pages/details.js b/test/integration/hydration/pages/details.js
new file mode 100644
index 000000000000..0acf307fdefc
--- /dev/null
+++ b/test/integration/hydration/pages/details.js
@@ -0,0 +1,6 @@
+export default () => {
+  if (typeof window !== 'undefined') {
+    window.didHydrate = true
+  }
+  return 'details'
+}
diff --git a/test/integration/hydration/pages/index.js b/test/integration/hydration/pages/index.js
new file mode 100644
index 000000000000..b0989ad629fb
--- /dev/null
+++ b/test/integration/hydration/pages/index.js
@@ -0,0 +1,6 @@
+export default () => {
+  if (typeof window !== 'undefined') {
+    window.didHydrate = true
+  }
+  return 'index'
+}
diff --git a/test/integration/hydration/test/index.test.js b/test/integration/hydration/test/index.test.js
new file mode 100644
index 000000000000..5a18abec5840
--- /dev/null
+++ b/test/integration/hydration/test/index.test.js
@@ -0,0 +1,33 @@
+/* eslint-env jest */
+/* global jasmine */
+import path from 'path'
+import fs from 'fs-extra'
+import webdriver from 'next-webdriver'
+import {
+  nextBuild,
+  nextStart,
+  findPort,
+  waitFor,
+  killApp,
+} from 'next-test-utils'
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 1
+const appDir = path.join(__dirname, '..')
+let app
+let appPort
+
+describe('Hydration', () => {
+  beforeAll(async () => {
+    await fs.remove(path.join(appDir, '.next'))
+    await nextBuild(appDir)
+    appPort = await findPort()
+    app = await nextStart(appDir, appPort)
+  })
+  afterAll(() => killApp(app))
+
+  it('Hydrates correctly', async () => {
+    const browser = await webdriver(appPort, '/')
+    await waitFor(2000)
+    expect(await browser.eval('window.didHydrate')).toBe(true)
+  })
+})

From 15cffd00598d7c8d0f8d6e44df6976e06200ed9c Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 17 Jan 2020 14:14:52 -0600
Subject: [PATCH 5/5] v9.2.1-canary.2

---
 lerna.json                                         | 2 +-
 packages/create-next-app/package.json              | 2 +-
 packages/next-bundle-analyzer/package.json         | 2 +-
 packages/next-mdx/package.json                     | 2 +-
 packages/next-plugin-google-analytics/package.json | 2 +-
 packages/next-plugin-material-ui/package.json      | 2 +-
 packages/next-plugin-sentry/package.json           | 2 +-
 packages/next/package.json                         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lerna.json b/lerna.json
index 4894d60912ca..2acdd4267e50 100644
--- a/lerna.json
+++ b/lerna.json
@@ -12,5 +12,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.2.1-canary.1"
+  "version": "9.2.1-canary.2"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 620e32d321d5..db83145c5dc4 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.2.1-canary.1",
+  "version": "9.2.1-canary.2",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index beaaa00ef740..3edf8b9a51cc 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.2.1-canary.1",
+  "version": "9.2.1-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index 675de247d266..76e825d3619e 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.2.1-canary.1",
+  "version": "9.2.1-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
index 3b961f283bec..463411e6b4e6 100644
--- a/packages/next-plugin-google-analytics/package.json
+++ b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "9.2.1-canary.1",
+  "version": "9.2.1-canary.2",
   "nextjs": {
     "name": "Google Analytics",
     "required-env": [
diff --git a/packages/next-plugin-material-ui/package.json b/packages/next-plugin-material-ui/package.json
index b30b6fa85420..3303af0dd9bb 100644
--- a/packages/next-plugin-material-ui/package.json
+++ b/packages/next-plugin-material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-material-ui",
-  "version": "9.2.1-canary.1",
+  "version": "9.2.1-canary.2",
   "nextjs": {
     "name": "Material UI",
     "required-env": []
diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
index a66e7f217683..fa780e258d1b 100644
--- a/packages/next-plugin-sentry/package.json
+++ b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "9.2.1-canary.1",
+  "version": "9.2.1-canary.2",
   "nextjs": {
     "name": "Sentry",
     "required-env": [
diff --git a/packages/next/package.json b/packages/next/package.json
index 26f3147b5b32..3c173676f08b 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.2.1-canary.1",
+  "version": "9.2.1-canary.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",