From 0d24bde8069b0cc43e1fb745c168a40ec4a52217 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 23 Sep 2019 15:12:31 -0700
Subject: [PATCH 01/37] Adding native-url package

---
 packages/next/build/webpack-config.ts | 11 +++++++++++
 packages/next/client/polyfill.js      |  1 +
 packages/next/package.json            |  2 ++
 packages/next/pages/_document.tsx     | 10 ++++++++++
 yarn.lock                             | 12 ++++++++++++
 5 files changed, 36 insertions(+)
 create mode 100644 packages/next/client/polyfill.js

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index e567f0c0292fd..764465fb5d85d 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -16,6 +16,7 @@ import { fileExists } from '../lib/file-exists'
 import { resolveRequest } from '../lib/resolve-request'
 import {
   CLIENT_STATIC_FILES_RUNTIME_MAIN,
+  CLIENT_STATIC_FILES_PATH,
   CLIENT_STATIC_FILES_RUNTIME_WEBPACK,
   REACT_LOADABLE_MANIFEST,
   SERVER_DIRECTORY,
@@ -111,6 +112,11 @@ export default async function getBaseWebpackConfig(
               dev ? `next-dev.js` : 'next.js'
             )
           ),
+        [path.join(
+          CLIENT_STATIC_FILES_PATH,
+          buildId,
+          'polyfill.js'
+        )]: path.join(NEXT_PROJECT_ROOT_DIST_CLIENT, 'polyfill.js'),
       }
     : undefined
 
@@ -156,6 +162,11 @@ export default async function getBaseWebpackConfig(
       next: NEXT_PROJECT_ROOT,
       [PAGES_DIR_ALIAS]: path.join(dir, 'pages'),
       [DOT_NEXT_ALIAS]: distDir,
+      ...(!isServer
+        ? {
+            url: 'native-url',
+          }
+        : {}),
     },
     mainFields: isServer ? ['main', 'module'] : ['browser', 'module', 'main'],
     plugins: [PnpWebpackPlugin],
diff --git a/packages/next/client/polyfill.js b/packages/next/client/polyfill.js
new file mode 100644
index 0000000000000..0fcabf84e8fd9
--- /dev/null
+++ b/packages/next/client/polyfill.js
@@ -0,0 +1 @@
+import 'url-polyfill'
diff --git a/packages/next/package.json b/packages/next/package.json
index 9a1fbc81c7a21..fb3fd7b7fd239 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -99,6 +99,7 @@
     "loader-utils": "1.2.3",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
+    "native-url": "0.1.1",
     "node-fetch": "2.6.0",
     "ora": "3.4.0",
     "path-to-regexp": "2.1.0",
@@ -120,6 +121,7 @@
     "terser": "4.0.0",
     "unfetch": "4.1.0",
     "url": "0.11.0",
+    "url-polyfill": "1.1.7",
     "watchpack": "2.0.0-beta.5",
     "webpack": "4.39.0",
     "webpack-dev-middleware": "3.7.0",
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index d2401fa75194b..3121eb5876ce5 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -749,6 +749,16 @@ export class NextScript extends Component<OriginProps> {
             }}
           />
         ) : null}
+        <script
+          nonce={this.props.nonce}
+          crossOrigin={this.props.crossOrigin || process.crossOrigin}
+          noModule={true}
+          src={
+            assetPrefix +
+            `/_next/static/${buildId}/polyfill.js` +
+            _devOnlyInvalidateCacheQueryString
+          }
+        />
         {page !== '/_error' && pageScript}
         {appScript}
         {staticMarkup ? null : this.getDynamicChunks()}
diff --git a/yarn.lock b/yarn.lock
index 43df8b9891e84..391c26972ddf1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9834,6 +9834,13 @@ native-or-bluebird@^1.2.0:
   resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
   integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck=
 
+native-url@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.1.1.tgz#3ac64d833a4c74beb1c6d81543a288c71666308a"
+  integrity sha512-s6SJ1KEYIu8G9lAx5enMoa4z51aZM2AcNSV9tQF69F9LKSNERinOm01B9YlVhSYBsdU5fnhTCP2BvuiWr7gy3w==
+  dependencies:
+    querystring "^0.2.0"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -14518,6 +14525,11 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
+url-polyfill@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.7.tgz#402ee84360eb549bbeb585f4c7971e79a31de9e3"
+  integrity sha512-ZrAxYWCREjmMtL8gSbSiKKLZZticgihCvVBtrFbUVpyoETt8GQJeG2okMWA8XryDAaHMjJfhnc+rnhXRbI4DXA==
+
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"

From ec54da816f4a9293807f3bd9237ab102763db25c Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Tue, 22 Oct 2019 16:19:06 -0700
Subject: [PATCH 02/37] Bumping native-url version

---
 packages/next/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index 1d8d36d8247ce..eeccfc7392dcf 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -100,7 +100,7 @@
     "lru-cache": "5.1.1",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
-    "native-url": "0.1.1",
+    "native-url": "0.1.2",
     "node-fetch": "2.6.0",
     "ora": "3.4.0",
     "path-to-regexp": "2.1.0",

From bc22678852f111697f963a40bcd5f7baa92a72aa Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 24 Oct 2019 20:23:59 -0700
Subject: [PATCH 03/37] Upgrading native-url

---
 packages/next/package.json | 2 +-
 yarn.lock                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index eeccfc7392dcf..986baa0a4d690 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -100,7 +100,7 @@
     "lru-cache": "5.1.1",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
-    "native-url": "0.1.2",
+    "native-url": "0.2.0",
     "node-fetch": "2.6.0",
     "ora": "3.4.0",
     "path-to-regexp": "2.1.0",
diff --git a/yarn.lock b/yarn.lock
index 824681e608e4b..be787297fd62d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9996,10 +9996,10 @@ native-or-bluebird@^1.2.0:
   resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
   integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck=
 
-native-url@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.1.1.tgz#3ac64d833a4c74beb1c6d81543a288c71666308a"
-  integrity sha512-s6SJ1KEYIu8G9lAx5enMoa4z51aZM2AcNSV9tQF69F9LKSNERinOm01B9YlVhSYBsdU5fnhTCP2BvuiWr7gy3w==
+native-url@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.0.tgz#7b4b12e8abd92e1dde1af23992d2aa92dc966b5b"
+  integrity sha512-6z2lBdT6gaTMgNQ16k28CKZEPjjHQGJGv9SFEBbAVL6gngsgDzGk7bJKXNndP0Wm6f7N+iBGh/bKQOalePoHMQ==
   dependencies:
     querystring "^0.2.0"
 

From c74137bbe9a18c764fa805ddbd6808ae6f70e078 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Fri, 25 Oct 2019 13:22:00 -0700
Subject: [PATCH 04/37] Logging stats object for debugging

