From 3fb4e091bcecc2fcca5860d946c37325f5e30f9a Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 15 Apr 2021 09:50:36 -0500
Subject: [PATCH 01/20] v10.1.4-canary.8

---
 lerna.json                                         |  2 +-
 packages/create-next-app/package.json              |  2 +-
 packages/eslint-plugin-next/package.json           |  2 +-
 packages/next-bundle-analyzer/package.json         |  2 +-
 packages/next-codemod/package.json                 |  2 +-
 packages/next-env/package.json                     |  2 +-
 packages/next-mdx/package.json                     |  2 +-
 packages/next-plugin-google-analytics/package.json |  2 +-
 packages/next-plugin-sentry/package.json           |  2 +-
 packages/next-plugin-storybook/package.json        |  2 +-
 packages/next-polyfill-module/package.json         |  2 +-
 packages/next-polyfill-nomodule/package.json       |  2 +-
 packages/next/package.json                         | 12 ++++++------
 packages/react-dev-overlay/package.json            |  2 +-
 packages/react-refresh-utils/package.json          |  2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9355fbe99c56e6..d961b3b65ecc5b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "10.1.4-canary.7"
+  "version": "10.1.4-canary.8"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 6f3d24e9dcfa27..5f8a479b90912b 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index 91e89d1df88cd9..eebfbebcbf775c 100644
--- a/packages/eslint-plugin-next/package.json
+++ b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 59375fa4447a55..4c89dc655d93ef 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 1ddaaee909f167..bedddaa0fcbc4f 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index f5959c1bea53f6..0f75d933a1d7f0 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index 50570b0ecc1fb9..e2a6f290850105 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "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 dce3be8f167bd6..6fc5974f3d0f42 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": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-google-analytics"
diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
index f6834afceb6348..42590d4820aabf 100644
--- a/packages/next-plugin-sentry/package.json
+++ b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-sentry"
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 0eea3a00f0062f..fee94233152831 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
index febafe25e237dc..52791ca2a188e2 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",
diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
index 9ebbaa0abac38c..d76667dc2e0f1f 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next/package.json b/packages/next/package.json
index fc43bbfb74c7cc..9e829d0d54f256 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -62,10 +62,10 @@
   "dependencies": {
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.1",
-    "@next/env": "10.1.4-canary.7",
-    "@next/polyfill-module": "10.1.4-canary.7",
-    "@next/react-dev-overlay": "10.1.4-canary.7",
-    "@next/react-refresh-utils": "10.1.4-canary.7",
+    "@next/env": "10.1.4-canary.8",
+    "@next/polyfill-module": "10.1.4-canary.8",
+    "@next/react-dev-overlay": "10.1.4-canary.8",
+    "@next/react-refresh-utils": "10.1.4-canary.8",
     "@opentelemetry/api": "0.14.0",
     "assert": "2.0.0",
     "ast-types": "0.13.2",
@@ -148,7 +148,7 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/traverse": "^7.12.10",
     "@babel/types": "7.12.12",
-    "@next/polyfill-nomodule": "10.1.4-canary.7",
+    "@next/polyfill-nomodule": "10.1.4-canary.8",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index 61aed2c5e85808..079d1a2dd6118b 100644
--- a/packages/react-dev-overlay/package.json
+++ b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
index 2d8961c2d5039d..60ee363d906f1f 100644
--- a/packages/react-refresh-utils/package.json
+++ b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "10.1.4-canary.7",
+  "version": "10.1.4-canary.8",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

From 35258650acb5bc17555e8e8c37845540f609ee9d Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 15 Apr 2021 10:21:32 -0500
Subject: [PATCH 02/20] Update with-electron test (#24036)

* Use ssh for git regexr dependency

* remove .git from dep

* update

* update test

* update step

* update install

* remove dep temporarily

* remove extra change

* move deps to specific test
---
 .github/workflows/build_test_deploy.yml                |  2 +-
 test/integration/with-electron/app/.gitignore          |  1 +
 .../integration/with-electron/{ => app}/next.config.js |  0
 test/integration/with-electron/app/package.json        | 10 ++++++++++
 .../integration/with-electron/{ => app}/pages/about.js |  0
 .../integration/with-electron/{ => app}/pages/index.js |  0
 .../integration/with-electron/{ => app}/public/main.js |  0
 test/integration/with-electron/test/index.test.js      |  8 ++++----
 8 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 test/integration/with-electron/app/.gitignore
 rename test/integration/with-electron/{ => app}/next.config.js (100%)
 create mode 100644 test/integration/with-electron/app/package.json
 rename test/integration/with-electron/{ => app}/pages/about.js (100%)
 rename test/integration/with-electron/{ => app}/pages/index.js (100%)
 rename test/integration/with-electron/{ => app}/public/main.js (100%)

diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index 1bd1f3252a5371..8fe06a8b3e5e82 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -126,7 +126,7 @@ jobs:
       - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
-      - run: yarn add -W --dev spectron@7.0.0 electron@5.0.0
+      - run: cd test/integration/with-electron/app && yarn
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
       - run: xvfb-run node run-tests.js test/integration/with-electron/test/index.test.js
diff --git a/test/integration/with-electron/app/.gitignore b/test/integration/with-electron/app/.gitignore
new file mode 100644
index 00000000000000..3c3629e647f5dd
--- /dev/null
+++ b/test/integration/with-electron/app/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/test/integration/with-electron/next.config.js b/test/integration/with-electron/app/next.config.js
similarity index 100%
rename from test/integration/with-electron/next.config.js
rename to test/integration/with-electron/app/next.config.js
diff --git a/test/integration/with-electron/app/package.json b/test/integration/with-electron/app/package.json
new file mode 100644
index 00000000000000..237fbaf1a647d5
--- /dev/null
+++ b/test/integration/with-electron/app/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "with-electron",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "electron": "5.0.0",
+    "spectron": "7.0.0"
+  }
+}
diff --git a/test/integration/with-electron/pages/about.js b/test/integration/with-electron/app/pages/about.js
similarity index 100%
rename from test/integration/with-electron/pages/about.js
rename to test/integration/with-electron/app/pages/about.js
diff --git a/test/integration/with-electron/pages/index.js b/test/integration/with-electron/app/pages/index.js
similarity index 100%
rename from test/integration/with-electron/pages/index.js
rename to test/integration/with-electron/app/pages/index.js
diff --git a/test/integration/with-electron/public/main.js b/test/integration/with-electron/app/public/main.js
similarity index 100%
rename from test/integration/with-electron/public/main.js
rename to test/integration/with-electron/app/public/main.js
diff --git a/test/integration/with-electron/test/index.test.js b/test/integration/with-electron/test/index.test.js
index 8981729f68701f..47174913e80fda 100644
--- a/test/integration/with-electron/test/index.test.js
+++ b/test/integration/with-electron/test/index.test.js
@@ -1,18 +1,18 @@
-/* eslint-env jest */
+// /* eslint-env jest */
 
 import { join } from 'path'
 import { nextBuild, nextExport } from 'next-test-utils'
 
 jest.setTimeout(1000 * 60 * 2)
 
