From afaff59f96219b7da1f461a3a8d1f39bdfe6a411 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 8 Oct 2019 14:28:15 -0400
Subject: [PATCH 01/31] Monkeypatch @zeit/next-css@0.2.1-canary.4 (#8996)

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

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 67ec13747c7e6..454f0778add89 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -955,7 +955,11 @@ export default async function getBaseWebpackConfig(
             // old `css-loader` versions. Custom setups (that aren't next-sass
             // or next-less) likely have the newer version.
             // We still handle this gracefully below.
-            Object.prototype.hasOwnProperty.call(use.options, 'minimize')
+            (Object.prototype.hasOwnProperty.call(use.options, 'minimize') ||
+              Object.prototype.hasOwnProperty.call(
+                use.options,
+                'exportOnlyLocals'
+              ))
           )
         ) {
           return

From 3c9787927790748a90c19d148ae768f3e3b30d4b Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Tue, 8 Oct 2019 17:26:18 -0400
Subject: [PATCH 02/31] v9.1.2-canary.1

---
 lerna.json                                 | 2 +-
 packages/create-next-app/package.json      | 2 +-
 packages/next-bundle-analyzer/package.json | 2 +-
 packages/next-mdx/package.json             | 2 +-
 packages/next/package.json                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lerna.json b/lerna.json
index 5da4d89b5b978..2d06d0ca05752 100644
--- a/lerna.json
+++ b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.1.2-canary.0"
+  "version": "9.1.2-canary.1"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 052e78743106d..c50ce454c8d96 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.1.2-canary.0",
+  "version": "9.1.2-canary.1",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 2a6e47f4de157..c8c0a2e667b7d 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.1.2-canary.0",
+  "version": "9.1.2-canary.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index d8318b4034dd4..64d89d1bd0699 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.1.2-canary.0",
+  "version": "9.1.2-canary.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next/package.json b/packages/next/package.json
index e46ad5c6bf688..861b81df151d0 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.1.2-canary.0",
+  "version": "9.1.2-canary.1",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",

From 32633c83ddac4f4389a07e02bf916ad5178268a7 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 9 Oct 2019 08:48:09 +0900
Subject: [PATCH 03/31] Add src directory support for global CSS (#8999)

---
 packages/next/build/webpack-config.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 454f0778add89..6fd3494d6a5c8 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -299,14 +299,10 @@ export default async function getBaseWebpackConfig(
       : config.crossOrigin
 
   let customAppFile: string | null = config.experimental.css
-    ? await findPageFile(
-        path.join(dir, 'pages'),
-        '/_app',
-        config.pageExtensions
-      )
+    ? await findPageFile(pagesDir, '/_app', config.pageExtensions)
     : null
   if (customAppFile) {
-    customAppFile = path.resolve(path.join(dir, 'pages', customAppFile))
+    customAppFile = path.resolve(path.join(pagesDir, customAppFile))
   }
 
   let webpackConfig: webpack.Configuration = {
@@ -668,7 +664,7 @@ export default async function getBaseWebpackConfig(
                             'Custom <App>'
                           )}. Please move all global CSS imports to ${chalk.cyan(
                             customAppFile
-                              ? path.relative(dir, customAppFile)
+                              ? path.relative(pagesDir, customAppFile)
                               : 'pages/_app.js'
                           )}.\n` +
                           `Read more: https://err.sh/next.js/global-css`,

From 13f05f2cd4f9484f088290803f9767afebacf202 Mon Sep 17 00:00:00 2001
From: manfwh <841533182@qq.com>
Date: Wed, 9 Oct 2019 23:15:34 +0800
Subject: [PATCH 04/31] Update README-zh-CN.md static-file-serving-eg-images
 (#9002)

---
 README-zh-CN.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README-zh-CN.md b/README-zh-CN.md
index fb07b8038531f..9061ab8bb3677 100644
--- a/README-zh-CN.md
+++ b/README-zh-CN.md
@@ -133,7 +133,7 @@ export default () => <div>Welcome to next.js!</div>
 - 自动打包编译 (使用 webpack 和 babel)
 - 热加载
 - 以 `./pages`作为服务的渲染和索引
-- 静态文件服务. `./static/` 映射到 `/static/` (可以 [创建一个静态目录](#static-file-serving-eg-images) 在你的项目中)
+- 静态文件服务. `./public/` 映射到 `/` (可以 [创建一个静态目录](#static-file-serving-eg-images) 在你的项目中)
 
 这里有个简单的案例，可以下载看看 [sample app - nextgram](https://github.com/zeit/nextgram)
 
@@ -227,13 +227,13 @@ export default () => <p style={{ color: 'red' }}>hi there</p>
 
 ### 静态文件服务（如图像）
 
-在根目录下新建文件夹叫`static`。代码可以通过`/static/`来引入相关的静态资源。
+在根目录下新建文件夹叫`public`。代码可以通过`/`来引入相关的静态资源。
 
 ```jsx
-export default () => <img src="/static/my-image.png" alt="my image" />
+export default () => <img src="/my-image.png" alt="my image" />
 ```
 
-_注意：不要自定义静态文件夹的名字，只能叫`static` ，因为只有这个名字 Next.js 才会把它当作静态资源。_
+_注意：不要自定义静态文件夹的名字，只能叫`public` ，因为只有这个名字 Next.js 才会把它当作静态资源。_
 
 <a id="populating-head" style="display: none"></a>
 

From e5202ffb24c90f5b4e22cc1e07be9e5f5005886f Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Wed, 9 Oct 2019 10:41:49 -0500
Subject: [PATCH 05/31] Add CSS fixture for src dir (#9001)

* Add CSS fixture for src dir

* Revert relative customAppFile dir and update tests
---
 packages/next/build/webpack-config.ts         |  2 +-
 .../single-global-src/src/pages/_app.js       | 12 +++++++
 .../single-global-src/src/pages/index.js      |  3 ++
 .../single-global-src/styles/global.css       |  3 ++
 test/integration/css/test/index.test.js       | 32 +++++++++++++++++--
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/css/fixtures/single-global-src/src/pages/_app.js
 create mode 100644 test/integration/css/fixtures/single-global-src/src/pages/index.js
 create mode 100644 test/integration/css/fixtures/single-global-src/styles/global.css

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 6fd3494d6a5c8..73bf5e756b969 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -664,7 +664,7 @@ export default async function getBaseWebpackConfig(
                             'Custom <App>'
                           )}. Please move all global CSS imports to ${chalk.cyan(
                             customAppFile
-                              ? path.relative(pagesDir, customAppFile)
+                              ? path.relative(dir, customAppFile)
                               : 'pages/_app.js'
                           )}.\n` +
                           `Read more: https://err.sh/next.js/global-css`,
diff --git a/test/integration/css/fixtures/single-global-src/src/pages/_app.js b/test/integration/css/fixtures/single-global-src/src/pages/_app.js
new file mode 100644
index 0000000000000..d6cf88cc354e8
--- /dev/null
+++ b/test/integration/css/fixtures/single-global-src/src/pages/_app.js
@@ -0,0 +1,12 @@
+import React from 'react'
+import App from 'next/app'
+import '../../styles/global.css'
+
+class MyApp extends App {
+  render () {
+    const { Component, pageProps } = this.props
+    return <Component {...pageProps} />
+  }
+}
+
+export default MyApp
diff --git a/test/integration/css/fixtures/single-global-src/src/pages/index.js b/test/integration/css/fixtures/single-global-src/src/pages/index.js
new file mode 100644
index 0000000000000..b23f4aa48f634
--- /dev/null
+++ b/test/integration/css/fixtures/single-global-src/src/pages/index.js
@@ -0,0 +1,3 @@
+export default function Home () {
+  return <div className='red-text'>This text should be red.</div>
+}
diff --git a/test/integration/css/fixtures/single-global-src/styles/global.css b/test/integration/css/fixtures/single-global-src/styles/global.css
new file mode 100644
index 0000000000000..8e1524022baf8
--- /dev/null
+++ b/test/integration/css/fixtures/single-global-src/styles/global.css
@@ -0,0 +1,3 @@
+.red-text {
+  color: red;
+}
diff --git a/test/integration/css/test/index.test.js b/test/integration/css/test/index.test.js
index 3402f6465c649..e647af834a5f4 100644
--- a/test/integration/css/test/index.test.js
+++ b/test/integration/css/test/index.test.js
@@ -44,6 +44,30 @@ describe('CSS Support', () => {
     })
   })
 
+  describe('Basic Global Support with src/ dir', () => {
+    const appDir = join(fixturesDir, 'single-global-src')
+
+    beforeAll(async () => {
+      await remove(join(appDir, '.next'))
+    })
+
+    it('should build successfully', async () => {
+      await nextBuild(appDir)
+    })
+
+    it(`should've emitted a single CSS file`, async () => {
+      const cssFolder = join(appDir, '.next/static/css')
+
+      const files = await readdir(cssFolder)
+      const cssFiles = files.filter(f => /\.css$/.test(f))
+
+      expect(cssFiles.length).toBe(1)
+      expect(await readFile(join(cssFolder, cssFiles[0]), 'utf8')).toContain(
+        'color:red'
+      )
+    })
+  })
+
   describe('Multi Global Support', () => {
     const appDir = join(fixturesDir, 'multi-global')
 
@@ -194,7 +218,9 @@ describe('CSS Support', () => {
       })
       expect(stderr).toContain('Failed to compile')
       expect(stderr).toContain('styles/global.css')
-      expect(stderr).toContain('Please move all global CSS imports')
+      expect(stderr).toMatch(
+        /Please move all global CSS imports.*?pages(\/|\\)_app/
+      )
     })
   })
 
@@ -211,7 +237,9 @@ describe('CSS Support', () => {
       })
       expect(stderr).toContain('Failed to compile')
       expect(stderr).toContain('styles/global.css')
-      expect(stderr).toContain('Please move all global CSS imports')
+      expect(stderr).toMatch(
+        /Please move all global CSS imports.*?pages(\/|\\)_app/
+      )
     })
   })
 

From 7f92c2649831791b3a2451d87a12097bc69f5552 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Wed, 9 Oct 2019 10:50:32 -0500
Subject: [PATCH 06/31] Fix global Bluebird causing HMR connection to fail
 (#9009)

---
 packages/next/server/on-demand-entry-handler.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/next/server/on-demand-entry-handler.ts b/packages/next/server/on-demand-entry-handler.ts
index c54ec4db24845..53ce4197cc22a 100644
--- a/packages/next/server/on-demand-entry-handler.ts
+++ b/packages/next/server/on-demand-entry-handler.ts
@@ -366,8 +366,6 @@ export default function onDemandEntryHandler(
           req.on('close', () => {
             clearInterval(pingInterval)
           })
-          // Do initial ping right after EventSource is finished being set up
-          setImmediate(() => runPing())
           next()
         }
       }

From 6ce6b96dfa9743b9480de2a8d89da098f5d93f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismael=20Mart=C3=ADnez?= <hola@isma.uy>
Date: Wed, 9 Oct 2019 19:28:06 -0300
Subject: [PATCH 07/31] Change to public folder in with-loading example (#9016)

---
 examples/with-loading/pages/_app.js                    | 2 +-
 examples/with-loading/{static => public}/nprogress.css | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename examples/with-loading/{static => public}/nprogress.css (100%)

diff --git a/examples/with-loading/pages/_app.js b/examples/with-loading/pages/_app.js
index 9ac9e58343d7b..5cb5ecc33b7e6 100644
--- a/examples/with-loading/pages/_app.js
+++ b/examples/with-loading/pages/_app.js
@@ -19,7 +19,7 @@ export default class MyApp extends App {
       <>
         <Head>
           {/* Import CSS for nprogress */}
-          <link rel='stylesheet' type='text/css' href='/static/nprogress.css' />
+          <link rel='stylesheet' type='text/css' href='/nprogress.css' />
         </Head>
         <nav>
           <style jsx>{`
diff --git a/examples/with-loading/static/nprogress.css b/examples/with-loading/public/nprogress.css
similarity index 100%
rename from examples/with-loading/static/nprogress.css
rename to examples/with-loading/public/nprogress.css

From c6609e5bd5ac11e6c43d6f8bd8e2d785eb197b38 Mon Sep 17 00:00:00 2001
From: Sandrino Di Mattia <contact@sandrino.be>
Date: Thu, 10 Oct 2019 11:31:51 +0200
Subject: [PATCH 08/31] Update Auth0 example with new version (#9020)

---
 examples/auth0/lib/auth0.js | 4 ++--
 examples/auth0/package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/auth0/lib/auth0.js b/examples/auth0/lib/auth0.js
index cfb4a36b8a92e..35612b9d5ca05 100644
--- a/examples/auth0/lib/auth0.js
+++ b/examples/auth0/lib/auth0.js
@@ -1,6 +1,6 @@
-import { useAuth0 } from '@auth0/nextjs-auth0'
+import { initAuth0 } from '@auth0/nextjs-auth0'
 
-export default useAuth0({
+export default initAuth0({
   clientId: process.env.AUTH0_CLIENT_ID,
   clientSecret: process.env.AUTH0_CLIENT_SECRET,
   scope: process.env.AUTH0_SCOPE,
diff --git a/examples/auth0/package.json b/examples/auth0/package.json
index cb39e11bbbe47..c7d03850520d8 100644
--- a/examples/auth0/package.json
+++ b/examples/auth0/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@auth0/nextjs-auth0": "0.2.0",
+    "@auth0/nextjs-auth0": "0.4.0",
     "dotenv": "^8.1.0",
     "isomorphic-unfetch": "^3.0.0",
     "next": "latest",

From ec40d51dc4d4b0a3c53a5ab8261e288abcc4f9af Mon Sep 17 00:00:00 2001
From: armspkt <49720317+armspkt@users.noreply.github.com>
Date: Thu, 10 Oct 2019 17:05:29 +0700
Subject: [PATCH 09/31] Next offline (#9010)

* example: add next-offline example

* fix: fix readme

* fix: lint standard
---
 examples/with-next-offline/README.md          |  46 ++++++++++++++++++
 examples/with-next-offline/next.config.js     |   5 ++
 examples/with-next-offline/package.json       |  18 +++++++
 examples/with-next-offline/pages/_document.js |  24 +++++++++
 examples/with-next-offline/pages/index.js     |   1 +
 .../with-next-offline/public/manifest.json    |  16 ++++++
 .../with-next-offline/public/static/pwa.png   | Bin 0 -> 11134 bytes
 7 files changed, 110 insertions(+)
 create mode 100644 examples/with-next-offline/README.md
 create mode 100644 examples/with-next-offline/next.config.js
 create mode 100644 examples/with-next-offline/package.json
 create mode 100644 examples/with-next-offline/pages/_document.js
 create mode 100644 examples/with-next-offline/pages/index.js
 create mode 100644 examples/with-next-offline/public/manifest.json
 create mode 100644 examples/with-next-offline/public/static/pwa.png

diff --git a/examples/with-next-offline/README.md b/examples/with-next-offline/README.md
new file mode 100644
index 0000000000000..3c4213a0aedda
--- /dev/null
+++ b/examples/with-next-offline/README.md
@@ -0,0 +1,46 @@
+# next-offline example
+
+## How to use
+
+### Using `create-next-app`
+
+Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+
+```bash
+npx create-next-app --example with-next-offline with-next-offline-app
+# or
+yarn create next-app --example with-next-offline with-next-offline-app
+```
+
+### Download manually
+
+Download the example:
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-next-offline
+cd with-next-offline
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run dev
+npm run export
+serve -s out
+# or
+yarn
+yarn dev
+yarn export
+serve -s out
+```
+
+Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
+
+```bash
+now
+```
+
+## The idea behind the example
+
+This example demonstrates how to use the [next-offline plugin](https://github.com/hanford/next-offline) It includes manifest.json to install app via chrome
diff --git a/examples/with-next-offline/next.config.js b/examples/with-next-offline/next.config.js
new file mode 100644
index 0000000000000..c08c9bcf11297
--- /dev/null
+++ b/examples/with-next-offline/next.config.js
@@ -0,0 +1,5 @@
+const withOffline = require('next-offline')
+
+const nextConfig = {}
+
+module.exports = withOffline(nextConfig)
diff --git a/examples/with-next-offline/package.json b/examples/with-next-offline/package.json
new file mode 100644
index 0000000000000..356d8a0a38e55
--- /dev/null
+++ b/examples/with-next-offline/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "with-next-offline",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start",
+    "export": "next build && next export"
+  },
+  "dependencies": {
+    "next": "latest",
+    "next-offline": "4.0.6",
+    "react": "^16.10.2",
+    "react-dom": "^16.10.2",
+    "serve": "11.2.0"
+  }
+}
diff --git a/examples/with-next-offline/pages/_document.js b/examples/with-next-offline/pages/_document.js
new file mode 100644
index 0000000000000..7c0d43d24ed9e
--- /dev/null
+++ b/examples/with-next-offline/pages/_document.js
@@ -0,0 +1,24 @@
+import Document, { Html, Head, Main, NextScript } from 'next/document'
+
+class MyDocument extends Document {
+  static async getInitialProps (ctx) {
+    const initialProps = await Document.getInitialProps(ctx)
+    return { ...initialProps }
+  }
+
+  render () {
+    return (
+      <Html>
+        <Head>
+          <link rel='manifest' href='/manifest.json' />
+        </Head>
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    )
+  }
+}
+
+export default MyDocument
diff --git a/examples/with-next-offline/pages/index.js b/examples/with-next-offline/pages/index.js
new file mode 100644
index 0000000000000..0e81e1203bd28
--- /dev/null
+++ b/examples/with-next-offline/pages/index.js
@@ -0,0 +1 @@
+export default () => <div>Next-Offline Example, try to install app via chrome</div>
diff --git a/examples/with-next-offline/public/manifest.json b/examples/with-next-offline/public/manifest.json
new file mode 100644
index 0000000000000..c0aca31d4e549
--- /dev/null
+++ b/examples/with-next-offline/public/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "next-offline",
+  "short_name": "next-offline",
+  "description": "Nextjs using serveice worker via next-offline",
+  "icons": [
+    {
+      "src": "/static/pwa.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "start_url": "/",
+  "display": "standalone"
+}
\ No newline at end of file
diff --git a/examples/with-next-offline/public/static/pwa.png b/examples/with-next-offline/public/static/pwa.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b1536f62043f682551e68171a837113be5618d7
GIT binary patch
literal 11134
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
ID`ph*KT0huYybcN

literal 0
HcmV?d00001


From 5e65161b8c94ae3c1c646ec84e401332483952ef Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Thu, 10 Oct 2019 12:52:31 -0400
Subject: [PATCH 10/31] Test no-path relative CSS imports (#9028)

---
 .../css/fixtures/url-global/styles/dark2.svg    | 17 +++++++++++++++++
 .../css/fixtures/url-global/styles/global1.css  |  2 +-
 test/integration/css/test/index.test.js         |  5 +++--
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/css/fixtures/url-global/styles/dark2.svg

diff --git a/test/integration/css/fixtures/url-global/styles/dark2.svg b/test/integration/css/fixtures/url-global/styles/dark2.svg
new file mode 100644
index 0000000000000..bdae3d6587872
--- /dev/null
+++ b/test/integration/css/fixtures/url-global/styles/dark2.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="114px" height="100px" viewBox="0 0 114 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch -->
+    <title>Logotype - Black</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="100.929941%" y1="181.283245%" x2="41.7687834%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#000000" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Black-Triangle" transform="translate(-293.000000, -150.000000)" fill="url(#linearGradient-1)">
+            <polygon id="Logotype---Black" points="350 150 407 250 293 250"></polygon>
+        </g>
+    </g>
+</svg>
diff --git a/test/integration/css/fixtures/url-global/styles/global1.css b/test/integration/css/fixtures/url-global/styles/global1.css
index 03dfc60701777..fdaf9c9476f9c 100644
--- a/test/integration/css/fixtures/url-global/styles/global1.css
+++ b/test/integration/css/fixtures/url-global/styles/global1.css
@@ -1,4 +1,4 @@
 .red-text {
   color: red;
-  background-image: url('./dark.svg');
+  background-image: url('./dark.svg') url(dark2.svg);
 }
diff --git a/test/integration/css/test/index.test.js b/test/integration/css/test/index.test.js
index e647af834a5f4..12671c505386c 100644
--- a/test/integration/css/test/index.test.js
+++ b/test/integration/css/test/index.test.js
@@ -486,11 +486,11 @@ describe('CSS Support', () => {
       expect(cssFiles.length).toBe(1)
       const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')
       expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatch(
-        /^\.red-text\{color:red;background-image:url\(static\/media\/dark\.[a-z0-9]{32}\.svg\)\}\.blue-text\{color:orange;font-weight:bolder;background-image:url\(static\/media\/light\.[a-z0-9]{32}\.svg\);color:#00f\}$/
+        /^\.red-text\{color:red;background-image:url\(static\/media\/dark\.[a-z0-9]{32}\.svg\) url\(static\/media\/dark2\.[a-z0-9]{32}\.svg\)\}\.blue-text\{color:orange;font-weight:bolder;background-image:url\(static\/media\/light\.[a-z0-9]{32}\.svg\);color:#00f\}$/
       )
 
       const mediaFiles = await readdir(mediaFolder)
-      expect(mediaFiles.length).toBe(2)
+      expect(mediaFiles.length).toBe(3)
       expect(
         mediaFiles
           .map(fileName =>
@@ -503,6 +503,7 @@ describe('CSS Support', () => {
       ).toMatchInlineSnapshot(`
         Array [
           "dark.svg",
+          "dark2.svg",
           "light.svg",
         ]
       `)

From ac42beae86ea1cdf189e8dc863cbf22ad3ea903d Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 10 Oct 2019 12:07:51 -0500
Subject: [PATCH 11/31] Add buildId to SPR data routes (#8929)

* Add buildId to SPR data routes

* Update buildId replace in serverless loader

* Use new RegExp and add comment

* Apply suggestions from code review

Co-Authored-By: Joe Haddad <joe.haddad@zeit.co>

* Test to ensure client transition and handle / data route
---
 packages/next/build/index.ts                  |   3 +
 .../webpack/loaders/next-serverless-loader.ts |   3 +-
 packages/next/export/index.ts                 |   4 +-
 .../next/next-server/lib/router/router.ts     |   9 +-
 .../next/next-server/server/next-server.ts    |  27 +++-
 test/integration/prerender/test/index.test.js | 143 ++++++++++--------
 6 files changed, 120 insertions(+), 69 deletions(-)

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index 5d59a8badb95c..70ccd61ae869e 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -535,6 +535,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
             srcRoute: null,
             dataRoute: path.posix.join(
               '/_next/data',
+              buildId,
               `${page === '/' ? '/index' : page}.json`
             ),
           }
@@ -552,6 +553,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
               srcRoute: page,
               dataRoute: path.posix.join(
                 '/_next/data',
+                buildId,
                 `${route === '/' ? '/index' : route}.json`
               ),
             }
@@ -583,6 +585,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
     tbdPrerenderRoutes.forEach(tbdRoute => {
       const dataRoute = path.posix.join(
         '/_next/data',
+        buildId,
         `${tbdRoute === '/' ? '/index' : tbdRoute}.json`
       )
 
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
index b0f37ffb97cfe..a726e8dd2f45e 100644
--- a/packages/next/build/webpack/loaders/next-serverless-loader.ts
+++ b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -42,6 +42,7 @@ const nextServerlessLoader: loader.Loader = function() {
     /\\/g,
     '/'
   )
+  const escapedBuildId = buildId.replace(/[|\\{}()[\]^$+*?.-]/g, '\\$&')
 
   if (page.match(API_ROUTE)) {
     return `
@@ -110,7 +111,7 @@ const nextServerlessLoader: loader.Loader = function() {
       if (req.url.match(/_next\\/data/)) {
         sprData = true
         req.url = req.url
-          .replace(/\\/_next\\/data\\//, '/')
+          .replace(new RegExp('/_next/data/${escapedBuildId}/'), '/')
           .replace(/\\.json$/, '')
       }
       const parsedUrl = parse(req.url, true)
diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
index ff0102d3fe874..1bf872b766551 100644
--- a/packages/next/export/index.ts
+++ b/packages/next/export/index.ts
@@ -243,7 +243,9 @@ export default async function(
   }
 
   const progress = !options.silent && createProgress(filteredPaths.length)
-  const sprDataDir = options.buildExport ? outDir : join(outDir, '_next/data')
+  const sprDataDir = options.buildExport
+    ? outDir
+    : join(outDir, '_next/data', buildId)
 
   const ampValidations: AmpPageStatus = {}
   let hadValidationError = false
diff --git a/packages/next/next-server/lib/router/router.ts b/packages/next/next-server/lib/router/router.ts
index 7735dd9de2f42..da7d44b3fe544 100644
--- a/packages/next/next-server/lib/router/router.ts
+++ b/packages/next/next-server/lib/router/router.ts
@@ -623,9 +623,14 @@ export default class Router implements BaseRouter {
       (Component as any).__NEXT_SPR
     ) {
       let status: any
-      const { pathname } = parse(ctx.asPath || ctx.pathname)
+      // pathname should have leading slash
+      let { pathname } = parse(ctx.asPath || ctx.pathname)
+      pathname = !pathname || pathname === '/' ? '/index' : pathname
 
-      props = await fetch(`/_next/data${pathname}.json`)
+      props = await fetch(
+        // @ts-ignore __NEXT_DATA__
+        `/_next/data/${__NEXT_DATA__.buildId}${pathname}.json`
+      )
         .then(res => {
           if (!res.ok) {
             status = res.status
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
index 50704b0e8033a..c7e18d36becc1 100644
--- a/packages/next/next-server/server/next-server.ts
+++ b/packages/next/next-server/server/next-server.ts
@@ -252,10 +252,24 @@ export default class Server {
       {
         match: route('/_next/data/:path*'),
         fn: async (req, res, params, _parsedUrl) => {
-          // Make sure to 404 for /_next/data/ itself
-          if (!params.path) return this.render404(req, res, _parsedUrl)
-          // TODO: force `.json` to be present
-          const pathname = `/${params.path.join('/')}`.replace(/\.json$/, '')
+          // Make sure to 404 for /_next/data/ itself and
+          // we also want to 404 if the buildId isn't correct
+          if (!params.path || params.path[0] !== this.buildId) {
+            return this.render404(req, res, _parsedUrl)
+          }
+          // remove buildId from URL
+          params.path.shift()
+
+          // show 404 if it doesn't end with .json
+          if (!params.path[params.path.length - 1].endsWith('.json')) {
+            return this.render404(req, res, _parsedUrl)
+          }
+
+          // re-create page's pathname
+          const pathname = `/${params.path.join('/')}`
+            .replace(/\.json$/, '')
+            .replace(/\/index$/, '/')
+
           req.url = pathname
           const parsedUrl = parseUrl(pathname, true)
           await this.render(
@@ -601,8 +615,9 @@ export default class Server {
     // Serverless requests need its URL transformed back into the original
     // request path (to emulate lambda behavior in production)
     if (isLikeServerless && isSprData) {
-      const curUrl = parseUrl(req.url || '', true)
-      req.url = `/_next/data${curUrl.pathname}.json`
+      let { pathname } = parseUrl(req.url || '', true)
+      pathname = !pathname || pathname === '/' ? '/index' : pathname
+      req.url = `/_next/data/${this.buildId}${pathname}.json`
     }
 
     const doRender = withCoalescedInvoke(async function(): Promise<{
diff --git a/test/integration/prerender/test/index.test.js b/test/integration/prerender/test/index.test.js
index f1f4b6272cc8e..696d1ccabb409 100644
--- a/test/integration/prerender/test/index.test.js
+++ b/test/integration/prerender/test/index.test.js
@@ -20,9 +20,58 @@ const appDir = join(__dirname, '..')
 const nextConfig = join(appDir, 'next.config.js')
 let app
 let appPort
+let buildId
 let distPagesDir
 let exportDir
 
+const expectedManifestRoutes = () => ({
+  '/': {
+    dataRoute: `/_next/data/${buildId}/index.json`,
+    initialRevalidateSeconds: 1,
+    srcRoute: null
+  },
+  '/blog/[post3]': {
+    dataRoute: `/_next/data/${buildId}/blog/[post3].json`,
+    initialRevalidateSeconds: 10,
+    srcRoute: '/blog/[post]'
+  },
+  '/blog/post-1': {
+    dataRoute: `/_next/data/${buildId}/blog/post-1.json`,
+    initialRevalidateSeconds: 10,
+    srcRoute: '/blog/[post]'
+  },
+  '/blog/post-2': {
+    dataRoute: `/_next/data/${buildId}/blog/post-2.json`,
+    initialRevalidateSeconds: 10,
+    srcRoute: '/blog/[post]'
+  },
+  '/blog/post-1/comment-1': {
+    dataRoute: `/_next/data/${buildId}/blog/post-1/comment-1.json`,
+    initialRevalidateSeconds: 2,
+    srcRoute: '/blog/[post]/[comment]'
+  },
+  '/blog/post-2/comment-2': {
+    dataRoute: `/_next/data/${buildId}/blog/post-2/comment-2.json`,
+    initialRevalidateSeconds: 2,
+    srcRoute: '/blog/[post]/[comment]'
+  },
+  '/another': {
+    dataRoute: `/_next/data/${buildId}/another.json`,
+    initialRevalidateSeconds: 0,
+    srcRoute: null
+  },
+  '/default-revalidate': {
+    dataRoute: `/_next/data/${buildId}/default-revalidate.json`,
+    initialRevalidateSeconds: 1,
+    srcRoute: null
+  },
+  '/something': {
+    dataRoute: `/_next/data/${buildId}/something.json`,
+    initialRevalidateSeconds: false,
+    srcRoute: null
+  }
+})
+
 const navigateTest = () => {
   it('should navigate between pages successfully', async () => {
     const browser = await webdriver(appPort, '/')
@@ -36,16 +85,19 @@ const navigateTest = () => {
     expect(text).toMatch(/hello.*?world/)
 
     // go to /
+    await browser.eval('window.didTransition = 1')
     await browser.elementByCss('#home').click()
     await browser.waitForElementByCss('#another')
     text = await browser.elementByCss('p').text()
     expect(text).toMatch(/hello.*?world/)
+    expect(await browser.eval('window.didTransition')).toBe(1)
 
     // go to /something
     await browser.elementByCss('#something').click()
     await browser.waitForElementByCss('#home')
     text = await browser.elementByCss('p').text()
     expect(text).toMatch(/hello.*?world/)
+    expect(await browser.eval('window.didTransition')).toBe(1)
 
     // go to /
     await browser.elementByCss('#home').click()
@@ -56,6 +108,7 @@ const navigateTest = () => {
     await browser.waitForElementByCss('#home')
     text = await browser.elementByCss('p').text()
     expect(text).toMatch(/Post:.*?post-1/)
+    expect(await browser.eval('window.didTransition')).toBe(1)
 
     // go to /
     await browser.elementByCss('#home').click()
@@ -66,6 +119,7 @@ const navigateTest = () => {
     await browser.waitForElementByCss('#home')
     text = await browser.elementByCss('p:nth-child(2)').text()
     expect(text).toMatch(/Comment:.*?comment-1/)
+    expect(await browser.eval('window.didTransition')).toBe(1)
 
     await browser.close()
   })
@@ -86,21 +140,33 @@ const runTests = (dev = false) => {
 
   it('should return data correctly', async () => {
     const data = JSON.parse(
-      await renderViaHTTP(appPort, '/_next/data/something.json')
+      await renderViaHTTP(
+        appPort,
+        expectedManifestRoutes()['/something'].dataRoute
+      )
     )
     expect(data.pageProps.world).toBe('world')
   })
 
   it('should return data correctly for dynamic page', async () => {
     const data = JSON.parse(
-      await renderViaHTTP(appPort, '/_next/data/blog/post-1.json')
+      await renderViaHTTP(
+        appPort,
+        expectedManifestRoutes()['/blog/post-1'].dataRoute
+      )
     )
     expect(data.pageProps.post).toBe('post-1')
   })
 
   it('should return data correctly for dynamic page (non-seeded)', async () => {
     const data = JSON.parse(
-      await renderViaHTTP(appPort, '/_next/data/blog/post-3.json')
+      await renderViaHTTP(
+        appPort,
+        expectedManifestRoutes()['/blog/post-1'].dataRoute.replace(
+          /post-1/,
+          'post-3'
+        )
+      )
     )
     expect(data.pageProps.post).toBe('post-3')
   })
@@ -147,66 +213,22 @@ const runTests = (dev = false) => {
     })
   } else {
     it('outputs a prerender-manifest correctly', async () => {
-      const manifest = require(join(appDir, '.next', 'prerender-manifest.json'))
+      const manifest = JSON.parse(
+        await fs.readFile(join(appDir, '.next/prerender-manifest.json'), 'utf8')
+      )
+      const escapedBuildId = buildId.replace(/[|\\{}()[\]^$+*?.-]/g, '\\$&')
 
       expect(manifest.version).toBe(1)
-      expect(manifest.routes).toEqual({
-        '/': {
-          dataRoute: '/_next/data/index.json',
-          initialRevalidateSeconds: 1,
-          srcRoute: null
-        },
-        '/blog/[post3]': {
-          dataRoute: '/_next/data/blog/[post3].json',
-          initialRevalidateSeconds: 10,
-          srcRoute: '/blog/[post]'
-        },
-        '/blog/post-1': {
-          dataRoute: '/_next/data/blog/post-1.json',
-          initialRevalidateSeconds: 10,
-          srcRoute: '/blog/[post]'
-        },
-        '/blog/post-2': {
-          dataRoute: '/_next/data/blog/post-2.json',
-          initialRevalidateSeconds: 10,
-          srcRoute: '/blog/[post]'
-        },
-        '/blog/post-1/comment-1': {
-          dataRoute: '/_next/data/blog/post-1/comment-1.json',
-          initialRevalidateSeconds: 2,
-          srcRoute: '/blog/[post]/[comment]'
-        },
-        '/blog/post-2/comment-2': {
-          dataRoute: '/_next/data/blog/post-2/comment-2.json',
-          initialRevalidateSeconds: 2,
-          srcRoute: '/blog/[post]/[comment]'
-        },
-        '/another': {
-          dataRoute: '/_next/data/another.json',
-          initialRevalidateSeconds: 0,
-          srcRoute: null
-        },
-        '/default-revalidate': {
-          dataRoute: '/_next/data/default-revalidate.json',
-          initialRevalidateSeconds: 1,
-          srcRoute: null
-        },
-        '/something': {
-          dataRoute: '/_next/data/something.json',
-          initialRevalidateSeconds: false,
-          srcRoute: null
-        }
-      })
+      expect(manifest.routes).toEqual(expectedManifestRoutes())
       expect(manifest.dynamicRoutes).toEqual({
         '/blog/[post]': {
-          dataRoute: '/_next/data/blog/[post].json',
-          dataRouteRegex: '^\\/_next\\/data\\/blog\\/([^\\/]+?)\\.json$',
+          dataRoute: `/_next/data/${buildId}/blog/[post].json`,
+          dataRouteRegex: `^\\/_next\\/data\\/${escapedBuildId}\\/blog\\/([^\\/]+?)\\.json$`,
           routeRegex: '^\\/blog\\/([^\\/]+?)(?:\\/)?$'
         },
         '/blog/[post]/[comment]': {
-          dataRoute: '/_next/data/blog/[post]/[comment].json',
-          dataRouteRegex:
-            '^\\/_next\\/data\\/blog\\/([^\\/]+?)\\/([^\\/]+?)\\.json$',
+          dataRoute: `/_next/data/${buildId}/blog/[post]/[comment].json`,
+          dataRouteRegex: `^\\/_next\\/data\\/${escapedBuildId}\\/blog\\/([^\\/]+?)\\/([^\\/]+?)\\.json$`,
           routeRegex: '^\\/blog\\/([^\\/]+?)\\/([^\\/]+?)(?:\\/)?$'
         }
       })
@@ -254,7 +276,7 @@ const runTests = (dev = false) => {
     })
 
     it('should handle revalidating JSON correctly', async () => {
-      const route = '/_next/data/blog/post-2/comment-3'
+      const route = `/_next/data/${buildId}/blog/post-2/comment-3.json`
       const initialJson = await renderViaHTTP(appPort, route)
       expect(initialJson).toMatch(/post-2/)
       expect(initialJson).toMatch(/comment-3/)
@@ -276,6 +298,7 @@ describe('SPR Prerender', () => {
     beforeAll(async () => {
       appPort = await findPort()
       app = await launchApp(appDir, appPort)
+      buildId = 'development'
     })
     afterAll(() => killApp(app))
 
@@ -293,6 +316,7 @@ describe('SPR Prerender', () => {
       appPort = await findPort()
       app = await nextStart(appDir, appPort)
       distPagesDir = join(appDir, '.next/serverless/pages')
+      buildId = await fs.readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
     })
     afterAll(() => killApp(app))
 
@@ -307,7 +331,7 @@ describe('SPR Prerender', () => {
       await nextBuild(appDir)
       appPort = await findPort()
       app = await nextStart(appDir, appPort)
-      const buildId = await fs.readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
+      buildId = await fs.readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
       distPagesDir = join(appDir, '.next/server/static', buildId, 'pages')
     })
     afterAll(() => killApp(app))
@@ -322,6 +346,7 @@ describe('SPR Prerender', () => {
       await nextExport(appDir, { outdir: exportDir })
       app = await startStaticServer(exportDir)
       appPort = app.address().port
+      buildId = await fs.readFile(join(appDir, '.next/BUILD_ID'), 'utf8')
     })
     afterAll(() => killApp(app))
 
@@ -335,7 +360,7 @@ describe('SPR Prerender', () => {
 
       for (const route of routes) {
         await fs.access(join(exportDir, `${route}.html`))
-        await fs.access(join(exportDir, '_next/data', `${route}.json`))
+        await fs.access(join(exportDir, '_next/data', buildId, `${route}.json`))
       }
     })
 

From de670b383488f4c792516ba4fe3bb99fc3ac9107 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Thu, 10 Oct 2019 13:18:07 -0400
Subject: [PATCH 12/31] Do Not Rely on Module State (#8968)

* Do Not Rely on Module State

* Update storage.ts
---
 packages/next/build/index.ts              |  42 +--
 packages/next/cli/next-telemetry.ts       |  10 +-
 packages/next/export/index.ts             |   8 +-
 packages/next/server/next-dev-server.ts   |   8 +-
 packages/next/telemetry/events/build.ts   |  18 +-
 packages/next/telemetry/events/plugins.ts |  47 +--
 packages/next/telemetry/events/version.ts |  26 +-
 packages/next/telemetry/project-id.ts     |  12 +-
 packages/next/telemetry/storage.ts        | 332 +++++++++++-----------
 9 files changed, 251 insertions(+), 252 deletions(-)

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index 70ccd61ae869e..a7bd15cbdb757 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -25,12 +25,12 @@ import loadConfig, {
   isTargetLikeServerless,
 } from '../next-server/server/config'
 import {
-  recordBuildDuration,
-  recordBuildOptimize,
-  recordNextPlugins,
-  recordVersion,
+  eventBuildDuration,
+  eventBuildOptimize,
+  eventNextPlugins,
+  eventVersion,
 } from '../telemetry/events'
-import { setDistDir as setTelemetryDir } from '../telemetry/storage'
+import { Telemetry } from '../telemetry/storage'
 import { CompilerResult, runCompiler } from './compiler'
 import { createEntrypoints, createPagesMapping } from './entries'
 import { generateBuildId } from './generate-build-id'
@@ -91,7 +91,9 @@ export default async function build(dir: string, conf = null): Promise<void> {
   const { target } = config
   const buildId = await generateBuildId(config.generateBuildId, nanoid)
   const distDir = path.join(dir, config.distDir)
-  setTelemetryDir(distDir)
+
+  const telemetry = new Telemetry({ distDir })
+
   const publicDir = path.join(dir, 'public')
   const pagesDir = findPagesDir(dir)
   let publicFiles: string[] = []
@@ -99,8 +101,8 @@ export default async function build(dir: string, conf = null): Promise<void> {
 
   let backgroundWork: (Promise<any> | undefined)[] = []
   backgroundWork.push(
-    recordVersion({ cliCommand: 'build' }),
-    recordNextPlugins(path.resolve(dir))
+    telemetry.record(eventVersion({ cliCommand: 'build' })),
+    eventNextPlugins(path.resolve(dir)).then(events => telemetry.record(events))
   )
 
   await verifyTypeScriptSetup(dir, pagesDir)
@@ -273,10 +275,12 @@ export default async function build(dir: string, conf = null): Promise<void> {
   } else {
     console.log(chalk.green('Compiled successfully.\n'))
     backgroundWork.push(
-      recordBuildDuration({
-        totalPageCount: pagePaths.length,
-        durationInSeconds: webpackBuildEnd[0],
-      })
+      telemetry.record(
+        eventBuildDuration({
+          totalPageCount: pagePaths.length,
+          durationInSeconds: webpackBuildEnd[0],
+        })
+      )
     )
   }
 
@@ -572,12 +576,14 @@ export default async function build(dir: string, conf = null): Promise<void> {
 
   const analysisEnd = process.hrtime(analysisBegin)
   backgroundWork.push(
-    recordBuildOptimize({
-      durationInSeconds: analysisEnd[0],
-      totalPageCount: pagePaths.length,
-      staticPageCount: staticPages.size,
-      ssrPageCount: pagePaths.length - staticPages.size,
-    })
+    telemetry.record(
+      eventBuildOptimize({
+        durationInSeconds: analysisEnd[0],
+        totalPageCount: pagePaths.length,
+        staticPageCount: staticPages.size,
+        ssrPageCount: pagePaths.length - staticPages.size,
+      })
+    )
   )
 
   if (sprPages.size > 0) {
diff --git a/packages/next/cli/next-telemetry.ts b/packages/next/cli/next-telemetry.ts
index 807d79de1a203..d118263611f37 100755
--- a/packages/next/cli/next-telemetry.ts
+++ b/packages/next/cli/next-telemetry.ts
@@ -3,7 +3,7 @@ import chalk from 'chalk'
 import arg from 'next/dist/compiled/arg/index.js'
 
 import { cliCommand } from '../bin/next'
-import { setTelemetryEnabled, isTelemetryEnabled } from '../telemetry/storage'
+import { Telemetry } from '../telemetry/storage'
 
 const nextTelemetry: cliCommand = argv => {
   const args = arg(
@@ -35,16 +35,18 @@ const nextTelemetry: cliCommand = argv => {
     return
   }
 
-  let isEnabled = isTelemetryEnabled()
+  const telemetry = new Telemetry({ distDir: process.cwd() })
+
+  let isEnabled = telemetry.isEnabled
 
   if (args['--enable'] || args._[0] === 'enable') {
-    setTelemetryEnabled(true)
+    telemetry.setEnabled(true)
     console.log(chalk.cyan('Success!'))
     console.log()
 
     isEnabled = true
   } else if (args['--disable'] || args._[0] === 'disable') {
-    setTelemetryEnabled(false)
+    telemetry.setEnabled(false)
     if (isEnabled) {
       console.log(chalk.cyan('Your preference has been saved.'))
     } else {
diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
index 1bf872b766551..6205d11d071c2 100644
--- a/packages/next/export/index.ts
+++ b/packages/next/export/index.ts
@@ -25,8 +25,8 @@ import {
 import loadConfig, {
   isTargetLikeServerless,
 } from '../next-server/server/config'
-import { recordVersion } from '../telemetry/events'
-import { setDistDir as setTelemetryDir } from '../telemetry/storage'
+import { eventVersion } from '../telemetry/events'
+import { Telemetry } from '../telemetry/storage'
 
 const mkdirp = promisify(mkdirpModule)
 const copyFile = promisify(copyFileOrig)
@@ -94,8 +94,8 @@ export default async function(
   const threads = options.threads || Math.max(cpus().length - 1, 1)
   const distDir = join(dir, nextConfig.distDir)
   if (!options.buildExport) {
-    setTelemetryDir(distDir)
-    recordVersion({ cliCommand: 'export' })
+    const telemetry = new Telemetry({ distDir })
+    telemetry.record(eventVersion({ cliCommand: 'export' }))
   }
 
   const subFolders = nextConfig.exportTrailingSlash
diff --git a/packages/next/server/next-dev-server.ts b/packages/next/server/next-dev-server.ts
index 8d68ddb0e0ebe..fd0c142b2545d 100644
--- a/packages/next/server/next-dev-server.ts
+++ b/packages/next/server/next-dev-server.ts
@@ -22,8 +22,8 @@ import {
 import Server, { ServerConstructor } from '../next-server/server/next-server'
 import { normalizePagePath } from '../next-server/server/normalize-page-path'
 import { route } from '../next-server/server/router'
-import { recordVersion } from '../telemetry/events'
-import { setDistDir as setTelemetryDir } from '../telemetry/storage'
+import { eventVersion } from '../telemetry/events'
+import { Telemetry } from '../telemetry/storage'
 import ErrorDebug from './error-debug'
 import HotReloader from './hot-reloader'
 import { findPageFile } from './lib/find-page-file'
@@ -206,8 +206,8 @@ export default class DevServer extends Server {
     await this.startWatcher()
     this.setDevReady!()
 
-    setTelemetryDir(this.distDir)
-    recordVersion({ cliCommand: 'dev' })
+    const telemetry = new Telemetry({ distDir: this.distDir })
+    telemetry.record(eventVersion({ cliCommand: 'dev' }))
   }
 
   protected async close() {
diff --git a/packages/next/telemetry/events/build.ts b/packages/next/telemetry/events/build.ts
index 90ceb8a865b2c..b413f0b3b86a4 100644
--- a/packages/next/telemetry/events/build.ts
+++ b/packages/next/telemetry/events/build.ts
@@ -1,16 +1,16 @@
-import { record } from '../storage'
-
 const EVENT_BUILD_DURATION = 'NEXT_BUILD_COMPLETED'
 type EventBuildCompleted = {
   durationInSeconds: number
   totalPageCount: number
 }
 
-export function recordBuildDuration(event: EventBuildCompleted) {
-  return record({
+export function eventBuildDuration(
+  event: EventBuildCompleted
+): { eventName: string; payload: EventBuildCompleted } {
+  return {
     eventName: EVENT_BUILD_DURATION,
     payload: event,
-  })
+  }
 }
 
 const EVENT_BUILD_OPTIMIZE = 'NEXT_BUILD_OPTIMIZED'
@@ -21,9 +21,11 @@ type EventBuildOptimized = {
   ssrPageCount: number
 }
 
-export function recordBuildOptimize(event: EventBuildOptimized) {
-  return record({
+export function eventBuildOptimize(
+  event: EventBuildOptimized
+): { eventName: string; payload: EventBuildOptimized } {
+  return {
     eventName: EVENT_BUILD_OPTIMIZE,
     payload: event,
-  })
+  }
 }
diff --git a/packages/next/telemetry/events/plugins.ts b/packages/next/telemetry/events/plugins.ts
index befe0b2a75561..56c00011c2922 100644
--- a/packages/next/telemetry/events/plugins.ts
+++ b/packages/next/telemetry/events/plugins.ts
@@ -1,4 +1,3 @@
-import { record } from '../storage'
 import findUp from 'find-up'
 
 const EVENT_PLUGIN_PRESENT = 'NEXT_PACKAGE_DETECTED'
@@ -159,32 +158,34 @@ const plugins = [
   '@apollo/react-ssr',
 ]
 
-export async function recordNextPlugins(dir: string) {
+export async function eventNextPlugins(
+  dir: string
+): Promise<Array<{ eventName: string; payload: EventPackageDetected }>> {
   try {
     const packageJsonPath = await findUp('package.json', { cwd: dir })
     if (!packageJsonPath) {
-      return
+      return []
     }
 
     const { dependencies = {}, devDependencies = {} } = require(packageJsonPath)
-    return record(
-      (plugins
-        .map(plugin => {
-          const version = dependencies[plugin] || devDependencies[plugin]
-          if (version) {
-            return { pluginName: plugin, pluginVersion: version }
-          }
-        })
-        .filter(Boolean) as {
-        pluginName: string
-        pluginVersion: string
-      }[]).map(({ pluginName, pluginVersion }) => ({
-        eventName: EVENT_PLUGIN_PRESENT,
-        payload: {
-          packageName: pluginName,
-          packageVersion: pluginVersion,
-        } as EventPackageDetected,
-      }))
-    )
-  } catch (_) {}
+    return (plugins
+      .map(plugin => {
+        const version = dependencies[plugin] || devDependencies[plugin]
+        if (version) {
+          return { pluginName: plugin, pluginVersion: version }
+        }
+      })
+      .filter(Boolean) as {
+      pluginName: string
+      pluginVersion: string
+    }[]).map(({ pluginName, pluginVersion }) => ({
+      eventName: EVENT_PLUGIN_PRESENT,
+      payload: {
+        packageName: pluginName,
+        packageVersion: pluginVersion,
+      } as EventPackageDetected,
+    }))
+  } catch (_) {
+    return []
+  }
 }
diff --git a/packages/next/telemetry/events/version.ts b/packages/next/telemetry/events/version.ts
index 5e978e0773fd3..e8490af39180a 100644
--- a/packages/next/telemetry/events/version.ts
+++ b/packages/next/telemetry/events/version.ts
@@ -1,5 +1,3 @@
-import { record } from '../storage'
-
 const EVENT_VERSION = 'NEXT_CLI_SESSION_STARTED'
 
 type EventCliSessionStarted = {
@@ -8,20 +6,22 @@ type EventCliSessionStarted = {
   cliCommand: string
 }
 
-export function recordVersion(
+export function eventVersion(
   event: Omit<EventCliSessionStarted, 'nextVersion' | 'nodeVersion'>
-) {
+): { eventName: string; payload: EventCliSessionStarted }[] {
   // This should be an invariant, if it fails our build tooling is broken.
   if (typeof process.env.__NEXT_VERSION !== 'string') {
-    return Promise.resolve()
+    return []
   }
 
-  return record({
-    eventName: EVENT_VERSION,
-    payload: {
-      nextVersion: process.env.__NEXT_VERSION,
-      nodeVersion: process.version,
-      cliCommand: event.cliCommand,
-    } as EventCliSessionStarted,
-  })
+  return [
+    {
+      eventName: EVENT_VERSION,
+      payload: {
+        nextVersion: process.env.__NEXT_VERSION,
+        nodeVersion: process.version,
+        cliCommand: event.cliCommand,
+      } as EventCliSessionStarted,
+    },
+  ]
 }
diff --git a/packages/next/telemetry/project-id.ts b/packages/next/telemetry/project-id.ts
index 0ad0b7e87cec2..5c307ef02b576 100644
--- a/packages/next/telemetry/project-id.ts
+++ b/packages/next/telemetry/project-id.ts
@@ -1,5 +1,4 @@
 import { execSync } from 'child_process'
-import { computeHash } from './storage'
 
 // Q: Why does Next.js need a project ID? Why is it looking at my git remote?
 // A:
@@ -28,13 +27,6 @@ function _getProjectIdByGit() {
   }
 }
 
-export function getProjectId(): string {
-  const projectId =
-    _getProjectIdByGit() || process.env.REPOSITORY_URL || process.cwd()
-
-  // Compute a one-way, salted hash of the project ID. This value cannot be
-  // reversed.
-  // See the top of the file for a more detailed reason why we ask for this
-  // data.
-  return computeHash(projectId.trim().toLowerCase()) || ''
+export function getRawProjectId(): string {
+  return _getProjectIdByGit() || process.env.REPOSITORY_URL || process.cwd()
 }
diff --git a/packages/next/telemetry/storage.ts b/packages/next/telemetry/storage.ts
index d341c0d9fcd53..e41ca12653d3d 100644
--- a/packages/next/telemetry/storage.ts
+++ b/packages/next/telemetry/storage.ts
@@ -7,13 +7,7 @@ import path from 'path'
 import { getAnonymousMeta } from './anonymous-meta'
 import * as ciEnvironment from './ci-info'
 import { _postPayload } from './post-payload'
-import { getProjectId } from './project-id'
-
-let distDir: string | undefined
-
-let config: Conf<any> | undefined
-let projectId: string | undefined
-let randomRunId: string | undefined
+import { getRawProjectId } from './project-id'
 
 // This is the key that stores whether or not telemetry is enabled or disabled.
 const TELEMETRY_KEY_ENABLED = 'telemetry.enabled'
@@ -29,201 +23,203 @@ const TELEMETRY_KEY_ID = `telemetry.anonymousId`
 // This is the cryptographic salt that is included within every hashed value.
 // This salt value is never sent to us, ensuring privacy and the one-way nature
 // of the hash (prevents dictionary lookups of pre-computed hashes).
-// See the `computeHash` function.
+// See the `oneWayHash` function.
 const TELEMETRY_KEY_SALT = `telemetry.salt`
 
 const { NEXT_TELEMETRY_DISABLED, NEXT_TELEMETRY_DEBUG } = process.env
 
-let isDisabled: boolean = !!NEXT_TELEMETRY_DISABLED
-
-function notify() {
-  // No notification needed if telemetry is not enabled
-  if (!config || isDisabled) {
-    return
-  }
-
-  // The end-user has already been notified about our telemetry integration. We
-  // don't need to constantly annoy them about it.
-  // We will re-inform users about the telemetry if significant changes are
-  // ever made.
-  if (config.get(TELEMETRY_KEY_NOTIFY_DATE, '')) {
-    return
-  }
-
-  config.set(TELEMETRY_KEY_NOTIFY_DATE, Date.now().toString())
-
-  console.log(
-    `${chalk.magenta.bold(
-      'Attention'
-    )}: Next.js now collects completely anonymous telemetry regarding usage.`
-  )
-  console.log(
-    `This information is used to shape Next.js' roadmap and prioritize features.`
-  )
-  console.log(
-    `You can learn more, including how to opt-out if you'd not like to participate in this anonymous program, by visiting the following URL:`
-  )
-  console.log(chalk.cyan('https://nextjs.org/telemetry'))
-  console.log()
+type TelemetryEvent = { eventName: string; payload: object }
+type EventContext = {
+  anonymousId: string
+  projectId: string
+  sessionId: string
+}
+type EventMeta = { [key: string]: unknown }
+type EventBatchShape = {
+  eventName: string
+  fields: object
 }
 
-function setup() {
-  if (config) {
-    return
-  }
+export class Telemetry {
+  private conf: Conf<any>
+  private sessionId: string
+  private rawProjectId: string
 
-  const cwd =
-    (ciEnvironment.isCI || isDockerFunction()) && distDir
-      ? path.join(distDir, 'cache')
-      : undefined
+  constructor({ distDir }: { distDir: string }) {
+    const storageDirectory = getStorageDirectory(distDir)
 
-  config = new Conf({ projectName: 'nextjs', cwd })
+    this.conf = new Conf({ projectName: 'nextjs', cwd: storageDirectory })
+    this.sessionId = randomBytes(32).toString('hex')
+    this.rawProjectId = getRawProjectId()
 
-  let anonymousId = config.get(TELEMETRY_KEY_ID)
-  if (!anonymousId) {
-    config.set(
-      TELEMETRY_KEY_ID,
-      (anonymousId = randomBytes(32).toString('hex'))
-    )
+    this.notify()
   }
 
-  if (!config.get(TELEMETRY_KEY_SALT)) {
-    config.set(TELEMETRY_KEY_SALT, randomBytes(16).toString('hex'))
+  private notify = () => {
+    if (this.isDisabled) {
+      return
+    }
+
+    // The end-user has already been notified about our telemetry integration. We
+    // don't need to constantly annoy them about it.
+    // We will re-inform users about the telemetry if significant changes are
+    // ever made.
+    if (this.conf.get(TELEMETRY_KEY_NOTIFY_DATE, '')) {
+      return
+    }
+    this.conf.set(TELEMETRY_KEY_NOTIFY_DATE, Date.now().toString())
+
+    console.log(
+      `${chalk.magenta.bold(
+        'Attention'
+      )}: Next.js now collects completely anonymous telemetry regarding usage.`
+    )
+    console.log(
+      `This information is used to shape Next.js' roadmap and prioritize features.`
+    )
+    console.log(
+      `You can learn more, including how to opt-out if you'd not like to participate in this anonymous program, by visiting the following URL:`
+    )
+    console.log(chalk.cyan('https://nextjs.org/telemetry'))
+    console.log()
   }
 
-  projectId = getProjectId()
-  randomRunId = randomBytes(8).toString('hex')
+  get anonymousId(): string {
+    const val = this.conf.get(TELEMETRY_KEY_ID)
+    if (val) {
+      return val
+    }
 
-  if (config.get(TELEMETRY_KEY_ENABLED, true) === false) {
-    isDisabled = true
+    const generated = randomBytes(32).toString('hex')
+    this.conf.set(TELEMETRY_KEY_ID, generated)
+    return generated
   }
 
-  notify()
-}
-
-export function setDistDir(_distDir: string) {
-  distDir = _distDir
-}
-
-export function computeHash(payload: BinaryLike): string | null {
-  setup()
+  get salt(): string {
+    const val = this.conf.get(TELEMETRY_KEY_SALT)
+    if (val) {
+      return val
+    }
 
-  const salt = config!.get(TELEMETRY_KEY_SALT)
-  if (!salt) {
-    return null
+    const generated = randomBytes(16).toString('hex')
+    this.conf.set(TELEMETRY_KEY_SALT, generated)
+    return generated
   }
 
-  const hash = createHash('sha256')
-
-  // Always prepend the payload value with salt. This ensures the hash is truly
-  // one-way.
-  hash.update(salt)
-
-  // Update is an append operation, not a replacement. The salt from the prior
-  // update is still present!
-  hash.update(payload)
-  return hash.digest('hex')
-}
-
-export function setTelemetryEnabled(_enabled: boolean) {
-  setup()
-
-  const enabled = !!_enabled
-  config!.set(TELEMETRY_KEY_ENABLED, enabled)
-  isDisabled = !enabled
-}
-
-export function isTelemetryEnabled(): boolean {
-  setup()
-
-  return config!.get(TELEMETRY_KEY_ENABLED, true) !== false
-}
+  private get isDisabled(): boolean {
+    if (!!NEXT_TELEMETRY_DISABLED) {
+      return true
+    }
+    return this.conf.get(TELEMETRY_KEY_ENABLED, true) === false
+  }
 
-type TelemetryEvent = { eventName: string; payload: object }
-type EventContext = {
-  anonymousId: string
-  projectId: string
-  sessionId: string
-}
-type EventMeta = { [key: string]: unknown }
-type EventBatchShape = {
-  eventName: string
-  fields: object
-}
-function _record(_events: TelemetryEvent | TelemetryEvent[]): Promise<any> {
-  let events: TelemetryEvent[]
-  if (Array.isArray(_events)) {
-    events = _events
-  } else {
-    events = [_events]
+  setEnabled = (_enabled: boolean) => {
+    const enabled = !!_enabled
+    this.conf.set(TELEMETRY_KEY_ENABLED, enabled)
   }
 
-  if (events.length < 1) {
-    return Promise.resolve()
+  get isEnabled(): boolean {
+    return this.conf.get(TELEMETRY_KEY_ENABLED, true) !== false
   }
 
-  setup()
+  oneWayHash = (payload: BinaryLike): string => {
+    const hash = createHash('sha256')
 
-  if (NEXT_TELEMETRY_DEBUG) {
-    // Print to standard error to simplify selecting the output
-    events.forEach(({ eventName, payload }) =>
-      console.error(
-        `[telemetry] ` + JSON.stringify({ eventName, payload }, null, 2)
-      )
-    )
-    // Do not send the telemetry data if debugging. Users may use this feature
-    // to preview what data would be sent.
-    return Promise.resolve()
+    // Always prepend the payload value with salt. This ensures the hash is truly
+    // one-way.
+    hash.update(this.salt)
+
+    // Update is an append operation, not a replacement. The salt from the prior
+    // update is still present!
+    hash.update(payload)
+    return hash.digest('hex')
   }
 
-  // Skip recording telemetry if the feature is disabled
-  if (isDisabled) {
-    return Promise.resolve()
+  private get projectId(): string {
+    return this.oneWayHash(this.rawProjectId)
   }
 
-  const anonymousId = config!.get(TELEMETRY_KEY_ID)
-  if (!anonymousId) {
-    return Promise.resolve()
+  record = (
+    _events: TelemetryEvent | TelemetryEvent[]
+  ): Promise<{
+    isFulfilled: boolean
+    isRejected: boolean
+    value?: any
+    reason?: any
+  }> => {
+    const _this = this
+    // pseudo try-catch
+    async function wrapper() {
+      return await _this.submitRecord(_events)
+    }
+
+    return wrapper()
+      .then(value => ({
+        isFulfilled: true,
+        isRejected: false,
+        value,
+      }))
+      .catch(reason => ({
+        isFulfilled: false,
+        isRejected: true,
+        reason,
+      }))
   }
 
-  const context: EventContext = {
-    anonymousId: anonymousId,
-    projectId: projectId!,
-    sessionId: randomRunId!,
+  private submitRecord = (
+    _events: TelemetryEvent | TelemetryEvent[]
+  ): Promise<any> => {
+    let events: TelemetryEvent[]
+    if (Array.isArray(_events)) {
+      events = _events
+    } else {
+      events = [_events]
+    }
+
+    if (events.length < 1) {
+      return Promise.resolve()
+    }
+
+    if (NEXT_TELEMETRY_DEBUG) {
+      // Print to standard error to simplify selecting the output
+      events.forEach(({ eventName, payload }) =>
+        console.error(
+          `[telemetry] ` + JSON.stringify({ eventName, payload }, null, 2)
+        )
+      )
+      // Do not send the telemetry data if debugging. Users may use this feature
+      // to preview what data would be sent.
+      return Promise.resolve()
+    }
+
+    // Skip recording telemetry if the feature is disabled
+    if (this.isDisabled) {
+      return Promise.resolve()
+    }
+
+    const context: EventContext = {
+      anonymousId: this.anonymousId,
+      projectId: this.projectId,
+      sessionId: this.sessionId,
+    }
+    const meta: EventMeta = getAnonymousMeta()
+    return _postPayload(`https://telemetry.nextjs.org/api/v1/record`, {
+      context,
+      meta,
+      events: events.map(({ eventName, payload }) => ({
+        eventName,
+        fields: payload,
+      })) as Array<EventBatchShape>,
+    })
   }
-  const meta: EventMeta = getAnonymousMeta()
-  return _postPayload(`https://telemetry.nextjs.org/api/v1/record`, {
-    context,
-    meta,
-    events: events.map(({ eventName, payload }) => ({
-      eventName,
-      fields: payload,
-    })) as Array<EventBatchShape>,
-  })
 }
 
-export function record(
-  _events: TelemetryEvent | TelemetryEvent[]
-): Promise<{
-  isFulfilled: boolean
-  isRejected: boolean
-  value?: any
-  reason?: any
-}> {
-  // pseudo try-catch
-  async function wrapper() {
-    return await _record(_events)
+function getStorageDirectory(distDir: string): string | undefined {
+  const isLikelyEphemeral = ciEnvironment.isCI || isDockerFunction()
+
+  if (isLikelyEphemeral) {
+    return path.join(distDir, 'cache')
   }
 
-  return wrapper()
-    .then(value => ({
-      isFulfilled: true,
-      isRejected: false,
-      value,
-    }))
-    .catch(reason => ({
-      isFulfilled: false,
-      isRejected: true,
-      reason,
-    }))
+  return undefined
 }

From 9ff7339e0d55fafc68bd39d01ad1e57b99c38366 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Thu, 10 Oct 2019 20:30:04 +0200
Subject: [PATCH 13/31] Add @zeit/fetch example (#9029)

---
 examples/with-zeit-fetch/README.md          | 42 +++++++++++++++++++++
 examples/with-zeit-fetch/fetch/browser.js   |  3 ++
 examples/with-zeit-fetch/fetch/package.json |  4 ++
 examples/with-zeit-fetch/fetch/server.js    |  3 ++
 examples/with-zeit-fetch/package.json       | 18 +++++++++
 examples/with-zeit-fetch/pages/index.js     | 22 +++++++++++
 examples/with-zeit-fetch/pages/preact.js    | 22 +++++++++++
 7 files changed, 114 insertions(+)
 create mode 100644 examples/with-zeit-fetch/README.md
 create mode 100644 examples/with-zeit-fetch/fetch/browser.js
 create mode 100644 examples/with-zeit-fetch/fetch/package.json
 create mode 100644 examples/with-zeit-fetch/fetch/server.js
 create mode 100644 examples/with-zeit-fetch/package.json
 create mode 100644 examples/with-zeit-fetch/pages/index.js
 create mode 100644 examples/with-zeit-fetch/pages/preact.js

diff --git a/examples/with-zeit-fetch/README.md b/examples/with-zeit-fetch/README.md
new file mode 100644
index 0000000000000..4bb9906468725
--- /dev/null
+++ b/examples/with-zeit-fetch/README.md
@@ -0,0 +1,42 @@
+# @zeit/fetch example
+
+## How to use
+
+### Using `create-next-app`
+
+Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+
+```bash
+npx create-next-app --example with-zeit-fetch-app
+# or
+yarn create next-app --example with-zeit-fetch-app
+```
+
+### Download manually
+
+Download the example:
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-zeit-fetch
+cd with-zeit-fetch
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run dev
+# or
+yarn
+yarn dev
+```
+
+Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
+
+```bash
+now
+```
+
+## The idea behind the example
+
+This example shows how to use [`@zeit/fetch`](https://npmjs.com/zeit/fetch) in a Next.js application.
diff --git a/examples/with-zeit-fetch/fetch/browser.js b/examples/with-zeit-fetch/fetch/browser.js
new file mode 100644
index 0000000000000..b5fbc9b47a1f5
--- /dev/null
+++ b/examples/with-zeit-fetch/fetch/browser.js
@@ -0,0 +1,3 @@
+import fetch from 'isomorphic-fetch'
+
+export default fetch
diff --git a/examples/with-zeit-fetch/fetch/package.json b/examples/with-zeit-fetch/fetch/package.json
new file mode 100644
index 0000000000000..f4d25d16d84e2
--- /dev/null
+++ b/examples/with-zeit-fetch/fetch/package.json
@@ -0,0 +1,4 @@
+{
+  "browser": "./browser.js",
+  "main": "./server.js"
+}
\ No newline at end of file
diff --git a/examples/with-zeit-fetch/fetch/server.js b/examples/with-zeit-fetch/fetch/server.js
new file mode 100644
index 0000000000000..618baba1f3566
--- /dev/null
+++ b/examples/with-zeit-fetch/fetch/server.js
@@ -0,0 +1,3 @@
+import zeitFetch from '@zeit/fetch'
+
+export default zeitFetch()
diff --git a/examples/with-zeit-fetch/package.json b/examples/with-zeit-fetch/package.json
new file mode 100644
index 0000000000000..828be083c5540
--- /dev/null
+++ b/examples/with-zeit-fetch/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "data-fetch",
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "@zeit/fetch": "5.1.1",
+    "next": "latest",
+    "node-fetch": "2.6.0",
+    "react": "^16.8.4",
+    "react-dom": "^16.8.4",
+    "unfetch": "4.1.0"
+  },
+  "license": "ISC"
+}
diff --git a/examples/with-zeit-fetch/pages/index.js b/examples/with-zeit-fetch/pages/index.js
new file mode 100644
index 0000000000000..80b3fd9862860
--- /dev/null
+++ b/examples/with-zeit-fetch/pages/index.js
@@ -0,0 +1,22 @@
+import React from 'react'
+import Link from 'next/link'
+import fetch from '../fetch'
+
+function Index (props) {
+  return (
+    <div>
+      <p>Next.js has {props.stars} ⭐️</p>
+      <Link href='/preact'>
+        <a>How about preact?</a>
+      </Link>
+    </div>
+  )
+}
+
+Index.getInitialProps = async () => {
+  const res = await fetch('https://api.github.com/repos/zeit/next.js')
+  const json = await res.json() // better use it inside try .. catch
+  return { stars: json.stargazers_count }
+}
+
+export default Index
diff --git a/examples/with-zeit-fetch/pages/preact.js b/examples/with-zeit-fetch/pages/preact.js
new file mode 100644
index 0000000000000..062f2ce41b249
--- /dev/null
+++ b/examples/with-zeit-fetch/pages/preact.js
@@ -0,0 +1,22 @@
+import React from 'react'
+import Link from 'next/link'
+import fetch from '../fetch'
+
+function Preact (props) {
+  return (
+    <div>
+      <p>Preact has {props.stars} ⭐</p>
+      <Link href='/'>
+        <a>I bet Next.js has more stars (?)</a>
+      </Link>
+    </div>
+  )
+}
+
+Preact.getInitialProps = async () => {
+  const res = await fetch('https://api.github.com/repos/developit/preact')
+  const json = await res.json() // better use it inside try .. catch
+  return { stars: json.stargazers_count }
+}
+
+export default Preact

From 5b574fc77875ee1988b94504727282eef1b70dcb Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 10 Oct 2019 16:56:38 -0500
Subject: [PATCH 14/31] Update to error on usage of serverRuntimeConfig with
 serverless (#9030)

* Update to error on usage of serverRuntimeConfig with serverless

* Add tests for errors for serverless and runtime configs

* Update docs wording
---
 errors/serverless-publicRuntimeConfig.md      |  4 +-
 packages/next/README.md                       |  2 +-
 packages/next/next-server/server/config.ts    |  8 +--
 .../next/next-server/server/next-server.ts    | 10 ++--
 .../serverless-runtime-configs/pages/index.js |  1 +
 .../test/index.test.js                        | 50 +++++++++++++++++++
 6 files changed, 65 insertions(+), 10 deletions(-)
 create mode 100644 test/integration/serverless-runtime-configs/pages/index.js
 create mode 100644 test/integration/serverless-runtime-configs/test/index.test.js

diff --git a/errors/serverless-publicRuntimeConfig.md b/errors/serverless-publicRuntimeConfig.md
index deb4ca5cecd93..800a1e664049a 100644
--- a/errors/serverless-publicRuntimeConfig.md
+++ b/errors/serverless-publicRuntimeConfig.md
@@ -1,8 +1,8 @@
-# Using `publicRuntimeConfig` with `target` set to `serverless`
+# Using `publicRuntimeConfig` or `serverRuntimeConfig` with `target` set to `serverless`
 
 #### Why This Error Occurred
 
-In the `serverless` target environment `next.config.js` is not loaded, so we don't support `publicRuntimeConfig`.
+In the `serverless` target environment `next.config.js` is not loaded, so we don't support `publicRuntimeConfig` or `serverRuntimeConfig`.
 
 #### Possible Ways to Fix It
 
diff --git a/packages/next/README.md b/packages/next/README.md
index e210949d17b71..ee60d588f133a 100644
--- a/packages/next/README.md
+++ b/packages/next/README.md
@@ -2045,7 +2045,7 @@ AuthMethod({ key: process.env.CUSTOM_KEY, secret: process.env.CUSTOM_SECRET })
 
 #### Runtime configuration
 
-> **Warning:** Note that this option is not available when using `target: 'serverless'`
+> **Warning:** Note that these options are not available when using `target: 'serverless'`
 
 > **Warning:** Generally you want to use build-time configuration to provide your configuration.
 > The reason for this is that runtime configuration adds rendering / initialization overhead and is **incompatible with [automatic static optimization](#automatic-static-optimization)**.
diff --git a/packages/next/next-server/server/config.ts b/packages/next/next-server/server/config.ts
index d2dce598349dd..60f3ac43758eb 100644
--- a/packages/next/next-server/server/config.ts
+++ b/packages/next/next-server/server/config.ts
@@ -147,12 +147,14 @@ export default function loadConfig(
     if (
       userConfig.target &&
       userConfig.target !== 'server' &&
-      userConfig.publicRuntimeConfig &&
-      Object.keys(userConfig.publicRuntimeConfig).length !== 0
+      ((userConfig.publicRuntimeConfig &&
+        Object.keys(userConfig.publicRuntimeConfig).length !== 0) ||
+        (userConfig.serverRuntimeConfig &&
+          Object.keys(userConfig.serverRuntimeConfig).length !== 0))
     ) {
       // TODO: change error message tone to "Only compatible with [fat] server mode"
       throw new Error(
-        'Cannot use publicRuntimeConfig with target=serverless https://err.sh/zeit/next.js/serverless-publicRuntimeConfig'
+        'Cannot use publicRuntimeConfig or serverRuntimeConfig with target=serverless https://err.sh/zeit/next.js/serverless-publicRuntimeConfig'
       )
     }
 
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
index c7e18d36becc1..dac09e2b3dabc 100644
--- a/packages/next/next-server/server/next-server.ts
+++ b/packages/next/next-server/server/next-server.ts
@@ -143,10 +143,12 @@ export default class Server {
     }
 
     // Initialize next/config with the environment configuration
-    envConfig.setConfig({
-      serverRuntimeConfig,
-      publicRuntimeConfig,
-    })
+    if (this.nextConfig.target === 'server') {
+      envConfig.setConfig({
+        serverRuntimeConfig,
+        publicRuntimeConfig,
+      })
+    }
 
     const routes = this.generateRoutes()
     this.router = new Router(routes)
diff --git a/test/integration/serverless-runtime-configs/pages/index.js b/test/integration/serverless-runtime-configs/pages/index.js
new file mode 100644
index 0000000000000..0957a987fc2f2
--- /dev/null
+++ b/test/integration/serverless-runtime-configs/pages/index.js
@@ -0,0 +1 @@
+export default () => 'hi'
diff --git a/test/integration/serverless-runtime-configs/test/index.test.js b/test/integration/serverless-runtime-configs/test/index.test.js
new file mode 100644
index 0000000000000..d14e636352721
--- /dev/null
+++ b/test/integration/serverless-runtime-configs/test/index.test.js
@@ -0,0 +1,50 @@
+/* eslint-env jest */
+/* global jasmine */
+import fs from 'fs-extra'
+import { join } from 'path'
+import { nextBuild } from 'next-test-utils'
+
+const appDir = join(__dirname, '../')
+const nextConfigPath = join(appDir, 'next.config.js')
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 2
+
+const cleanUp = () => fs.remove(nextConfigPath)
+
+describe('Serverless runtime configs', () => {
+  beforeAll(() => cleanUp())
+  afterAll(() => cleanUp())
+
+  it('should error on usage of publicRuntimeConfig', async () => {
+    await fs.writeFile(
+      nextConfigPath,
+      `module.exports = {
+      target: 'serverless',
+      publicRuntimeConfig: {
+        hello: 'world'
+      }
+    }`
+    )
+
+    const { stderr } = await nextBuild(appDir, undefined, { stderr: true })
+    expect(stderr).toMatch(
+      /Cannot use publicRuntimeConfig or serverRuntimeConfig/
+    )
+  })
+
+  it('should error on usage of serverRuntimeConfig', async () => {
+    await fs.writeFile(
+      nextConfigPath,
+      `module.exports = {
+      target: 'serverless',
+      serverRuntimeConfig: {
+        hello: 'world'
+      }
+    }`
+    )
+
+    const { stderr } = await nextBuild(appDir, undefined, { stderr: true })
+    expect(stderr).toMatch(
+      /Cannot use publicRuntimeConfig or serverRuntimeConfig/
+    )
+  })
+})

From f10f3304fe3926b69ad01fdf76e4ae1fbafaf141 Mon Sep 17 00:00:00 2001
From: Luis Alvarez D <luis@zeit.co>
Date: Thu, 10 Oct 2019 22:34:14 -0500
Subject: [PATCH 15/31] Replace the deprecated Create Next App URL (#9032)

---
 examples/active-class-name/README.md                        | 2 +-
 examples/amp-story/README.md                                | 2 +-
 examples/amp/README.md                                      | 2 +-
 examples/analyze-bundles/README.md                          | 2 +-
 examples/api-routes-apollo-server-and-client/README.md      | 2 +-
 examples/api-routes-graphql/README.md                       | 2 +-
 examples/api-routes-micro/README.md                         | 2 +-
 examples/api-routes-middleware/README.md                    | 2 +-
 examples/api-routes-rest/README.md                          | 2 +-
 examples/api-routes/README.md                               | 2 +-
 examples/auth0/README.md                                    | 2 +-
 examples/basic-css/README.md                                | 2 +-
 examples/basic-export/README.md                             | 2 +-
 examples/blog-starter/README.md                             | 2 +-
 examples/custom-charset/README.md                           | 2 +-
 examples/custom-server-actionhero/README.md                 | 2 +-
 examples/custom-server-express/README.md                    | 2 +-
 examples/custom-server-fastify/README.md                    | 2 +-
 examples/custom-server-hapi/README.md                       | 2 +-
 examples/custom-server-koa/README.md                        | 2 +-
 examples/custom-server-micro/README.md                      | 2 +-
 examples/custom-server-nodemon/README.md                    | 2 +-
 examples/custom-server-polka/README.md                      | 2 +-
 examples/custom-server-typescript/README.md                 | 2 +-
 examples/custom-server/README.md                            | 2 +-
 examples/data-fetch/README.md                               | 2 +-
 examples/dynamic-routing/README.md                          | 2 +-
 examples/form-handler/README.md                             | 2 +-
 examples/gh-pages/README.md                                 | 2 +-
 examples/head-elements/README.md                            | 2 +-
 examples/hello-world/README.md                              | 2 +-
 examples/layout-component/README.md                         | 2 +-
 examples/nested-components/README.md                        | 2 +-
 examples/only-client-render-external-dependencies/README.md | 2 +-
 examples/parameterized-routing/README.md                    | 2 +-
 examples/progressive-render/README.md                       | 2 +-
 examples/shared-modules/README.md                           | 2 +-
 examples/ssr-caching/README.md                              | 2 +-
 examples/svg-components/README.md                           | 2 +-
 examples/using-inferno/README.md                            | 2 +-
 examples/using-nerv/README.md                               | 2 +-
 examples/using-preact/README.md                             | 2 +-
 examples/using-router/README.md                             | 2 +-
 examples/using-with-router/README.md                        | 2 +-
 examples/with-absolute-imports/README.md                    | 2 +-
 examples/with-algolia-react-instantsearch/README.md         | 2 +-
 examples/with-ant-design-less/README.md                     | 2 +-
 examples/with-ant-design/README.md                          | 2 +-
 examples/with-antd-mobile/README.md                         | 2 +-
 examples/with-aphrodite/README.md                           | 2 +-
 examples/with-apollo-and-redux-saga/README.md               | 2 +-
 examples/with-apollo-and-redux/README.md                    | 2 +-
 examples/with-apollo-auth/README.md                         | 2 +-
 examples/with-apollo/README.md                              | 2 +-
 examples/with-app-layout/readme.md                          | 2 +-
 examples/with-asset-imports/README.md                       | 2 +-
 examples/with-astroturf/README.md                           | 2 +-
 examples/with-aws-amplify-typescript/README.md              | 2 +-
 examples/with-aws-amplify/README.md                         | 2 +-
 examples/with-babel-macros/README.md                        | 2 +-
 examples/with-carbon-components/README.md                   | 2 +-
 examples/with-carlo/README.md                               | 2 +-
 examples/with-cerebral/README.md                            | 2 +-
 examples/with-componentdidcatch/readme.md                   | 2 +-
 examples/with-configured-preset-env/README.md               | 2 +-
 examples/with-context-api/README.md                         | 2 +-
 examples/with-cookie-auth/README.md                         | 2 +-
 examples/with-custom-babel-config/README.md                 | 2 +-
 examples/with-custom-reverse-proxy/README.md                | 2 +-
 examples/with-cxs/README.md                                 | 2 +-
 examples/with-data-prefetch/README.md                       | 2 +-
 examples/with-docker/README.md                              | 2 +-
 examples/with-dotenv/README.md                              | 2 +-
 examples/with-draft-js/README.md                            | 2 +-
 examples/with-dynamic-app-layout/readme.md                  | 2 +-
 examples/with-dynamic-import/README.md                      | 2 +-
 examples/with-electron-typescript/README.md                 | 2 +-
 examples/with-electron/README.md                            | 2 +-
 examples/with-emotion-fiber/README.md                       | 2 +-
 examples/with-emotion/README.md                             | 2 +-
 examples/with-env-from-next-config-js/README.md             | 2 +-
 examples/with-external-styled-jsx-sass/README.md            | 2 +-
 examples/with-fela/README.md                                | 2 +-
 examples/with-firebase-authentication/README.md             | 2 +-
 examples/with-firebase-hosting-and-docker/README.md         | 2 +-
 examples/with-firebase-hosting-and-typescript/README.md     | 2 +-
 examples/with-firebase-hosting/README.md                    | 2 +-
 examples/with-flow/README.md                                | 2 +-
 examples/with-freactal/README.md                            | 2 +-
 examples/with-glamor/README.md                              | 2 +-
 examples/with-glamorous/README.md                           | 2 +-
 examples/with-google-analytics/README.md                    | 2 +-
 examples/with-graphql-hooks/README.md                       | 2 +-
 examples/with-grommet/README.md                             | 2 +-
 examples/with-hashed-statics/README.md                      | 2 +-
 examples/with-higher-order-component/README.md              | 2 +-
 examples/with-http2/README.md                               | 2 +-
 examples/with-immutable-redux-wrapper/README.md             | 2 +-
 examples/with-ioc/README.md                                 | 2 +-
 examples/with-jest-flow/README.md                           | 2 +-
 examples/with-jest-react-testing-library/README.md          | 2 +-
 examples/with-jest-typescript/README.md                     | 2 +-
 examples/with-jest/README.md                                | 2 +-
 examples/with-kea/README.md                                 | 2 +-
 examples/with-linaria/README.md                             | 2 +-
 examples/with-lingui/README.md                              | 2 +-
 examples/with-loading/README.md                             | 2 +-
 examples/with-markdown/README.md                            | 2 +-
 examples/with-mdx/README.md                                 | 2 +-
 examples/with-mobx-react-lite/README.md                     | 2 +-
 examples/with-mobx-state-tree-typescript/README.md          | 2 +-
 examples/with-mobx-state-tree/README.md                     | 2 +-
 examples/with-mobx/README.md                                | 2 +-
 examples/with-mocha/README.md                               | 2 +-
 examples/with-next-css/README.md                            | 2 +-
 examples/with-next-less/README.md                           | 2 +-
 examples/with-next-offline/README.md                        | 2 +-
 examples/with-next-page-transitions/README.md               | 2 +-
 examples/with-next-routes/README.md                         | 2 +-
 examples/with-next-sass/README.md                           | 2 +-
 examples/with-next-seo/README.md                            | 2 +-
 examples/with-noscript/README.md                            | 2 +-
 examples/with-now-env/README.md                             | 2 +-
 examples/with-office-ui-fabric-react/README.md              | 2 +-
 examples/with-orbit-components/README.md                    | 2 +-
 examples/with-overmind/README.md                            | 2 +-
 examples/with-pkg/README.md                                 | 2 +-
 examples/with-polyfills/README.md                           | 2 +-
 examples/with-portals-ssr/README.md                         | 2 +-
 examples/with-portals/README.md                             | 2 +-
 examples/with-prefetching/README.md                         | 2 +-
 examples/with-pretty-url-routing/README.md                  | 2 +-
 examples/with-quill-js/README.md                            | 2 +-
 examples/with-rbx-bulma-pro/pages/index.js                  | 2 +-
 examples/with-react-css-modules/README.md                   | 2 +-
 examples/with-react-esi/README.md                           | 2 +-
 examples/with-react-ga/README.md                            | 2 +-
 examples/with-react-helmet/README.md                        | 2 +-
 examples/with-react-intl/README.md                          | 2 +-
 examples/with-react-jss/README.md                           | 2 +-
 examples/with-react-md/README.md                            | 2 +-
 examples/with-react-native-web/README.md                    | 2 +-
 examples/with-react-relay-network-modern/README.md          | 2 +-
 examples/with-react-toolbox/README.md                       | 2 +-
 examples/with-react-useragent/README.md                     | 2 +-
 examples/with-react-uwp/README.md                           | 2 +-
 examples/with-react-with-styles/README.md                   | 2 +-
 examples/with-reasonml-todo/README.md                       | 2 +-
 examples/with-reasonml/README.md                            | 2 +-
 examples/with-rebass/README.md                              | 2 +-
 examples/with-recompose/README.md                           | 2 +-
 examples/with-redux-code-splitting/README.md                | 2 +-
 examples/with-redux-observable/README.md                    | 2 +-
 examples/with-redux-persist/README.md                       | 2 +-
 examples/with-redux-reselect-recompose/README.md            | 2 +-
 examples/with-redux-saga/README.md                          | 2 +-
 examples/with-redux-thunk/README.md                         | 2 +-
 examples/with-redux-wrapper/README.md                       | 2 +-
 examples/with-redux/README.md                               | 2 +-
 examples/with-reflux/README.md                              | 2 +-
 examples/with-refnux/README.md                              | 2 +-
 examples/with-relay-modern-server-express/README.md         | 2 +-
 examples/with-relay-modern/README.md                        | 2 +-
 examples/with-rematch/README.md                             | 2 +-
 examples/with-segment-analytics/README.md                   | 2 +-
 examples/with-semantic-ui/README.md                         | 2 +-
 examples/with-sentry-simple/README.md                       | 2 +-
 examples/with-sentry/README.md                              | 2 +-
 examples/with-shallow-routing/README.md                     | 2 +-
 examples/with-sitemap-and-robots-express-server/README.md   | 2 +-
 examples/with-slate/README.md                               | 2 +-
 examples/with-socket.io/README.md                           | 2 +-
 examples/with-static-export/README.md                       | 2 +-
 examples/with-stomp/README.md                               | 2 +-
 examples/with-storybook/README.md                           | 2 +-
 examples/with-strict-csp-hash/README.md                     | 2 +-
 examples/with-strict-csp/README.md                          | 2 +-
 examples/with-style-sheet/README.md                         | 2 +-
 examples/with-styled-components/README.md                   | 2 +-
 examples/with-styled-jsx-plugins/README.md                  | 2 +-
 examples/with-styled-jsx-scss/README.md                     | 2 +-
 examples/with-styletron/README.md                           | 2 +-
 examples/with-sw-precache/README.md                         | 2 +-
 examples/with-tailwindcss/README.md                         | 2 +-
 examples/with-ts-node/README.md                             | 2 +-
 examples/with-typescript-styled-components/README.md        | 2 +-
 examples/with-typescript/README.md                          | 2 +-
 examples/with-typestyle/README.md                           | 2 +-
 examples/with-typings-for-css-modules/README.md             | 2 +-
 examples/with-universal-configuration-build-time/README.md  | 2 +-
 examples/with-universal-configuration-runtime/README.md     | 2 +-
 examples/with-unstated/README.md                            | 2 +-
 examples/with-url-object-routing/README.md                  | 2 +-
 examples/with-videojs/README.md                             | 2 +-
 examples/with-webassembly/readme.md                         | 2 +-
 examples/with-webpack-bundle-size-analyzer/README.md        | 2 +-
 examples/with-yarn-workspaces/README.md                     | 2 +-
 examples/with-zeit-fetch/README.md                          | 6 +++---
 examples/with-zones/README.md                               | 2 +-
 199 files changed, 201 insertions(+), 201 deletions(-)

diff --git a/examples/active-class-name/README.md b/examples/active-class-name/README.md
index 6a11c34bd60cc..e4770280263c6 100644
--- a/examples/active-class-name/README.md
+++ b/examples/active-class-name/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example active-class-name active-class-name-app
diff --git a/examples/amp-story/README.md b/examples/amp-story/README.md
index 10f74603ab2c3..d349cff030988 100644
--- a/examples/amp-story/README.md
+++ b/examples/amp-story/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example amp-story amp-app
diff --git a/examples/amp/README.md b/examples/amp/README.md
index dfa09341b4d39..e4d32f74d27c0 100644
--- a/examples/amp/README.md
+++ b/examples/amp/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example amp amp-app
diff --git a/examples/analyze-bundles/README.md b/examples/analyze-bundles/README.md
index fb8a46da0319d..08143391ef671 100644
--- a/examples/analyze-bundles/README.md
+++ b/examples/analyze-bundles/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example analyze-bundles analyze-bundles-app
diff --git a/examples/api-routes-apollo-server-and-client/README.md b/examples/api-routes-apollo-server-and-client/README.md
index 437cb2385077c..d0770ad9e5f24 100644
--- a/examples/api-routes-apollo-server-and-client/README.md
+++ b/examples/api-routes-apollo-server-and-client/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example api-routes-apollo-server-and-client api-routes-apollo-server-and-client-app
diff --git a/examples/api-routes-graphql/README.md b/examples/api-routes-graphql/README.md
index 3b33b0c8ae9b6..874bfa1ccdc3f 100644
--- a/examples/api-routes-graphql/README.md
+++ b/examples/api-routes-graphql/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example api-routes-graphql api-routes-graphql-app
diff --git a/examples/api-routes-micro/README.md b/examples/api-routes-micro/README.md
index a0e29cd74b421..0bc77008152f9 100644
--- a/examples/api-routes-micro/README.md
+++ b/examples/api-routes-micro/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example api-routes-micro api-routes-micro-app
diff --git a/examples/api-routes-middleware/README.md b/examples/api-routes-middleware/README.md
index e46bc083eac56..a726b8ae1c120 100644
--- a/examples/api-routes-middleware/README.md
+++ b/examples/api-routes-middleware/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example api-routes-middleware api-routes-middleware-app
diff --git a/examples/api-routes-rest/README.md b/examples/api-routes-rest/README.md
index adfe929a0aecd..9f36ed47bedd9 100644
--- a/examples/api-routes-rest/README.md
+++ b/examples/api-routes-rest/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://www.npmjs.com/package/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example api-routes-rest api-routes-rest-app
diff --git a/examples/api-routes/README.md b/examples/api-routes/README.md
index 6e2a4b71cc7a5..a3b64a9c612b2 100644
--- a/examples/api-routes/README.md
+++ b/examples/api-routes/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example api-routes api-routes-app
diff --git a/examples/auth0/README.md b/examples/auth0/README.md
index 4b9b21f050852..f9d63636b4785 100644
--- a/examples/auth0/README.md
+++ b/examples/auth0/README.md
@@ -4,7 +4,7 @@ This example shows how you can use `@auth0/nextjs-auth` to easily add authentica
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://www.npmjs.com/package/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example auth0 auth0
diff --git a/examples/basic-css/README.md b/examples/basic-css/README.md
index 850c1b682c322..498a8626b88ac 100644
--- a/examples/basic-css/README.md
+++ b/examples/basic-css/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example basic-css basic-css-app
diff --git a/examples/basic-export/README.md b/examples/basic-export/README.md
index c8c4db3317a88..49b200aaca072 100644
--- a/examples/basic-export/README.md
+++ b/examples/basic-export/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example basic-export basic-export-app
diff --git a/examples/blog-starter/README.md b/examples/blog-starter/README.md
index 2d222d0dc1a2c..66c500f297f80 100644
--- a/examples/blog-starter/README.md
+++ b/examples/blog-starter/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+Download [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to bootstrap the example:
 
 ```
 npm i -g create-next-app
diff --git a/examples/custom-charset/README.md b/examples/custom-charset/README.md
index 12c0df95b5bfa..7e9d3b7667a34 100644
--- a/examples/custom-charset/README.md
+++ b/examples/custom-charset/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-charset custom-charset-app
diff --git a/examples/custom-server-actionhero/README.md b/examples/custom-server-actionhero/README.md
index f70e37f9b424a..5c2067d9d5b07 100644
--- a/examples/custom-server-actionhero/README.md
+++ b/examples/custom-server-actionhero/README.md
@@ -9,7 +9,7 @@ A more detailed example showcasing how to use fetch and web sockets to interact
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-actionhero custom-server-actionhero-app
diff --git a/examples/custom-server-express/README.md b/examples/custom-server-express/README.md
index fbbab060a400e..0ad50f6e2ac1a 100644
--- a/examples/custom-server-express/README.md
+++ b/examples/custom-server-express/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-express custom-server-express-app
diff --git a/examples/custom-server-fastify/README.md b/examples/custom-server-fastify/README.md
index 70cc856336a49..e6807325b602b 100644
--- a/examples/custom-server-fastify/README.md
+++ b/examples/custom-server-fastify/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-fastify custom-server-fastify-app
diff --git a/examples/custom-server-hapi/README.md b/examples/custom-server-hapi/README.md
index 3869fd47114b3..4f049db126ab2 100644
--- a/examples/custom-server-hapi/README.md
+++ b/examples/custom-server-hapi/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-hapi custom-server-hapi-app
diff --git a/examples/custom-server-koa/README.md b/examples/custom-server-koa/README.md
index b617d1be04d0f..13a693d3869ed 100644
--- a/examples/custom-server-koa/README.md
+++ b/examples/custom-server-koa/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-koa custom-server-koa-app
diff --git a/examples/custom-server-micro/README.md b/examples/custom-server-micro/README.md
index 6b0c858c42d11..8d65ad9b4f2ce 100644
--- a/examples/custom-server-micro/README.md
+++ b/examples/custom-server-micro/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-micro custom-server-micro-app
diff --git a/examples/custom-server-nodemon/README.md b/examples/custom-server-nodemon/README.md
index 52cd6153ea018..d77a5d5e21a90 100644
--- a/examples/custom-server-nodemon/README.md
+++ b/examples/custom-server-nodemon/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-nodemon custom-server-nodemon-app
diff --git a/examples/custom-server-polka/README.md b/examples/custom-server-polka/README.md
index b4959a5180f0b..41a4c71dfaf8c 100644
--- a/examples/custom-server-polka/README.md
+++ b/examples/custom-server-polka/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-polka custom-server-polka-app
diff --git a/examples/custom-server-typescript/README.md b/examples/custom-server-typescript/README.md
index df01ee07836dd..6f10728bb2704 100644
--- a/examples/custom-server-typescript/README.md
+++ b/examples/custom-server-typescript/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server-typescript custom-server-typescript-app
diff --git a/examples/custom-server/README.md b/examples/custom-server/README.md
index b6921e0990fad..29452a0d8be0c 100644
--- a/examples/custom-server/README.md
+++ b/examples/custom-server/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example custom-server custom-server-app
diff --git a/examples/data-fetch/README.md b/examples/data-fetch/README.md
index 498589a369961..f49f9a5427379 100644
--- a/examples/data-fetch/README.md
+++ b/examples/data-fetch/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example data-fetch data-fetch-app
diff --git a/examples/dynamic-routing/README.md b/examples/dynamic-routing/README.md
index b984d8faf0f82..76a66f0214631 100644
--- a/examples/dynamic-routing/README.md
+++ b/examples/dynamic-routing/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example dynamic-routing dynamic-routing-app
diff --git a/examples/form-handler/README.md b/examples/form-handler/README.md
index b4b9689ca41c5..0c37d04eae145 100644
--- a/examples/form-handler/README.md
+++ b/examples/form-handler/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example form-handler form-handler-app
diff --git a/examples/gh-pages/README.md b/examples/gh-pages/README.md
index 154a224e8be2c..cec9e33ba3637 100644
--- a/examples/gh-pages/README.md
+++ b/examples/gh-pages/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example gh-pages gh-pages-app
diff --git a/examples/head-elements/README.md b/examples/head-elements/README.md
index c950bcba1edd4..119b56c4f2d41 100644
--- a/examples/head-elements/README.md
+++ b/examples/head-elements/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example head-elements head-elements-app
diff --git a/examples/hello-world/README.md b/examples/hello-world/README.md
index f6e017c7041f6..977b821cdc6fc 100644
--- a/examples/hello-world/README.md
+++ b/examples/hello-world/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example hello-world hello-world-app
diff --git a/examples/layout-component/README.md b/examples/layout-component/README.md
index b63365db4f506..8f0e4d1fd48a8 100644
--- a/examples/layout-component/README.md
+++ b/examples/layout-component/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example layout-component layout-component-app
diff --git a/examples/nested-components/README.md b/examples/nested-components/README.md
index c4a28f2226c99..bfe9d5254c19f 100644
--- a/examples/nested-components/README.md
+++ b/examples/nested-components/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example nested-components nested-components-app
diff --git a/examples/only-client-render-external-dependencies/README.md b/examples/only-client-render-external-dependencies/README.md
index f6dbb99750f67..f28f7c20f2ac7 100644
--- a/examples/only-client-render-external-dependencies/README.md
+++ b/examples/only-client-render-external-dependencies/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example only-client-render-external-dependencies only-client-render-external-dependencies-app
diff --git a/examples/parameterized-routing/README.md b/examples/parameterized-routing/README.md
index f5e0e96a32a2a..0c4e6df3d440c 100644
--- a/examples/parameterized-routing/README.md
+++ b/examples/parameterized-routing/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example parameterized-routing parameterized-routing-app
diff --git a/examples/progressive-render/README.md b/examples/progressive-render/README.md
index 54b82c3ac511b..75388c758a058 100644
--- a/examples/progressive-render/README.md
+++ b/examples/progressive-render/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example progressive-render progressive-render-app
diff --git a/examples/shared-modules/README.md b/examples/shared-modules/README.md
index f474853a41ef4..476d845f2cf25 100644
--- a/examples/shared-modules/README.md
+++ b/examples/shared-modules/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example shared-modules shared-modules-app
diff --git a/examples/ssr-caching/README.md b/examples/ssr-caching/README.md
index a82f05cd05255..6c0062850329d 100644
--- a/examples/ssr-caching/README.md
+++ b/examples/ssr-caching/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example ssr-caching ssr-caching-app
diff --git a/examples/svg-components/README.md b/examples/svg-components/README.md
index a391eced9ba00..b418d2a4b2300 100644
--- a/examples/svg-components/README.md
+++ b/examples/svg-components/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example svg-components svg-components-app
diff --git a/examples/using-inferno/README.md b/examples/using-inferno/README.md
index d139318f202b4..efbf117936b27 100644
--- a/examples/using-inferno/README.md
+++ b/examples/using-inferno/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example using-inferno using-inferno-app
diff --git a/examples/using-nerv/README.md b/examples/using-nerv/README.md
index 98c81e4a33980..544a6362c0567 100644
--- a/examples/using-nerv/README.md
+++ b/examples/using-nerv/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example using-nerv using-nerv-app
diff --git a/examples/using-preact/README.md b/examples/using-preact/README.md
index 1a1fb024784ea..4b9ec50ac02aa 100644
--- a/examples/using-preact/README.md
+++ b/examples/using-preact/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example using-preact using-preact-app
diff --git a/examples/using-router/README.md b/examples/using-router/README.md
index 9771c0c1227e4..36a36ab2579d4 100644
--- a/examples/using-router/README.md
+++ b/examples/using-router/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example using-router using-router-app
diff --git a/examples/using-with-router/README.md b/examples/using-with-router/README.md
index 3c365bc505e4b..a00a819f09598 100644
--- a/examples/using-with-router/README.md
+++ b/examples/using-with-router/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example using-with-router using-with-router-app
diff --git a/examples/with-absolute-imports/README.md b/examples/with-absolute-imports/README.md
index cd70d29588293..7cc1d0c5d883f 100644
--- a/examples/with-absolute-imports/README.md
+++ b/examples/with-absolute-imports/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-absolute-imports with-absolute-imports-app
diff --git a/examples/with-algolia-react-instantsearch/README.md b/examples/with-algolia-react-instantsearch/README.md
index 4f7b55b744a8f..bedde44192adb 100644
--- a/examples/with-algolia-react-instantsearch/README.md
+++ b/examples/with-algolia-react-instantsearch/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-algolia-react-instantsearch with-algolia-react-instantsearch-app
diff --git a/examples/with-ant-design-less/README.md b/examples/with-ant-design-less/README.md
index 381bfae4e18ea..68deb9b2e0340 100644
--- a/examples/with-ant-design-less/README.md
+++ b/examples/with-ant-design-less/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-ant-design-less with-ant-design-app
diff --git a/examples/with-ant-design/README.md b/examples/with-ant-design/README.md
index 70f71cc25e611..ad078971372b1 100644
--- a/examples/with-ant-design/README.md
+++ b/examples/with-ant-design/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-ant-design with-ant-design-app
diff --git a/examples/with-antd-mobile/README.md b/examples/with-antd-mobile/README.md
index d7a00f9b66d94..c1626089936d3 100644
--- a/examples/with-antd-mobile/README.md
+++ b/examples/with-antd-mobile/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-antd-mobile with-antd-mobile-app
diff --git a/examples/with-aphrodite/README.md b/examples/with-aphrodite/README.md
index 5212e83539028..6b8c5ac67caa8 100644
--- a/examples/with-aphrodite/README.md
+++ b/examples/with-aphrodite/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-aphrodite with-aphrodite-app
diff --git a/examples/with-apollo-and-redux-saga/README.md b/examples/with-apollo-and-redux-saga/README.md
index 100b6fdff16e9..97dc40176f741 100644
--- a/examples/with-apollo-and-redux-saga/README.md
+++ b/examples/with-apollo-and-redux-saga/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-apollo-and-redux-saga with-apollo-and-redux-saga-app
diff --git a/examples/with-apollo-and-redux/README.md b/examples/with-apollo-and-redux/README.md
index 4cd3b377dea8d..f7d9b6896fb5c 100644
--- a/examples/with-apollo-and-redux/README.md
+++ b/examples/with-apollo-and-redux/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-apollo-and-redux with-apollo-and-redux-app
diff --git a/examples/with-apollo-auth/README.md b/examples/with-apollo-auth/README.md
index 9ddfcbac4f7ed..800958a402434 100644
--- a/examples/with-apollo-auth/README.md
+++ b/examples/with-apollo-auth/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-apollo-auth with-apollo-auth-app
diff --git a/examples/with-apollo/README.md b/examples/with-apollo/README.md
index 3d52ef31465f0..20be6490dd73c 100644
--- a/examples/with-apollo/README.md
+++ b/examples/with-apollo/README.md
@@ -8,7 +8,7 @@ https://next-with-apollo.now.sh
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-apollo with-apollo-app
diff --git a/examples/with-app-layout/readme.md b/examples/with-app-layout/readme.md
index cd0262c285c77..3f9cf81c9579a 100644
--- a/examples/with-app-layout/readme.md
+++ b/examples/with-app-layout/readme.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-app-layout with-app-layout-app
diff --git a/examples/with-asset-imports/README.md b/examples/with-asset-imports/README.md
index a0f901d9e46fe..f3e6b5c90f65b 100644
--- a/examples/with-asset-imports/README.md
+++ b/examples/with-asset-imports/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-asset-imports with-asset-imports-app
diff --git a/examples/with-astroturf/README.md b/examples/with-astroturf/README.md
index 3d4cc05ebc8a6..9b877afdcaee8 100644
--- a/examples/with-astroturf/README.md
+++ b/examples/with-astroturf/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-astroturf with-astroturf-app
diff --git a/examples/with-aws-amplify-typescript/README.md b/examples/with-aws-amplify-typescript/README.md
index 46533b99da3c3..b0e7b29e5e75a 100644
--- a/examples/with-aws-amplify-typescript/README.md
+++ b/examples/with-aws-amplify-typescript/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://open.segment.com/create-next-app/) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-aws-amplify-typescript nextjs-aws-amplify-typescript-app
diff --git a/examples/with-aws-amplify/README.md b/examples/with-aws-amplify/README.md
index 22cbc6868cc52..cf9bb92be3920 100644
--- a/examples/with-aws-amplify/README.md
+++ b/examples/with-aws-amplify/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://open.segment.com/create-next-app/) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-aws-amplify nextjs-aws-amplify-app
diff --git a/examples/with-babel-macros/README.md b/examples/with-babel-macros/README.md
index 7c2d140cf4b57..65317d3122edd 100644
--- a/examples/with-babel-macros/README.md
+++ b/examples/with-babel-macros/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-babel-macros with-babel-macros-app
diff --git a/examples/with-carbon-components/README.md b/examples/with-carbon-components/README.md
index 6a44c13699686..d5871c883c1c7 100644
--- a/examples/with-carbon-components/README.md
+++ b/examples/with-carbon-components/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-carbon-components with-carbon-components-app
diff --git a/examples/with-carlo/README.md b/examples/with-carlo/README.md
index e5b5aa0008bc8..d7da77941f208 100644
--- a/examples/with-carlo/README.md
+++ b/examples/with-carlo/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-carlo with-carlo-app
diff --git a/examples/with-cerebral/README.md b/examples/with-cerebral/README.md
index 4c373f5a7c9a7..5d9a5cd476efc 100644
--- a/examples/with-cerebral/README.md
+++ b/examples/with-cerebral/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-cerebral with-cerebral-app
diff --git a/examples/with-componentdidcatch/readme.md b/examples/with-componentdidcatch/readme.md
index 0694ba81b005b..1ab0989c4547d 100644
--- a/examples/with-componentdidcatch/readme.md
+++ b/examples/with-componentdidcatch/readme.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-componentdidcatch with-componentdidcatch-app
diff --git a/examples/with-configured-preset-env/README.md b/examples/with-configured-preset-env/README.md
index c50d16d0e86c0..e76ddd64963e9 100644
--- a/examples/with-configured-preset-env/README.md
+++ b/examples/with-configured-preset-env/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-configured-preset-env with-configured-preset-env-app
diff --git a/examples/with-context-api/README.md b/examples/with-context-api/README.md
index b8681b4fec720..8df221519729f 100644
--- a/examples/with-context-api/README.md
+++ b/examples/with-context-api/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-context-api with-context-api-app
diff --git a/examples/with-cookie-auth/README.md b/examples/with-cookie-auth/README.md
index 616ff4c0a95dd..a41cd5452ba2e 100644
--- a/examples/with-cookie-auth/README.md
+++ b/examples/with-cookie-auth/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+Download [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to bootstrap the example:
 
 ```
 npm i -g create-next-app
diff --git a/examples/with-custom-babel-config/README.md b/examples/with-custom-babel-config/README.md
index e4d84238e1261..d8120318f3b41 100644
--- a/examples/with-custom-babel-config/README.md
+++ b/examples/with-custom-babel-config/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-custom-babel-config with-custom-babel-config-app
diff --git a/examples/with-custom-reverse-proxy/README.md b/examples/with-custom-reverse-proxy/README.md
index a520c4af9f455..70323218f2f14 100644
--- a/examples/with-custom-reverse-proxy/README.md
+++ b/examples/with-custom-reverse-proxy/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-custom-reverse-proxy with-custom-reverse-proxy-app
diff --git a/examples/with-cxs/README.md b/examples/with-cxs/README.md
index 09458bf7380ce..9fdb2392affbc 100644
--- a/examples/with-cxs/README.md
+++ b/examples/with-cxs/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-cxs with-cxs-app
diff --git a/examples/with-data-prefetch/README.md b/examples/with-data-prefetch/README.md
index 26bedd163050d..ff07117444035 100644
--- a/examples/with-data-prefetch/README.md
+++ b/examples/with-data-prefetch/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-data-prefetch with-data-prefetch-app
diff --git a/examples/with-docker/README.md b/examples/with-docker/README.md
index bd1ef19113f56..ae18ad304f9e3 100644
--- a/examples/with-docker/README.md
+++ b/examples/with-docker/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-docker with-docker-app
diff --git a/examples/with-dotenv/README.md b/examples/with-dotenv/README.md
index 3127b598a70e8..6ec6626115068 100644
--- a/examples/with-dotenv/README.md
+++ b/examples/with-dotenv/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-dotenv with-dotenv-app
diff --git a/examples/with-draft-js/README.md b/examples/with-draft-js/README.md
index 8baaa3d45d4fc..7c4a018fea52d 100644
--- a/examples/with-draft-js/README.md
+++ b/examples/with-draft-js/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-draft-js
diff --git a/examples/with-dynamic-app-layout/readme.md b/examples/with-dynamic-app-layout/readme.md
index d97f911887ed8..4b3155d307408 100644
--- a/examples/with-dynamic-app-layout/readme.md
+++ b/examples/with-dynamic-app-layout/readme.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-dynamic-app-layout with-dynamic-app-layout-app
diff --git a/examples/with-dynamic-import/README.md b/examples/with-dynamic-import/README.md
index 356cc3459f05e..82134931f2744 100644
--- a/examples/with-dynamic-import/README.md
+++ b/examples/with-dynamic-import/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-dynamic-import with-dynamic-import-app
diff --git a/examples/with-electron-typescript/README.md b/examples/with-electron-typescript/README.md
index d1b12af4f90ab..cacc6b8bf7d35 100644
--- a/examples/with-electron-typescript/README.md
+++ b/examples/with-electron-typescript/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-electron-typescript with-electron-typescript-app
diff --git a/examples/with-electron/README.md b/examples/with-electron/README.md
index 7f392cac21ef3..79c1ff2c1ea24 100644
--- a/examples/with-electron/README.md
+++ b/examples/with-electron/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-electron with-electron-app
diff --git a/examples/with-emotion-fiber/README.md b/examples/with-emotion-fiber/README.md
index 364fc921e2e7e..a4466b4068c6d 100644
--- a/examples/with-emotion-fiber/README.md
+++ b/examples/with-emotion-fiber/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-emotion-fiber with-emotion-fiber-app
diff --git a/examples/with-emotion/README.md b/examples/with-emotion/README.md
index f62b3b417de2f..93ab2cbe513b6 100644
--- a/examples/with-emotion/README.md
+++ b/examples/with-emotion/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-emotion with-emotion-app
diff --git a/examples/with-env-from-next-config-js/README.md b/examples/with-env-from-next-config-js/README.md
index d44e11c359534..899c196e28080 100644
--- a/examples/with-env-from-next-config-js/README.md
+++ b/examples/with-env-from-next-config-js/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-env-from-next-config-app
diff --git a/examples/with-external-styled-jsx-sass/README.md b/examples/with-external-styled-jsx-sass/README.md
index 81b938d310b43..9e14442f9d7dd 100644
--- a/examples/with-external-styled-jsx-sass/README.md
+++ b/examples/with-external-styled-jsx-sass/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-external-styled-jsx-sass with-external-styled-jsx-sass-app
diff --git a/examples/with-fela/README.md b/examples/with-fela/README.md
index 937f4f3d0dd5a..fb7013ee111a5 100755
--- a/examples/with-fela/README.md
+++ b/examples/with-fela/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-fela with-fela-app
diff --git a/examples/with-firebase-authentication/README.md b/examples/with-firebase-authentication/README.md
index 601f9d8920977..e7b3feda64e0e 100644
--- a/examples/with-firebase-authentication/README.md
+++ b/examples/with-firebase-authentication/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-firebase-authentication with-firebase-authentication-app
diff --git a/examples/with-firebase-hosting-and-docker/README.md b/examples/with-firebase-hosting-and-docker/README.md
index 50e2586310c9e..ce4761e158049 100644
--- a/examples/with-firebase-hosting-and-docker/README.md
+++ b/examples/with-firebase-hosting-and-docker/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-firebase-hosting-and-docker with-firebase-hosting-and-docker-app
diff --git a/examples/with-firebase-hosting-and-typescript/README.md b/examples/with-firebase-hosting-and-typescript/README.md
index 35a191813cb1b..2b6df506b9aa2 100644
--- a/examples/with-firebase-hosting-and-typescript/README.md
+++ b/examples/with-firebase-hosting-and-typescript/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-firebase-hosting-and-typescript with-firebase-hosting-and-typescript-app
diff --git a/examples/with-firebase-hosting/README.md b/examples/with-firebase-hosting/README.md
index 13bb7feb5e442..3c3f89559677e 100644
--- a/examples/with-firebase-hosting/README.md
+++ b/examples/with-firebase-hosting/README.md
@@ -4,7 +4,7 @@
 
 **Using `create-next-app`**
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-firebase-hosting with-firebase-hosting-app
diff --git a/examples/with-flow/README.md b/examples/with-flow/README.md
index ab1349e3ff94c..9e9ef5d7031bf 100644
--- a/examples/with-flow/README.md
+++ b/examples/with-flow/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-flow with-flow-app
diff --git a/examples/with-freactal/README.md b/examples/with-freactal/README.md
index 8f9c1f777985c..2460c17458530 100644
--- a/examples/with-freactal/README.md
+++ b/examples/with-freactal/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-freactal with-freactal-app
diff --git a/examples/with-glamor/README.md b/examples/with-glamor/README.md
index bbff0f9d90d9f..dc833821cb2fd 100644
--- a/examples/with-glamor/README.md
+++ b/examples/with-glamor/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-glamor with-glamor-app
diff --git a/examples/with-glamorous/README.md b/examples/with-glamorous/README.md
index fd4386babe80c..1b9a02340bb9e 100644
--- a/examples/with-glamorous/README.md
+++ b/examples/with-glamorous/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-glamorous with-glamorous-app
diff --git a/examples/with-google-analytics/README.md b/examples/with-google-analytics/README.md
index 69298c873e0bc..2c3982b5fbe4b 100644
--- a/examples/with-google-analytics/README.md
+++ b/examples/with-google-analytics/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-google-analytics with-google-analytics-app
diff --git a/examples/with-graphql-hooks/README.md b/examples/with-graphql-hooks/README.md
index accc427da7a3d..55b063087eaad 100644
--- a/examples/with-graphql-hooks/README.md
+++ b/examples/with-graphql-hooks/README.md
@@ -10,7 +10,7 @@ https://next-with-graphql-hooks.now.sh
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-graphql-hooks with-graphql-hooks-app
diff --git a/examples/with-grommet/README.md b/examples/with-grommet/README.md
index 1cf03b4bbdcf5..f69a02aff2a3a 100644
--- a/examples/with-grommet/README.md
+++ b/examples/with-grommet/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-grommet with-grommet-app
diff --git a/examples/with-hashed-statics/README.md b/examples/with-hashed-statics/README.md
index f4d561f389e05..2a719ae8fa640 100644
--- a/examples/with-hashed-statics/README.md
+++ b/examples/with-hashed-statics/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-hashed-statics with-hashed-statics-app
diff --git a/examples/with-higher-order-component/README.md b/examples/with-higher-order-component/README.md
index c9b5269ad2256..fb1b136c78c75 100644
--- a/examples/with-higher-order-component/README.md
+++ b/examples/with-higher-order-component/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to
 bootstrap the example:
 
 ```bash
diff --git a/examples/with-http2/README.md b/examples/with-http2/README.md
index a40282086b1fb..efce7b7cf3b54 100644
--- a/examples/with-http2/README.md
+++ b/examples/with-http2/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-http2 with-http2-app
diff --git a/examples/with-immutable-redux-wrapper/README.md b/examples/with-immutable-redux-wrapper/README.md
index d4de2196fdaf9..b2ed38f24217c 100644
--- a/examples/with-immutable-redux-wrapper/README.md
+++ b/examples/with-immutable-redux-wrapper/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-immutable-redux-wrapper with-immutable-redux-wrapper-app
diff --git a/examples/with-ioc/README.md b/examples/with-ioc/README.md
index f540b48bf3296..b8b2fc2252099 100644
--- a/examples/with-ioc/README.md
+++ b/examples/with-ioc/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-ioc with-ioc-app
diff --git a/examples/with-jest-flow/README.md b/examples/with-jest-flow/README.md
index f1387a0d0f53b..f6ad8dee410db 100644
--- a/examples/with-jest-flow/README.md
+++ b/examples/with-jest-flow/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-jest-flow with-jest-flow-app
diff --git a/examples/with-jest-react-testing-library/README.md b/examples/with-jest-react-testing-library/README.md
index a0010e4816d2d..788d96f746335 100644
--- a/examples/with-jest-react-testing-library/README.md
+++ b/examples/with-jest-react-testing-library/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-jest-react-testing-library with-rtl-app
diff --git a/examples/with-jest-typescript/README.md b/examples/with-jest-typescript/README.md
index b308b367f2c51..0bb7ac9611ae7 100644
--- a/examples/with-jest-typescript/README.md
+++ b/examples/with-jest-typescript/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-jest-typescript with-jest-typescript-app
diff --git a/examples/with-jest/README.md b/examples/with-jest/README.md
index 69771ad5669c3..b8fdadb096775 100644
--- a/examples/with-jest/README.md
+++ b/examples/with-jest/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-jest with-jest-app
diff --git a/examples/with-kea/README.md b/examples/with-kea/README.md
index 10b85d8659eef..70bc8c1150351 100644
--- a/examples/with-kea/README.md
+++ b/examples/with-kea/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-kea with-kea-app
diff --git a/examples/with-linaria/README.md b/examples/with-linaria/README.md
index 49fce57a0f2fc..d015858f35e57 100644
--- a/examples/with-linaria/README.md
+++ b/examples/with-linaria/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-linaria with-linaria-app
diff --git a/examples/with-lingui/README.md b/examples/with-lingui/README.md
index 92c7eef45a7c8..92406b0d41d98 100644
--- a/examples/with-lingui/README.md
+++ b/examples/with-lingui/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-lingui with-lingui-app
diff --git a/examples/with-loading/README.md b/examples/with-loading/README.md
index ee5c28452d40e..c7150303037e9 100644
--- a/examples/with-loading/README.md
+++ b/examples/with-loading/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-loading with-loading-app
diff --git a/examples/with-markdown/README.md b/examples/with-markdown/README.md
index da92345769041..e90046c93c560 100644
--- a/examples/with-markdown/README.md
+++ b/examples/with-markdown/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-markdown with-markdown
diff --git a/examples/with-mdx/README.md b/examples/with-mdx/README.md
index a2110d71c574e..eaba895738479 100644
--- a/examples/with-mdx/README.md
+++ b/examples/with-mdx/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-mdx with-mdx-app
diff --git a/examples/with-mobx-react-lite/README.md b/examples/with-mobx-react-lite/README.md
index fb4a36f3b4b81..da94316b3b462 100644
--- a/examples/with-mobx-react-lite/README.md
+++ b/examples/with-mobx-react-lite/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-mobx-react-lite with-mobx-react-lite-app
diff --git a/examples/with-mobx-state-tree-typescript/README.md b/examples/with-mobx-state-tree-typescript/README.md
index dd422e925a71d..7170538135412 100644
--- a/examples/with-mobx-state-tree-typescript/README.md
+++ b/examples/with-mobx-state-tree-typescript/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-mobx-state-tree-typescript with-mobx-state-tree-typescript-app
diff --git a/examples/with-mobx-state-tree/README.md b/examples/with-mobx-state-tree/README.md
index 64323f7433e9d..53b2006651d8f 100644
--- a/examples/with-mobx-state-tree/README.md
+++ b/examples/with-mobx-state-tree/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-mobx-state-tree with-mobx-state-tree-app
diff --git a/examples/with-mobx/README.md b/examples/with-mobx/README.md
index 05965b7244a16..df3554e3483e4 100644
--- a/examples/with-mobx/README.md
+++ b/examples/with-mobx/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-mobx with-mobx-app
diff --git a/examples/with-mocha/README.md b/examples/with-mocha/README.md
index 1bed1da156875..4b9d7cef47bed 100644
--- a/examples/with-mocha/README.md
+++ b/examples/with-mocha/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-mocha with-mocha-app
diff --git a/examples/with-next-css/README.md b/examples/with-next-css/README.md
index 69532d61f30fc..17c757ff577f1 100644
--- a/examples/with-next-css/README.md
+++ b/examples/with-next-css/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-next-css with-next-css-app
diff --git a/examples/with-next-less/README.md b/examples/with-next-less/README.md
index c6e9af0ef1af2..69c106fd236b2 100644
--- a/examples/with-next-less/README.md
+++ b/examples/with-next-less/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-next-less with-next-less-app
diff --git a/examples/with-next-offline/README.md b/examples/with-next-offline/README.md
index 3c4213a0aedda..680e93630ac79 100644
--- a/examples/with-next-offline/README.md
+++ b/examples/with-next-offline/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-next-offline with-next-offline-app
diff --git a/examples/with-next-page-transitions/README.md b/examples/with-next-page-transitions/README.md
index f951275dbb744..14c0b254a8385 100644
--- a/examples/with-next-page-transitions/README.md
+++ b/examples/with-next-page-transitions/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-next-page-transitions with-next-page-transitions
diff --git a/examples/with-next-routes/README.md b/examples/with-next-routes/README.md
index 1da4696e14b9d..537a8f8561321 100644
--- a/examples/with-next-routes/README.md
+++ b/examples/with-next-routes/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-next-routes with-next-routes-app
diff --git a/examples/with-next-sass/README.md b/examples/with-next-sass/README.md
index dd6469d57f617..4a8541f1c0895 100644
--- a/examples/with-next-sass/README.md
+++ b/examples/with-next-sass/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-next-sass with-next-sass-app
diff --git a/examples/with-next-seo/README.md b/examples/with-next-seo/README.md
index 14e14ae8ca7a5..5b8c023e939b3 100644
--- a/examples/with-next-seo/README.md
+++ b/examples/with-next-seo/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-next-seo next-seo-app
diff --git a/examples/with-noscript/README.md b/examples/with-noscript/README.md
index e873a17089546..51c08194f8f8e 100644
--- a/examples/with-noscript/README.md
+++ b/examples/with-noscript/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-noscript with-noscript-app
diff --git a/examples/with-now-env/README.md b/examples/with-now-env/README.md
index d2ca4b0b072e0..8cc5955352e80 100644
--- a/examples/with-now-env/README.md
+++ b/examples/with-now-env/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-now-env with-now-env-app
diff --git a/examples/with-office-ui-fabric-react/README.md b/examples/with-office-ui-fabric-react/README.md
index 49ca09cbb5bc3..55d671b5565b8 100644
--- a/examples/with-office-ui-fabric-react/README.md
+++ b/examples/with-office-ui-fabric-react/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-office-ui-fabric-react with-office-ui-fabric-react-app
diff --git a/examples/with-orbit-components/README.md b/examples/with-orbit-components/README.md
index f39358dd8cf08..3014ca4dd3a03 100644
--- a/examples/with-orbit-components/README.md
+++ b/examples/with-orbit-components/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-orbit-components with-orbit-components-app
diff --git a/examples/with-overmind/README.md b/examples/with-overmind/README.md
index e02f0fdbf7d62..60a21eb763ffe 100644
--- a/examples/with-overmind/README.md
+++ b/examples/with-overmind/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-overmind with-overmind-app
diff --git a/examples/with-pkg/README.md b/examples/with-pkg/README.md
index f8fb85eaa6a2b..4db5f0fd4c8b2 100644
--- a/examples/with-pkg/README.md
+++ b/examples/with-pkg/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-pkg with-pkg-app
diff --git a/examples/with-polyfills/README.md b/examples/with-polyfills/README.md
index 19f589f1e995d..633ff72cc53c2 100644
--- a/examples/with-polyfills/README.md
+++ b/examples/with-polyfills/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-polyfills with-polyfills-app
diff --git a/examples/with-portals-ssr/README.md b/examples/with-portals-ssr/README.md
index 1a22ba15d1175..074428f08caa9 100644
--- a/examples/with-portals-ssr/README.md
+++ b/examples/with-portals-ssr/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-portals-ssr with-portals-ssr
diff --git a/examples/with-portals/README.md b/examples/with-portals/README.md
index 982d0a093e486..3d1b207db06cb 100644
--- a/examples/with-portals/README.md
+++ b/examples/with-portals/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-portals with-portals-app
diff --git a/examples/with-prefetching/README.md b/examples/with-prefetching/README.md
index 7717861c04605..4b70ea7777572 100644
--- a/examples/with-prefetching/README.md
+++ b/examples/with-prefetching/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-prefetching with-prefetching-app
diff --git a/examples/with-pretty-url-routing/README.md b/examples/with-pretty-url-routing/README.md
index 8d19361f679fe..f5b16f2c6a44b 100644
--- a/examples/with-pretty-url-routing/README.md
+++ b/examples/with-pretty-url-routing/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-pretty-url-routing with-pretty-url-routing-app
diff --git a/examples/with-quill-js/README.md b/examples/with-quill-js/README.md
index 6910fe99a9cd9..8394628b404df 100644
--- a/examples/with-quill-js/README.md
+++ b/examples/with-quill-js/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-quill-js with-quill-js-app
diff --git a/examples/with-rbx-bulma-pro/pages/index.js b/examples/with-rbx-bulma-pro/pages/index.js
index ff18ae06472b2..ede642a4fa1c2 100644
--- a/examples/with-rbx-bulma-pro/pages/index.js
+++ b/examples/with-rbx-bulma-pro/pages/index.js
@@ -35,7 +35,7 @@ const Home = () => (
       <Card>
         <Card.Content>
           <Content>
-            <Link href='https://github.com/segmentio/create-next-app'>
+            <Link href='https://github.com/zeit/next.js/tree/canary/packages/create-next-app'>
               <a>
                 <Title as='h3'>Create Next App &rarr;</Title>
                 <p>Was this tool helpful? Let us know how we can improve it</p>
diff --git a/examples/with-react-css-modules/README.md b/examples/with-react-css-modules/README.md
index d92f5e281ac5b..8f32080a87ad3 100644
--- a/examples/with-react-css-modules/README.md
+++ b/examples/with-react-css-modules/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-css-modules with-react-css-modules-app
diff --git a/examples/with-react-esi/README.md b/examples/with-react-esi/README.md
index 38e3f70cbdfca..8d567475579cc 100644
--- a/examples/with-react-esi/README.md
+++ b/examples/with-react-esi/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-esi with-react-esi-app
diff --git a/examples/with-react-ga/README.md b/examples/with-react-ga/README.md
index 49b2013d86a73..82731e3ba4c1c 100644
--- a/examples/with-react-ga/README.md
+++ b/examples/with-react-ga/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-ga with-react-ga-app
diff --git a/examples/with-react-helmet/README.md b/examples/with-react-helmet/README.md
index 15f7c3c4fa988..4b5d91e476287 100644
--- a/examples/with-react-helmet/README.md
+++ b/examples/with-react-helmet/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-helmet with-react-helmet-app
diff --git a/examples/with-react-intl/README.md b/examples/with-react-intl/README.md
index 79f106f58fcc3..1c13d3c6a95c2 100644
--- a/examples/with-react-intl/README.md
+++ b/examples/with-react-intl/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-intl with-react-intl-app
diff --git a/examples/with-react-jss/README.md b/examples/with-react-jss/README.md
index ae68ff400a361..3b330c1c8fa3c 100644
--- a/examples/with-react-jss/README.md
+++ b/examples/with-react-jss/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-jss with-react-jss-app
diff --git a/examples/with-react-md/README.md b/examples/with-react-md/README.md
index 0e262679130b7..bca5e18ff86ed 100644
--- a/examples/with-react-md/README.md
+++ b/examples/with-react-md/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-md with-react-md-app
diff --git a/examples/with-react-native-web/README.md b/examples/with-react-native-web/README.md
index 0a9a70e3ad2e7..ea48dd3ea59e2 100644
--- a/examples/with-react-native-web/README.md
+++ b/examples/with-react-native-web/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-native-web
diff --git a/examples/with-react-relay-network-modern/README.md b/examples/with-react-relay-network-modern/README.md
index 1e2a0138f3ebb..193080d1b5baa 100644
--- a/examples/with-react-relay-network-modern/README.md
+++ b/examples/with-react-relay-network-modern/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-relay-network-modern with-react-relay-network-modern-app
diff --git a/examples/with-react-toolbox/README.md b/examples/with-react-toolbox/README.md
index 6300a3231b1e4..e8dad71fe798f 100644
--- a/examples/with-react-toolbox/README.md
+++ b/examples/with-react-toolbox/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-toolbox with-react-toolbox-app
diff --git a/examples/with-react-useragent/README.md b/examples/with-react-useragent/README.md
index 85b0aae2e7710..fcef568555aab 100644
--- a/examples/with-react-useragent/README.md
+++ b/examples/with-react-useragent/README.md
@@ -6,7 +6,7 @@ Show how to setup [@quentin-sommer/react-useragent](https://github.com/quentin-s
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-useragent with-react-useragent-app
diff --git a/examples/with-react-uwp/README.md b/examples/with-react-uwp/README.md
index ba5a85b8a01b1..b213f9a407aec 100644
--- a/examples/with-react-uwp/README.md
+++ b/examples/with-react-uwp/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-uwp with-react-uwp-app
diff --git a/examples/with-react-with-styles/README.md b/examples/with-react-with-styles/README.md
index 7a5feef2e958d..2e22a2e1bcd37 100644
--- a/examples/with-react-with-styles/README.md
+++ b/examples/with-react-with-styles/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-react-with-styles with-react-with-styles-app
diff --git a/examples/with-reasonml-todo/README.md b/examples/with-reasonml-todo/README.md
index 1cb4c9250cdf0..b09db4b6d3484 100644
--- a/examples/with-reasonml-todo/README.md
+++ b/examples/with-reasonml-todo/README.md
@@ -10,7 +10,7 @@ without the added complexity of a redux type library.
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with
 [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or
 [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
diff --git a/examples/with-reasonml/README.md b/examples/with-reasonml/README.md
index 8066d7850b9f1..67cdaeac09793 100644
--- a/examples/with-reasonml/README.md
+++ b/examples/with-reasonml/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-reasonml with-reasonml-app
diff --git a/examples/with-rebass/README.md b/examples/with-rebass/README.md
index 4c94e702b8c8d..ea04f9c6267d4 100644
--- a/examples/with-rebass/README.md
+++ b/examples/with-rebass/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-rebass with-rebass-app
diff --git a/examples/with-recompose/README.md b/examples/with-recompose/README.md
index c597f186f0b4f..d443bc4bd84bc 100644
--- a/examples/with-recompose/README.md
+++ b/examples/with-recompose/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-recompose with-recompose-app
diff --git a/examples/with-redux-code-splitting/README.md b/examples/with-redux-code-splitting/README.md
index 05134c2995870..58c1702e1ce2d 100644
--- a/examples/with-redux-code-splitting/README.md
+++ b/examples/with-redux-code-splitting/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux-code-splitting with-redux-code-splitting-app
diff --git a/examples/with-redux-observable/README.md b/examples/with-redux-observable/README.md
index a8251c735f927..903b938e6dd04 100644
--- a/examples/with-redux-observable/README.md
+++ b/examples/with-redux-observable/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux-observable with-redux-observable-app
diff --git a/examples/with-redux-persist/README.md b/examples/with-redux-persist/README.md
index 8d9e2adde8ea2..a988f96968ec4 100644
--- a/examples/with-redux-persist/README.md
+++ b/examples/with-redux-persist/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux-persist with-redux-persist-app
diff --git a/examples/with-redux-reselect-recompose/README.md b/examples/with-redux-reselect-recompose/README.md
index 214184e42dcf0..3194bf84c3767 100644
--- a/examples/with-redux-reselect-recompose/README.md
+++ b/examples/with-redux-reselect-recompose/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux-reselect-recompose with-redux-reselect-recompose-app
diff --git a/examples/with-redux-saga/README.md b/examples/with-redux-saga/README.md
index ca03c564c4004..fdd8548cbab84 100644
--- a/examples/with-redux-saga/README.md
+++ b/examples/with-redux-saga/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux-saga with-redux-saga-app
diff --git a/examples/with-redux-thunk/README.md b/examples/with-redux-thunk/README.md
index 323aed9d44c48..3969eead34275 100644
--- a/examples/with-redux-thunk/README.md
+++ b/examples/with-redux-thunk/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux-thunk with-redux-thunk-app
diff --git a/examples/with-redux-wrapper/README.md b/examples/with-redux-wrapper/README.md
index c5f8cfe54ee0e..bdd9b8793a797 100644
--- a/examples/with-redux-wrapper/README.md
+++ b/examples/with-redux-wrapper/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux-wrapper with-redux-wrapper-app
diff --git a/examples/with-redux/README.md b/examples/with-redux/README.md
index df7ceff24d998..29f7c00067f79 100644
--- a/examples/with-redux/README.md
+++ b/examples/with-redux/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-redux with-redux-app
diff --git a/examples/with-reflux/README.md b/examples/with-reflux/README.md
index 70f31414d297c..b343137786315 100644
--- a/examples/with-reflux/README.md
+++ b/examples/with-reflux/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-reflux with-reflux-app
diff --git a/examples/with-refnux/README.md b/examples/with-refnux/README.md
index 48c10b4b2bd98..65d1d0db06ef8 100644
--- a/examples/with-refnux/README.md
+++ b/examples/with-refnux/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-refnux with-refnux-app
diff --git a/examples/with-relay-modern-server-express/README.md b/examples/with-relay-modern-server-express/README.md
index e9d9e16e6b569..1f43805ebbca0 100644
--- a/examples/with-relay-modern-server-express/README.md
+++ b/examples/with-relay-modern-server-express/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-relay-modern-server-express with-relay-modern-server-express-app
diff --git a/examples/with-relay-modern/README.md b/examples/with-relay-modern/README.md
index cb32cde7c8617..337e0bc54b321 100644
--- a/examples/with-relay-modern/README.md
+++ b/examples/with-relay-modern/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-relay-modern with-relay-modern-app
diff --git a/examples/with-rematch/README.md b/examples/with-rematch/README.md
index 4fcd14377eb37..64567fcd29bab 100644
--- a/examples/with-rematch/README.md
+++ b/examples/with-rematch/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-rematch with-rematch-app
diff --git a/examples/with-segment-analytics/README.md b/examples/with-segment-analytics/README.md
index 59954baf21e55..3049ca49b64f0 100644
--- a/examples/with-segment-analytics/README.md
+++ b/examples/with-segment-analytics/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-segment-analytics with-segment-analytics-app
diff --git a/examples/with-semantic-ui/README.md b/examples/with-semantic-ui/README.md
index 74c1dfd5a5e1e..ed1c83ae7087e 100644
--- a/examples/with-semantic-ui/README.md
+++ b/examples/with-semantic-ui/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-semantic-ui with-semantic-ui-app
diff --git a/examples/with-sentry-simple/README.md b/examples/with-sentry-simple/README.md
index 791d2a2f9187a..83d76a03982e5 100644
--- a/examples/with-sentry-simple/README.md
+++ b/examples/with-sentry-simple/README.md
@@ -6,7 +6,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-sentry-simple with-sentry-simple
diff --git a/examples/with-sentry/README.md b/examples/with-sentry/README.md
index 482f7179447ab..92b69c83849d4 100644
--- a/examples/with-sentry/README.md
+++ b/examples/with-sentry/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-sentry with-sentry-app
diff --git a/examples/with-shallow-routing/README.md b/examples/with-shallow-routing/README.md
index aeb21c43d47af..3303c8a901e54 100644
--- a/examples/with-shallow-routing/README.md
+++ b/examples/with-shallow-routing/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-shallow-routing with-shallow-routing-app
diff --git a/examples/with-sitemap-and-robots-express-server/README.md b/examples/with-sitemap-and-robots-express-server/README.md
index fbff3700bb8fe..cd40576c4182d 100644
--- a/examples/with-sitemap-and-robots-express-server/README.md
+++ b/examples/with-sitemap-and-robots-express-server/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-sitemap-and-robots-express-server with-sitemap-and-robots-express-server-app
diff --git a/examples/with-slate/README.md b/examples/with-slate/README.md
index 81d8b8416e7ff..a34188b3adc4e 100644
--- a/examples/with-slate/README.md
+++ b/examples/with-slate/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-slate with-slate-app
diff --git a/examples/with-socket.io/README.md b/examples/with-socket.io/README.md
index 87112d557eec9..3c528785aea65 100644
--- a/examples/with-socket.io/README.md
+++ b/examples/with-socket.io/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-socket.io with-socket.io-app
diff --git a/examples/with-static-export/README.md b/examples/with-static-export/README.md
index 5b6e9297fb184..cc8b53d6f7658 100644
--- a/examples/with-static-export/README.md
+++ b/examples/with-static-export/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-static-export with-static-export-app
diff --git a/examples/with-stomp/README.md b/examples/with-stomp/README.md
index de7a2177b2628..b72a478369c13 100644
--- a/examples/with-stomp/README.md
+++ b/examples/with-stomp/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-stomp with-stomp-app
diff --git a/examples/with-storybook/README.md b/examples/with-storybook/README.md
index 6531dcff615ab..530a34478deb1 100644
--- a/examples/with-storybook/README.md
+++ b/examples/with-storybook/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-storybook with-storybook-app
diff --git a/examples/with-strict-csp-hash/README.md b/examples/with-strict-csp-hash/README.md
index d22250c673236..add9eed575950 100644
--- a/examples/with-strict-csp-hash/README.md
+++ b/examples/with-strict-csp-hash/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-strict-csp-hash with-strict-csp-hash-app
diff --git a/examples/with-strict-csp/README.md b/examples/with-strict-csp/README.md
index 8a84ab39c09ca..babbf7f205256 100644
--- a/examples/with-strict-csp/README.md
+++ b/examples/with-strict-csp/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-strict-csp with-strict-csp-app
diff --git a/examples/with-style-sheet/README.md b/examples/with-style-sheet/README.md
index 2822e8efd05ff..4e83144911362 100644
--- a/examples/with-style-sheet/README.md
+++ b/examples/with-style-sheet/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-style-sheet with-style-sheet-app
diff --git a/examples/with-styled-components/README.md b/examples/with-styled-components/README.md
index 64e983040dbd9..355a412c04e3f 100644
--- a/examples/with-styled-components/README.md
+++ b/examples/with-styled-components/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-styled-components with-styled-components-app
diff --git a/examples/with-styled-jsx-plugins/README.md b/examples/with-styled-jsx-plugins/README.md
index 39c574693b650..7adf969f363f7 100644
--- a/examples/with-styled-jsx-plugins/README.md
+++ b/examples/with-styled-jsx-plugins/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-styled-jsx-plugins with-styled-jsx-plugins-app
diff --git a/examples/with-styled-jsx-scss/README.md b/examples/with-styled-jsx-scss/README.md
index 47a2e4d8259d5..b80dbfb2378c5 100644
--- a/examples/with-styled-jsx-scss/README.md
+++ b/examples/with-styled-jsx-scss/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-styled-jsx-scss with-styled-jsx-scss-app
diff --git a/examples/with-styletron/README.md b/examples/with-styletron/README.md
index 487ef8d2bfed0..03267f55b0a04 100644
--- a/examples/with-styletron/README.md
+++ b/examples/with-styletron/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-styletron with-styletron-app
diff --git a/examples/with-sw-precache/README.md b/examples/with-sw-precache/README.md
index 8546390a20d0c..61411cb2525f6 100644
--- a/examples/with-sw-precache/README.md
+++ b/examples/with-sw-precache/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-sw-precache with-sw-precache-app
diff --git a/examples/with-tailwindcss/README.md b/examples/with-tailwindcss/README.md
index f705f250a642d..01e2c622d7a6f 100644
--- a/examples/with-tailwindcss/README.md
+++ b/examples/with-tailwindcss/README.md
@@ -6,7 +6,7 @@ This is an example of how you can include a global stylesheet in a next.js webap
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-tailwindcss with-tailwindcss-app
diff --git a/examples/with-ts-node/README.md b/examples/with-ts-node/README.md
index 078c2e30d5351..972203fa5a128 100644
--- a/examples/with-ts-node/README.md
+++ b/examples/with-ts-node/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-ts-node with-ts-node-app
diff --git a/examples/with-typescript-styled-components/README.md b/examples/with-typescript-styled-components/README.md
index e8a8bf6dcd112..19afbafd99e95 100644
--- a/examples/with-typescript-styled-components/README.md
+++ b/examples/with-typescript-styled-components/README.md
@@ -6,7 +6,7 @@ This is a really simple project that show the usage of Next.js with TypeScript a
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-typescript-styled-components with-typescript-app
diff --git a/examples/with-typescript/README.md b/examples/with-typescript/README.md
index f5a047685541e..7ad0ca60cf147 100644
--- a/examples/with-typescript/README.md
+++ b/examples/with-typescript/README.md
@@ -6,7 +6,7 @@ This is a really simple project that show the usage of Next.js with TypeScript.
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-typescript with-typescript-app
diff --git a/examples/with-typestyle/README.md b/examples/with-typestyle/README.md
index 9fb79a852257e..9d455bfe70f27 100644
--- a/examples/with-typestyle/README.md
+++ b/examples/with-typestyle/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-typestyle with-typestyle-app
diff --git a/examples/with-typings-for-css-modules/README.md b/examples/with-typings-for-css-modules/README.md
index 3e2255e5d2442..b1338e885d724 100644
--- a/examples/with-typings-for-css-modules/README.md
+++ b/examples/with-typings-for-css-modules/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-typings-for-css-modules with-typings-for-css-modules-app
diff --git a/examples/with-universal-configuration-build-time/README.md b/examples/with-universal-configuration-build-time/README.md
index 354649b3bd28f..1dfefb88eb319 100644
--- a/examples/with-universal-configuration-build-time/README.md
+++ b/examples/with-universal-configuration-build-time/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-universal-configuration-build-time with-universal-configuration-build-time-app
diff --git a/examples/with-universal-configuration-runtime/README.md b/examples/with-universal-configuration-runtime/README.md
index d5504dc09c0db..b0c1661e69f97 100644
--- a/examples/with-universal-configuration-runtime/README.md
+++ b/examples/with-universal-configuration-runtime/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-universal-configuration-runtime with-universal-configuration-runtime-app
diff --git a/examples/with-unstated/README.md b/examples/with-unstated/README.md
index 182799eea5361..734517cf85b58 100644
--- a/examples/with-unstated/README.md
+++ b/examples/with-unstated/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-unstated with-unstated-app
diff --git a/examples/with-url-object-routing/README.md b/examples/with-url-object-routing/README.md
index 03d051e625e6c..ffe09347c1752 100644
--- a/examples/with-url-object-routing/README.md
+++ b/examples/with-url-object-routing/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-url-object-routing with-url-object-routing-app
diff --git a/examples/with-videojs/README.md b/examples/with-videojs/README.md
index 3441a7c5a1f38..b82ad7ee66f40 100644
--- a/examples/with-videojs/README.md
+++ b/examples/with-videojs/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-videojs with-videojs-app
diff --git a/examples/with-webassembly/readme.md b/examples/with-webassembly/readme.md
index 0eba8dd268ecb..b28595423715c 100644
--- a/examples/with-webassembly/readme.md
+++ b/examples/with-webassembly/readme.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-webassembly with-webassembly-app
diff --git a/examples/with-webpack-bundle-size-analyzer/README.md b/examples/with-webpack-bundle-size-analyzer/README.md
index 9a975c219e4d2..084a49f37fb30 100644
--- a/examples/with-webpack-bundle-size-analyzer/README.md
+++ b/examples/with-webpack-bundle-size-analyzer/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-webpack-bundle-size-analyzer with-webpack-bundle-size-analyzer-app
diff --git a/examples/with-yarn-workspaces/README.md b/examples/with-yarn-workspaces/README.md
index d640a9d7b33ae..affea95c79842 100644
--- a/examples/with-yarn-workspaces/README.md
+++ b/examples/with-yarn-workspaces/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-yarn-workspaces with-yarn-workspaces-app
diff --git a/examples/with-zeit-fetch/README.md b/examples/with-zeit-fetch/README.md
index 4bb9906468725..21ba4be586cb3 100644
--- a/examples/with-zeit-fetch/README.md
+++ b/examples/with-zeit-fetch/README.md
@@ -4,12 +4,12 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
-npx create-next-app --example with-zeit-fetch-app
+npx create-next-app --example with-zeit-fetch with-zeit-fetch-app
 # or
-yarn create next-app --example with-zeit-fetch-app
+yarn create next-app --example with-zeit-fetch with-zeit-fetch-app
 ```
 
 ### Download manually
diff --git a/examples/with-zones/README.md b/examples/with-zones/README.md
index 81628380878dc..3ed5cd9519778 100644
--- a/examples/with-zones/README.md
+++ b/examples/with-zones/README.md
@@ -4,7 +4,7 @@
 
 ### Using `create-next-app`
 
-Execute [`create-next-app`](https://github.com/segmentio/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
+Execute [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app) with [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) or [npx](https://github.com/zkat/npx#readme) to bootstrap the example:
 
 ```bash
 npx create-next-app --example with-zones with-zones-app

From c941b6129c1c94c9e46dda81c8092181edea5c88 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 11 Oct 2019 04:49:18 -0500
Subject: [PATCH 16/31] Trigger error overlay for dynamic route mismatch
 (#9031)

---
 .../next/next-server/lib/router/router.ts     |  9 +++++++--
 .../pages/dynamic-route-mismatch.js           |  7 +++++++
 .../invalid-href/test/index.test.js           | 20 +++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 test/integration/invalid-href/pages/dynamic-route-mismatch.js

diff --git a/packages/next/next-server/lib/router/router.ts b/packages/next/next-server/lib/router/router.ts
index da7d44b3fe544..6b4db8e8cbe78 100644
--- a/packages/next/next-server/lib/router/router.ts
+++ b/packages/next/next-server/lib/router/router.ts
@@ -318,9 +318,14 @@ export default class Router implements BaseRouter {
         const rr = getRouteRegex(route)
         const routeMatch = getRouteMatcher(rr)(asPathname)
         if (!routeMatch) {
-          console.error(
+          const error =
             'The provided `as` value is incompatible with the `href` value. This is invalid. https://err.sh/zeit/next.js/incompatible-href-as'
-          )
+
+          if (process.env.NODE_ENV !== 'production') {
+            throw new Error(error)
+          } else {
+            console.error(error)
+          }
           return resolve(false)
         }
 
diff --git a/test/integration/invalid-href/pages/dynamic-route-mismatch.js b/test/integration/invalid-href/pages/dynamic-route-mismatch.js
new file mode 100644
index 0000000000000..c7c91ff7022e0
--- /dev/null
+++ b/test/integration/invalid-href/pages/dynamic-route-mismatch.js
@@ -0,0 +1,7 @@
+import Link from 'next/link'
+
+export default () => (
+  <Link href='/[post]' as='/blog/post-1'>
+    <a>Click me</a>
+  </Link>
+)
diff --git a/test/integration/invalid-href/test/index.test.js b/test/integration/invalid-href/test/index.test.js
index dc2c2de161015..d429965bedbef 100644
--- a/test/integration/invalid-href/test/index.test.js
+++ b/test/integration/invalid-href/test/index.test.js
@@ -82,6 +82,14 @@ describe('Invalid hrefs', () => {
     it('shows error when https://google.com is used as href on router.replace', async () => {
       await showsError('/second?method=replace', secondErrorRegex, true)
     })
+
+    it('shows error when dynamic route mismatch is used on Link', async () => {
+      await showsError(
+        '/dynamic-route-mismatch',
+        /The provided `as` value is incompatible with the `href` value/,
+        true
+      )
+    })
   })
 
   describe('production mode', () => {
@@ -92,27 +100,27 @@ describe('Invalid hrefs', () => {
     })
     afterAll(() => killApp())
 
-    it('shows error when mailto: is used as href on Link', async () => {
+    it('does not show error in production when mailto: is used as href on Link', async () => {
       await noError('/first')
     })
 
-    it('shows error when mailto: is used as href on router.push', async () => {
+    it('does not show error in production when mailto: is used as href on router.push', async () => {
       await noError('/first?method=push', true)
     })
 
-    it('shows error when mailto: is used as href on router.replace', async () => {
+    it('does not show error in production when mailto: is used as href on router.replace', async () => {
       await noError('/first?method=replace', true)
     })
 
-    it('shows error when https://google.com is used as href on Link', async () => {
+    it('does not show error in production when https://google.com is used as href on Link', async () => {
       await noError('/second')
     })
 
-    it('shows error when http://google.com is used as href on router.push', async () => {
+    it('does not show error in production when http://google.com is used as href on router.push', async () => {
       await noError('/second?method=push', true)
     })
 
-    it('shows error when https://google.com is used as href on router.replace', async () => {
+    it('does not show error in production when https://google.com is used as href on router.replace', async () => {
       await noError('/second?method=replace', true)
     })
   })

From 6c9fa8662cf0a9619a46409f831a4d8b4bf710db Mon Sep 17 00:00:00 2001
From: Luis Alvarez D <luis@zeit.co>
Date: Fri, 11 Oct 2019 04:50:06 -0500
Subject: [PATCH 17/31] Updated multiple examples to use /public (#9033)

---
 examples/blog-starter/components/head.js            |   1 -
 examples/blog-starter/posts/rss-feed.js             |   2 +-
 .../blog-starter/{static => public}/favicon.ico     | Bin
 .../blog-starter/{ => public}/static/_jolvera.png   | Bin
 examples/blog-starter/{ => public}/static/next.svg  |   0
 .../{ => public}/static/site-feature.png            | Bin
 .../components/head.js                              |   1 -
 .../{static => public}/favicon.ico                  | Bin
 .../{ => public}/static/instantsearch.css           |   0
 examples/with-asset-imports/README.md               |   4 ++--
 examples/with-asset-imports/pages/index.js          |   2 +-
 .../with-asset-imports/{static => public}/logo.png  | Bin
 .../{ => public}/static/img/angular.jpg             | Bin
 .../{ => public}/static/img/nextjs.png              | Bin
 .../{ => public}/static/img/reactjs.png             | Bin
 .../with-noscript/{ => public}/static/img/vuejs.png | Bin
 examples/with-react-md/README.md                    |   4 ++--
 examples/with-react-md/pages/index.js               |   5 +----
 .../public/react-md.light_blue-yellow.min.css       |   1 +
 .../static/react-md.light_blue-yellow.min.css       |   1 -
 20 files changed, 8 insertions(+), 13 deletions(-)
 rename examples/blog-starter/{static => public}/favicon.ico (100%)
 rename examples/blog-starter/{ => public}/static/_jolvera.png (100%)
 rename examples/blog-starter/{ => public}/static/next.svg (100%)
 rename examples/blog-starter/{ => public}/static/site-feature.png (100%)
 rename examples/with-algolia-react-instantsearch/{static => public}/favicon.ico (100%)
 rename examples/with-algolia-react-instantsearch/{ => public}/static/instantsearch.css (100%)
 rename examples/with-asset-imports/{static => public}/logo.png (100%)
 rename examples/with-noscript/{ => public}/static/img/angular.jpg (100%)
 rename examples/with-noscript/{ => public}/static/img/nextjs.png (100%)
 rename examples/with-noscript/{ => public}/static/img/reactjs.png (100%)
 rename examples/with-noscript/{ => public}/static/img/vuejs.png (100%)
 create mode 100644 examples/with-react-md/public/react-md.light_blue-yellow.min.css
 delete mode 120000 examples/with-react-md/static/react-md.light_blue-yellow.min.css

diff --git a/examples/blog-starter/components/head.js b/examples/blog-starter/components/head.js
index 3b57c05c88277..e01831d4a8e54 100644
--- a/examples/blog-starter/components/head.js
+++ b/examples/blog-starter/components/head.js
@@ -18,7 +18,6 @@ const Head = props => (
       content={props.description || defaultDescription}
     />
     <meta name='viewport' content='width=device-width, initial-scale=1' />
-    <link rel='icon' href='/static/favicon.ico' />
 
     <link
       rel='alternate'
diff --git a/examples/blog-starter/posts/rss-feed.js b/examples/blog-starter/posts/rss-feed.js
index df6de9fcfd5bb..bbe87784ec9b5 100644
--- a/examples/blog-starter/posts/rss-feed.js
+++ b/examples/blog-starter/posts/rss-feed.js
@@ -11,7 +11,7 @@ const feed = {
   feed_url: `${siteMeta.siteUrl}/feed.json`,
   description: siteMeta.description,
   icon: `${siteMeta.siteUrl}/static/apple-touch-icon-152x152.png`,
-  favicon: `${siteMeta.siteUrl}/static/favicon.ico`,
+  favicon: `${siteMeta.siteUrl}/favicon.ico`,
   author: {
     name: siteMeta.author,
     url: siteMeta.siteUrl,
diff --git a/examples/blog-starter/static/favicon.ico b/examples/blog-starter/public/favicon.ico
similarity index 100%
rename from examples/blog-starter/static/favicon.ico
rename to examples/blog-starter/public/favicon.ico
diff --git a/examples/blog-starter/static/_jolvera.png b/examples/blog-starter/public/static/_jolvera.png
similarity index 100%
rename from examples/blog-starter/static/_jolvera.png
rename to examples/blog-starter/public/static/_jolvera.png
diff --git a/examples/blog-starter/static/next.svg b/examples/blog-starter/public/static/next.svg
similarity index 100%
rename from examples/blog-starter/static/next.svg
rename to examples/blog-starter/public/static/next.svg
diff --git a/examples/blog-starter/static/site-feature.png b/examples/blog-starter/public/static/site-feature.png
similarity index 100%
rename from examples/blog-starter/static/site-feature.png
rename to examples/blog-starter/public/static/site-feature.png
diff --git a/examples/with-algolia-react-instantsearch/components/head.js b/examples/with-algolia-react-instantsearch/components/head.js
index 9051c725c84fa..a6cdb2da6c10a 100644
--- a/examples/with-algolia-react-instantsearch/components/head.js
+++ b/examples/with-algolia-react-instantsearch/components/head.js
@@ -18,7 +18,6 @@ export const Head = props => (
     <link rel='icon' sizes='192x192' href='/static/touch-icon.png' />
     <link rel='apple-touch-icon' href='/static/touch-icon.png' />
     <link rel='mask-icon' href='/static/favicon-mask.svg' color='#49B882' />
-    <link rel='icon' href='/static/favicon.ico' />
     <meta property='og:url' content={props.url || defaultOGURL} />
     <meta property='og:title' content={props.title || ''} />
     <meta
diff --git a/examples/with-algolia-react-instantsearch/static/favicon.ico b/examples/with-algolia-react-instantsearch/public/favicon.ico
similarity index 100%
rename from examples/with-algolia-react-instantsearch/static/favicon.ico
rename to examples/with-algolia-react-instantsearch/public/favicon.ico
diff --git a/examples/with-algolia-react-instantsearch/static/instantsearch.css b/examples/with-algolia-react-instantsearch/public/static/instantsearch.css
similarity index 100%
rename from examples/with-algolia-react-instantsearch/static/instantsearch.css
rename to examples/with-algolia-react-instantsearch/public/static/instantsearch.css
diff --git a/examples/with-asset-imports/README.md b/examples/with-asset-imports/README.md
index f3e6b5c90f65b..84134e96bff8e 100644
--- a/examples/with-asset-imports/README.md
+++ b/examples/with-asset-imports/README.md
@@ -39,7 +39,7 @@ now
 
 ## The idea behind the example
 
-This example shows how to enable the imports of assets (images, videos, etc.) and get a URL pointing to `/static`.
+This example shows how to enable the imports of assets (images, videos, etc.) and get a URL pointing to `/public`.
 
 This is also configurable to point to a CDN changing the `baseUri` to the CDN domain, something similar to this:
 
@@ -47,7 +47,7 @@ This is also configurable to point to a CDN changing the `baseUri` to the CDN do
 [
   "transform-assets-import-to-string",
   {
-    "baseDir": "/static",
+    "baseDir": "/",
     "baseUri": "https://cdn.domain.com"
   }
 ]
diff --git a/examples/with-asset-imports/pages/index.js b/examples/with-asset-imports/pages/index.js
index e67291d012859..a032723c5a6a5 100644
--- a/examples/with-asset-imports/pages/index.js
+++ b/examples/with-asset-imports/pages/index.js
@@ -1,3 +1,3 @@
-import avatar from '../static/logo.png'
+import avatar from '../public/logo.png'
 
 export default () => <img src={avatar} />
diff --git a/examples/with-asset-imports/static/logo.png b/examples/with-asset-imports/public/logo.png
similarity index 100%
rename from examples/with-asset-imports/static/logo.png
rename to examples/with-asset-imports/public/logo.png
diff --git a/examples/with-noscript/static/img/angular.jpg b/examples/with-noscript/public/static/img/angular.jpg
similarity index 100%
rename from examples/with-noscript/static/img/angular.jpg
rename to examples/with-noscript/public/static/img/angular.jpg
diff --git a/examples/with-noscript/static/img/nextjs.png b/examples/with-noscript/public/static/img/nextjs.png
similarity index 100%
rename from examples/with-noscript/static/img/nextjs.png
rename to examples/with-noscript/public/static/img/nextjs.png
diff --git a/examples/with-noscript/static/img/reactjs.png b/examples/with-noscript/public/static/img/reactjs.png
similarity index 100%
rename from examples/with-noscript/static/img/reactjs.png
rename to examples/with-noscript/public/static/img/reactjs.png
diff --git a/examples/with-noscript/static/img/vuejs.png b/examples/with-noscript/public/static/img/vuejs.png
similarity index 100%
rename from examples/with-noscript/static/img/vuejs.png
rename to examples/with-noscript/public/static/img/vuejs.png
diff --git a/examples/with-react-md/README.md b/examples/with-react-md/README.md
index bca5e18ff86ed..a9a75717dfe00 100644
--- a/examples/with-react-md/README.md
+++ b/examples/with-react-md/README.md
@@ -27,11 +27,11 @@ Install it and run:
 
 ```bash
 npm install
-ln -f -s ../node_modules/react-md/dist/react-md.light_blue-yellow.min.css static/react-md.light_blue-yellow.min.css
+ln -f -s ../node_modules/react-md/dist/react-md.light_blue-yellow.min.css public/react-md.light_blue-yellow.min.css
 npm run dev
 # or
 yarn
-ln -f -s ../node_modules/react-md/dist/react-md.light_blue-yellow.min.css static/react-md.light_blue-yellow.min.css
+ln -f -s ../node_modules/react-md/dist/react-md.light_blue-yellow.min.css public/react-md.light_blue-yellow.min.css
 yarn dev
 ```
 
diff --git a/examples/with-react-md/pages/index.js b/examples/with-react-md/pages/index.js
index 13a76b185a3aa..275c8969c11f9 100644
--- a/examples/with-react-md/pages/index.js
+++ b/examples/with-react-md/pages/index.js
@@ -73,10 +73,7 @@ export default () => {
   return (
     <div>
       <Head>
-        <link
-          rel='stylesheet'
-          href='/static/react-md.light_blue-yellow.min.css'
-        />
+        <link rel='stylesheet' href='/react-md.light_blue-yellow.min.css' />
         <link
           rel='stylesheet'
           href='https://fonts.googleapis.com/css?family=Roboto:300,400,500'
diff --git a/examples/with-react-md/public/react-md.light_blue-yellow.min.css b/examples/with-react-md/public/react-md.light_blue-yellow.min.css
new file mode 100644
index 0000000000000..d1ec1bf198553
--- /dev/null
+++ b/examples/with-react-md/public/react-md.light_blue-yellow.min.css
@@ -0,0 +1 @@
+../node_modules/react-md/dist/react-md.light_blue-yellow.min.css
\ No newline at end of file
diff --git a/examples/with-react-md/static/react-md.light_blue-yellow.min.css b/examples/with-react-md/static/react-md.light_blue-yellow.min.css
deleted file mode 120000
index d1ec1bf198553..0000000000000
--- a/examples/with-react-md/static/react-md.light_blue-yellow.min.css
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/react-md/dist/react-md.light_blue-yellow.min.css
\ No newline at end of file

From 9b0ec37f246495f9ad2f5b0921ddfb5f55fb6eeb Mon Sep 17 00:00:00 2001
From: Rafael Almeida <rafaelalmeidatk@gmail.com>
Date: Fri, 11 Oct 2019 06:57:33 -0300
Subject: [PATCH 18/31] Update storybook example to v5.2 with CSF (#9036)

* Update storybook example to v5.2 with CSF

* Fix linter errors
---
 examples/with-storybook/.storybook/config.js  | 26 +++++++++++++++----
 examples/with-storybook/package.json          |  8 +++---
 .../with-storybook/stories/button.stories.js  | 17 ++++++++++++
 .../stories/helloWorld.stories.js             |  6 +++++
 .../with-storybook/stories/index.stories.js   | 26 -------------------
 .../with-storybook/stories/welcome.stories.js |  7 +++++
 6 files changed, 55 insertions(+), 35 deletions(-)
 create mode 100644 examples/with-storybook/stories/button.stories.js
 create mode 100644 examples/with-storybook/stories/helloWorld.stories.js
 delete mode 100644 examples/with-storybook/stories/index.stories.js
 create mode 100644 examples/with-storybook/stories/welcome.stories.js

diff --git a/examples/with-storybook/.storybook/config.js b/examples/with-storybook/.storybook/config.js
index 0f1c26f70e422..28c65f4e7fca5 100644
--- a/examples/with-storybook/.storybook/config.js
+++ b/examples/with-storybook/.storybook/config.js
@@ -1,9 +1,25 @@
-import { configure } from '@storybook/react'
+import { configure, addParameters } from '@storybook/react'
+
+addParameters({
+  options: {
+    storySort: (a, b) => {
+      // We want the Welcome story at the top
+      if (a[1].kind === 'Welcome') {
+        return -1
+      }
+
+      // Sort the other stories by ID
+      // https://github.com/storybookjs/storybook/issues/548#issuecomment-530305279
+      return a[1].kind === b[1].kind
+        ? 0
+        : a[1].id.localeCompare(b[1].id, { numeric: true })
+    },
+  },
+})
 
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/)
-function loadStories () {
-  req.keys().forEach(filename => req(filename))
-}
 
-configure(loadStories, module)
+// the first argument can be an array too, so if you want to load from different locations or
+// different extensions, you can do it like this: configure([req1, req2], module)
+configure(req, module)
diff --git a/examples/with-storybook/package.json b/examples/with-storybook/package.json
index 36045f25783db..f44b2f5e06445 100644
--- a/examples/with-storybook/package.json
+++ b/examples/with-storybook/package.json
@@ -16,10 +16,10 @@
   },
   "license": "ISC",
   "devDependencies": {
-    "@storybook/addon-actions": "^4.1.7",
-    "@storybook/addon-links": "^4.1.7",
-    "@storybook/addons": "^4.1.7",
-    "@storybook/react": "^4.1.7",
+    "@storybook/addon-actions": "5.2.3",
+    "@storybook/addon-links": "5.2.3",
+    "@storybook/addons": "5.2.3",
+    "@storybook/react": "5.2.3",
     "babel-loader": "^8.0.5"
   }
 }
diff --git a/examples/with-storybook/stories/button.stories.js b/examples/with-storybook/stories/button.stories.js
new file mode 100644
index 0000000000000..84adac5dc9a84
--- /dev/null
+++ b/examples/with-storybook/stories/button.stories.js
@@ -0,0 +1,17 @@
+import React from 'react'
+import { action } from '@storybook/addon-actions'
+import { Button } from '@storybook/react/demo'
+
+export default { title: 'Button' }
+
+export const withText = () => (
+  <Button onClick={action('clicked')}>Hello Button</Button>
+)
+
+export const withSomeEmoji = () => (
+  <Button onClick={action('clicked')}>
+    <span role='img' aria-label='so cool'>
+      😀 😎 👍 💯
+    </span>
+  </Button>
+)
diff --git a/examples/with-storybook/stories/helloWorld.stories.js b/examples/with-storybook/stories/helloWorld.stories.js
new file mode 100644
index 0000000000000..1c524fc556c66
--- /dev/null
+++ b/examples/with-storybook/stories/helloWorld.stories.js
@@ -0,0 +1,6 @@
+import React from 'react'
+import HelloWorld from '../components'
+
+export default { title: 'Hello World' }
+
+export const simpleComponent = () => <HelloWorld />
diff --git a/examples/with-storybook/stories/index.stories.js b/examples/with-storybook/stories/index.stories.js
deleted file mode 100644
index f97e8916b73e2..0000000000000
--- a/examples/with-storybook/stories/index.stories.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react'
-
-import { storiesOf } from '@storybook/react'
-import { action } from '@storybook/addon-actions'
-import { linkTo } from '@storybook/addon-links'
-
-import { Button, Welcome } from '@storybook/react/demo'
-import HelloWorld from '../components'
-
-storiesOf('Welcome', module).add('to Storybook', () => (
-  <Welcome showApp={linkTo('Button')} />
-))
-
-storiesOf('Button', module)
-  .add('with text', () => (
-    <Button onClick={action('clicked')}>Hello Button</Button>
-  ))
-  .add('with some emoji', () => (
-    <Button onClick={action('clicked')}>
-      <span role='img' aria-label='so cool'>
-        😀 😎 👍 💯
-      </span>
-    </Button>
-  ))
-
-storiesOf('HelloWorld', module).add('simple component', () => <HelloWorld />)
diff --git a/examples/with-storybook/stories/welcome.stories.js b/examples/with-storybook/stories/welcome.stories.js
new file mode 100644
index 0000000000000..2466b9882ddfc
--- /dev/null
+++ b/examples/with-storybook/stories/welcome.stories.js
@@ -0,0 +1,7 @@
+import React from 'react'
+import { linkTo } from '@storybook/addon-links'
+import { Welcome } from '@storybook/react/demo'
+
+export default { title: 'Welcome' }
+
+export const toStorybook = () => <Welcome showApp={linkTo('Button')} />

From a3b990a52a47cb8c8d7d85823bae9ee81c5f03b0 Mon Sep 17 00:00:00 2001
From: Serhii <gregamezzo@gmail.com>
Date: Fri, 11 Oct 2019 15:14:17 +0300
Subject: [PATCH 19/31] Update README.md (#9040)

---
 examples/auth0/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/auth0/README.md b/examples/auth0/README.md
index f9d63636b4785..c486d480b1687 100644
--- a/examples/auth0/README.md
+++ b/examples/auth0/README.md
@@ -92,7 +92,7 @@ This sample tries to cover a few topics:
 
 - Signing in
 - Signing out
-- Loading the user on the server side and adding it as part of SSR (`/pages/advanced/srr-profile.js`)
+- Loading the user on the server side and adding it as part of SSR (`/pages/advanced/ssr-profile.js`)
 - Loading the user on the client side and using fast/cached SSR pages (`/pages/index.js`)
 - API Routes which can load the current user (`/pages/api/me.js`)
 - Using hooks to make the user available throughout the application (`/lib/user.js`)

From 58cc1d3be49f297ccd4c6fba236429b22906b5ef Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Fri, 11 Oct 2019 10:39:38 -0400
Subject: [PATCH 20/31] Remove static optimization from message (#9045)

* Remove static optimization from message
This check does not pertain to automatic static optimization.

Closes https://github.com/zeit/next.js/issues/9042

* Update help message
---
 errors/page-without-valid-component.md                | 11 +++++++++--
 packages/next/build/index.ts                          |  2 +-
 .../test/index.test.js                                |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/errors/page-without-valid-component.md b/errors/page-without-valid-component.md
index 31f7e7f464837..9344b712c9dbb 100644
--- a/errors/page-without-valid-component.md
+++ b/errors/page-without-valid-component.md
@@ -2,8 +2,15 @@
 
 #### Why This Error Occurred
 
-While auto exporting a page a valid React Component wasn't found. This could mean you have a file in `pages` that exports something that is not a React Component.
+A page that does not export a valid React Component was found while analyzing the build output.
+
+This is a hard error because the page would error when rendered, and causes poor build performance.
 
 #### Possible Ways to Fix It
 
-Move any non-page files that don't export a React Component as the default export to a different folder like `components` or `lib`.
+Investigate the list of page(s) specified in the error message.
+For each, you'll want to check if the file is meant to be a page.
+
+If the file is not meant to be a page, and instead, is a shared component or file, move the file to a different folder like `components` or `lib`.
+
+If the file is meant to be a page, double check you have an `export default` with the React Component instead of an `export`. If you're already using `export default`, make sure the returned valid is a valid React Component.
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index a7bd15cbdb757..d6c88ef87df26 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -411,7 +411,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
 
   if (invalidPages.size > 0) {
     throw new Error(
-      `automatic static optimization failed: found page${
+      `Build optimization failed: found page${
         invalidPages.size === 1 ? '' : 's'
       } without a React Component as default export in \n${[...invalidPages]
         .map(pg => `pages${pg}`)
diff --git a/test/integration/invalid-page-automatic-static-optimization/test/index.test.js b/test/integration/invalid-page-automatic-static-optimization/test/index.test.js
index bcecd517ef7e7..847172a9a707a 100644
--- a/test/integration/invalid-page-automatic-static-optimization/test/index.test.js
+++ b/test/integration/invalid-page-automatic-static-optimization/test/index.test.js
@@ -11,7 +11,7 @@ describe('Invalid Page automatic static optimization', () => {
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
 
     expect(stderr).toMatch(
-      /automatic static optimization failed: found pages without a React Component as default export in/
+      /Build optimization failed: found pages without a React Component as default export in/
     )
     expect(stderr).toMatch(/pages\/invalid/)
     expect(stderr).toMatch(/pages\/also-invalid/)

From 6efa1daf34278374a9c73937f80363d42cfacdca Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Fri, 11 Oct 2019 17:25:32 -0400
Subject: [PATCH 21/31] v9.1.2-canary.2

---
 lerna.json                                 | 2 +-
 packages/create-next-app/package.json      | 2 +-
 packages/next-bundle-analyzer/package.json | 2 +-
 packages/next-mdx/package.json             | 2 +-
 packages/next/package.json                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2d06d0ca05752..899874d97629f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.1.2-canary.1"
+  "version": "9.1.2-canary.2"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index c50ce454c8d96..36cca67fa64df 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.1.2-canary.1",
+  "version": "9.1.2-canary.2",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index c8c0a2e667b7d..96f77b5539ab6 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.1.2-canary.1",
+  "version": "9.1.2-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index 64d89d1bd0699..4c9d2b4b4a754 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.1.2-canary.1",
+  "version": "9.1.2-canary.2",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next/package.json b/packages/next/package.json
index 861b81df151d0..12923310a7f85 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.1.2-canary.1",
+  "version": "9.1.2-canary.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",

From 000f385b6e52b7a0dcc7a614f8045205e6dd0297 Mon Sep 17 00:00:00 2001
From: Bauyrzhan <baur3dn@gmail.com>
Date: Sat, 12 Oct 2019 11:29:08 +0600
Subject: [PATCH 22/31] Fix a minor typo in link (#9049)

---
 examples/with-zeit-fetch/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-zeit-fetch/README.md b/examples/with-zeit-fetch/README.md
index 21ba4be586cb3..b8a707c4c7d45 100644
--- a/examples/with-zeit-fetch/README.md
+++ b/examples/with-zeit-fetch/README.md
@@ -39,4 +39,4 @@ now
 
 ## The idea behind the example
 
-This example shows how to use [`@zeit/fetch`](https://npmjs.com/zeit/fetch) in a Next.js application.
+This example shows how to use [`@zeit/fetch`](https://npmjs.com/package/@zeit/fetch) in a Next.js application.

From 09681cd597873b3eafb57776ef63947c3a08f8b1 Mon Sep 17 00:00:00 2001
From: Nishant Singh <saysnishant@gmail.com>
Date: Sun, 13 Oct 2019 22:48:10 +0530
Subject: [PATCH 23/31] [Docs] Update static file serving section (#9062)

This block seemed redundant

```
To serve static files from the root directory you can add a folder called `public` and reference those files from the root, e.g: `/robots.txt`.
```

The block above this already mentions the same thing:
```
Create a folder called `public` in your project root directory. From your code you can then reference those files starting from the baseURL `/`
```

We could add the `robots.txt` eg to the first block itself if necessary
---
 packages/next/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/next/README.md b/packages/next/README.md
index ee60d588f133a..76c2c6355e00e 100644
--- a/packages/next/README.md
+++ b/packages/next/README.md
@@ -286,8 +286,6 @@ function MyImage() {
 export default MyImage
 ```
 
-To serve static files from the root directory you can add a folder called `public` and reference those files from the root, e.g: `/robots.txt`.
-
 _Note: Don't name the `public` directory anything else. The name can't be changed and is the only directory that Next.js uses for serving static assets._
 
 ### Dynamic Routing

From b2adfde983b22da38fde628db3a6e88a2b84180c Mon Sep 17 00:00:00 2001
From: Gerald Monaco <gbmonaco@google.com>
Date: Mon, 14 Oct 2019 09:45:56 -0700
Subject: [PATCH 24/31] Remove _document context (#9068)

---
 .../next/next-server/lib/document-context.ts  |  9 +++
 packages/next/next-server/lib/utils.ts        |  8 ++-
 packages/next/next-server/server/render.tsx   | 34 +++++-----
 packages/next/pages/_document.tsx             | 67 ++++++++-----------
 4 files changed, 60 insertions(+), 58 deletions(-)
 create mode 100644 packages/next/next-server/lib/document-context.ts

diff --git a/packages/next/next-server/lib/document-context.ts b/packages/next/next-server/lib/document-context.ts
new file mode 100644
index 0000000000000..3f594cf027691
--- /dev/null
+++ b/packages/next/next-server/lib/document-context.ts
@@ -0,0 +1,9 @@
+import * as React from 'react'
+import { DocumentProps } from './utils'
+
+type DocumentContext = {
+  readonly _documentProps: DocumentProps
+  readonly _devOnlyInvalidateCacheQueryString: string
+}
+
+export const DocumentContext = React.createContext<DocumentContext>(null as any)
diff --git a/packages/next/next-server/lib/utils.ts b/packages/next/next-server/lib/utils.ts
index 368a5bad596d1..e37f045f4f22b 100644
--- a/packages/next/next-server/lib/utils.ts
+++ b/packages/next/next-server/lib/utils.ts
@@ -4,6 +4,7 @@ import { ComponentType } from 'react'
 import { ParsedUrlQuery } from 'querystring'
 import { ManifestItem } from '../server/render'
 import { NextRouter } from './router/router'
+import { DocumentContext as DocumentComponentContext } from './document-context'
 
 /**
  * Types used by both next and next-server
@@ -20,7 +21,12 @@ export type DocumentType = NextComponentType<
   DocumentContext,
   DocumentInitialProps,
   DocumentProps
->
+> & {
+  renderDocument(
+    Document: DocumentType,
+    props: DocumentProps
+  ): React.ReactElement
+}
 
 export type AppType = NextComponentType<
   AppContextType,
diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index 3db8896ff4e72..69dbe742d0266 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -209,8 +209,8 @@ function renderDocument(
     '<!DOCTYPE html>' +
     renderToStaticMarkup(
       <AmpStateContext.Provider value={ampState}>
-        <Document
-          __NEXT_DATA__={{
+        {Document.renderDocument(Document, {
+          __NEXT_DATA__: {
             dataManager: dataManagerData,
             props, // The result of getInitialProps
             page: pathname, // The rendered page
@@ -224,21 +224,21 @@ function renderDocument(
             dynamicIds:
               dynamicImportsIds.length === 0 ? undefined : dynamicImportsIds,
             err: err ? serializeError(dev, err) : undefined, // Error if one happened, otherwise don't sent in the resulting HTML
-          }}
-          dangerousAsPath={dangerousAsPath}
-          canonicalBase={canonicalBase}
-          ampPath={ampPath}
-          inAmpMode={inAmpMode}
-          isDevelopment={!!dev}
-          hasCssMode={hasCssMode}
-          hybridAmp={hybridAmp}
-          staticMarkup={staticMarkup}
-          devFiles={devFiles}
-          files={files}
-          dynamicImports={dynamicImports}
-          assetPrefix={assetPrefix}
-          {...docProps}
-        />
+          },
+          dangerousAsPath,
+          canonicalBase,
+          ampPath,
+          inAmpMode,
+          isDevelopment: !!dev,
+          hasCssMode,
+          hybridAmp,
+          staticMarkup,
+          devFiles,
+          files,
+          dynamicImports,
+          assetPrefix,
+          ...docProps,
+        })}
       </AmpStateContext.Provider>
     )
   )
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 3ceb7b3f7e29b..ca723cc5eacee 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -13,6 +13,7 @@ import {
   CLIENT_STATIC_FILES_RUNTIME_AMP,
   CLIENT_STATIC_FILES_RUNTIME_WEBPACK,
 } from '../next-server/lib/constants'
+import { DocumentContext as DocumentComponentContext } from '../next-server/lib/document-context'
 
 export { DocumentContext, DocumentInitialProps, DocumentProps }
 
@@ -21,11 +22,6 @@ export type OriginProps = {
   crossOrigin?: string
 }
 
-export type DocumentComponentContext = {
-  readonly _documentProps: DocumentProps
-  readonly _devOnlyInvalidateCacheQueryString: string
-}
-
 export async function middleware({ req, res }: DocumentContext) {}
 
 function dedupe(bundles: any[]): any[] {
@@ -52,11 +48,6 @@ function getOptionalModernScriptVariant(path: string) {
  * Commonly used for implementing server side rendering for `css-in-js` libraries.
  */
 export default class Document<P = {}> extends Component<DocumentProps & P> {
-  static childContextTypes = {
-    _documentProps: PropTypes.any,
-    _devOnlyInvalidateCacheQueryString: PropTypes.string,
-  }
-
   /**
    * `getInitialProps` hook returns the context object with the addition of `renderPage`.
    * `renderPage` callback executes `React` rendering logic synchronously to support server-rendering wrappers
@@ -69,17 +60,24 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
     return { html, head, styles, dataOnly }
   }
 
-  context!: DocumentComponentContext
-
-  getChildContext(): DocumentComponentContext {
-    return {
-      _documentProps: this.props,
-      // In dev we invalidate the cache by appending a timestamp to the resource URL.
-      // This is a workaround to fix https://github.com/zeit/next.js/issues/5860
-      // TODO: remove this workaround when https://bugs.webkit.org/show_bug.cgi?id=187726 is fixed.
-      _devOnlyInvalidateCacheQueryString:
-        process.env.NODE_ENV !== 'production' ? '?ts=' + Date.now() : '',
-    }
+  static renderDocument<P>(
+    Document: new () => Document<P>,
+    props: DocumentProps & P
+  ): React.ReactElement {
+    return (
+      <DocumentComponentContext.Provider
+        value={{
+          _documentProps: props,
+          // In dev we invalidate the cache by appending a timestamp to the resource URL.
+          // This is a workaround to fix https://github.com/zeit/next.js/issues/5860
+          // TODO: remove this workaround when https://bugs.webkit.org/show_bug.cgi?id=187726 is fixed.
+          _devOnlyInvalidateCacheQueryString:
+            process.env.NODE_ENV !== 'production' ? '?ts=' + Date.now() : '',
+        }}
+      >
+        <Document {...props} />
+      </DocumentComponentContext.Provider>
+    )
   }
 
   render() {
@@ -101,15 +99,13 @@ export class Html extends Component<
     HTMLHtmlElement
   >
 > {
-  static contextTypes = {
-    _documentProps: PropTypes.any,
-  }
+  static contextType = DocumentComponentContext
 
   static propTypes = {
     children: PropTypes.node.isRequired,
   }
 
-  context!: DocumentComponentContext
+  context!: React.ContextType<typeof DocumentComponentContext>
 
   render() {
     const { inAmpMode } = this.context._documentProps
@@ -132,17 +128,14 @@ export class Head extends Component<
       HTMLHeadElement
     >
 > {
-  static contextTypes = {
-    _documentProps: PropTypes.any,
-    _devOnlyInvalidateCacheQueryString: PropTypes.string,
-  }
+  static contextType = DocumentComponentContext
 
   static propTypes = {
     nonce: PropTypes.string,
     crossOrigin: PropTypes.string,
   }
 
-  context!: DocumentComponentContext
+  context!: React.ContextType<typeof DocumentComponentContext>
 
   getCssLinks() {
     const { assetPrefix, files } = this.context._documentProps
@@ -469,12 +462,9 @@ export class Head extends Component<
 }
 
 export class Main extends Component {
-  static contextTypes = {
-    _documentProps: PropTypes.any,
-    _devOnlyInvalidateCacheQueryString: PropTypes.string,
-  }
+  static contextType = DocumentComponentContext
 
-  context!: DocumentComponentContext
+  context!: React.ContextType<typeof DocumentComponentContext>
 
   render() {
     const { inAmpMode, html } = this.context._documentProps
@@ -484,17 +474,14 @@ export class Main extends Component {
 }
 
 export class NextScript extends Component<OriginProps> {
-  static contextTypes = {
-    _documentProps: PropTypes.any,
-    _devOnlyInvalidateCacheQueryString: PropTypes.string,
-  }
+  static contextType = DocumentComponentContext
 
   static propTypes = {
     nonce: PropTypes.string,
     crossOrigin: PropTypes.string,
   }
 
-  context!: DocumentComponentContext
+  context!: React.ContextType<typeof DocumentComponentContext>
 
   // Source: https://gist.github.com/samthor/64b114e4a4f539915a95b91ffd340acc
   static safariNomoduleFix =

From 3263af513e4b110d7cf2bf9478f5b078179b2b95 Mon Sep 17 00:00:00 2001
From: Alex Castle <atcastle@gmail.com>
Date: Mon, 14 Oct 2019 11:02:11 -0700
Subject: [PATCH 25/31] Update framework chunk test regex to not select nested
 dependencies (#9012)

* Update framework chunk test regex to not select nested dependencies

* Update webpack-config.ts
---
 packages/next/build/webpack-config.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 73bf5e756b969..c53682dee4697 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -234,7 +234,10 @@ export default async function getBaseWebpackConfig(
           // TODO(atcastle): Analyze if other cache groups should be set to 'all' as well
           chunks: 'all',
           name: 'framework',
-          test: /[\\/]node_modules[\\/](react|react-dom|scheduler|prop-types)[\\/]/,
+          // This regex ignores nested copies of framework libraries so they're 
+          // bundled with their issuer.
+          // https://github.com/zeit/next.js/pull/9012
+          test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|scheduler|prop-types)[\\/]/,
           priority: 40,
         },
         lib: {

From 7d1f18799be2e347a1cfa6ce5c3590e246d21a00 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Mon, 14 Oct 2019 14:11:33 -0400
Subject: [PATCH 26/31] Fix import in `@zeit/fetch` example (#9074)

---
 examples/with-zeit-fetch/fetch/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-zeit-fetch/fetch/browser.js b/examples/with-zeit-fetch/fetch/browser.js
index b5fbc9b47a1f5..808452912c7b8 100644
--- a/examples/with-zeit-fetch/fetch/browser.js
+++ b/examples/with-zeit-fetch/fetch/browser.js
@@ -1,3 +1,3 @@
-import fetch from 'isomorphic-fetch'
+import fetch from 'unfetch'
 
 export default fetch

From 7ff5cc13db1a6dd2fcaa4280283150a61d38edb6 Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Mon, 14 Oct 2019 14:53:33 -0400
Subject: [PATCH 27/31] Pin Azure Chromedriver (#9075)

This pins chromedriver to the version specified in https://github.com/Microsoft/azure-pipelines-image-generation/blob/master/images/win/Vs2017-Server2016-Readme.md.
---
 azure-pipelines.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cc39d77b375f1..222811468ab8e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,6 +4,7 @@ pool:
 variables:
   NEXT_TELEMETRY_DISABLED: '1'
   YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
+  CHROMEDRIVER_VERSION: '76.0.3809.68'
 
 strategy:
   maxParallel: 10
@@ -37,6 +38,10 @@ steps:
       yarn --frozen-lockfile --check-files
     displayName: 'Install dependencies'
 
+  - script: |
+      yarn add chromedriver@76 -W
+    displayName: 'Install correct Chrome Driver version'
+
   - script: |
       node run-tests.js -c 2 -g $(group)
     displayName: 'Run tests'

From 8676b0ffd6ce5b403ccb1a82d098c446cd68a03d Mon Sep 17 00:00:00 2001
From: "Hyeonjun (Jello)" <guswnsxodlf@gmail.com>
Date: Wed, 16 Oct 2019 00:42:44 +0900
Subject: [PATCH 28/31] Update no-document-title.md (#9082)

---
 errors/no-document-title.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/errors/no-document-title.md b/errors/no-document-title.md
index 53a3fa92a3d7b..62a3cc5d88b0f 100644
--- a/errors/no-document-title.md
+++ b/errors/no-document-title.md
@@ -10,7 +10,7 @@ Set `<title>` in `pages/_app.js` instead:
 
 ```js
 // pages/_app.js
-import App, { Container } from 'next/app'
+import App from 'next/app'
 import Head from 'next/head'
 import React from 'react'
 
@@ -29,12 +29,12 @@ export default class MyApp extends App {
     const { Component, pageProps } = this.props
 
     return (
-      <Container>
+      <>
         <Head>
           <title>My new cool app</title>
         </Head>
         <Component {...pageProps} />
-      </Container>
+      </>
     )
   }
 }

From c77338bd3166cc8e09a0e809e604a7b770fcce5f Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 15 Oct 2019 14:44:50 -0400
Subject: [PATCH 29/31] Temporary: Add Support for Now Platform Headers (#9085)

---
 .../build/webpack/loaders/next-serverless-loader.ts  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
index a726e8dd2f45e..6d678bb227ba1 100644
--- a/packages/next/build/webpack/loaders/next-serverless-loader.ts
+++ b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -131,7 +131,17 @@ const nextServerlessLoader: loader.Loader = function() {
             ? `const params = fromExport && !unstable_getStaticProps ? {} : getRouteMatcher(getRouteRegex("${page}"))(parsedUrl.pathname) || {};`
             : `const params = {};`
         }
-        const result = await renderToHTML(req, res, "${page}", Object.assign({}, unstable_getStaticProps ? {} : parsedUrl.query, params, sprData ? { _nextSprData: '1' } : {}), renderOpts)
+        ${
+          // Temporary work around -- `x-now-route-params` is a platform header
+          // _only_ set for `Prerender` requests. We should move this logic
+          // into our builder to ensure we're decoupled. However, this entails
+          // removing reliance on `req.url` and using `req.query` instead
+          // (which is needed for "custom routes" anyway).
+          isDynamicRoute(page)
+            ? `const nowParams = (req.headers && req.headers["x-now-route-params"]) ? querystring.parse(req.headers["x-now-route-params"]) : null;`
+            : `const nowParams = null;`
+        }
+        const result = await renderToHTML(req, res, "${page}", Object.assign({}, unstable_getStaticProps ? {} : parsedUrl.query, nowParams ? nowParams : params, sprData ? { _nextSprData: '1' } : {}), renderOpts)
 
         if (fromExport) return { html: result, renderOpts }
         return result

From 0208356f6756c2b6c88e91db54092d2dec323a70 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 15 Oct 2019 16:30:10 -0400
Subject: [PATCH 30/31] Temporary: SPR: Use Group Index Mapping (#9089)

This pull request is a temporary addition that uses the `x-now-route-params` header in serverless.

This header returns the regex groups with indexes, not their named variants.
As a result, we must use the getRouteMatcher utility to reverse this into Next.js' expected names.

Since this got complex, I've added a test for it. We should probably remove this behavior sooner than later.
---
 .../webpack/loaders/next-serverless-loader.ts | 26 ++++++++++++++++++-
 .../integration/serverless/pages/dr/[slug].js |  5 ++++
 .../integration/serverless/test/index.test.js | 23 ++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/serverless/pages/dr/[slug].js

diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
index 6d678bb227ba1..e21329d52f1df 100644
--- a/packages/next/build/webpack/loaders/next-serverless-loader.ts
+++ b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -70,6 +70,7 @@ const nextServerlessLoader: loader.Loader = function() {
   } else {
     return `
     import {parse} from 'url'
+    import {parse as parseQs} from 'querystring'
     import {renderToHTML} from 'next/dist/next-server/server/render';
     import {sendHTML} from 'next/dist/next-server/server/send-html';
     ${
@@ -138,7 +139,30 @@ const nextServerlessLoader: loader.Loader = function() {
           // removing reliance on `req.url` and using `req.query` instead
           // (which is needed for "custom routes" anyway).
           isDynamicRoute(page)
-            ? `const nowParams = (req.headers && req.headers["x-now-route-params"]) ? querystring.parse(req.headers["x-now-route-params"]) : null;`
+            ? `const nowParams = req.headers && req.headers["x-now-route-params"]
+              ? getRouteMatcher(
+                  (function() {
+                    const { re, groups } = getRouteRegex("${page}");
+                    return {
+                      re: {
+                        // Simulate a RegExp match from the \`req.url\` input
+                        exec: str => {
+                          const obj = parseQs(str);
+                          return Object.keys(obj).reduce(
+                            (prev, key) =>
+                              Object.assign(prev, {
+                                [key]: encodeURIComponent(obj[key])
+                              }),
+                            {}
+                          );
+                        }
+                      },
+                      groups
+                    };
+                  })()
+                )(req.headers["x-now-route-params"])
+              : null;
+          `
             : `const nowParams = null;`
         }
         const result = await renderToHTML(req, res, "${page}", Object.assign({}, unstable_getStaticProps ? {} : parsedUrl.query, nowParams ? nowParams : params, sprData ? { _nextSprData: '1' } : {}), renderOpts)
diff --git a/test/integration/serverless/pages/dr/[slug].js b/test/integration/serverless/pages/dr/[slug].js
new file mode 100644
index 0000000000000..0f29909605636
--- /dev/null
+++ b/test/integration/serverless/pages/dr/[slug].js
@@ -0,0 +1,5 @@
+const SlugPage = ({ query }) => <div>{JSON.stringify(query)}</div>
+
+SlugPage.getInitialProps = ({ query }) => ({ query })
+
+export default SlugPage
diff --git a/test/integration/serverless/test/index.test.js b/test/integration/serverless/test/index.test.js
index b54b7395ec5e7..cf30d8e2b7d36 100644
--- a/test/integration/serverless/test/index.test.js
+++ b/test/integration/serverless/test/index.test.js
@@ -12,6 +12,7 @@ import {
   fetchViaHTTP,
   renderViaHTTP
 } from 'next-test-utils'
+import qs from 'querystring'
 import fetch from 'node-fetch'
 
 const appDir = join(__dirname, '../')
@@ -192,6 +193,28 @@ describe('Serverless', () => {
     expect(res.status).toBe(404)
   })
 
+  it('should have the correct query string for a dynamic route', async () => {
+    const paramRaw = 'test % 123'
+    const param = encodeURIComponent(paramRaw)
+
+    const html = await renderViaHTTP(appPort, `/dr/${param}`)
+    const $ = cheerio.load(html)
+    const data = JSON.parse($('#__NEXT_DATA__').html())
+
+    expect(data.query).toEqual({ slug: paramRaw })
+  })
+
+  it('should have the correct query string for a spr route', async () => {
+    const paramRaw = 'test % 123'
+    const html = await fetchViaHTTP(appPort, `/dr/[slug]`, '', {
+      headers: { 'x-now-route-params': qs.stringify({ 1: paramRaw }) }
+    }).then(res => res.text())
+    const $ = cheerio.load(html)
+    const data = JSON.parse($('#__NEXT_DATA__').html())
+
+    expect(data.query).toEqual({ slug: paramRaw })
+  })
+
   describe('With basic usage', () => {
     it('should allow etag header support', async () => {
       const url = `http://localhost:${appPort}/`

From 07502ba2dd4e30246873254a9e22ca8011736f7b Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Tue, 15 Oct 2019 16:38:30 -0400
Subject: [PATCH 31/31] v9.1.2-canary.3

---
 lerna.json                                 | 2 +-
 packages/create-next-app/package.json      | 2 +-
 packages/next-bundle-analyzer/package.json | 2 +-
 packages/next-mdx/package.json             | 2 +-
 packages/next/package.json                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lerna.json b/lerna.json
index 899874d97629f..6e7667da6d2e6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.1.2-canary.2"
+  "version": "9.1.2-canary.3"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 36cca67fa64df..c22b170767d64 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.1.2-canary.2",
+  "version": "9.1.2-canary.3",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 96f77b5539ab6..a4c87701d7dbc 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.1.2-canary.2",
+  "version": "9.1.2-canary.3",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index 4c9d2b4b4a754..3625302e8f9c8 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.1.2-canary.2",
+  "version": "9.1.2-canary.3",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next/package.json b/packages/next/package.json
index 12923310a7f85..5d480f4c48d74 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.1.2-canary.2",
+  "version": "9.1.2-canary.3",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",