---
 test/integration/chunking/test/index.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index a30901aa45c73..ba764e937eade 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -36,6 +36,7 @@ describe('Chunking', () => {
       .replace(/"static\\(.*?":)/g, '"static\\\\$1')
       .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
 
+    console.log(stats)
     stats = JSON.parse(stats)
     buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
     chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))

From a816aff0a4fb5ed4ebb5c9bbb399b84e85576a05 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Fri, 25 Oct 2019 13:45:28 -0700
Subject: [PATCH 05/37] Logging stats object for debugging

---
 test/integration/chunking/test/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index ba764e937eade..10bd1e2d3f01d 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -36,7 +36,7 @@ describe('Chunking', () => {
       .replace(/"static\\(.*?":)/g, '"static\\\\$1')
       .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
 
-    console.log(stats)
+    console.error(stats)
     stats = JSON.parse(stats)
     buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
     chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))

From 5bbf5855f241fb41fb5724d92ce21a40de071eca Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 28 Oct 2019 10:36:47 -0700
Subject: [PATCH 06/37] Adding try catch to the error lines

---
 test/integration/chunking/test/index.test.js | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index 10bd1e2d3f01d..cee4a5a3ed069 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -27,19 +27,19 @@ describe('Chunking', () => {
           return unlink(join(appDir, '.next', 'static', 'chunks', chunk))
         })
       )
+
+      await nextBuild(appDir)
+      stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
+        // fixes backslashes in keyNames not being escaped on windows
+        .replace(/"static\\(.*?":)/g, '"static\\\\$1')
+        .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
+
+      stats = JSON.parse(stats)
+      buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
+      chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))
     } catch (e) {
-      // Error here means old chunks don't exist, so we don't need to do anything
+      console.error(stats)
     }
-    await nextBuild(appDir)
-    stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
-      // fixes backslashes in keyNames not being escaped on windows
-      .replace(/"static\\(.*?":)/g, '"static\\\\$1')
-      .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
-
-    console.error(stats)
-    stats = JSON.parse(stats)
-    buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
-    chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))
   })
 
   it('should use all url friendly names', () => {

From 044dae3d9b7ee2038c1935b293e33852f93bcc09 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 28 Oct 2019 11:28:38 -0700
Subject: [PATCH 07/37] Experimenting with regex

---
 test/integration/chunking/test/index.test.js | 21 ++++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index cee4a5a3ed069..1338b3cea1f44 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -27,19 +27,18 @@ describe('Chunking', () => {
           return unlink(join(appDir, '.next', 'static', 'chunks', chunk))
         })
       )
-
-      await nextBuild(appDir)
-      stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
-        // fixes backslashes in keyNames not being escaped on windows
-        .replace(/"static\\(.*?":)/g, '"static\\\\$1')
-        .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
-
-      stats = JSON.parse(stats)
-      buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
-      chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))
     } catch (e) {
-      console.error(stats)
+      // Error here means old chunks don't exist, so we don't need to do anything
     }
+    await nextBuild(appDir)
+    stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
+      // fixes backslashes in keyNames not being escaped on windows
+      .replace(/"static\\(.*?":?)/g, '"static\\\\$1')
+      .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
+
+    stats = JSON.parse(stats)
+    buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
+    chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))
   })
 
   it('should use all url friendly names', () => {

From e45be118deda7344517223c3f8344fd5f5841bcd Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 28 Oct 2019 14:09:18 -0700
Subject: [PATCH 08/37] Experimenting with regex

---
 test/integration/chunking/test/index.test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index 1338b3cea1f44..7f9e432496239 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -34,9 +34,11 @@ describe('Chunking', () => {
     stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
       // fixes backslashes in keyNames not being escaped on windows
       .replace(/"static\\(.*?":?)/g, '"static\\\\$1')
+      .replace(/("static\\.*?)\\(polyfill\.js":)/g, '$1\\\\$2')
       .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
 
     stats = JSON.parse(stats)
+    // console.log(stats)
     buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
     chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))
   })

From 5458c70d9c544e0aa0e680245dd8ce1d7947547f Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 28 Oct 2019 15:39:49 -0700
Subject: [PATCH 09/37] Experimenting with regex

---
 test/integration/chunking/test/index.test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index 7f9e432496239..320bc2d6fcdcd 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -33,9 +33,9 @@ describe('Chunking', () => {
     await nextBuild(appDir)
     stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
       // fixes backslashes in keyNames not being escaped on windows
-      .replace(/"static\\(.*?":?)/g, '"static\\\\$1')
-      .replace(/("static\\.*?)\\(polyfill\.js":)/g, '$1\\\\$2')
-      .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
+      .replace(/"static\\(.*?":?)/g, match => match.replace('\\', '\\\\'))
+    // .replace(/("static\\.*?)\\(polyfill\.js":)/g, '$1\\\\$2')
+    // .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
 
     stats = JSON.parse(stats)
     // console.log(stats)

From bf44461a588ed7348dadc80b870cbd84461091ca Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 28 Oct 2019 16:16:30 -0700
Subject: [PATCH 10/37] Testing regex changes

---
 test/integration/chunking/test/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index 320bc2d6fcdcd..83475397c6a3b 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -33,7 +33,7 @@ describe('Chunking', () => {
     await nextBuild(appDir)
     stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
       // fixes backslashes in keyNames not being escaped on windows
-      .replace(/"static\\(.*?":?)/g, match => match.replace('\\', '\\\\'))
+      .replace(/"static\\(.*?":?)/g, match => match.replace(/\\/g, '\\\\'))
     // .replace(/("static\\.*?)\\(polyfill\.js":)/g, '$1\\\\$2')
     // .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
 

From e976414bcb4815856b9cf69a6686283b2f3bf53a Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Tue, 29 Oct 2019 13:30:34 -0700
Subject: [PATCH 11/37] Fixing defer-script test case to not include
 polyfill.js

---
 test/integration/defer-scripts/test/index.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/defer-scripts/test/index.test.js b/test/integration/defer-scripts/test/index.test.js