-const nextdir = join(__dirname, '../')
+const nextdir = join(__dirname, '../app')
 const outdir = join(nextdir, 'out')
 const appdir = join(outdir, 'main.js')
 let app = null
 
 if (process.env.TEST_ELECTRON) {
-  const electron = require('electron')
-  const { Application } = require('spectron')
+  const electron = require(join(nextdir, 'node_modules/electron'))
+  const { Application } = require(join(nextdir, 'node_modules/spectron'))
 
   describe('Parse Relative Url', () => {
     describe('File Protocol via Electron', () => {

From b2ee0a93fe5653a050550455d817f7e460205b4a Mon Sep 17 00:00:00 2001
From: Martin Alix <github@malix.com>
Date: Thu, 15 Apr 2021 12:34:52 -0400
Subject: [PATCH 03/20] Fix IE11 incompatibility due to string litterals
 (#23784)

Fixes #22270

## Bug

- [X] Related issues linked using `fixes #number`
- [  ] Integration tests added
---
 azure-pipelines.yml                           |  4 +-
 .../runtime/injectStylesIntoStyleTag.js       | 19 +++---
 .../css-client-nav/test/index.test.js         | 62 ++++++++++++-------
 3 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 008c8f15e76507..7f95822f0e86f9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -69,7 +69,7 @@ stages:
   - stage: Test
     dependsOn: Build
     jobs:
-      - job: test_ie11_production
+      - job: test_ie11
         pool:
           vmImage: 'windows-2019'
         steps:
@@ -86,7 +86,7 @@ stages:
               path: $(System.DefaultWorkingDirectory)
             displayName: Cache Build
           - script: |
-              yarn testie --forceExit test/integration/production/
+              yarn testie --forceExit test/integration/production/ test/integration/css-client-nav/
             displayName: 'Run tests'
 
       - job: test_unit
diff --git a/packages/next/build/webpack/loaders/next-style-loader/runtime/injectStylesIntoStyleTag.js b/packages/next/build/webpack/loaders/next-style-loader/runtime/injectStylesIntoStyleTag.js
index 12fcbb2c6f3ab8..8df13e1fdbf46d 100644
--- a/packages/next/build/webpack/loaders/next-style-loader/runtime/injectStylesIntoStyleTag.js
+++ b/packages/next/build/webpack/loaders/next-style-loader/runtime/injectStylesIntoStyleTag.js
@@ -67,7 +67,7 @@ function modulesToDom(list, options) {
     const item = list[i]
     const id = options.base ? item[0] + options.base : item[0]
     const count = idCountMap[id] || 0
-    const identifier = `${id} ${count}`
+    const identifier = id + ' ' + count.toString()
 
     idCountMap[id] = count + 1
 
@@ -83,7 +83,7 @@ function modulesToDom(list, options) {
       stylesInDom[index].updater(obj)
     } else {
       stylesInDom.push({
-        identifier,
+        identifier: identifier,
         updater: addStyle(obj, options),
         references: 1,
       })
@@ -109,7 +109,7 @@ function insertStyleElement(options) {
     }
   }
 
-  Object.keys(attributes).forEach((key) => {
+  Object.keys(attributes).forEach(function (key) {
     style.setAttribute(key, attributes[key])
   })
 
@@ -154,7 +154,7 @@ function applyToSingletonTag(style, index, remove, obj) {
   const css = remove
     ? ''
     : obj.media
-    ? `@media ${obj.media} {${obj.css}}`
+    ? '@media ' + obj.media + ' {' + obj.css + '}'
     : obj.css
 
   // For old IE
@@ -189,9 +189,10 @@ function applyToTag(style, options, obj) {
   }
 
   if (sourceMap && typeof btoa !== 'undefined') {
-    css += `\n/*# sourceMappingURL=data:application/json;base64,${btoa(
-      unescape(encodeURIComponent(JSON.stringify(sourceMap)))
-    )} */`
+    css +=
+      '\n/*# sourceMappingURL=data:application/json;base64,' +
+      btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))) +
+      ' */'
   }
 
   // For old IE
@@ -226,7 +227,7 @@ function addStyle(obj, options) {
     style = insertStyleElement(options)
 
     update = applyToTag.bind(null, style, options)
-    remove = () => {
+    remove = function () {
       removeStyleElement(style)
     }
   }
@@ -250,7 +251,7 @@ function addStyle(obj, options) {
   }
 }
 
-module.exports = (list, options) => {
+module.exports = function (list, options) {
   options = options || {}
 
   // Force single-tag solution on IE6-9, which has a hard limit on the # of <style>
diff --git a/test/integration/css-client-nav/test/index.test.js b/test/integration/css-client-nav/test/index.test.js
index acdc8197cf1623..2a3d2eea03ce96 100644
--- a/test/integration/css-client-nav/test/index.test.js
+++ b/test/integration/css-client-nav/test/index.test.js
@@ -5,6 +5,7 @@ import { remove } from 'fs-extra'
 import {
   findPort,
   killApp,
+  launchApp,
   nextBuild,
   nextStart,
   renderViaHTTP,
@@ -15,25 +16,12 @@ import { join } from 'path'
 jest.setTimeout(1000 * 60 * 1)
 
 const fixturesDir = join(__dirname, '../../css-fixtures')
+const appDir = join(fixturesDir, 'multi-module')
 
-describe('CSS Module client-side navigation in Production', () => {
-  const appDir = join(fixturesDir, 'multi-module')
-
-  beforeAll(async () => {
-    await remove(join(appDir, '.next'))
-  })
-
-  let appPort
-  let app
-  beforeAll(async () => {
-    await nextBuild(appDir)
-    appPort = await findPort()
-    app = await nextStart(appDir, appPort)
-  })
-  afterAll(async () => {
-    await killApp(app)
-  })
+let appPort
+let app
 
+function runTests(dev) {
   it('should be able to client-side navigate from red to blue', async () => {
     let browser
     try {
@@ -69,16 +57,19 @@ describe('CSS Module client-side navigation in Production', () => {
     const content = await renderViaHTTP(appPort, '/blue')
     const $ = cheerio.load(content)
 
-    // Ensure only `/blue` page's CSS is preloaded
-    const serverCssPreloads = $('link[rel="preload"][as="style"]')
-    expect(serverCssPreloads.length).toBe(1)
+    if (!dev) {
+      // Ensure only `/blue` page's CSS is preloaded
+      const serverCssPreloads = $('link[rel="preload"][as="style"]')
+      expect(serverCssPreloads.length).toBe(1)
 
-    const serverCssPrefetches = $('link[rel="prefetch"][as="style"]')
-    expect(serverCssPrefetches.length).toBe(0)
+      const serverCssPrefetches = $('link[rel="prefetch"][as="style"]')
+      expect(serverCssPrefetches.length).toBe(0)
+    }
 
     let browser
     try {
       browser = await webdriver(appPort, '/blue')
+
       await browser.eval(`window.__did_not_ssr = 'make sure this is set'`)
 
       const redColor = await browser.eval(
@@ -154,4 +145,31 @@ describe('CSS Module client-side navigation in Production', () => {
       }
     }
   })
+}
+
+describe('CSS Module client-side navigation', () => {
+  describe('production', () => {
+    beforeAll(async () => {
+      await remove(join(appDir, '.next'))
+      await nextBuild(appDir)
+      appPort = await findPort()
+      app = await nextStart(appDir, appPort)
+    })
+    afterAll(async () => {
+      await killApp(app)
+    })
+    runTests()
+  })
+
+  describe('dev', () => {
+    beforeAll(async () => {
+      await remove(join(appDir, '.next'))
+      appPort = await findPort()
+      app = await launchApp(appDir, appPort)
+    })
+    afterAll(async () => {
+      await killApp(app)
+    })
+    runTests(true)
+  })
 })

From 15133b47ec7bfc413aa068d92fb678626cf47571 Mon Sep 17 00:00:00 2001
From: Sahil Rajput <sahilrajput03@gmail.com>
Date: Fri, 16 Apr 2021 00:25:30 +0530
Subject: [PATCH 04/20] Fix typescript types. (#23771)

Fix typescript type for cache and null check in mutation result.

## Bug

- fixes : https://github.com/vercel/next.js/issues/23770

**That issue deals with -**

- Return the codeflow if data is not returned from the mutation, and that fixes this warning.
![Screenshot from 2021-04-07 18-24-44](https://user-images.githubusercontent.com/31458531/113873069-18353a80-97d2-11eb-8c8c-9e9c9d280f95.png)

- Supply typescript typings for the target cache object.
![Screenshot from 2021-04-07 18-52-15](https://user-images.githubusercontent.com/31458531/113873504-80841c00-97d2-11eb-9b14-17d16a524c84.png)

Thanks.!
---
 .../with-typescript-graphql/pages/index.tsx   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/examples/with-typescript-graphql/pages/index.tsx b/examples/with-typescript-graphql/pages/index.tsx
index 9b2d44635f1056..cae3acee2b8c19 100644
--- a/examples/with-typescript-graphql/pages/index.tsx
+++ b/examples/with-typescript-graphql/pages/index.tsx
@@ -1,6 +1,7 @@
 import Link from 'next/link'
 import { useState } from 'react'
 import {
+  ViewerQuery,
   useViewerQuery,
   useUpdateNameMutation,
   ViewerDocument,
@@ -19,21 +20,18 @@ const Index = () => {
       },
       //Follow apollo suggestion to update cache
       //https://www.apollographql.com/docs/angular/features/cache-updates/#update
-      update: (
-        store,
-        {
-          data: {
-            updateName: { name },
-          },
-        }
-      ) => {
+      update: (cache, mutationResult) => {
+        const { data } = mutationResult
+        if (!data) return // Cancel updating name in cache if no data is returned from mutation.
         // Read the data from our cache for this query.
-        const { viewer } = store.readQuery({ query: ViewerDocument })
+        const { viewer } = cache.readQuery({
+          query: ViewerDocument,
+        }) as ViewerQuery
         const newViewer = { ...viewer }
         // Add our comment from the mutation to the end.
-        newViewer.name = name
+        newViewer.name = data.updateName.name
         // Write our data back to the cache.
-        store.writeQuery({ query: ViewerDocument, data: { viewer: newViewer } })
+        cache.writeQuery({ query: ViewerDocument, data: { viewer: newViewer } })
       },
     })
   }

From b7a12655e27df3d2af4f5038135def8817693263 Mon Sep 17 00:00:00 2001
From: Marc van Gend <info@marcvangend.nl>
Date: Fri, 16 Apr 2021 14:54:02 +0200
Subject: [PATCH 05/20] Document the need to call App.getInitialProps() from a
 custom app's getInitialProps (#24002)

Document the need to call App.getInitialProps() from a custom app's getInitialProps. See https://github.com/vercel/next.js/issues/23055.
---
 docs/advanced-features/custom-app.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/advanced-features/custom-app.md b/docs/advanced-features/custom-app.md
index 571bf79da5a6e2..4f0cdead04d92e 100644
--- a/docs/advanced-features/custom-app.md
+++ b/docs/advanced-features/custom-app.md
@@ -44,6 +44,7 @@ The `Component` prop is the active `page`, so whenever you navigate between rout
 
 - If your app is running and you just added a custom `App`, you'll need to restart the development server. Only required if `pages/_app.js` didn't exist before.
 - Adding a custom `getInitialProps` in your `App` will disable [Automatic Static Optimization](/docs/advanced-features/automatic-static-optimization.md) in pages without [Static Generation](/docs/basic-features/data-fetching.md#getstaticprops-static-generation).
+- When you add `getInitialProps` in your custom app, you must `import App from "next/app"`, call `App.getInitialProps(appContext)` inside `getInitialProps` and merge the returned object into the return value.
 - `App` currently does not support Next.js [Data Fetching methods](/docs/basic-features/data-fetching.md) like [`getStaticProps`](/docs/basic-features/data-fetching.md#getstaticprops-static-generation) or [`getServerSideProps`](/docs/basic-features/data-fetching.md#getserversideprops-server-side-rendering).
 
 ### TypeScript

From 4b8e539628d4c1ba9071185088b8ea661ca06389 Mon Sep 17 00:00:00 2001
From: James George <jamesgeorge998001@gmail.com>
Date: Fri, 16 Apr 2021 19:09:34 +0530
Subject: [PATCH 06/20] test(create-next-app): use latest examples (#24048)

Update CNA test suite to consume [vercel-learn-starter](https://github.com/vercel/next-learn-starter) as the example repo.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.

## Documentation / Examples

- [ ] Make sure the linting passes
---
 .../integration/create-next-app/index.test.js | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/test/integration/create-next-app/index.test.js b/test/integration/create-next-app/index.test.js
index ba5360ac9aad06..6f35a294b61b5e 100644
--- a/test/integration/create-next-app/index.test.js
+++ b/test/integration/create-next-app/index.test.js
@@ -6,6 +6,9 @@ import path from 'path'
 
 const cli = require.resolve('create-next-app/dist/index.js')
 
+const exampleRepo = 'https://github.com/vercel/next-learn-starter/tree/master'
+const examplePath = 'navigate-between-pages-starter'
+
 jest.setTimeout(1000 * 60 * 5)
 
 const run = (args, options) => execa('node', [cli].concat(args), options)
@@ -92,11 +95,7 @@ describe('create next app', () => {
     await usingTempDir(async (cwd) => {
       const projectName = 'github-app'
       const res = await run(
-        [
-          projectName,
-          '--example',
-          'https://github.com/zeit/next-learn-demo/tree/master/1-navigate-between-pages',
-        ],
+        [projectName, '--example', `${exampleRepo}/${examplePath}`],
         {
           cwd,
         }
@@ -109,9 +108,6 @@ describe('create next app', () => {
       expect(
         fs.existsSync(path.join(cwd, projectName, 'pages/index.js'))
       ).toBeTruthy()
-      expect(
-        fs.existsSync(path.join(cwd, projectName, 'pages/about.js'))
-      ).toBeTruthy()
       expect(
         fs.existsSync(path.join(cwd, projectName, '.gitignore'))
       ).toBeTruthy()
@@ -122,13 +118,7 @@ describe('create next app', () => {
     await usingTempDir(async (cwd) => {
       const projectName = 'github-example-path'
       const res = await run(
-        [
-          projectName,
-          '--example',
-          'https://github.com/zeit/next-learn-demo/tree/master',
-          '--example-path',
-          '1-navigate-between-pages',
-        ],
+        [projectName, '--example', exampleRepo, '--example-path', examplePath],
         {
           cwd,
         }
@@ -141,9 +131,6 @@ describe('create next app', () => {
       expect(
         fs.existsSync(path.join(cwd, projectName, 'pages/index.js'))
       ).toBeTruthy()
-      expect(
-        fs.existsSync(path.join(cwd, projectName, 'pages/about.js'))
-      ).toBeTruthy()
       expect(
         fs.existsSync(path.join(cwd, projectName, '.gitignore'))
       ).toBeTruthy()
@@ -157,9 +144,9 @@ describe('create next app', () => {
         [
           projectName,
           '--example',
-          'https://github.com/zeit/next-learn-demo/tree/master/1-navigate-between-pages',
+          `${exampleRepo}/${examplePath}`,
           '--example-path',
-          '1-navigate-between-pages',
+          examplePath,
         ],
         {
           cwd,
@@ -173,9 +160,6 @@ describe('create next app', () => {
       expect(
         fs.existsSync(path.join(cwd, projectName, 'pages/index.js'))
       ).toBeTruthy()
-      expect(
-        fs.existsSync(path.join(cwd, projectName, 'pages/about.js'))
-      ).toBeTruthy()
       expect(
         fs.existsSync(path.join(cwd, projectName, '.gitignore'))
       ).toBeTruthy()

From 7d77a19af2e6da82ffbc02a9b66a9f0d3c1e53ac Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 16 Apr 2021 10:07:24 -0500
Subject: [PATCH 07/20] Fix fallback: false triggering 404 before rewrites
 (#24121)

This fixes dynamic pages with `fallback: false` that don't have a matching path causing a 404 before rewrites are checked unexpectedly. This ensures we treat `fallback: false` pages as a match only if they also have a matching static path so that fallback rewrites can be triggered correctly. An additional test suite as been added to ensure this is working as expected.

## Bug

- [ ] Related issues linked using `fixes #number`
- [x] Integration tests added
---
 .../next/next-server/server/next-server.ts    |  38 +++++-
 packages/next/next-server/server/router.ts    |   8 +-
 .../fallback-false-rewrite/next.config.js     |  12 ++
 .../fallback-false-rewrite/pages/[slug].js    |  31 +++++
 .../fallback-false-rewrite/pages/another.js   |  16 +++
 .../fallback-false-rewrite/test/index.test.js | 119 ++++++++++++++++++
 6 files changed, 215 insertions(+), 9 deletions(-)
 create mode 100644 test/integration/fallback-false-rewrite/next.config.js
 create mode 100644 test/integration/fallback-false-rewrite/pages/[slug].js
 create mode 100644 test/integration/fallback-false-rewrite/pages/another.js
 create mode 100644 test/integration/fallback-false-rewrite/test/index.test.js

diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
index e8e9b23eb051b6..0867d1b46e3575 100644
--- a/packages/next/next-server/server/next-server.ts
+++ b/packages/next/next-server/server/next-server.ts
@@ -997,8 +997,11 @@ export default class Server {
             parsedUrl.query.__nextLocale = localePathResult.detectedLocale
           }
         }
+        const bubbleNoFallback = !!query._nextBubbleNoFallback
 
         if (pathname === '/api' || pathname.startsWith('/api/')) {
+          delete query._nextBubbleNoFallback
+
           const handled = await this.handleApiRequest(
             req as NextApiRequest,
             res as NextApiResponse,
@@ -1010,9 +1013,19 @@ export default class Server {
           }
         }
 
-        await this.render(req, res, pathname, query, parsedUrl)
-        return {
-          finished: true,
+        try {
+          await this.render(req, res, pathname, query, parsedUrl)
+
+          return {
+            finished: true,
+          }
+        } catch (err) {
+          if (err instanceof NoFallbackError && bubbleNoFallback) {
+            return {
+              finished: false,
+            }
+          }
+          throw err
         }
       },
     }
@@ -1861,6 +1874,9 @@ export default class Server {
     pathname: string,
     query: ParsedUrlQuery = {}
   ): Promise<string | null> {
+    const bubbleNoFallback = !!query._nextBubbleNoFallback
+    delete query._nextBubbleNoFallback
+
     try {
       const result = await this.findPageComponents(pathname, query)
       if (result) {
@@ -1873,7 +1889,9 @@ export default class Server {
             { ...this.renderOpts }
           )
         } catch (err) {
-          if (!(err instanceof NoFallbackError)) {
+          const isNoFallbackError = err instanceof NoFallbackError
+
+          if (!isNoFallbackError || (isNoFallbackError && bubbleNoFallback)) {
             throw err
           }
         }
@@ -1901,7 +1919,12 @@ export default class Server {
                 { ...this.renderOpts, params }
               )
             } catch (err) {
-              if (!(err instanceof NoFallbackError)) {
+              const isNoFallbackError = err instanceof NoFallbackError
+
+              if (
+                !isNoFallbackError ||
+                (isNoFallbackError && bubbleNoFallback)
+              ) {
                 throw err
               }
             }
@@ -1909,6 +1932,11 @@ export default class Server {
         }
       }
     } catch (err) {
+      const isNoFallbackError = err instanceof NoFallbackError
+
+      if (isNoFallbackError && bubbleNoFallback) {
+        throw err
+      }
       if (err && err.code === 'DECODE_FAILED') {
         this.logError(err)
         res.statusCode = 400
diff --git a/packages/next/next-server/server/router.ts b/packages/next/next-server/server/router.ts
index 4917427feecec2..5c0f437ea267ea 100644
--- a/packages/next/next-server/server/router.ts
+++ b/packages/next/next-server/server/router.ts
@@ -171,17 +171,17 @@ export default class Router {
 
       // Matched a page or dynamic route so render it using catchAllRoute
       if (matchedPage) {
-        checkParsedUrl.pathname = fsPathname
-
         const pageParams = this.catchAllRoute.match(checkParsedUrl.pathname)
+        checkParsedUrl.pathname = fsPathname
+        checkParsedUrl.query._nextBubbleNoFallback = '1'
 
-        await this.catchAllRoute.fn(
+        const result = await this.catchAllRoute.fn(
           req,
           res,
           pageParams as Params,
           checkParsedUrl
         )
-        return true
+        return result.finished
       }
     }
 
diff --git a/test/integration/fallback-false-rewrite/next.config.js b/test/integration/fallback-false-rewrite/next.config.js
new file mode 100644
index 00000000000000..1f9c73c606910e
--- /dev/null
+++ b/test/integration/fallback-false-rewrite/next.config.js
@@ -0,0 +1,12 @@
+module.exports = {
+  rewrites() {
+    return {
+      fallback: [
+        {
+          source: '/:path*',
+          destination: '/another',
+        },
+      ],
+    }
+  },
+}
diff --git a/test/integration/fallback-false-rewrite/pages/[slug].js b/test/integration/fallback-false-rewrite/pages/[slug].js
new file mode 100644
index 00000000000000..2778149e17c7cf
--- /dev/null
+++ b/test/integration/fallback-false-rewrite/pages/[slug].js
@@ -0,0 +1,31 @@
+import { useRouter } from 'next/router'
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      world: 'world',
+    },
+  }
+}
+
+export const getStaticPaths = () => {
+  return {
+    paths: ['/first', '/second'],
+    fallback: false,
+  }
+}
+
+export default function Page({ world }) {
+  const router = useRouter()
+
+  if (router.isFallback) {
+    throw new Error('should not have fallback')
+  }
+
+  return (
+    <>
+      <p id="slug">hello {world}</p>
+      <p id="query">{JSON.stringify(router.query)}</p>
+    </>
+  )
+}
diff --git a/test/integration/fallback-false-rewrite/pages/another.js b/test/integration/fallback-false-rewrite/pages/another.js
new file mode 100644
index 00000000000000..b0709b377eb60e
--- /dev/null
+++ b/test/integration/fallback-false-rewrite/pages/another.js
@@ -0,0 +1,16 @@
+import { useRouter } from 'next/router'
+
+export const getServerSideProps = () => {
+  return {
+    props: {},
+  }
+}
+
+export default function Page() {
+  return (
+    <>
+      <p id="another">another</p>
+      <p id="query">{JSON.stringify(useRouter().query)}</p>
+    </>
+  )
+}
diff --git a/test/integration/fallback-false-rewrite/test/index.test.js b/test/integration/fallback-false-rewrite/test/index.test.js
new file mode 100644
index 00000000000000..3dd60a2fb5775d
--- /dev/null
+++ b/test/integration/fallback-false-rewrite/test/index.test.js
@@ -0,0 +1,119 @@
+/* eslint-env jest */
+
+import fs from 'fs-extra'
+import { join } from 'path'
+import cheerio from 'cheerio'
+import webdriver from 'next-webdriver'
+import {
+  killApp,
+  findPort,
+  nextBuild,
+  nextStart,
+  launchApp,
+  fetchViaHTTP,
+} from 'next-test-utils'
+
+jest.setTimeout(1000 * 60 * 2)
+
+const appDir = join(__dirname, '../')
+let appPort
+let app
+
+const runTests = () => {
+  it('should rewrite correctly for path at same level as fallback: false SSR', async () => {
+    const res = await fetchViaHTTP(appPort, '/hello', undefined, {
+      redirect: 'manual',
+    })
+    expect(res.status).toBe(200)
+
+    const html = await res.text()
+    const $ = cheerio.load(html)
+
+    expect($('#another').text()).toBe('another')
+    expect(JSON.parse($('#query').text())).toEqual({
+      path: ['hello'],
+    })
+  })
+
+  it('should rewrite correctly for path above fallback: false SSR', async () => {
+    const res = await fetchViaHTTP(appPort, '/hello/world', undefined, {
+      redirect: 'manual',
+    })
+    expect(res.status).toBe(200)
+
+    const html = await res.text()
+    const $ = cheerio.load(html)
+
+    expect($('#another').text()).toBe('another')
+    expect(JSON.parse($('#query').text())).toEqual({
+      path: ['hello', 'world'],
+    })
+  })
+
+  it('should rewrite correctly for path at same level as fallback: false client', async () => {
+    const browser = await webdriver(appPort, '/hello')
+
+    expect(await browser.elementByCss('#another').text()).toBe('another')
+    expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual({
+      path: ['hello'],
+    })
+  })
+
+  it('should rewrite correctly for path above fallback: false client', async () => {
+    const browser = await webdriver(appPort, '/hello/world')
+
+    expect(await browser.elementByCss('#another').text()).toBe('another')
+    expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual({
+      path: ['hello', 'world'],
+    })
+  })
+
+  it('should not rewrite for path from fallback: false SSR', async () => {
+    const res = await fetchViaHTTP(appPort, '/first', undefined, {
+      redirect: 'manual',
+    })
+    expect(res.status).toBe(200)
+
+    const html = await res.text()
+    const $ = cheerio.load(html)
+
+    expect($('#slug').text()).toContain('hello')
+    expect(JSON.parse($('#query').text())).toEqual({
+      slug: 'first',
+    })
+  })
+
+  it('should not rewrite for path from fallback: false client', async () => {
+    const browser = await webdriver(appPort, '/second')
+
+    expect(await browser.elementByCss('#slug').text()).toContain('hello')
+    expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual({
+      slug: 'second',
+    })
+  })
+}
+
+describe('fallback: false rewrite', () => {
+  describe('dev mode', () => {
+    beforeAll(async () => {
+      await fs.remove(join(appDir, '.next'))
+      appPort = await findPort()
+      app = await launchApp(appDir, appPort)
+    })
+    afterAll(() => killApp(app))
+
+    runTests()
+  })
+
+  describe('production mode', () => {
+    beforeAll(async () => {
+      await fs.remove(join(appDir, '.next'))
+      await nextBuild(appDir, [])
+      appPort = await findPort()
+      app = await nextStart(appDir, appPort)
+    })
+    afterAll(() => killApp(app))
+
+    runTests()
+  })
+})

From fe0583edea83c42332f1b65485f93f6096f317bd Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 16 Apr 2021 10:09:07 -0500
Subject: [PATCH 08/20] v10.1.4-canary.9

---
 lerna.json                                         |  2 +-
 packages/create-next-app/package.json              |  2 +-
 packages/eslint-plugin-next/package.json           |  2 +-
 packages/next-bundle-analyzer/package.json         |  2 +-
 packages/next-codemod/package.json                 |  2 +-
 packages/next-env/package.json                     |  2 +-
 packages/next-mdx/package.json                     |  2 +-
 packages/next-plugin-google-analytics/package.json |  2 +-
 packages/next-plugin-sentry/package.json           |  2 +-
 packages/next-plugin-storybook/package.json        |  2 +-
 packages/next-polyfill-module/package.json         |  2 +-
 packages/next-polyfill-nomodule/package.json       |  2 +-
 packages/next/package.json                         | 12 ++++++------
 packages/react-dev-overlay/package.json            |  2 +-
 packages/react-refresh-utils/package.json          |  2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lerna.json b/lerna.json
index d961b3b65ecc5b..04b760248a9097 100644
--- a/lerna.json
+++ b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "10.1.4-canary.8"
+  "version": "10.1.4-canary.9"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 5f8a479b90912b..677791e0ace888 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index eebfbebcbf775c..30437bf4176aa6 100644
--- a/packages/eslint-plugin-next/package.json
+++ b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 4c89dc655d93ef..92a2a3abbc13ad 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index bedddaa0fcbc4f..32f9da380861f5 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index 0f75d933a1d7f0..95835224d34cba 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index e2a6f290850105..c724d80515c576 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "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 6fc5974f3d0f42..9421190bbd2122 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": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-google-analytics"
diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
index 42590d4820aabf..bb12c9e791dd66 100644
--- a/packages/next-plugin-sentry/package.json
+++ b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-sentry"
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index fee94233152831..8785a8f628368e 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
index 52791ca2a188e2..e81c0df0eadb9d 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",
diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
index d76667dc2e0f1f..34fcbb6aea7bef 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next/package.json b/packages/next/package.json
index 9e829d0d54f256..56191b824bf925 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -62,10 +62,10 @@
   "dependencies": {
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.1",
-    "@next/env": "10.1.4-canary.8",
-    "@next/polyfill-module": "10.1.4-canary.8",
-    "@next/react-dev-overlay": "10.1.4-canary.8",
-    "@next/react-refresh-utils": "10.1.4-canary.8",
+    "@next/env": "10.1.4-canary.9",
+    "@next/polyfill-module": "10.1.4-canary.9",
+    "@next/react-dev-overlay": "10.1.4-canary.9",
+    "@next/react-refresh-utils": "10.1.4-canary.9",
     "@opentelemetry/api": "0.14.0",
     "assert": "2.0.0",
     "ast-types": "0.13.2",
@@ -148,7 +148,7 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/traverse": "^7.12.10",
     "@babel/types": "7.12.12",
-    "@next/polyfill-nomodule": "10.1.4-canary.8",
+    "@next/polyfill-nomodule": "10.1.4-canary.9",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index 079d1a2dd6118b..c5bdd1c32bd383 100644
--- a/packages/react-dev-overlay/package.json
+++ b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
index 60ee363d906f1f..559cd0a88dd364 100644
--- a/packages/react-refresh-utils/package.json
+++ b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "10.1.4-canary.8",
+  "version": "10.1.4-canary.9",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

From 6e22a440e284628ed768a1a92a2936b9f5b1f380 Mon Sep 17 00:00:00 2001
From: Steven Tey <stevensteel97@gmail.com>
Date: Sat, 17 Apr 2021 09:08:06 -0700
Subject: [PATCH 09/20] Updated prefetch documentation (#24171)

Added the fact that when `prefetch` is set to `false`, Next will prefetch the link when an `onMouseEnter` is triggered. Response to issue #11793



## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.

## Documentation / Examples

- [X] Make sure the linting passes

Closes: https://github.com/vercel/next.js/issues/23525
---
 docs/api-reference/next/link.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-reference/next/link.md b/docs/api-reference/next/link.md
index acb8be15da77a7..9abe8ec06c0d73 100644
--- a/docs/api-reference/next/link.md
+++ b/docs/api-reference/next/link.md
@@ -57,7 +57,7 @@ export default Home
 - `href` - The path or URL to navigate to. This is the only required prop
 - `as` - Optional decorator for the path that will be shown in the browser URL bar. Before Next.js 9.5.3 this was used for dynamic routes, check our [previous docs](https://nextjs.org/docs/tag/v9.5.2/api-reference/next/link#dynamic-routes) to see how it worked
 - [`passHref`](#if-the-child-is-a-custom-component-that-wraps-an-a-tag) - Forces `Link` to send the `href` property to its child. Defaults to `false`
-- `prefetch` - Prefetch the page in the background. Defaults to `true`. Any `<Link />` that is in the viewport (initially or through scroll) will be preloaded. Prefetch can be disabled by passing `prefetch={false}`. Pages using [Static Generation](/docs/basic-features/data-fetching.md#getstaticprops-static-generation) will preload `JSON` files with the data for faster page transitions. Prefetching is only enabled in production.
+- `prefetch` - Prefetch the page in the background. Defaults to `true`. Any `<Link />` that is in the viewport (initially or through scroll) will be preloaded. Prefetch can be disabled by passing `prefetch={false}`. When `prefetch` is set to `false`, prefetching will still occur on hover. Pages using [Static Generation](/docs/basic-features/data-fetching.md#getstaticprops-static-generation) will preload `JSON` files with the data for faster page transitions. Prefetching is only enabled in production.
 - [`replace`](#replace-the-url-instead-of-push) - Replace the current `history` state instead of adding a new url into the stack. Defaults to `false`
 - [`scroll`](#disable-scrolling-to-the-top-of-the-page) - Scroll to the top of the page after a navigation. Defaults to `true`
 - [`shallow`](/docs/routing/shallow-routing.md) - Update the path of the current page without rerunning [`getStaticProps`](/docs/basic-features/data-fetching.md#getstaticprops-static-generation), [`getServerSideProps`](/docs/basic-features/data-fetching.md#getserversideprops-server-side-rendering) or [`getInitialProps`](/docs/api-reference/data-fetching/getInitialProps.md). Defaults to `false`

From 646a881183132b0756818bc48484360c1fa12cf8 Mon Sep 17 00:00:00 2001
From: Julien Benchetrit <julienben@users.noreply.github.com>
Date: Sat, 17 Apr 2021 22:40:35 +0300
Subject: [PATCH 10/20] Docs update: Redirect paths with parentheses (#24062)

It took me quite a while to understand that in order to redirect from `/english(default)/:path` to `/en-us/:path`, I have to escape the parentheses in the source with double backslashes so I thought I'd suggest it as a small doc update.


## Documentation / Examples

- [x] Make sure the linting passes
---
 docs/api-reference/next.config.js/headers.md  | 17 +++++++++++++++++
 .../api-reference/next.config.js/redirects.md | 19 ++++++++++++++++++-
 docs/api-reference/next.config.js/rewrites.md | 17 +++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/docs/api-reference/next.config.js/headers.md b/docs/api-reference/next.config.js/headers.md
index 7c0d99e797479f..e95caabb7b1de3 100644
--- a/docs/api-reference/next.config.js/headers.md
+++ b/docs/api-reference/next.config.js/headers.md
@@ -154,6 +154,23 @@ module.exports = {
 }
 ```
 
+The following characters `(`, `)`, `{`, `}`, `:`, `*`, `+`, `?` are used for regex path matching, so when used in the `source` as non-special values they must be escaped by adding `\\` before them:
+
+```js
+module.exports = {
+  async redirects() {
+    return [
+      {
+        // this will match `/english(default)/something` being requested
+        source: '/english\\(default\\)/:slug',
+        destination: '/en-us/:slug',
+        permanent: false,
+      },
+    ]
+  },
+}
+```
+
 ## Header, Cookie, and Query Matching
 
 Note: this feature is still experimental and not covered by semver and is to be used at your own risk until it is made stable.
diff --git a/docs/api-reference/next.config.js/redirects.md b/docs/api-reference/next.config.js/redirects.md
index 8f6f6d94852b9c..e881fe13ca93c0 100644
--- a/docs/api-reference/next.config.js/redirects.md
+++ b/docs/api-reference/next.config.js/redirects.md
@@ -82,7 +82,7 @@ module.exports = {
 
 ### Regex Path Matching
 
-To match a regex path you can wrap the regex in parenthesis after a parameter, for example `/post/:slug(\\d{1,})` will match `/post/123` but not `/post/abc`:
+To match a regex path you can wrap the regex in parentheses after a parameter, for example `/post/:slug(\\d{1,})` will match `/post/123` but not `/post/abc`:
 
 ```js
 module.exports = {
@@ -98,6 +98,23 @@ module.exports = {
 }
 ```
 
+The following characters `(`, `)`, `{`, `}`, `:`, `*`, `+`, `?` are used for regex path matching, so when used in the `source` as non-special values they must be escaped by adding `\\` before them:
+
+```js
+module.exports = {
+  async redirects() {
+    return [
+      {
+        // this will match `/english(default)/something` being requested
+        source: '/english\\(default\\)/:slug',
+        destination: '/en-us/:slug',
+        permanent: false,
+      },
+    ]
+  },
+}
+```
+
 ## Header, Cookie, and Query Matching
 
 Note: this feature is still experimental and not covered by semver and is to be used at your own risk until it is made stable.
diff --git a/docs/api-reference/next.config.js/rewrites.md b/docs/api-reference/next.config.js/rewrites.md
index 3dc42b64a5bb06..0c291c1fc94bce 100644
--- a/docs/api-reference/next.config.js/rewrites.md
+++ b/docs/api-reference/next.config.js/rewrites.md
@@ -178,6 +178,23 @@ module.exports = {
 }
 ```
 
+The following characters `(`, `)`, `{`, `}`, `:`, `*`, `+`, `?` are used for regex path matching, so when used in the `source` as non-special values they must be escaped by adding `\\` before them:
+
+```js
+module.exports = {
+  async redirects() {
+    return [
+      {
+        // this will match `/english(default)/something` being requested
+        source: '/english\\(default\\)/:slug',
+        destination: '/en-us/:slug',
+        permanent: false,
+      },
+    ]
+  },
+}
+```
+
 ## Header, Cookie, and Query Matching
 
 Note: this feature is still experimental and not covered by semver and is to be used at your own risk until it is made stable.

From 432c9ee5fcf7687e0dae2252a7eed2277c954d16 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sat, 17 Apr 2021 15:09:26 -0500
Subject: [PATCH 11/20] Use same num workers between export and build (#24180)

This ensures we use the same `numWorkers` config between `next build` and `next export` since we already calculate the correct value to use [in the config](https://github.com/vercel/next.js/blob/6e22a440e284628ed768a1a92a2936b9f5b1f380/packages/next/next-server/server/config-shared.ts#L99-L103).

## Bug

- [x] Related issues linked using `fixes #number`
- [ ] Integration tests added

Fixes: https://github.com/vercel/next.js/issues/23318
---
 packages/next/export/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
index 59e4ff23de9f54..13177a4a0510ad 100644
--- a/packages/next/export/index.ts
+++ b/packages/next/export/index.ts
@@ -8,7 +8,6 @@ import {
   writeFileSync,
 } from 'fs'
 import { Worker } from 'jest-worker'
-import { cpus } from 'os'
 import { dirname, join, resolve, sep } from 'path'
 import { promisify } from 'util'
 import { AmpPageStatus, formatAmpMessages } from '../build/output/index'
@@ -154,7 +153,7 @@ export default async function exportApp(
       (await nextExportSpan
         .traceChild('load-next-config')
         .traceAsyncFn(() => loadConfig(PHASE_EXPORT, dir)))
-    const threads = options.threads || Math.max(cpus().length - 1, 1)
+    const threads = options.threads || nextConfig.experimental.cpus
     const distDir = join(dir, nextConfig.distDir)
 
     const telemetry = options.buildExport ? null : new Telemetry({ distDir })

From 9fcfce3463095af63e93251ae12f5cac8344aa7f Mon Sep 17 00:00:00 2001
From: umarsenpai <51594564+umarsenpai@users.noreply.github.com>
Date: Sun, 18 Apr 2021 02:03:08 +0500
Subject: [PATCH 12/20] Fix serving Images through external rewrite with Image
 component (#21001)

This PR fixes the issue described here: https://github.com/vercel/next.js/issues/20909

The _req passed to getRequestHandler doesn't have `on` function which is required by http-proxy. It throws the error e.on is not a function. We should also wait for buffer to finish writing before sending the response.

Fixes: https://github.com/vercel/next.js/issues/20909
Closes: https://github.com/vercel/next.js/issues/24177
---
 .../next-server/server/image-optimizer.ts     | 26 +++++++++++----
 .../image-optimizer/test/index.test.js        | 33 +++++++++++++++++++
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/packages/next/next-server/server/image-optimizer.ts b/packages/next/next-server/server/image-optimizer.ts
index 1a3f689a9648b4..527201f213c9be 100644
--- a/packages/next/next-server/server/image-optimizer.ts
+++ b/packages/next/next-server/server/image-optimizer.ts
@@ -194,14 +194,15 @@ export async function imageOptimizer(
       maxAge = getMaxAge(upstreamRes.headers.get('Cache-Control'))
     } else {
       try {
-        const _req: any = {
-          headers: req.headers,
-          method: req.method,
-          url: href,
-        }
         const resBuffers: Buffer[] = []
         const mockRes: any = new Stream.Writable()
 
+        const isStreamFinished = new Promise(function (resolve, reject) {
+          mockRes.on('finish', () => resolve(true))
+          mockRes.on('end', () => resolve(true))
+          mockRes.on('error', () => reject())
+        })
+
         mockRes.write = (chunk: Buffer | string) => {
           resBuffers.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk))
         }
@@ -222,11 +223,24 @@ export async function imageOptimizer(
         mockRes.finished = false
         mockRes.statusCode = 200
 
+        const mockReq: any = new Stream.Readable()
+
+        mockReq._read = () => {
+          mockReq.emit('end')
+          mockReq.emit('close')
+          return Buffer.from('')
+        }
+
+        mockReq.headers = req.headers
+        mockReq.method = req.method
+        mockReq.url = href
+
         await server.getRequestHandler()(
-          _req,
+          mockReq,
           mockRes,
           nodeUrl.parse(href, true)
         )
+        await isStreamFinished
         res.statusCode = mockRes.statusCode
 
         upstreamBuffer = Buffer.concat(resBuffers)
diff --git a/test/integration/image-optimizer/test/index.test.js b/test/integration/image-optimizer/test/index.test.js
index 2b1f5d27ab30a2..d8b63b85a937bf 100644
--- a/test/integration/image-optimizer/test/index.test.js
+++ b/test/integration/image-optimizer/test/index.test.js
@@ -796,4 +796,37 @@ describe('Image Optimizer', () => {
       expect(res.status).toBe(404)
     })
   })
+
+  describe('External rewrite support with for serving static content in images', () => {
+    beforeAll(async () => {
+      const newConfig = `{
+        async rewrites() {
+          return [
+            {
+              source: '/:base(next-js)/:rest*',
+              destination: 'https://assets.vercel.com/image/upload/v1538361091/repositories/:base/:rest*',
+            },
+          ]
+        },
+      }`
+      nextConfig.replace('{ /* replaceme */ }', newConfig)
+      appPort = await findPort()
+      app = await launchApp(appDir, appPort)
+    })
+
+    afterAll(async () => {
+      await killApp(app)
+      nextConfig.restore()
+      await fs.remove(imagesDir)
+    })
+
+    it('should return response when image is served from an external rewrite', async () => {
+      const query = { url: '/next-js/next-js-bg.png', w: 64, q: 75 }
+      const opts = { headers: { accept: 'image/webp' } }
+      const res = await fetchViaHTTP(appPort, '/_next/image', query, opts)
+      expect(res.status).toBe(200)
+      expect(res.headers.get('Content-Type')).toBe('image/webp')
+      await expectWidth(res, 64)
+    })
+  })
 })

From 2e7d405fedbc9c07135ece14c6f7f2ac18a81a2a Mon Sep 17 00:00:00 2001
From: Abdullah Mzaien <s201540830@kfupm.edu.sa>
Date: Sun, 18 Apr 2021 00:22:30 +0300
Subject: [PATCH 13/20] Update Chakra UI examples to latest versions. (#23585)

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.

## Documentation / Examples

- [x] Make sure the linting passes
---
 examples/with-chakra-ui-typescript/README.md     |  6 ++++++
 examples/with-chakra-ui-typescript/package.json  | 16 ++++++++--------
 .../src/components/CTA.tsx                       |  2 +-
 .../src/components/Hero.tsx                      |  8 +++++++-
 examples/with-chakra-ui/README.md                |  6 ++++++
 examples/with-chakra-ui/package.json             |  8 ++++----
 examples/with-chakra-ui/src/components/CTA.js    |  4 ++--
 examples/with-chakra-ui/src/components/Hero.js   |  8 +++++++-
 8 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/examples/with-chakra-ui-typescript/README.md b/examples/with-chakra-ui-typescript/README.md
index e2966eb95d5639..1d2a9199b79668 100644
--- a/examples/with-chakra-ui-typescript/README.md
+++ b/examples/with-chakra-ui-typescript/README.md
@@ -25,3 +25,9 @@ yarn create next-app --example with-chakra-ui-typescript with-chakra-ui-typescri
 ```
 
 Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
+
+## Notes
+
+Chakra has supported Gradients and RTL in `v1.1`. To utilize RTL, [add RTL direction and swap](https://chakra-ui.com/docs/features/rtl-support).
+
+If you don't have multi-direction app, you should make `<Html lang="ar" dir="rtl">` inside `_document.ts`.
diff --git a/examples/with-chakra-ui-typescript/package.json b/examples/with-chakra-ui-typescript/package.json
index 9c78c727581148..8bed2c84615cf0 100644
--- a/examples/with-chakra-ui-typescript/package.json
+++ b/examples/with-chakra-ui-typescript/package.json
@@ -8,20 +8,20 @@
   },
   "dependencies": {
     "@chakra-ui/icons": "^1.0.5",
-    "@chakra-ui/react": "^1.3.3",
-    "@chakra-ui/theme-tools": "1.0.4",
+    "@chakra-ui/react": "^1.4.2",
+    "@chakra-ui/theme-tools": "1.1.2",
     "@emotion/react": "11.1.5",
     "@emotion/styled": "11.1.5",
-    "framer-motion": "^3.5.2",
+    "framer-motion": "^4.0.3",
     "next": "latest",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@types/node": "^14.6.0",
-    "@types/react": "^16.9.46",
-    "@types/react-dom": "^16.9.8",
-    "typescript": "4.0.5"
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.3",
+    "typescript": "4.2.3"
   },
   "license": "MIT"
 }
diff --git a/examples/with-chakra-ui-typescript/src/components/CTA.tsx b/examples/with-chakra-ui-typescript/src/components/CTA.tsx
index 9d2656711e529c..35f9fc179a5ac9 100644
--- a/examples/with-chakra-ui-typescript/src/components/CTA.tsx
+++ b/examples/with-chakra-ui-typescript/src/components/CTA.tsx
@@ -9,7 +9,7 @@ export const CTA = () => (
     bottom="0"
     width="100%"
     maxWidth="48rem"
-    py={2}
+    py={3}
   >
     <ChakraLink isExternal href="https://chakra-ui.com" flexGrow={1} mx={2}>
       <Button width="100%" variant="outline" colorScheme="green">
diff --git a/examples/with-chakra-ui-typescript/src/components/Hero.tsx b/examples/with-chakra-ui-typescript/src/components/Hero.tsx
index 01ccf6082c8716..d10435e5526fd5 100644
--- a/examples/with-chakra-ui-typescript/src/components/Hero.tsx
+++ b/examples/with-chakra-ui-typescript/src/components/Hero.tsx
@@ -1,7 +1,13 @@
 import { Flex, Heading } from '@chakra-ui/react'
 
 export const Hero = ({ title }: { title: string }) => (
-  <Flex justifyContent="center" alignItems="center" height="100vh">
+  <Flex
+    justifyContent="center"
+    alignItems="center"
+    height="100vh"
+    bgGradient="linear(to-l, #7928CA, #FF0080)"
+    bgClip="text"
+  >
     <Heading fontSize="6vw">{title}</Heading>
   </Flex>
 )
diff --git a/examples/with-chakra-ui/README.md b/examples/with-chakra-ui/README.md
index 4c62d18b49058e..46a8d54135cb72 100644
--- a/examples/with-chakra-ui/README.md
+++ b/examples/with-chakra-ui/README.md
@@ -21,3 +21,9 @@ yarn create next-app --example with-chakra-ui with-chakra-ui-app
 ```
 
 Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
+
+## Notes
+
+Chakra has supported Gradients and RTL in `v1.1`. To utilize RTL, [add RTL direction and swap](https://chakra-ui.com/docs/features/rtl-support).
+
+If you don't have multi-direction app, you should make `<Html lang="ar" dir="rtl">` inside `_document.js`.
diff --git a/examples/with-chakra-ui/package.json b/examples/with-chakra-ui/package.json
index 5344d0d157e5ad..9fe0f4413bf564 100644
--- a/examples/with-chakra-ui/package.json
+++ b/examples/with-chakra-ui/package.json
@@ -8,13 +8,13 @@
   },
   "dependencies": {
     "@chakra-ui/icons": "^1.0.0",
-    "@chakra-ui/react": "^1.0.0",
+    "@chakra-ui/react": "^1.4.2",
     "@emotion/react": "^11.0.0",
     "@emotion/styled": "^11.0.0",
-    "framer-motion": "^2.9.4",
+    "framer-motion": "^4.0.3",
     "next": "latest",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "license": "MIT"
 }
diff --git a/examples/with-chakra-ui/src/components/CTA.js b/examples/with-chakra-ui/src/components/CTA.js
index 15b2bf89900ee3..8967493c3986b9 100644
--- a/examples/with-chakra-ui/src/components/CTA.js
+++ b/examples/with-chakra-ui/src/components/CTA.js
@@ -12,7 +12,7 @@ export const CTA = () => (
     py={2}
   >
     <ChakraLink isExternal href="https://chakra-ui.com" flexGrow={1} mx={2}>
-      <Button width="100%" variant="outline" variantcolor="green">
+      <Button width="100%" bgGradient="linear(to-tr, teal.300,yellow.400)">
         chakra-ui
       </Button>
     </ChakraLink>
@@ -23,7 +23,7 @@ export const CTA = () => (
       flexGrow={3}
       mx={2}
     >
-      <Button width="100%" variant="solid" variantcolor="green">
+      <Button width="100%" bgGradient="linear(to-tr, teal.300,yellow.400)">
         View Repo
       </Button>
     </ChakraLink>
diff --git a/examples/with-chakra-ui/src/components/Hero.js b/examples/with-chakra-ui/src/components/Hero.js
index c20fb39b33f13f..bf4d104cd237af 100644
--- a/examples/with-chakra-ui/src/components/Hero.js
+++ b/examples/with-chakra-ui/src/components/Hero.js
@@ -2,7 +2,13 @@ import { Flex, Heading } from '@chakra-ui/react'
 
 export const Hero = ({ title }) => (
   <Flex justifyContent="center" alignItems="center" height="100vh">
-    <Heading fontSize="10vw">{title}</Heading>
+    <Heading
+      fontSize="10vw"
+      bgGradient="linear(to-l, #7928CA, #FF0080)"
+      bgClip="text"
+    >
+      {title}
+    </Heading>
   </Flex>
 )
 

From 557ecb0fa27badea42d1b82012529d29a3ef7959 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sat, 17 Apr 2021 17:26:43 -0500
Subject: [PATCH 14/20] Update SWR in with-magic example (#24185)

## Documentation / Examples

- [x] Make sure the linting passes

Closes: https://github.com/vercel/next.js/issues/24184
---
 examples/with-magic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-magic/package.json b/examples/with-magic/package.json
index a481152b0242d5..fac85379061141 100644
--- a/examples/with-magic/package.json
+++ b/examples/with-magic/package.json
@@ -13,7 +13,7 @@
     "next": "latest",
     "react": "latest",
     "react-dom": "latest",
-    "swr": "0.1.16"
+    "swr": "0.5.5"
   },
   "license": "MIT"
 }

From d2b0d43eb92a6dbc6194e2361b4f3c079e76d47a Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sun, 18 Apr 2021 03:26:08 -0500
Subject: [PATCH 15/20] Update incremental adoption in rewrites doc (#24186)

This updates the incremental adoption section in the rewrites docs to mention the new fallback rewrites instead of the no-op rewrite and also points to the incrementally adopting Next.js doc.

## Documentation / Examples

- [x] Make sure the linting passes

Closes: https://github.com/vercel/next.js/pull/23700
Closes: https://github.com/vercel/next.js/issues/23699
---
 docs/api-reference/next.config.js/rewrites.md | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/docs/api-reference/next.config.js/rewrites.md b/docs/api-reference/next.config.js/rewrites.md
index 0c291c1fc94bce..36f6b5b8ce1bca 100644
--- a/docs/api-reference/next.config.js/rewrites.md
+++ b/docs/api-reference/next.config.js/rewrites.md
@@ -300,29 +300,27 @@ module.exports = {
 
 ### Incremental adoption of Next.js
 
-You can also make Next.js check the application routes before falling back to proxying to the previous website.
+You can also have Next.js fall back to proxying to an existing website after checking all Next.js routes.
 
 This way you don't have to change the rewrites configuration when migrating more pages to Next.js
 
 ```js
 module.exports = {
   async rewrites() {
-    return [
-      // we need to define a no-op rewrite to trigger checking
-      // all pages/static files before we attempt proxying
-      {
-        source: '/:path*',
-        destination: '/:path*',
-      },
-      {
-        source: '/:path*',
-        destination: `https://custom-routes-proxying-endpoint.vercel.app/:path*`,
-      },
-    ]
+    return {
+      fallback: [
+        {
+          source: '/:path*',
+          destination: `https://custom-routes-proxying-endpoint.vercel.app/:path*`,
+        },
+      ],
+    }
   },
 }
 ```
 
+See additional information on incremental adoption [in the docs here](https://nextjs.org/docs/migrating/incremental-adoption).
+
 ### Rewrites with basePath support
 
 When leveraging [`basePath` support](/docs/api-reference/next.config.js/basepath.md) with rewrites each `source` and `destination` is automatically prefixed with the `basePath` unless you add `basePath: false` to the rewrite:

From a153b63240f38488a7a82eb6c54e9f8890ab7a22 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sun, 18 Apr 2021 04:01:01 -0500
Subject: [PATCH 16/20] Ensure locale is not duplicated from differing casing
 (#24187)

This ensures we don't attempt adding a locale to a path when the locale is already present but in a different casing, this also ensures we successfully remove the locale if the casing differs in the path. Additional tests have been added in the `i18n-support` suites to ensure this is working correctly.

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added

Fixes: https://github.com/vercel/next.js/issues/23553
---
 .../next/next-server/lib/router/router.ts     | 13 +++++--
 test/integration/i18n-support/test/shared.js  | 34 +++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/packages/next/next-server/lib/router/router.ts b/packages/next/next-server/lib/router/router.ts
index e9502affb3ba2e..28e6d864c9ac41 100644
--- a/packages/next/next-server/lib/router/router.ts
+++ b/packages/next/next-server/lib/router/router.ts
@@ -113,10 +113,13 @@ export function addLocale(
   defaultLocale?: string
 ) {
   if (process.env.__NEXT_I18N_SUPPORT) {
+    const pathLower = path.toLowerCase()
+    const localeLower = locale && locale.toLowerCase()
+
     return locale &&
       locale !== defaultLocale &&
-      !path.startsWith('/' + locale + '/') &&
-      path !== '/' + locale
+      !pathLower.startsWith('/' + localeLower + '/') &&
+      pathLower !== '/' + localeLower
       ? addPathPrefix(path, '/' + locale)
       : path
   }
@@ -126,8 +129,12 @@ export function addLocale(
 export function delLocale(path: string, locale?: string) {
   if (process.env.__NEXT_I18N_SUPPORT) {
     const pathname = pathNoQueryHash(path)
+    const pathLower = pathname.toLowerCase()
+    const localeLower = locale && locale.toLowerCase()
+
     return locale &&
-      (pathname.startsWith('/' + locale + '/') || pathname === '/' + locale)
+      (pathLower.startsWith('/' + localeLower + '/') ||
+        pathLower === '/' + localeLower)
       ? (pathname.length === locale.length + 1 ? '/' : '') +
           path.substr(locale.length + 1)
       : path
diff --git a/test/integration/i18n-support/test/shared.js b/test/integration/i18n-support/test/shared.js
index 615908aa94b460..d8c5326d88cbe9 100644
--- a/test/integration/i18n-support/test/shared.js
+++ b/test/integration/i18n-support/test/shared.js
@@ -37,6 +37,40 @@ async function addDefaultLocaleCookie(browser) {
 }
 
 export function runTests(ctx) {
+  it('should handle navigating back to different casing of locale', async () => {
+    const browser = await webdriver(
+      ctx.appPort,
+      `${ctx.basePath || ''}/FR/links`
+    )
+
+    expect(await browser.eval(() => document.location.pathname)).toBe(
+      `${ctx.basePath || ''}/FR/links`
+    )
+    expect(await browser.elementByCss('#router-pathname').text()).toBe('/links')
+    expect(await browser.elementByCss('#router-locale').text()).toBe('fr')
+
+    await browser
+      .elementByCss('#to-another')
+      .click()
+      .waitForElementByCss('#another')
+
+    expect(await browser.eval(() => document.location.pathname)).toBe(
+      `${ctx.basePath || ''}/fr/another`
+    )
+    expect(await browser.elementByCss('#router-pathname').text()).toBe(
+      '/another'
+    )
+    expect(await browser.elementByCss('#router-locale').text()).toBe('fr')
+
+    await browser.back().waitForElementByCss('#links')
+
+    expect(await browser.eval(() => document.location.pathname)).toBe(
+      `${ctx.basePath || ''}/FR/links`
+    )
+    expect(await browser.elementByCss('#router-pathname').text()).toBe('/links')
+    expect(await browser.elementByCss('#router-locale').text()).toBe('fr')
+  })
+
   it('should have correct initial query values for fallback', async () => {
     const res = await fetchViaHTTP(
       ctx.appPort,

From 6e7245cddb1e1671ec1c57cb9ceec5eba9f0ddd2 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sun, 18 Apr 2021 04:31:40 -0500
Subject: [PATCH 17/20] Add error for getStaticPaths on non-dynamic page
 (#24188)

Noticed in this issue the reproduction was using `getStaticPaths` on a non-dynamic page incorrectly although we don't currently show an error for this.

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added

x-ref: https://github.com/vercel/next.js/issues/22931
---
 errors/non-dynamic-getstaticpaths-usage.md    | 14 ++++++
 packages/next/next-server/server/render.tsx   |  7 +++
 .../test/index.test.js                        | 49 +++++++++++++++++--
 3 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 errors/non-dynamic-getstaticpaths-usage.md

diff --git a/errors/non-dynamic-getstaticpaths-usage.md b/errors/non-dynamic-getstaticpaths-usage.md
new file mode 100644
index 00000000000000..2f94c774b0cab6
--- /dev/null
+++ b/errors/non-dynamic-getstaticpaths-usage.md
@@ -0,0 +1,14 @@
+# getStaticPaths Used on Non-Dynamic Page
+
+#### Why This Error Occurred
+
+On a non-dynamic SSG page `getStaticPaths` was incorrectly exported as this can only be used on dynamic pages to return the paths to prerender.
+
+#### Possible Ways to Fix It
+
+Remove the `getStaticPaths` export on the non-dynamic page or rename the page to be a dynamic page.
+
+### Useful Links
+
+- [Dynamic Routes Documentation](https://nextjs.org/docs/routing/dynamic-routes)
+- [`getStaticPaths` Documentation](https://nextjs.org/docs/routing/dynamic-routes)
diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index ff3d809aff48a5..07effe84120d45 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -483,6 +483,13 @@ export async function renderToHTML(
     throw new Error(SERVER_PROPS_SSG_CONFLICT + ` ${pathname}`)
   }
 
+  if (getStaticPaths && !pageIsDynamic) {
+    throw new Error(
+      `getStaticPaths is only allowed for dynamic SSG pages and was found on '${pathname}'.` +
+        `\nRead more: https://nextjs.org/docs/messages/non-dynamic-getstaticpaths-usage`
+    )
+  }
+
   if (!!getStaticPaths && !isSSG) {
     throw new Error(
       `getStaticPaths was added without a getStaticProps in ${pathname}. Without getStaticProps, getStaticPaths does nothing`
diff --git a/test/integration/mixed-ssg-serverprops-error/test/index.test.js b/test/integration/mixed-ssg-serverprops-error/test/index.test.js
index 210c513794ea33..4263dda780c725 100644
--- a/test/integration/mixed-ssg-serverprops-error/test/index.test.js
+++ b/test/integration/mixed-ssg-serverprops-error/test/index.test.js
@@ -5,10 +5,10 @@ import { join } from 'path'
 import { nextBuild } from 'next-test-utils'
 import { SERVER_PROPS_SSG_CONFLICT } from 'next/dist/lib/constants'
 
-jest.setTimeout(1000 * 60 * 1)
+jest.setTimeout(1000 * 60 * 2)
+
 const appDir = join(__dirname, '..')
 const indexPage = join(appDir, 'pages/index.js')
-const indexPageAlt = `${indexPage}.alt`
 const indexPageBak = `${indexPage}.bak`
 
 describe('Mixed getStaticProps and getServerSideProps error', () => {
@@ -19,14 +19,53 @@ describe('Mixed getStaticProps and getServerSideProps error', () => {
 
   it('should error when exporting both getStaticPaths and getServerSideProps', async () => {
     await fs.move(indexPage, indexPageBak)
-    await fs.move(indexPageAlt, indexPage)
+    await fs.writeFile(
+      indexPage,
+      `
+      export const getStaticPaths = async () => {
+        return {
+          props: { world: 'world' }, fallback: true
+        }
+      }
+
+      export const getServerSideProps = async () => {
+        return {
+          props: { world: 'world' }
+        }
+      }
 
+      export default ({ world }) => <p>Hello {world}</p>
+    `
+    )
     const { stderr, code } = await nextBuild(appDir, [], { stderr: true })
 
-    await fs.move(indexPage, indexPageAlt)
+    await fs.remove(indexPage)
     await fs.move(indexPageBak, indexPage)
-
     expect(code).toBe(1)
     expect(stderr).toContain(SERVER_PROPS_SSG_CONFLICT)
   })
+
+  it('should error when exporting getStaticPaths on a non-dynamic page', async () => {
+    await fs.move(indexPage, indexPageBak)
+    await fs.writeFile(
+      indexPage,
+      `
+      export const getStaticPaths = async () => {
+        return {
+          props: { world: 'world' }, fallback: true
+        }
+      }
+
+      export default ({ world }) => <p>Hello {world}</p>
+    `
+    )
+    const { stderr, code } = await nextBuild(appDir, [], { stderr: true })
+
+    await fs.remove(indexPage)
+    await fs.move(indexPageBak, indexPage)
+    expect(code).toBe(1)
+    expect(stderr).toContain(
+      "getStaticPaths is only allowed for dynamic SSG pages and was found on '/'."
+    )
+  })
 })

From 65588083db392712f842a67f3e63911a626e33ec Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sun, 18 Apr 2021 05:00:04 -0500
Subject: [PATCH 18/20] Ensure query for static pages with rewrites is updated
 correctly (#24189)

This updates the query refreshing on the client to also refresh when rewrites are used and the page is static since additional query values can be provided from rewrites that are relied on client-side. An additional test has been added in the custom-routes suite to ensure this is working correctly.

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added

Fixes: https://github.com/vercel/next.js/issues/23490
Fixes: https://github.com/vercel/next.js/issues/22931
Fixes: https://github.com/vercel/next.js/issues/21062
---
 packages/next/client/index.tsx                | 18 ++++++++++--
 .../next/next-server/lib/router/router.ts     |  4 ++-
 .../build-output/test/index.test.js           |  4 +--
 test/integration/custom-routes/next.config.js |  6 +++-
 .../custom-routes/pages/auto-export/[slug].js |  8 +++++-
 .../pages/auto-export/another.js              | 11 ++++++++
 .../custom-routes/test/index.test.js          | 28 ++++++++++++++++++-
 .../integration/production/test/index.test.js |  3 +-
 8 files changed, 73 insertions(+), 9 deletions(-)
 create mode 100644 test/integration/custom-routes/pages/auto-export/another.js

diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
index 25c559f9c543da..448a89608d97fa 100644
--- a/packages/next/client/index.tsx
+++ b/packages/next/client/index.tsx
@@ -186,10 +186,24 @@ class Container extends React.Component<{
     // - if it is a client-side skeleton (fallback render)
     if (
       router.isSsr &&
+      // We don't update for 404 requests as this can modify
+      // the asPath unexpectedly e.g. adding basePath when
+      // it wasn't originally present
+      page !== '/404' &&
+      !(
+        page === '/_error' &&
+        hydrateProps &&
+        hydrateProps.pageProps &&
+        hydrateProps.pageProps.statusCode === 404
+      ) &&
       (isFallback ||
         (data.nextExport &&
-          (isDynamicRoute(router.pathname) || location.search)) ||
-        (hydrateProps && hydrateProps.__N_SSG && location.search))
+          (isDynamicRoute(router.pathname) ||
+            location.search ||
+            process.env.__NEXT_HAS_REWRITES)) ||
+        (hydrateProps &&
+          hydrateProps.__N_SSG &&
+          (location.search || process.env.__NEXT_HAS_REWRITES)))
     ) {
       // update query on mount for exported pages
       router.replace(
diff --git a/packages/next/next-server/lib/router/router.ts b/packages/next/next-server/lib/router/router.ts
index 28e6d864c9ac41..785cbf0bbaf8b7 100644
--- a/packages/next/next-server/lib/router/router.ts
+++ b/packages/next/next-server/lib/router/router.ts
@@ -615,7 +615,9 @@ export default class Router implements BaseRouter {
     this.isReady = !!(
       self.__NEXT_DATA__.gssp ||
       self.__NEXT_DATA__.gip ||
-      (!autoExportDynamic && !self.location.search)
+      (!autoExportDynamic &&
+        !self.location.search &&
+        !process.env.__NEXT_HAS_REWRITES)
     )
     this.isPreview = !!isPreview
     this.isLocaleDomain = false
diff --git a/test/integration/build-output/test/index.test.js b/test/integration/build-output/test/index.test.js
index eb680f8b1010bc..434ff9af58d4d1 100644
--- a/test/integration/build-output/test/index.test.js
+++ b/test/integration/build-output/test/index.test.js
@@ -99,7 +99,7 @@ describe('Build Output', () => {
       expect(indexSize.endsWith('B')).toBe(true)
 
       // should be no bigger than 64.8 kb
-      expect(parseFloat(indexFirstLoad)).toBeCloseTo(65.3, 1)
+      expect(parseFloat(indexFirstLoad)).toBeCloseTo(65.4, 1)
       expect(indexFirstLoad.endsWith('kB')).toBe(true)
 
       expect(parseFloat(err404Size)).toBeCloseTo(3.7, 1)
@@ -108,7 +108,7 @@ describe('Build Output', () => {
       expect(parseFloat(err404FirstLoad)).toBeCloseTo(68.5, 0)
       expect(err404FirstLoad.endsWith('kB')).toBe(true)
 
-      expect(parseFloat(sharedByAll)).toBeCloseTo(65, 1)
+      expect(parseFloat(sharedByAll)).toBeCloseTo(65.1, 1)
       expect(sharedByAll.endsWith('kB')).toBe(true)
 
       if (_appSize.endsWith('kB')) {
diff --git a/test/integration/custom-routes/next.config.js b/test/integration/custom-routes/next.config.js
index 047b59c659f0dd..c5ac6882668161 100644
--- a/test/integration/custom-routes/next.config.js
+++ b/test/integration/custom-routes/next.config.js
@@ -13,7 +13,11 @@ module.exports = {
           : []),
         {
           source: '/rewriting-to-auto-export',
-          destination: '/auto-export/hello',
+          destination: '/auto-export/hello?rewrite=1',
+        },
+        {
+          source: '/rewriting-to-another-auto-export/:path*',
+          destination: '/auto-export/another?rewrite=1',
         },
         {
           source: '/to-another',
diff --git a/test/integration/custom-routes/pages/auto-export/[slug].js b/test/integration/custom-routes/pages/auto-export/[slug].js
index dd3efd7950a870..fe2b9fb3ea7c59 100644
--- a/test/integration/custom-routes/pages/auto-export/[slug].js
+++ b/test/integration/custom-routes/pages/auto-export/[slug].js
@@ -1,5 +1,11 @@
 import { useRouter } from 'next/router'
 
 export default function Page() {
-  return <p id="auto-export">auto-export {useRouter().query.slug}</p>
+  const router = useRouter()
+  return (
+    <>
+      <p id="auto-export">auto-export {router.query.slug}</p>
+      <p id="query">{JSON.stringify(router.query)}</p>
+    </>
+  )
 }
diff --git a/test/integration/custom-routes/pages/auto-export/another.js b/test/integration/custom-routes/pages/auto-export/another.js
new file mode 100644
index 00000000000000..d0a7267419dac8
--- /dev/null
+++ b/test/integration/custom-routes/pages/auto-export/another.js
@@ -0,0 +1,11 @@
+import { useRouter } from 'next/router'
+
+export default function Page() {
+  const router = useRouter()
+  return (
+    <>
+      <p id="auto-export-another">auto-export another</p>
+      <p id="query">{JSON.stringify(router.query)}</p>
+    </>
+  )
+}
diff --git a/test/integration/custom-routes/test/index.test.js b/test/integration/custom-routes/test/index.test.js
index d5bb4ed4766952..725809849fc370 100644
--- a/test/integration/custom-routes/test/index.test.js
+++ b/test/integration/custom-routes/test/index.test.js
@@ -42,6 +42,25 @@ const runTests = (isDev = false) => {
     const browser = await webdriver(appPort, '/rewriting-to-auto-export')
     const text = await browser.eval(() => document.documentElement.innerHTML)
     expect(text).toContain('auto-export hello')
+    expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual({
+      rewrite: '1',
+      slug: 'hello',
+    })
+  })
+
+  it('should provide params correctly for rewrite to auto-export non-dynamic page', async () => {
+    const browser = await webdriver(
+      appPort,
+      '/rewriting-to-another-auto-export/first'
+    )
+
+    expect(await browser.elementByCss('#auto-export-another').text()).toBe(
+      'auto-export another'
+    )
+    expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual({
+      rewrite: '1',
+      path: ['first'],
+    })
   })
 
   it('should handle one-to-one rewrite successfully', async () => {
@@ -1377,10 +1396,17 @@ const runTests = (isDev = false) => {
           ],
           afterFiles: [
             {
-              destination: '/auto-export/hello',
+              destination: '/auto-export/hello?rewrite=1',
               regex: normalizeRegEx('^\\/rewriting-to-auto-export$'),
               source: '/rewriting-to-auto-export',
             },
+            {
+              destination: '/auto-export/another?rewrite=1',
+              regex: normalizeRegEx(
+                '^\\/rewriting-to-another-auto-export(?:\\/((?:[^\\/]+?)(?:\\/(?:[^\\/]+?))*))?$'
+              ),
+              source: '/rewriting-to-another-auto-export/:path*',
+            },
             {
               destination: '/another/one',
               regex: normalizeRegEx('^\\/to-another$'),
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
index 90ca62b5e7299f..ec56edb6f2a093 100644
--- a/test/integration/production/test/index.test.js
+++ b/test/integration/production/test/index.test.js
@@ -803,7 +803,8 @@ describe('Production Usage', () => {
   it('should clear all core performance marks', async () => {
     let browser
     try {
-      browser = await webdriver(appPort, '/about')
+      browser = await webdriver(appPort, '/fully-dynamic')
+
       const currentPerfMarks = await browser.eval(
         `window.performance.getEntriesByType('mark')`
       )

From 5bdef6aabee380ce682d65b1da7cce984bfc3748 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Sun, 18 Apr 2021 12:28:09 +0200
Subject: [PATCH 19/20] startup performance improvements (#24129)

* import next-server logic during the time the configuration is loaded
* load minimizer plugins only when used
* load ReactDevOverlay only when used
* load only meta information of tsconfig for validation
* make worker for configuration loading lighter
* only load runTypeCheck when used
* load postcss config only when used
---
 packages/next/build/webpack-config.ts         |  48 ++++----
 .../terser-webpack-plugin/src/index.js        |   4 +-
 .../typescript/getTypeScriptConfiguration.ts  |  18 ++-
 .../typescript/writeConfigurationDefaults.ts  |   2 +-
 packages/next/lib/verifyTypeScriptSetup.ts    |   4 +-
 .../next-server/server/config-utils-worker.ts | 101 ++++++++++++++++
 .../next/next-server/server/config-utils.ts   | 111 ++----------------
 packages/next/server/next-dev-server.ts       |  11 +-
 packages/next/server/next.ts                  |  23 +++-
 9 files changed, 188 insertions(+), 134 deletions(-)
 create mode 100644 packages/next/next-server/server/config-utils-worker.ts

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index c4906392837c36..7e9737a765e57e 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -4,8 +4,6 @@ import crypto from 'crypto'
 import { readFileSync, realpathSync } from 'fs'
 import chalk from 'chalk'
 import semver from 'next/dist/compiled/semver'
-// @ts-ignore No typings yet
-import TerserPlugin from './webpack/plugins/terser-webpack-plugin/src/index.js'
 import path from 'path'
 import { webpack, isWebpack5 } from 'next/dist/compiled/webpack/webpack'
 import {
@@ -42,7 +40,6 @@ import { pluginLoaderOptions } from './webpack/loaders/next-plugin-loader'
 import BuildManifestPlugin from './webpack/plugins/build-manifest-plugin'
 import BuildStatsPlugin from './webpack/plugins/build-stats-plugin'
 import ChunkNamesPlugin from './webpack/plugins/chunk-names-plugin'
-import { CssMinimizerPlugin } from './webpack/plugins/css-minimizer-plugin'
 import { JsConfigPathsPlugin } from './webpack/plugins/jsconfig-paths-plugin'
 import { DropClientPage } from './webpack/plugins/next-drop-client-page-plugin'
 import NextJsSsrImportPlugin from './webpack/plugins/nextjs-ssr-import'
@@ -332,7 +329,7 @@ export default async function getBaseWebpackConfig(
   // jsconfig is a subset of tsconfig
   if (useTypeScript) {
     const ts = (await import(typeScriptPath!)) as typeof import('typescript')
-    const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath)
+    const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath, true)
     jsConfig = { compilerOptions: tsConfig.options }
   }
 
@@ -822,24 +819,35 @@ export default async function getBaseWebpackConfig(
       minimize: !(dev || isServer),
       minimizer: [
         // Minify JavaScript
-        new TerserPlugin({
-          cacheDir: path.join(distDir, 'cache', 'next-minifier'),
-          parallel: config.experimental.cpus,
-          terserOptions,
-        }),
+        (compiler: webpack.Compiler) => {
+          // @ts-ignore No typings yet
+          const {
+            TerserPlugin,
+          } = require('./webpack/plugins/terser-webpack-plugin/src/index.js')
+          new TerserPlugin({
+            cacheDir: path.join(distDir, 'cache', 'next-minifier'),
+            parallel: config.experimental.cpus,
+            terserOptions,
+          }).apply(compiler)
+        },
         // Minify CSS
-        new CssMinimizerPlugin({
-          postcssOptions: {
-            map: {
-              // `inline: false` generates the source map in a separate file.
-              // Otherwise, the CSS file is needlessly large.
-              inline: false,
-              // `annotation: false` skips appending the `sourceMappingURL`
-              // to the end of the CSS file. Webpack already handles this.
-              annotation: false,
+        (compiler: webpack.Compiler) => {
+          const {
+            CssMinimizerPlugin,
+          } = require('./webpack/plugins/css-minimizer-plugin')
+          new CssMinimizerPlugin({
+            postcssOptions: {
+              map: {
+                // `inline: false` generates the source map in a separate file.
+                // Otherwise, the CSS file is needlessly large.
+                inline: false,
+                // `annotation: false` skips appending the `sourceMappingURL`
+                // to the end of the CSS file. Webpack already handles this.
+                annotation: false,
+              },
             },
-          },
-        }),
+          }).apply(compiler)
+        },
       ],
     },
     context: dir,
diff --git a/packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js b/packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js
index bfe6e2c5210151..1909410fd05649 100644
--- a/packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js
+++ b/packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js
@@ -102,7 +102,7 @@ class Webpack4Cache {
   }
 }
 
-class TerserPlugin {
+export class TerserPlugin {
   constructor(options = {}) {
     const { cacheDir, terserOptions = {}, parallel } = options
 
@@ -400,5 +400,3 @@ class TerserPlugin {
     })
   }
 }
-
-export default TerserPlugin
diff --git a/packages/next/lib/typescript/getTypeScriptConfiguration.ts b/packages/next/lib/typescript/getTypeScriptConfiguration.ts
index ccd13ba21fc37b..97d7dc7c77c7e3 100644
--- a/packages/next/lib/typescript/getTypeScriptConfiguration.ts
+++ b/packages/next/lib/typescript/getTypeScriptConfiguration.ts
@@ -5,7 +5,8 @@ import { FatalTypeScriptError } from './FatalTypeScriptError'
 
 export async function getTypeScriptConfiguration(
   ts: typeof import('typescript'),
-  tsConfigPath: string
+  tsConfigPath: string,
+  metaOnly?: boolean
 ): Promise<import('typescript').ParsedCommandLine> {
   try {
     const formatDiagnosticsHost: import('typescript').FormatDiagnosticsHost = {
@@ -21,9 +22,20 @@ export async function getTypeScriptConfiguration(
       )
     }
 
+    let configToParse: any = config
+
     const result = ts.parseJsonConfigFileContent(
-      config,
-      ts.sys,
+      configToParse,
+      // When only interested in meta info,
+      // avoid enumerating all files (for performance reasons)
+      metaOnly
+        ? {
+            ...ts.sys,
+            readDirectory(_path, extensions, _excludes, _includes, _depth) {
+              return [extensions ? `file${extensions[0]}` : `file.ts`]
+            },
+          }
+        : ts.sys,
       path.dirname(tsConfigPath)
     )
 
diff --git a/packages/next/lib/typescript/writeConfigurationDefaults.ts b/packages/next/lib/typescript/writeConfigurationDefaults.ts
index ffdf748e7d4b4c..61af02eca7f316 100644
--- a/packages/next/lib/typescript/writeConfigurationDefaults.ts
+++ b/packages/next/lib/typescript/writeConfigurationDefaults.ts
@@ -98,7 +98,7 @@ export async function writeConfigurationDefaults(
   const {
     options: tsOptions,
     raw: rawConfig,
-  } = await getTypeScriptConfiguration(ts, tsConfigPath)
+  } = await getTypeScriptConfiguration(ts, tsConfigPath, true)
 
   const userTsConfigContent = await fs.readFile(tsConfigPath, {
     encoding: 'utf8',
diff --git a/packages/next/lib/verifyTypeScriptSetup.ts b/packages/next/lib/verifyTypeScriptSetup.ts
index 751d52fea99413..14b28785791d28 100644
--- a/packages/next/lib/verifyTypeScriptSetup.ts
+++ b/packages/next/lib/verifyTypeScriptSetup.ts
@@ -6,7 +6,7 @@ import {
   hasNecessaryDependencies,
   NecessaryDependencies,
 } from './typescript/hasNecessaryDependencies'
-import { runTypeCheck, TypeCheckResult } from './typescript/runTypeCheck'
+import type { TypeCheckResult } from './typescript/runTypeCheck'
 import { TypeScriptCompileError } from './typescript/TypeScriptCompileError'
 import { writeAppTypeDeclarations } from './typescript/writeAppTypeDeclarations'
 import { writeConfigurationDefaults } from './typescript/writeConfigurationDefaults'
@@ -41,6 +41,8 @@ export async function verifyTypeScriptSetup(
     await writeAppTypeDeclarations(dir)
 
     if (typeCheckPreflight) {
+      const { runTypeCheck } = require('./typescript/runTypeCheck')
+
       // Verify the project passes type-checking before we go to webpack phase:
       return await runTypeCheck(ts, dir, tsConfigPath)
     }
diff --git a/packages/next/next-server/server/config-utils-worker.ts b/packages/next/next-server/server/config-utils-worker.ts
new file mode 100644
index 00000000000000..7897d460c2629e
--- /dev/null
+++ b/packages/next/next-server/server/config-utils-worker.ts
@@ -0,0 +1,101 @@
+import { loadEnvConfig } from '@next/env'
+import findUp from 'next/dist/compiled/find-up'
+import { init as initWebpack } from 'next/dist/compiled/webpack/webpack'
+import { CONFIG_FILE, PHASE_DEVELOPMENT_SERVER } from '../lib/constants'
+import { NextConfig, normalizeConfig } from './config-shared'
+import * as Log from '../../build/output/log'
+
+let installed: boolean = false
+
+export function install(useWebpack5: boolean) {
+  if (installed) {
+    return
+  }
+  installed = true
+
+  initWebpack(useWebpack5)
+
+  // hook the Node.js require so that webpack requires are
+  // routed to the bundled and now initialized webpack version
+  require('../../build/webpack/require-hook')
+}
+
+export type CheckReasons =
+  | 'test-mode'
+  | 'no-config'
+  | 'future-flag'
+  | 'no-future-flag'
+  | 'no-webpack-config'
+  | 'webpack-config'
+
+export type CheckResult = {
+  enabled: boolean
+  reason: CheckReasons
+}
+
+export async function shouldLoadWithWebpack5(
+  phase: string,
+  dir: string
+): Promise<CheckResult> {
+  await loadEnvConfig(dir, phase === PHASE_DEVELOPMENT_SERVER, Log)
+
+  const path = await findUp(CONFIG_FILE, {
+    cwd: dir,
+  })
+
+  if (Number(process.env.NEXT_PRIVATE_TEST_WEBPACK5_MODE) > 0) {
+    return {
+      enabled: true,
+      reason: 'test-mode',
+    }
+  }
+
+  // No `next.config.js`:
+  if (!path?.length) {
+    // Uncomment to add auto-enable when there is no next.config.js
+    // Use webpack 5 by default in new apps:
+    return {
+      enabled: true,
+      reason: 'no-config',
+    }
+  }
+
+  // Default to webpack 4 for backwards compatibility on boot:
+  install(false)
+
+  const userConfigModule = require(path)
+  const userConfig: Partial<NextConfig> = normalizeConfig(
+    phase,
+    userConfigModule.default || userConfigModule
+  )
+
+  // Opted-in manually
+  if (userConfig.future?.webpack5 === true) {
+    return {
+      enabled: true,
+      reason: 'future-flag',
+    }
+  }
+
+  // Opted-out manually
+  if (userConfig.future?.webpack5 === false) {
+    return {
+      enabled: false,
+      reason: 'no-future-flag',
+    }
+  }
+
+  // Uncomment to add auto-enable when there is no custom webpack config
+  // The user isn't configuring webpack
+  if (!userConfig.webpack) {
+    return {
+      enabled: true,
+      reason: 'no-webpack-config',
+    }
+  }
+
+  return {
+    enabled: false,
+    reason: 'webpack-config',
+  }
+}
diff --git a/packages/next/next-server/server/config-utils.ts b/packages/next/next-server/server/config-utils.ts
index 373c81199a1722..742b30bca485f1 100644
--- a/packages/next/next-server/server/config-utils.ts
+++ b/packages/next/next-server/server/config-utils.ts
@@ -1,105 +1,10 @@
-import { loadEnvConfig } from '@next/env'
+import path from 'path'
 import { Worker } from 'jest-worker'
-import findUp from 'next/dist/compiled/find-up'
-import { init as initWebpack } from 'next/dist/compiled/webpack/webpack'
-import { CONFIG_FILE, PHASE_DEVELOPMENT_SERVER } from '../lib/constants'
-import { NextConfig, normalizeConfig } from './config-shared'
 import * as Log from '../../build/output/log'
+import type { CheckReasons, CheckResult } from './config-utils-worker'
+import { install, shouldLoadWithWebpack5 } from './config-utils-worker'
 
-let installed: boolean = false
-
-export function install(useWebpack5: boolean) {
-  if (installed) {
-    return
-  }
-  installed = true
-
-  initWebpack(useWebpack5)
-
-  // hook the Node.js require so that webpack requires are
-  // routed to the bundled and now initialized webpack version
-  require('../../build/webpack/require-hook')
-}
-
-type CheckReasons =
-  | 'test-mode'
-  | 'no-config'
-  | 'future-flag'
-  | 'no-future-flag'
-  | 'no-webpack-config'
-  | 'webpack-config'
-
-type CheckResult = {
-  enabled: boolean
-  reason: CheckReasons
-}
-
-export async function shouldLoadWithWebpack5(
-  phase: string,
-  dir: string
-): Promise<CheckResult> {
-  await loadEnvConfig(dir, phase === PHASE_DEVELOPMENT_SERVER, Log)
-
-  const path = await findUp(CONFIG_FILE, {
-    cwd: dir,
-  })
-
-  if (Number(process.env.NEXT_PRIVATE_TEST_WEBPACK5_MODE) > 0) {
-    return {
-      enabled: true,
-      reason: 'test-mode',
-    }
-  }
-
-  // No `next.config.js`:
-  if (!path?.length) {
-    // Uncomment to add auto-enable when there is no next.config.js
-    // Use webpack 5 by default in new apps:
-    return {
-      enabled: true,
-      reason: 'no-config',
-    }
-  }
-
-  // Default to webpack 4 for backwards compatibility on boot:
-  install(false)
-
-  const userConfigModule = require(path)
-  const userConfig: Partial<NextConfig> = normalizeConfig(
-    phase,
-    userConfigModule.default || userConfigModule
-  )
-
-  // Opted-in manually
-  if (userConfig.future?.webpack5 === true) {
-    return {
-      enabled: true,
-      reason: 'future-flag',
-    }
-  }
-
-  // Opted-out manually
-  if (userConfig.future?.webpack5 === false) {
-    return {
-      enabled: false,
-      reason: 'no-future-flag',
-    }
-  }
-
-  // Uncomment to add auto-enable when there is no custom webpack config
-  // The user isn't configuring webpack
-  if (!userConfig.webpack) {
-    return {
-      enabled: true,
-      reason: 'no-webpack-config',
-    }
-  }
-
-  return {
-    enabled: false,
-    reason: 'webpack-config',
-  }
-}
+export { install, shouldLoadWithWebpack5 }
 
 function reasonMessage(reason: CheckReasons) {
   switch (reason) {
@@ -122,7 +27,13 @@ function reasonMessage(reason: CheckReasons) {
 
 export async function loadWebpackHook(phase: string, dir: string) {
   let useWebpack5 = false
-  const worker: any = new Worker(__filename, { enableWorkerThreads: false })
+  const worker: any = new Worker(
+    path.resolve(__dirname, './config-utils-worker.js'),
+    {
+      enableWorkerThreads: false,
+      numWorkers: 1,
+    }
+  )
   try {
     const result: CheckResult = await worker.shouldLoadWithWebpack5(phase, dir)
     Log.info(
diff --git a/packages/next/server/next-dev-server.ts b/packages/next/server/next-dev-server.ts
index 0d095c62e82135..85979fecc73ab8 100644
--- a/packages/next/server/next-dev-server.ts
+++ b/packages/next/server/next-dev-server.ts
@@ -1,4 +1,3 @@
-import { ReactDevOverlay } from '@next/react-dev-overlay/lib/client'
 import crypto from 'crypto'
 import fs from 'fs'
 import { IncomingMessage, ServerResponse } from 'http'
@@ -47,6 +46,16 @@ if (typeof React.Suspense === 'undefined') {
   )
 }
 
+// Load ReactDevOverlay only when needed
+let ReactDevOverlayImpl: React.FunctionComponent
+const ReactDevOverlay = (props: any) => {
+  if (ReactDevOverlayImpl === undefined) {
+    ReactDevOverlayImpl = require('@next/react-dev-overlay/lib/client')
+      .ReactDevOverlay
+  }
+  return ReactDevOverlayImpl(props)
+}
+
 export default class DevServer extends Server {
   private devReady: Promise<void>
   private setDevReady?: Function
diff --git a/packages/next/server/next.ts b/packages/next/server/next.ts
index d834c7ad48555c..6fd8c0e17ca213 100644
--- a/packages/next/server/next.ts
+++ b/packages/next/server/next.ts
@@ -1,4 +1,8 @@
-import Server, { ServerConstructor } from '../next-server/server/next-server'
+import '../next-server/server/node-polyfill-fetch'
+import type {
+  default as Server,
+  ServerConstructor,
+} from '../next-server/server/next-server'
 import { NON_STANDARD_NODE_ENV } from '../lib/constants'
 import * as log from '../build/output/log'
 import loadConfig, { NextConfig } from '../next-server/server/config'
@@ -17,6 +21,14 @@ type NextServerConstructor = ServerConstructor & {
   dev?: boolean
 }
 
+let ServerImpl: typeof Server
+
+const getServerImpl = async () => {
+  if (ServerImpl === undefined)
+    ServerImpl = (await import('../next-server/server/next-server')).default
+  return ServerImpl
+}
+
 export class NextServer {
   private serverPromise?: Promise<Server>
   private server?: Server
@@ -93,17 +105,17 @@ export class NextServer {
     return (server as any).close()
   }
 
-  private createServer(
+  private async createServer(
     options: NextServerConstructor & {
       conf: NextConfig
       isNextDevCommand?: boolean
     }
-  ): Server {
+  ): Promise<Server> {
     if (options.dev) {
       const DevServer = require('./next-dev-server').default
       return new DevServer(options)
     }
-    return new Server(options)
+    return new (await getServerImpl())(options)
   }
 
   private async loadConfig() {
@@ -117,8 +129,9 @@ export class NextServer {
 
   private async getServer() {
     if (!this.serverPromise) {
+      setTimeout(getServerImpl, 10)
       this.serverPromise = this.loadConfig().then(async (conf) => {
-        this.server = this.createServer({
+        this.server = await this.createServer({
           ...this.options,
           conf,
         })

From 0bcc6943ae7a8c3c7d1865b4ae090edafe417c7c Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sun, 18 Apr 2021 08:59:27 -0500
Subject: [PATCH 20/20] v10.1.4-canary.10

---
 lerna.json                                         |  2 +-
 packages/create-next-app/package.json              |  2 +-
 packages/eslint-plugin-next/package.json           |  2 +-
 packages/next-bundle-analyzer/package.json         |  2 +-
 packages/next-codemod/package.json                 |  2 +-
 packages/next-env/package.json                     |  2 +-
 packages/next-mdx/package.json                     |  2 +-
 packages/next-plugin-google-analytics/package.json |  2 +-
 packages/next-plugin-sentry/package.json           |  2 +-
 packages/next-plugin-storybook/package.json        |  2 +-
 packages/next-polyfill-module/package.json         |  2 +-
 packages/next-polyfill-nomodule/package.json       |  2 +-
 packages/next/package.json                         | 12 ++++++------
 packages/react-dev-overlay/package.json            |  2 +-
 packages/react-refresh-utils/package.json          |  2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lerna.json b/lerna.json
index 04b760248a9097..e08191b73f3f10 100644
--- a/lerna.json
+++ b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "10.1.4-canary.9"
+  "version": "10.1.4-canary.10"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 677791e0ace888..e102598aac9fee 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index 30437bf4176aa6..1784e63b371d71 100644
--- a/packages/eslint-plugin-next/package.json
+++ b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 92a2a3abbc13ad..e1369922a874cd 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 32f9da380861f5..9301eb544856eb 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index 95835224d34cba..c81e325549ea18 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index c724d80515c576..d93ace930cc53c 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "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 9421190bbd2122..1dca6a71c75e11 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": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-google-analytics"
diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
index bb12c9e791dd66..a2fd3f6430253c 100644
--- a/packages/next-plugin-sentry/package.json
+++ b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-sentry"
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 8785a8f628368e..88cb8cc0b3cd17 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
index e81c0df0eadb9d..d5cbbd81d35fc9 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",
diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
index 34fcbb6aea7bef..540810eb7580ec 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next/package.json b/packages/next/package.json
index 56191b824bf925..2029270bc85d7c 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -62,10 +62,10 @@
   "dependencies": {
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.1",
-    "@next/env": "10.1.4-canary.9",
-    "@next/polyfill-module": "10.1.4-canary.9",
-    "@next/react-dev-overlay": "10.1.4-canary.9",
-    "@next/react-refresh-utils": "10.1.4-canary.9",
+    "@next/env": "10.1.4-canary.10",
+    "@next/polyfill-module": "10.1.4-canary.10",
+    "@next/react-dev-overlay": "10.1.4-canary.10",
+    "@next/react-refresh-utils": "10.1.4-canary.10",
     "@opentelemetry/api": "0.14.0",
     "assert": "2.0.0",
     "ast-types": "0.13.2",
@@ -148,7 +148,7 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/traverse": "^7.12.10",
     "@babel/types": "7.12.12",
-    "@next/polyfill-nomodule": "10.1.4-canary.9",
+    "@next/polyfill-nomodule": "10.1.4-canary.10",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index c5bdd1c32bd383..05cecd5f140f88 100644
--- a/packages/react-dev-overlay/package.json
+++ b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
index 559cd0a88dd364..49c7c284d1f50c 100644
--- a/packages/react-refresh-utils/package.json
+++ b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "10.1.4-canary.9",
+  "version": "10.1.4-canary.10",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",