index 385e4b3d0f1b7..58281fc17f72a 100644
--- a/test/integration/defer-scripts/test/index.test.js
+++ b/test/integration/defer-scripts/test/index.test.js
@@ -38,9 +38,9 @@ describe('Defer Scripts', () => {
     let missing = false
 
     for (const script of $('script').toArray()) {
-      const { defer, type } = script.attribs
+      const { defer, type, src } = script.attribs
       // application/json doesn't need defer
-      if (type === 'application/json') {
+      if (type === 'application/json' || /polyfill\.js$/.test(src)) {
         continue
       }
 

From 96e44561940394e5f3efad1bfb0a9299e33c625d Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Tue, 5 Nov 2019 11:04:34 -0800
Subject: [PATCH 12/37] Meging changes with existing polyfill work

---
 packages/next/build/webpack-config.ts        | 2 ++
 packages/next/client/polyfill.js             | 1 -
 packages/next/client/polyfills.js            | 1 +
 test/integration/chunking/test/index.test.js | 3 ---
 4 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 packages/next/client/polyfill.js

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 19612cfd5ce1e..429e765d86433 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -65,6 +65,8 @@ function getOptimizedAliases(isServer: boolean): { [pkg: string]: string } {
     unfetch$: stubWindowFetch,
     'isomorphic-unfetch$': stubWindowFetch,
     'whatwg-fetch$': stubWindowFetch,
+
+    url: 'native-url',
   }
 }
 
diff --git a/packages/next/client/polyfill.js b/packages/next/client/polyfill.js
deleted file mode 100644
index 0fcabf84e8fd9..0000000000000
--- a/packages/next/client/polyfill.js
+++ /dev/null
@@ -1 +0,0 @@
-import 'url-polyfill'
diff --git a/packages/next/client/polyfills.js b/packages/next/client/polyfills.js
index 5750e9a194ed9..2dc1a90e0a434 100644
--- a/packages/next/client/polyfills.js
+++ b/packages/next/client/polyfills.js
@@ -1 +1,2 @@
 import '__next_polyfill__fetch'
+import 'url-polyfill'
diff --git a/test/integration/chunking/test/index.test.js b/test/integration/chunking/test/index.test.js
index 62033f206098d..a0c16849e265d 100644
--- a/test/integration/chunking/test/index.test.js
+++ b/test/integration/chunking/test/index.test.js
@@ -46,11 +46,8 @@ describe('Chunking', () => {
     stats = (await readFile(join(appDir, '.next', 'stats.json'), 'utf8'))
       // fixes backslashes in keyNames not being escaped on windows
       .replace(/"static\\(.*?":?)/g, match => match.replace(/\\/g, '\\\\'))
-    // .replace(/("static\\.*?)\\(polyfill\.js":)/g, '$1\\\\$2')
-    // .replace(/("static\\.*?)\\pages\\(.*?":)/g, '$1\\\\pages\\\\$2')
 
     stats = JSON.parse(stats)
-    // console.log(stats)
     buildId = await readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
     chunks = await readdir(join(appDir, '.next', 'static', 'chunks'))
   })

From 8431e0ae3a02a34d5efabb32010f9c264dc98f81 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 25 Nov 2019 11:14:39 -0800
Subject: [PATCH 13/37] Bumping version

---
 packages/next/package.json | 2 +-
 yarn.lock                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index 95c745a2e6c0c..06bd684690904 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -101,7 +101,7 @@
     "lru-cache": "5.1.1",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
-    "native-url": "0.2.0",
+    "native-url": "0.2.1",
     "node-fetch": "2.6.0",
     "object-assign": "4.1.1",
     "ora": "3.4.0",
diff --git a/yarn.lock b/yarn.lock
index 3825a869132e0..c74a54687afd4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10493,10 +10493,10 @@ native-or-bluebird@^1.2.0:
   resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
   integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck=
 
-native-url@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.0.tgz#7b4b12e8abd92e1dde1af23992d2aa92dc966b5b"
-  integrity sha512-6z2lBdT6gaTMgNQ16k28CKZEPjjHQGJGv9SFEBbAVL6gngsgDzGk7bJKXNndP0Wm6f7N+iBGh/bKQOalePoHMQ==
+native-url@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.1.tgz#af34e7ade00049a880dbd476f6fc80ffbb4095ef"
+  integrity sha512-1wtxUvRw9yfnqbP/gI7rWnRx3boHosUXz2d+EahWafx86gG0EdxbglqhA6hSKybteH6uLLN867yNmh4cnqndvw==
   dependencies:
     querystring "^0.2.0"
 

From 62c15acdc9c7ea8ac9c923a199c89b44802d8ded Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Mon, 25 Nov 2019 17:33:27 -0500
Subject: [PATCH 14/37] adjust webpack config

---
 packages/next/build/webpack-config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index ace59c19fb845..06cc3026f714c 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -87,7 +87,8 @@ function getOptimizedAliases(isServer: boolean): { [pkg: string]: string } {
     'object.assign/polyfill': path.join(shimAssign, 'polyfill.js'),
     'object.assign/shim': path.join(shimAssign, 'shim.js'),
 
-    url: 'native-url',
+    // Replace: full URL polyfill with platform-based polyfill
+    url: require.resolve('native-url'),
   }
 }
 

From 98f5742260bb5ffcb6103f54dc63c162a5bd1f59 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Mon, 25 Nov 2019 17:33:59 -0500
Subject: [PATCH 15/37] Reduce size in size test

---
 test/integration/size-limit/test/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js
index 3d6dc6d1fca99..0049762a7e5b9 100644
--- a/test/integration/size-limit/test/index.test.js
+++ b/test/integration/size-limit/test/index.test.js
@@ -101,7 +101,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizeKilobytes - 204
+    const delta = responseSizeKilobytes - 197
     expect(delta).toBeLessThanOrEqual(0) // don't increase size
     expect(delta).toBeGreaterThanOrEqual(-2) // don't decrease size without updating target
   })

From ba8e6da08148816d56042f7442cb017cd8bcc830 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Mon, 25 Nov 2019 17:36:21 -0500
Subject: [PATCH 16/37] Remove 1kb from legacy

---
 test/integration/size-limit/test/index.test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js
index 0049762a7e5b9..a0993aded0551 100644
--- a/test/integration/size-limit/test/index.test.js
+++ b/test/integration/size-limit/test/index.test.js
@@ -81,9 +81,9 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizeKilobytes - 230
+    const delta = responseSizeKilobytes - 229
     expect(delta).toBeLessThanOrEqual(0) // don't increase size
-    expect(delta).toBeGreaterThanOrEqual(-2) // don't decrease size without updating target
+    expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target
   })
 
   it('should not increase the overall response size of modern build', async () => {
@@ -103,6 +103,6 @@ describe('Production response size', () => {
     // These numbers are without gzip compression!
     const delta = responseSizeKilobytes - 197
     expect(delta).toBeLessThanOrEqual(0) // don't increase size
-    expect(delta).toBeGreaterThanOrEqual(-2) // don't decrease size without updating target
+    expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target
   })
 })

From 3af432586be2e96e5a93826cd4ff59ed42d164a7 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Tue, 26 Nov 2019 10:52:56 -0800
Subject: [PATCH 17/37] Bumping native-url version, includes fix for IE11

---
 packages/next/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index 523f489bdebec..a330d098f35cf 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -102,7 +102,7 @@
     "lru-cache": "5.1.1",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
-    "native-url": "0.2.1",
+    "native-url": "0.2.2",
     "node-fetch": "2.6.0",
     "object-assign": "4.1.1",
     "ora": "3.4.0",

From d9b07f2e13dd498c582f4f6bc7107c1a41921e87 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Tue, 26 Nov 2019 14:02:22 -0500
Subject: [PATCH 18/37] Update lock file

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4ca1c1696dc99..4f9aee50bfda3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10572,10 +10572,10 @@ native-or-bluebird@^1.2.0:
   resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
   integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck=
 
-native-url@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.1.tgz#af34e7ade00049a880dbd476f6fc80ffbb4095ef"
-  integrity sha512-1wtxUvRw9yfnqbP/gI7rWnRx3boHosUXz2d+EahWafx86gG0EdxbglqhA6hSKybteH6uLLN867yNmh4cnqndvw==
+native-url@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.2.tgz#a0e1ece7753a17d155068214872e81d7d322b410"
+  integrity sha512-X4a7YwNjY0ZxWIibqUuILfg7EaV2alawCgRZeczemcyTwOMYz5/zjR6l3nnDLARHl2sLlNbqk2A7ysb0atoYjA==
   dependencies:
     querystring "^0.2.0"
 

From 1cb4e988a96eb3f489d105271c8cd76ded8a2942 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Wed, 27 Nov 2019 10:55:23 -0800
Subject: [PATCH 19/37] Updating native-url, fixes issue on IE11

---
 packages/next/package.json | 2 +-
 yarn.lock                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index 485be86a0477e..88529ef85fb26 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -103,7 +103,7 @@
     "lru-cache": "5.1.1",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
-    "native-url": "0.2.2",
+    "native-url": "0.2.3",
     "node-fetch": "2.6.0",
     "object-assign": "4.1.1",
     "ora": "3.4.0",
diff --git a/yarn.lock b/yarn.lock
index 4c111dfa5f165..634ec5e74d0fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10612,10 +10612,10 @@ native-or-bluebird@^1.2.0:
   resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
   integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck=
 
-native-url@0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.2.tgz#a0e1ece7753a17d155068214872e81d7d322b410"
-  integrity sha512-X4a7YwNjY0ZxWIibqUuILfg7EaV2alawCgRZeczemcyTwOMYz5/zjR6l3nnDLARHl2sLlNbqk2A7ysb0atoYjA==
+native-url@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.3.tgz#29dfc0d7b2b396af493872ccc4b7d974e72ecb9a"
+  integrity sha512-AeSn0qFkS9EVPExWw/mN8le1HUj09LXovYPBTT9rnr9300OTvz+MZoEzIM1F7iPROsT2UNMzM+UsJCTPDqaL1g==
   dependencies:
     querystring "^0.2.0"
 

From 80b3d56a32e47d051bda73d2cd8e0e675efd32ab Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Wed, 4 Dec 2019 14:47:09 -0800
Subject: [PATCH 20/37] Fix sourcemap being added in document

---
 packages/next/pages/_document.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 861bf9edb4321..1d08fbf966efa 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -624,7 +624,9 @@ export class NextScript extends Component<OriginProps> {
     const { _devOnlyInvalidateCacheQueryString } = this.context
 
     return polyfillFiles
-      .filter(polyfill => !/\.module\.js$/.test(polyfill))
+      .filter(
+        polyfill => polyfill.endsWith('.js') && !/\.module\.js$/.test(polyfill)
+      )
       .map(polyfill => (
         <script
           key={polyfill}

From 1c3a145bd8ae1ee7528f1ea9da7f1cea937e8fe6 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 9 Dec 2019 14:01:10 -0800
Subject: [PATCH 21/37] Adding Router as an app level dep. Fixes Router not
 being added as a dep to pages without Link when granularChunks is enabled

---
 packages/next/pages/_app.tsx             | 3 ++-
 test/integration/chunking/pages/page2.js | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/next/pages/_app.tsx b/packages/next/pages/_app.tsx
index 3971441a24339..1567c8eb67a37 100644
--- a/packages/next/pages/_app.tsx
+++ b/packages/next/pages/_app.tsx
@@ -6,7 +6,8 @@ import {
   AppInitialProps,
   AppPropsType,
 } from '../next-server/lib/utils'
-import { Router } from '../client/router'
+import * as RouterObj from '../client/router'
+const { Router } = RouterObj
 
 export { AppInitialProps }
 
diff --git a/test/integration/chunking/pages/page2.js b/test/integration/chunking/pages/page2.js
index 937d4a16ec258..5168967bcdfab 100644
--- a/test/integration/chunking/pages/page2.js
+++ b/test/integration/chunking/pages/page2.js
@@ -1,7 +1,6 @@
 import { useState, useEffect } from 'react'
 import _ from 'lodash'
 import dynamic from 'next/dynamic'
-import Link from 'next/link'
 
 const One = dynamic(() => import('../components/one'))
 
@@ -17,7 +16,6 @@ const Page = () => {
       page2
       <p id="padded-str">{str}</p>
       <One />
-      <Link href="/page3">Page3</Link>
     </div>
   )
 }

From 356edeef9427c5682e7ecb3d116c37ce52053682 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 9 Dec 2019 15:13:03 -0800
Subject: [PATCH 22/37] Fix typescript error

---
 packages/next/pages/_app.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/next/pages/_app.tsx b/packages/next/pages/_app.tsx
index 1567c8eb67a37..c4041f9613d76 100644
--- a/packages/next/pages/_app.tsx
+++ b/packages/next/pages/_app.tsx
@@ -6,8 +6,8 @@ import {
   AppInitialProps,
   AppPropsType,
 } from '../next-server/lib/utils'
-import * as RouterObj from '../client/router'
-const { Router } = RouterObj
+import { Router } from '../client/router'
+import '../client/router'
 
 export { AppInitialProps }
 

From 9272b598e86485ff9a5aadca5a7743ec53ff9ab7 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 12 Dec 2019 12:12:44 -0800
Subject: [PATCH 23/37] Fix modern + granularChunks hydration failing

---
 .../build/webpack/plugins/next-esm-plugin.ts  | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/packages/next/build/webpack/plugins/next-esm-plugin.ts b/packages/next/build/webpack/plugins/next-esm-plugin.ts
index 765e09393ed56..9c1b00c2268dd 100644
--- a/packages/next/build/webpack/plugins/next-esm-plugin.ts
+++ b/packages/next/build/webpack/plugins/next-esm-plugin.ts
@@ -213,22 +213,30 @@ export default class NextEsmPlugin implements Plugin {
       compilation.namedChunkGroups
     )
 
+    const unnamedChunks = []
     const childChunkFileMap = childCompilation.chunks.reduce(
       (
         chunkMap: { [key: string]: compilation.Chunk },
         chunk: compilation.Chunk
       ) => {
-        chunkMap[chunk.name] = chunk
+        // Dynamic chunks may not have a name. It'll be null in such cases
+        if (chunk.name === null) {
+          unnamedChunks.push(chunkMap)
+        } else {
+          chunkMap[chunk.name] = chunk
+        }
+
         return chunkMap
       },
       {}
     )
 
-    // Merge files from similar chunks
+    // Merge chunks - merge the files of chunks with the same name
     compilation.chunks.forEach((chunk: compilation.Chunk) => {
       const childChunk = childChunkFileMap[chunk.name]
 
-      if (childChunk && childChunk.files) {
+      // Do not merge null named chunks since they are different
+      if (chunk.name !== null && childChunk && childChunk.files) {
         delete childChunkFileMap[chunk.name]
         chunk.files.push(
           ...childChunk.files.filter((v: any) => !chunk.files.includes(v))
@@ -236,15 +244,22 @@ export default class NextEsmPlugin implements Plugin {
       }
     })
 
-    // Add modern only chunks
-    compilation.chunks.push(...Object.values(childChunkFileMap))
+    // Add modern only chunks into the main compilation
+    compilation.chunks.push(
+      ...Object.values(childChunkFileMap),
+      ...unnamedChunks
+    )
 
-    // Place modern only chunk inside the right entry point
+    // Place modern only (unmerged) chunks inside the right entry point
     compilation.entrypoints.forEach((entryPoint, entryPointName) => {
       const childEntryPoint = childCompilation.entrypoints.get(entryPointName)
 
       childEntryPoint.chunks.forEach((chunk: compilation.Chunk) => {
-        if (childChunkFileMap.hasOwnProperty(chunk.name)) {
+        if (
+          // Add null named dynamic chunks since they weren't merged
+          chunk.name === null ||
+          childChunkFileMap.hasOwnProperty(chunk.name)
+        ) {
           entryPoint.chunks.push(chunk)
         }
       })

From a575d5ba9f861326ad10d7506c3c9e3a15113a4e Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 12 Dec 2019 12:24:11 -0800
Subject: [PATCH 24/37] Fix TS error

---
 packages/next/build/webpack/plugins/next-esm-plugin.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/next/build/webpack/plugins/next-esm-plugin.ts b/packages/next/build/webpack/plugins/next-esm-plugin.ts
index 9c1b00c2268dd..1f4ae64198ce8 100644
--- a/packages/next/build/webpack/plugins/next-esm-plugin.ts
+++ b/packages/next/build/webpack/plugins/next-esm-plugin.ts
@@ -213,7 +213,7 @@ export default class NextEsmPlugin implements Plugin {
       compilation.namedChunkGroups
     )
 
-    const unnamedChunks = []
+    const unnamedChunks: compilation.Chunk[] = []
     const childChunkFileMap = childCompilation.chunks.reduce(
       (
         chunkMap: { [key: string]: compilation.Chunk },
@@ -221,7 +221,7 @@ export default class NextEsmPlugin implements Plugin {
       ) => {
         // Dynamic chunks may not have a name. It'll be null in such cases
         if (chunk.name === null) {
-          unnamedChunks.push(chunkMap)
+          unnamedChunks.push(chunk)
         } else {
           chunkMap[chunk.name] = chunk
         }

From d9c593ed81d799a305a4c8e9e766f3af76471b4d Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 16 Dec 2019 13:33:26 -0800
Subject: [PATCH 25/37] Update native-url version

---
 packages/next/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index ff57bef9050b6..3eff458d67898 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -107,7 +107,7 @@
     "lru-cache": "5.1.1",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
-    "native-url": "0.2.3",
+    "native-url": "0.2.4",
     "node-fetch": "2.6.0",
     "object-assign": "4.1.1",
     "ora": "3.4.0",

From a323b44cc5c9893cb1cc69206ab27fa3a760f074 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 13 Feb 2020 23:30:13 -0800
Subject: [PATCH 26/37] Adding native-url with safari fix

---
 packages/next/build/webpack-config.ts          |  5 ++---
 packages/next/package.json                     |  3 ++-
 test/integration/size-limit/test/index.test.js |  4 ++--
 yarn.lock                                      | 12 ++++++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 606a31b3adbc6..46b587c59f057 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -106,9 +106,8 @@ function getOptimizedAliases(
       'object.assign/polyfill': path.join(shimAssign, 'polyfill.js'),
       'object.assign/shim': path.join(shimAssign, 'shim.js'),
 
-      // TODO: re-enable when `native-url` supports Safari 10
-      // // Replace: full URL polyfill with platform-based polyfill
-      // url: require.resolve('native-url'),
+      // Replace: full URL polyfill with platform-based polyfill
+      url: require.resolve('native-url'),
     }
   )
 }
diff --git a/packages/next/package.json b/packages/next/package.json
index e877198846b9f..5f0c660888316 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -115,6 +115,7 @@
     "lru-cache": "5.1.1",
     "mini-css-extract-plugin": "0.8.0",
     "mkdirp": "0.5.1",
+    "native-url": "0.2.6",
     "node-fetch": "2.6.0",
     "object-assign": "4.1.1",
     "ora": "3.4.0",
@@ -141,7 +142,7 @@
     "thread-loader": "2.1.3",
     "unfetch": "4.1.0",
     "url": "0.11.0",
-    "url-polyfill": "1.1.7",
+    "url-polyfill": "1.1.8",
     "use-subscription": "1.1.1",
     "watchpack": "2.0.0-beta.5",
     "webpack": "4.41.2",
diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js
index 5cec5c5e90726..a156295d8ea01 100644
--- a/test/integration/size-limit/test/index.test.js
+++ b/test/integration/size-limit/test/index.test.js
@@ -80,7 +80,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizesBytes - 233 * 1024
+    const delta = responseSizesBytes - 226 * 1024
     expect(delta).toBeLessThanOrEqual(1024) // don't increase size more than 1kb
     expect(delta).toBeGreaterThanOrEqual(-1024) // don't decrease size more than 1kb without updating target
   })
@@ -100,7 +100,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizesBytes - 201 * 1024
+    const delta = responseSizesBytes - 195 * 1024
     expect(delta).toBeLessThanOrEqual(1024) // don't increase size more than 1kb
     expect(delta).toBeGreaterThanOrEqual(-1024) // don't decrease size more than 1kb without updating target
   })
diff --git a/yarn.lock b/yarn.lock
index 87e1fcbeaa82d..5e92206ceb52a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10918,6 +10918,13 @@ native-or-bluebird@^1.2.0:
   resolved "https://registry.yarnpkg.com/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz#39c47bfd7825d1fb9ffad32210ae25daadf101c9"
   integrity sha1-OcR7/Xgl0fuf+tMiEK4l2q3xAck=
 
+native-url@0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae"
+  integrity sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA==
+  dependencies:
+    querystring "^0.2.0"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -16525,6 +16532,11 @@ url-polyfill@1.1.7:
   resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.7.tgz#402ee84360eb549bbeb585f4c7971e79a31de9e3"
   integrity sha512-ZrAxYWCREjmMtL8gSbSiKKLZZticgihCvVBtrFbUVpyoETt8GQJeG2okMWA8XryDAaHMjJfhnc+rnhXRbI4DXA==
 
+url-polyfill@1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.8.tgz#21eb58ad61192f52b77dcac8ab5293ae7bc67060"
+  integrity sha512-Ey61F4FEqhcu1vHSOMmjl0Vd/RPRLEjMj402qszD/dhMBrVfoUsnIj8KSZo2yj+eIlxJGKFdnm6ES+7UzMgZ3Q==
+
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"

From 2485d0a73a2ec30aa0e64dca3477f128135fc469 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 27 Feb 2020 16:30:09 -0800
Subject: [PATCH 27/37] Update url-polyfill in polyfill-nomodule package

---
 packages/next-polyfill-nomodule/package.json   | 2 +-
 test/integration/size-limit/test/index.test.js | 4 ++--
 yarn.lock                                      | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
index a6622237da113..bdeb9f370e946 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -13,7 +13,7 @@
     "microbundle": "0.11.0",
     "object-assign": "4.1.1",
     "promise-polyfill": "8.1.3",
-    "url-polyfill": "1.1.7",
+    "url-polyfill": "1.1.8",
     "whatwg-fetch": "3.0.0"
   }
 }
diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js
index 1700dafa5efe4..08a1262ded5a7 100644
--- a/test/integration/size-limit/test/index.test.js
+++ b/test/integration/size-limit/test/index.test.js
@@ -80,7 +80,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizesBytes - 237 * 1024
+    const delta = responseSizesBytes - 230 * 1024
     expect(delta).toBeLessThanOrEqual(1024) // don't increase size more than 1kb
     expect(delta).toBeGreaterThanOrEqual(-1024) // don't decrease size more than 1kb without updating target
   })
@@ -100,7 +100,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    const delta = responseSizesBytes - 171 * 1024
+    const delta = responseSizesBytes - 163 * 1024
     expect(delta).toBeLessThanOrEqual(1024) // don't increase size more than 1kb
     expect(delta).toBeGreaterThanOrEqual(-1024) // don't decrease size more than 1kb without updating target
   })
diff --git a/yarn.lock b/yarn.lock
index 460b6d80f2347..290c37a28f996 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16559,11 +16559,6 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-polyfill@1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.7.tgz#402ee84360eb549bbeb585f4c7971e79a31de9e3"
-  integrity sha512-ZrAxYWCREjmMtL8gSbSiKKLZZticgihCvVBtrFbUVpyoETt8GQJeG2okMWA8XryDAaHMjJfhnc+rnhXRbI4DXA==
-
 url-polyfill@1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.8.tgz#21eb58ad61192f52b77dcac8ab5293ae7bc67060"

From 51c5790935185358799944dc84fc95e715898580 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 27 Feb 2020 16:40:26 -0800
Subject: [PATCH 28/37] Remove url-polyfill from next package.json

---
 packages/next/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index a460ee43a20b8..ecb1da1243ae7 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -141,7 +141,6 @@
     "thread-loader": "2.1.3",
     "unfetch": "4.1.0",
     "url": "0.11.0",
-    "url-polyfill": "1.1.8",
     "use-subscription": "1.1.1",
     "watchpack": "2.0.0-beta.13",
     "webpack": "4.41.2",

From 57eb6b4a40a7246f090e708451150940b150f264 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 26 Mar 2020 14:53:06 -0700
Subject: [PATCH 29/37] Adding granularChunks conformance check

---
 packages/next/build/webpack-config.ts         |  10 ++
 .../checks/granular-chunks-conformance.ts     | 104 ++++++++++++++++++
 .../webpack-conformance-plugin/index.ts       |   1 +
 .../webpack-conformance-plugin/utils/utils.ts |  10 ++
 test/integration/conformance/next.config.js   |  12 ++
 .../conformance/test/index.test.js            |  13 ++-
 6 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
 create mode 100644 packages/next/build/webpack/plugins/webpack-conformance-plugin/utils/utils.ts

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 1eb1f4548efcd..a3102c7c234e8 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -48,6 +48,7 @@ import WebpackConformancePlugin, {
   MinificationConformanceCheck,
   ReactSyncScriptsConformanceCheck,
   DuplicatePolyfillsConformanceCheck,
+  GranularChunksConformanceCheck,
 } from './webpack/plugins/webpack-conformance-plugin'
 
 type ExcludesFalse = <T>(x: T | false) => x is T
@@ -462,6 +463,9 @@ export default async function getBaseWebpackConfig(
             ?.BlockedAPIToBePolyfilled || []
         ),
       },
+      GranularChunksConformanceCheck: {
+        enabled: true,
+      },
     },
     config.conformance
   )
@@ -901,6 +905,12 @@ export default async function getBaseWebpackConfig(
                   conformanceConfig.DuplicatePolyfillsConformanceCheck
                     .BlockedAPIToBePolyfilled,
               }),
+            !isServer &&
+              config.experimental.granularChunks &&
+              conformanceConfig.GranularChunksConformanceCheck.enabled &&
+              new GranularChunksConformanceCheck(
+                splitChunksConfigs.prodGranular
+              ),
           ].filter(Boolean),
         }),
     ].filter((Boolean as any) as ExcludesFalse),
diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
new file mode 100644
index 0000000000000..8a404ec3dde75
--- /dev/null
+++ b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
@@ -0,0 +1,104 @@
+import { bold } from 'kleur'
+import {
+  IWebpackConformanceTest,
+  IConformanceTestResult,
+  IConformanceTestStatus,
+} from '../TestInterface'
+import {
+  CONFORMANCE_ERROR_PREFIX,
+  CONFORMANCE_WARNING_PREFIX,
+} from '../constants'
+import { deepEqual } from '../utils/utils'
+
+export interface GranularChunksConformanceCheck
+  extends IWebpackConformanceTest {
+  granularChunksConfig: any
+}
+
+function getWarningMessage(modifiedProp: string) {
+  return (
+    `${CONFORMANCE_WARNING_PREFIX}: The splitChunks config as part of the granularChunks flag has ` +
+    `been carefully crafted to optimize build size and build times. Modifying - ${red(
+      modifiedProp
+    )} could result in slower builds and increased code duplication`
+  )
+}
+
+function getErrorMessage(message: string) {
+  return (
+    `${CONFORMANCE_ERROR_PREFIX}: The splitChunks config as part of the granularChunks flag has ` +
+    `been carefully crafted to optimize build size and build times. Please avoid changes to ${bold(
+      message
+    )}`
+  )
+}
+
+export class GranularChunksConformanceCheck {
+  constructor(granularChunksConfig: any) {
+    this.granularChunksConfig = granularChunksConfig
+  }
+
+  public buildStared(options: any): IConformanceTestResult {
+    const userSplitChunks = options.optimization.splitChunks
+    const warnings = []
+    const errors = []
+
+    if (
+      userSplitChunks.maxInitialRequests !==
+      this.granularChunksConfig.maxInitialRequests
+    ) {
+      warnings.push('splitChunks.maxInitialRequests')
+    }
+
+    if (userSplitChunks.minSize !== this.granularChunksConfig.minSize) {
+      warnings.push('splitChunks.minSize')
+    }
+
+    const userCacheGroup = userSplitChunks.cacheGroups
+    const originalCacheGroup = this.granularChunksConfig.cacheGroups
+
+    if (userCacheGroup.vendors !== false) {
+      errors.push('splitChunks.cacheGroups.vendors')
+    }
+
+    if (!deepEqual(userCacheGroup.framework, originalCacheGroup.framework)) {
+      errors.push('splitChunks.cacheGroups.framework')
+    }
+
+    if (!deepEqual(userCacheGroup.lib, originalCacheGroup.lib)) {
+      errors.push('splitChunks.cacheGroups.lib')
+    }
+
+    if (!deepEqual(userCacheGroup.commons, originalCacheGroup.commons)) {
+      errors.push('splitChunks.cacheGroups.commons')
+    }
+
+    if (!deepEqual(userCacheGroup.shared, originalCacheGroup.shared)) {
+      errors.push('splitChunks.cacheGroups.shared')
+    }
+
+    if (!warnings.length && !errors.length) {
+      return {
+        result: IConformanceTestStatus.SUCCESS,
+      }
+    }
+
+    const failedResult: IConformanceTestResult = {
+      result: IConformanceTestStatus.FAILED,
+    }
+
+    if (warnings.length) {
+      failedResult.warnings = warnings.map(warning => ({
+        message: getWarningMessage(warning),
+      }))
+    }
+
+    if (errors.length) {
+      failedResult.warnings = errors.map(error => ({
+        message: getErrorMessage(error),
+      }))
+    }
+
+    return failedResult
+  }
+}
diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/index.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/index.ts
index 8bb91509133c6..e1fc3a71c7f77 100644
--- a/packages/next/build/webpack/plugins/webpack-conformance-plugin/index.ts
+++ b/packages/next/build/webpack/plugins/webpack-conformance-plugin/index.ts
@@ -13,6 +13,7 @@ import { visit } from 'recast'
 export { MinificationConformanceCheck } from './checks/minification-conformance-check'
 export { ReactSyncScriptsConformanceCheck } from './checks/react-sync-scripts-conformance-check'
 export { DuplicatePolyfillsConformanceCheck } from './checks/duplicate-polyfills-conformance-check'
+export { GranularChunksConformanceCheck } from './checks/granular-chunks-conformance'
 
 export interface IWebpackConformancePluginOptions {
   tests: IWebpackConformanceTest[]
diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/utils/utils.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/utils/utils.ts
new file mode 100644
index 0000000000000..0a3e63021d49e
--- /dev/null
+++ b/packages/next/build/webpack/plugins/webpack-conformance-plugin/utils/utils.ts
@@ -0,0 +1,10 @@
+const assert = require('assert').strict
+
+export function deepEqual(a: any, b: any) {
+  try {
+    assert.deepStrictEqual(a, b)
+    return true
+  } catch (_) {
+    return false
+  }
+}
diff --git a/test/integration/conformance/next.config.js b/test/integration/conformance/next.config.js
index 0b728b708aaf9..6b6e74dda8f55 100644
--- a/test/integration/conformance/next.config.js
+++ b/test/integration/conformance/next.config.js
@@ -2,4 +2,16 @@ module.exports = {
   experimental: {
     conformance: true,
   },
+  webpack(cfg, { dev, isServer }) {
+    if (!dev && !isServer) {
+      cfg.optimization.splitChunks.cacheGroups.vendors = {
+        chunks: 'initial',
+        name: 'vendor',
+        test: 'vendor',
+        enforce: true,
+      }
+    }
+
+    return cfg
+  },
 }
diff --git a/test/integration/conformance/test/index.test.js b/test/integration/conformance/test/index.test.js
index d70d3fde0b0c6..e1e6b53ca947d 100644
--- a/test/integration/conformance/test/index.test.js
+++ b/test/integration/conformance/test/index.test.js
@@ -2,6 +2,7 @@
 /* global jasmine */
 import { join } from 'path'
 import { killApp, nextBuild } from 'next-test-utils'
+import { bold } from 'kleur'
 
 const appDir = join(__dirname, '../')
 let server
@@ -24,10 +25,20 @@ describe('Conformance system', () => {
     )
   })
 
-  it('Should warn about sync external sync scripts', async () => {
+  it('Should warn about duplicate polyfills', async () => {
     const { stderr } = build
     expect(stderr).toContain(
       '[BUILD CONFORMANCE WARNING]: Found polyfill.io loading polyfill for fetch.'
     )
   })
+
+  it('Should warn about changes to granularChunks config', async () => {
+    const { stderr } = build
+    expect(stderr).toContain(
+      '[BUILD CONFORMANCE ERROR]: The splitChunks config as part of the granularChunks flag has ' +
+        `been carefully crafted to optimize build size and build times. Please avoid changes to ${bold(
+          'splitChunks.cacheGroups.vendors'
+        )}`
+    )
+  })
 })

From 3a3dca30ff14e5fadd89a82a4b6913634188fca1 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Thu, 26 Mar 2020 18:15:25 -0700
Subject: [PATCH 30/37] Fixed error

---
 .../checks/granular-chunks-conformance.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
index 8a404ec3dde75..3df042053ebb1 100644
--- a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
+++ b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
@@ -18,7 +18,7 @@ export interface GranularChunksConformanceCheck
 function getWarningMessage(modifiedProp: string) {
   return (
     `${CONFORMANCE_WARNING_PREFIX}: The splitChunks config as part of the granularChunks flag has ` +
-    `been carefully crafted to optimize build size and build times. Modifying - ${red(
+    `been carefully crafted to optimize build size and build times. Modifying - ${bold(
       modifiedProp
     )} could result in slower builds and increased code duplication`
   )

From 1f91d4b85e701027a0a2b1b5500573dd2d216e44 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Sat, 4 Apr 2020 14:29:41 -0700
Subject: [PATCH 31/37] Updating native-url version

---
 packages/next/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index a72c2e1e6af4b..3f0e8fd3f508c 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -83,7 +83,7 @@
     "jest-worker": "24.9.0",
     "loader-utils": "2.0.0",
     "mini-css-extract-plugin": "0.8.0",
-    "native-url": "0.2.6",
+    "native-url": "0.3.0",
     "pnp-webpack-plugin": "1.5.0",
     "postcss": "7.0.27",
     "prop-types": "15.7.2",

From 2191728bf830d1b9630ec321f59702e6d58a73e4 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Sat, 4 Apr 2020 14:35:14 -0700
Subject: [PATCH 32/37] Revert "Updating native-url version"

This reverts commit 1f91d4b85e701027a0a2b1b5500573dd2d216e44.
---
 packages/next/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index 3f0e8fd3f508c..a72c2e1e6af4b 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -83,7 +83,7 @@
     "jest-worker": "24.9.0",
     "loader-utils": "2.0.0",
     "mini-css-extract-plugin": "0.8.0",
-    "native-url": "0.3.0",
+    "native-url": "0.2.6",
     "pnp-webpack-plugin": "1.5.0",
     "postcss": "7.0.27",
     "prop-types": "15.7.2",

From a8431e6d84503fb501c22bb8881d030151eba865 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 6 Apr 2020 12:05:17 -0700
Subject: [PATCH 33/37] Fix review comment

---
 .../checks/granular-chunks-conformance.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
index 3df042053ebb1..d978f15269251 100644
--- a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
+++ b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
@@ -1,4 +1,4 @@
-import { bold } from 'kleur'
+import { bold } from 'chalk'
 import {
   IWebpackConformanceTest,
   IConformanceTestResult,

From 85c45d205ed95d0a131ff5d6b90ee94614643d4e Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 6 Apr 2020 13:23:50 -0700
Subject: [PATCH 34/37] Fix TS error

---
 .../checks/granular-chunks-conformance.ts                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
index d978f15269251..229633637e391 100644
--- a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
+++ b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
@@ -1,4 +1,4 @@
-import { bold } from 'chalk'
+import chalk from 'chalk'
 import {
   IWebpackConformanceTest,
   IConformanceTestResult,
@@ -18,7 +18,7 @@ export interface GranularChunksConformanceCheck
 function getWarningMessage(modifiedProp: string) {
   return (
     `${CONFORMANCE_WARNING_PREFIX}: The splitChunks config as part of the granularChunks flag has ` +
-    `been carefully crafted to optimize build size and build times. Modifying - ${bold(
+    `been carefully crafted to optimize build size and build times. Modifying - ${chalk.bold(
       modifiedProp
     )} could result in slower builds and increased code duplication`
   )
@@ -27,7 +27,7 @@ function getWarningMessage(modifiedProp: string) {
 function getErrorMessage(message: string) {
   return (
     `${CONFORMANCE_ERROR_PREFIX}: The splitChunks config as part of the granularChunks flag has ` +
-    `been carefully crafted to optimize build size and build times. Please avoid changes to ${bold(
+    `been carefully crafted to optimize build size and build times. Please avoid changes to ${chalk.bold(
       message
     )}`
   )

From 8b6c255e2dbfcfe69f5b627d07ddbd8d2d8b3696 Mon Sep 17 00:00:00 2001
From: Janicklas Ralph James <janicklas@google.com>
Date: Mon, 6 Apr 2020 13:43:50 -0700
Subject: [PATCH 35/37] Fix TS error

---
 test/integration/conformance/test/index.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/conformance/test/index.test.js b/test/integration/conformance/test/index.test.js
index e1e6b53ca947d..d6608f680a23b 100644
--- a/test/integration/conformance/test/index.test.js
+++ b/test/integration/conformance/test/index.test.js
@@ -2,7 +2,7 @@
 /* global jasmine */
 import { join } from 'path'
 import { killApp, nextBuild } from 'next-test-utils'
-import { bold } from 'kleur'
+import chalk from 'chalk'
 
 const appDir = join(__dirname, '../')
 let server
@@ -36,7 +36,7 @@ describe('Conformance system', () => {
     const { stderr } = build
     expect(stderr).toContain(
       '[BUILD CONFORMANCE ERROR]: The splitChunks config as part of the granularChunks flag has ' +
-        `been carefully crafted to optimize build size and build times. Please avoid changes to ${bold(
+        `been carefully crafted to optimize build size and build times. Please avoid changes to ${chalk.bold(
           'splitChunks.cacheGroups.vendors'
         )}`
     )

From fb85cff66d711ca0959737f1fdd8e0a86de0eb29 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Wed, 20 May 2020 00:52:46 -0400
Subject: [PATCH 36/37] apply lint

---
 .../checks/granular-chunks-conformance.ts                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
index 229633637e391..536d3e7d1fbf3 100644
--- a/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
+++ b/packages/next/build/webpack/plugins/webpack-conformance-plugin/checks/granular-chunks-conformance.ts
@@ -88,13 +88,13 @@ export class GranularChunksConformanceCheck {
     }
 
     if (warnings.length) {
-      failedResult.warnings = warnings.map(warning => ({
+      failedResult.warnings = warnings.map((warning) => ({
         message: getWarningMessage(warning),
       }))
     }
 
     if (errors.length) {
-      failedResult.warnings = errors.map(error => ({
+      failedResult.warnings = errors.map((error) => ({
         message: getErrorMessage(error),
       }))
     }

From 33691f0f64faa4575162caf4e664089770ee2fc6 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Wed, 20 May 2020 00:53:24 -0400
Subject: [PATCH 37/37] remove unused

---
 test/integration/conformance/test/index.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/conformance/test/index.test.js b/test/integration/conformance/test/index.test.js
index 9d31b05750a30..a7cfae4412058 100644
--- a/test/integration/conformance/test/index.test.js
+++ b/test/integration/conformance/test/index.test.js
@@ -1,8 +1,8 @@
 /* eslint-env jest */
 
-import { join } from 'path'
-import { killApp, nextBuild } from 'next-test-utils'
 import chalk from 'chalk'
+import { nextBuild } from 'next-test-utils'
+import { join } from 'path'
 
 const appDir = join(__dirname, '../')
 jest.setTimeout(1000 * 60 * 2)