From ebf0c47c25541cfc50c8f319141f4bc9f47daeb8 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Tue, 27 Mar 2018 20:11:03 +0200
Subject: [PATCH 01/73] Upgrade standard.js (#4064)

* Upgrade standard.js

# Conflicts:
#	yarn.lock

* Upgrade babel-eslint
---
 bin/next-build                                |    8 +-
 bin/next-dev                                  |   40 +-
 bin/next-start                                |   18 +-
 examples/custom-charset/server.js             |   20 +-
 .../custom-server-actionhero/config/tasks.js  |    2 +-
 examples/custom-server-express/server.js      |   36 +-
 examples/custom-server-fastify/server.js      |   30 +-
 examples/custom-server-hapi/server.js         |   60 +-
 examples/custom-server-koa/server.js          |   46 +-
 .../custom-server-nodemon/server/index.js     |   32 +-
 examples/custom-server/server.js              |   32 +-
 examples/form-handler/server.js               |   32 +-
 examples/parameterized-routing/server.js      |   34 +-
 examples/root-static-files/server.js          |   38 +-
 examples/ssr-caching/server.js                |   34 +-
 examples/using-inferno/server.js              |   18 +-
 examples/using-nerv/server.js                 |   18 +-
 examples/using-preact/server.js               |   18 +-
 examples/with-ant-design/next.config.js       |    1 +
 examples/with-cerebral/components/Page.js     |   36 +-
 examples/with-draft-js/pages/index.js         |   10 +-
 .../credentials/client.js                     |    2 +-
 .../credentials/server.js                     |    2 +-
 .../pages/index.js                            |    4 +-
 .../with-firebase-authentication/server.js    |   76 +-
 .../with-global-stylesheet/next.config.js     |    4 +-
 examples/with-ioc/server.js                   |   12 +-
 examples/with-next-routes/server.js           |   12 +-
 examples/with-pkg/server.js                   |   12 +-
 examples/with-polyfills/client/polyfills.js   |    8 +-
 examples/with-pretty-url-routing/server.js    |   16 +-
 examples/with-react-helmet/pages/_document.js |    4 +-
 .../components/CharacterInfo.js               |    2 +-
 examples/with-redux-observable/pages/index.js |    2 +-
 examples/with-redux-observable/redux/index.js |    2 +-
 examples/with-static-export/next.config.js    |    2 +-
 examples/with-static-export/server.js         |   28 +-
 examples/with-sw-precache/server.js           |   30 +-
 .../styles/config/tailwind.config.js          |   18 +-
 .../pages/index.js                            |    2 +-
 examples/with-url-object-routing/server.js    |   28 +-
 lib/EventEmitter.js                           |    2 +-
 lib/error-debug.js                            |    4 +-
 lib/head.js                                   |   36 +-
 lib/router/router.js                          |    2 +-
 package.json                                  |    4 +-
 .../build/loaders/hot-self-accept-loader.js   |    2 +-
 server/build/plugins/pages-plugin.js          |   12 +-
 server/build/plugins/unlink-file-plugin.js    |    4 +-
 server/hot-reloader.js                        |   10 +-
 server/index.js                               |    1 +
 server/render.js                              |   16 +-
 test/integration/basic/pages/async-props.js   |    2 +-
 test/integration/basic/test/error-recovery.js |    2 +-
 .../custom-server/test/index.test.js          |    2 +-
 .../integration/production/test/index.test.js |   14 +-
 test/integration/static/test/browser.js       |   76 +-
 test/integration/static/test/ssr.js           |   10 +-
 yarn.lock                                     | 1564 ++++++++++++-----
 59 files changed, 1656 insertions(+), 936 deletions(-)

diff --git a/bin/next-build b/bin/next-build
index c9cab02931691..5261802f47210 100755
--- a/bin/next-build
+++ b/bin/next-build
@@ -43,7 +43,7 @@ if (!existsSync(join(dir, 'pages'))) {
 }
 
 build(dir)
-.catch((err) => {
-  console.error(err)
-  process.exit(1)
-})
+  .catch((err) => {
+    console.error(err)
+    process.exit(1)
+  })
diff --git a/bin/next-dev b/bin/next-dev
index dc1693b0a11e9..2a3c8f6cf2a2e 100755
--- a/bin/next-dev
+++ b/bin/next-dev
@@ -54,23 +54,23 @@ if (!existsSync(join(dir, 'pages'))) {
 
 const srv = new Server({ dir, dev: true })
 srv.start(argv.port, argv.hostname)
-.then(async () => {
-  if (!process.env.NOW) {
-    console.log(`> Ready on http://${argv.hostname ? argv.hostname : 'localhost'}:${argv.port}`)
-  }
-})
-.catch((err) => {
-  if (err.code === 'EADDRINUSE') {
-    let errorMessage = `Port ${argv.port} is already in use.`
-    const pkgAppPath = require('find-up').sync('package.json', {
-      cwd: dir
-    })
-    const appPackage = JSON.parse(readFileSync(pkgAppPath, 'utf8'))
-    const nextScript = Object.entries(appPackage.scripts).find(scriptLine => scriptLine[1] === 'next')
-    if (nextScript) errorMessage += `\nUse \`npm run ${nextScript[0]} -- -p <some other port>\`.`
-    console.error(errorMessage)
-  } else {
-    console.error(err)
-  }
-  process.nextTick(() => process.exit(1))
-})
+  .then(async () => {
+    if (!process.env.NOW) {
+      console.log(`> Ready on http://${argv.hostname ? argv.hostname : 'localhost'}:${argv.port}`)
+    }
+  })
+  .catch((err) => {
+    if (err.code === 'EADDRINUSE') {
+      let errorMessage = `Port ${argv.port} is already in use.`
+      const pkgAppPath = require('find-up').sync('package.json', {
+        cwd: dir
+      })
+      const appPackage = JSON.parse(readFileSync(pkgAppPath, 'utf8'))
+      const nextScript = Object.entries(appPackage.scripts).find(scriptLine => scriptLine[1] === 'next')
+      if (nextScript) errorMessage += `\nUse \`npm run ${nextScript[0]} -- -p <some other port>\`.`
+      console.error(errorMessage)
+    } else {
+      console.error(err)
+    }
+    process.nextTick(() => process.exit(1))
+  })
diff --git a/bin/next-start b/bin/next-start
index fd743e3b82554..19832a170b05e 100755
--- a/bin/next-start
+++ b/bin/next-start
@@ -46,12 +46,12 @@ const dir = resolve(argv._[0] || '.')
 
 const srv = new Server({ dir })
 srv.start(argv.port, argv.hostname)
-.then(() => {
-  if (!process.env.NOW) {
-    console.log(`> Ready on http://${argv.hostname ? argv.hostname : 'localhost'}:${argv.port}`)
-  }
-})
-.catch((err) => {
-  console.error(err)
-  process.exit(1)
-})
+  .then(() => {
+    if (!process.env.NOW) {
+      console.log(`> Ready on http://${argv.hostname ? argv.hostname : 'localhost'}:${argv.port}`)
+    }
+  })
+  .catch((err) => {
+    console.error(err)
+    process.exit(1)
+  })
diff --git a/examples/custom-charset/server.js b/examples/custom-charset/server.js
index bf8b0a43fc08b..5cc46fb427c1d 100644
--- a/examples/custom-charset/server.js
+++ b/examples/custom-charset/server.js
@@ -8,14 +8,14 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    res.setHeader('Content-Type', 'text/html; charset=iso-8859-2')
-    handle(req, res, parsedUrl)
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      res.setHeader('Content-Type', 'text/html; charset=iso-8859-2')
+      handle(req, res, parsedUrl)
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/custom-server-actionhero/config/tasks.js b/examples/custom-server-actionhero/config/tasks.js
index f32d4d4288ac0..b5652c2e5d98b 100644
--- a/examples/custom-server-actionhero/config/tasks.js
+++ b/examples/custom-server-actionhero/config/tasks.js
@@ -8,7 +8,7 @@ exports['default'] = {
       // Logging levels of task workers
       workerLogging: {
         failure: 'error', // task failure
-        success: 'info',  // task success
+        success: 'info', // task success
         start: 'info',
         end: 'info',
         cleaning_worker: 'info',
diff --git a/examples/custom-server-express/server.js b/examples/custom-server-express/server.js
index 208bfe97fd8c2..3a645a6c7bee0 100644
--- a/examples/custom-server-express/server.js
+++ b/examples/custom-server-express/server.js
@@ -7,27 +7,27 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  const server = express()
+  .then(() => {
+    const server = express()
 
-  server.get('/a', (req, res) => {
-    return app.render(req, res, '/b', req.query)
-  })
+    server.get('/a', (req, res) => {
+      return app.render(req, res, '/b', req.query)
+    })
 
-  server.get('/b', (req, res) => {
-    return app.render(req, res, '/a', req.query)
-  })
+    server.get('/b', (req, res) => {
+      return app.render(req, res, '/a', req.query)
+    })
 
-  server.get('/posts/:id', (req, res) => {
-    return app.render(req, res, '/posts', { id: req.params.id })
-  })
+    server.get('/posts/:id', (req, res) => {
+      return app.render(req, res, '/posts', { id: req.params.id })
+    })
 
-  server.get('*', (req, res) => {
-    return handle(req, res)
-  })
+    server.get('*', (req, res) => {
+      return handle(req, res)
+    })
 
-  server.listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+    server.listen(port, (err) => {
+      if (err) throw err
+      console.log(`> Ready on http://localhost:${port}`)
+    })
   })
-})
diff --git a/examples/custom-server-fastify/server.js b/examples/custom-server-fastify/server.js
index 8c8fa8cec3a62..910afac64ec91 100644
--- a/examples/custom-server-fastify/server.js
+++ b/examples/custom-server-fastify/server.js
@@ -7,23 +7,23 @@ const app = Next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  const server = fastify()
+  .then(() => {
+    const server = fastify()
 
-  server.get('/a', (req, res) => {
-    return app.render(req.req, res.res, '/a', req.query)
-  })
+    server.get('/a', (req, res) => {
+      return app.render(req.req, res.res, '/a', req.query)
+    })
 
-  server.get('/b', (req, res) => {
-    return app.render(req.req, res.res, '/b', req.query)
-  })
+    server.get('/b', (req, res) => {
+      return app.render(req.req, res.res, '/b', req.query)
+    })
 
-  server.get('/*', (req, res) => {
-    return handle(req.req, res.res)
-  })
+    server.get('/*', (req, res) => {
+      return handle(req.req, res.res)
+    })
 
-  server.listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+    server.listen(port, (err) => {
+      if (err) throw err
+      console.log(`> Ready on http://localhost:${port}`)
+    })
   })
-})
diff --git a/examples/custom-server-hapi/server.js b/examples/custom-server-hapi/server.js
index d79e0cac4f20c..4019d0f943f7a 100644
--- a/examples/custom-server-hapi/server.js
+++ b/examples/custom-server-hapi/server.js
@@ -10,37 +10,37 @@ const server = new Hapi.Server({
 })
 
 app
-.prepare()
-.then(async () => {
-  server.route({
-    method: 'GET',
-    path: '/a',
-    handler: pathWrapper(app, '/a')
-  })
+  .prepare()
+  .then(async () => {
+    server.route({
+      method: 'GET',
+      path: '/a',
+      handler: pathWrapper(app, '/a')
+    })
 
-  server.route({
-    method: 'GET',
-    path: '/b',
-    handler: pathWrapper(app, '/b')
-  })
+    server.route({
+      method: 'GET',
+      path: '/b',
+      handler: pathWrapper(app, '/b')
+    })
 
-  server.route({
-    method: 'GET',
-    path: '/_next/{p*}', /* next specific routes */
-    handler: nextHandlerWrapper(app)
-  })
+    server.route({
+      method: 'GET',
+      path: '/_next/{p*}', /* next specific routes */
+      handler: nextHandlerWrapper(app)
+    })
 
-  server.route({
-    method: 'GET',
-    path: '/{p*}', /* catch all route */
-    handler: defaultHandlerWrapper(app)
-  })
+    server.route({
+      method: 'GET',
+      path: '/{p*}', /* catch all route */
+      handler: defaultHandlerWrapper(app)
+    })
 
-  try {
-    await server.start()
-    console.log(`> Ready on http://localhost:${port}`)
-  } catch (error) {
-    console.log('Error starting server')
-    console.log(error)
-  }
-})
+    try {
+      await server.start()
+      console.log(`> Ready on http://localhost:${port}`)
+    } catch (error) {
+      console.log('Error starting server')
+      console.log(error)
+    }
+  })
diff --git a/examples/custom-server-koa/server.js b/examples/custom-server-koa/server.js
index 532abeeedb557..fb122444700bc 100644
--- a/examples/custom-server-koa/server.js
+++ b/examples/custom-server-koa/server.js
@@ -8,32 +8,32 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  const server = new Koa()
-  const router = new Router()
+  .then(() => {
+    const server = new Koa()
+    const router = new Router()
 
-  router.get('/a', async ctx => {
-    await app.render(ctx.req, ctx.res, '/b', ctx.query)
-    ctx.respond = false
-  })
+    router.get('/a', async ctx => {
+      await app.render(ctx.req, ctx.res, '/b', ctx.query)
+      ctx.respond = false
+    })
 
-  router.get('/b', async ctx => {
-    await app.render(ctx.req, ctx.res, '/a', ctx.query)
-    ctx.respond = false
-  })
+    router.get('/b', async ctx => {
+      await app.render(ctx.req, ctx.res, '/a', ctx.query)
+      ctx.respond = false
+    })
 
-  router.get('*', async ctx => {
-    await handle(ctx.req, ctx.res)
-    ctx.respond = false
-  })
+    router.get('*', async ctx => {
+      await handle(ctx.req, ctx.res)
+      ctx.respond = false
+    })
 
-  server.use(async (ctx, next) => {
-    ctx.res.statusCode = 200
-    await next()
-  })
+    server.use(async (ctx, next) => {
+      ctx.res.statusCode = 200
+      await next()
+    })
 
-  server.use(router.routes())
-  server.listen(port, () => {
-    console.log(`> Ready on http://localhost:${port}`)
+    server.use(router.routes())
+    server.listen(port, () => {
+      console.log(`> Ready on http://localhost:${port}`)
+    })
   })
-})
diff --git a/examples/custom-server-nodemon/server/index.js b/examples/custom-server-nodemon/server/index.js
index 56cda75224ec2..3684c62cb57da 100644
--- a/examples/custom-server-nodemon/server/index.js
+++ b/examples/custom-server-nodemon/server/index.js
@@ -8,21 +8,21 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    const { pathname, query } = parsedUrl
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      const { pathname, query } = parsedUrl
 
-    if (pathname === '/a') {
-      app.render(req, res, '/b', query)
-    } else if (pathname === '/b') {
-      app.render(req, res, '/a', query)
-    } else {
-      handle(req, res, parsedUrl)
-    }
+      if (pathname === '/a') {
+        app.render(req, res, '/b', query)
+      } else if (pathname === '/b') {
+        app.render(req, res, '/a', query)
+      } else {
+        handle(req, res, parsedUrl)
+      }
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/custom-server/server.js b/examples/custom-server/server.js
index 56cda75224ec2..3684c62cb57da 100644
--- a/examples/custom-server/server.js
+++ b/examples/custom-server/server.js
@@ -8,21 +8,21 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    const { pathname, query } = parsedUrl
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      const { pathname, query } = parsedUrl
 
-    if (pathname === '/a') {
-      app.render(req, res, '/b', query)
-    } else if (pathname === '/b') {
-      app.render(req, res, '/a', query)
-    } else {
-      handle(req, res, parsedUrl)
-    }
+      if (pathname === '/a') {
+        app.render(req, res, '/b', query)
+      } else if (pathname === '/b') {
+        app.render(req, res, '/a', query)
+      } else {
+        handle(req, res, parsedUrl)
+      }
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/form-handler/server.js b/examples/form-handler/server.js
index 87c187109e811..46839ab0c1d72 100644
--- a/examples/form-handler/server.js
+++ b/examples/form-handler/server.js
@@ -6,23 +6,23 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  const server = express()
+  .then(() => {
+    const server = express()
 
-  server.get('/', (req, res) => {
-    return handle(req, res)
-  })
+    server.get('/', (req, res) => {
+      return handle(req, res)
+    })
 
-  server.get('*', (req, res) => {
-    return handle(req, res)
-  })
+    server.get('*', (req, res) => {
+      return handle(req, res)
+    })
 
-  server.listen(3000, (err) => {
-    if (err) throw err
-    console.log('> Ready on http://localhost:3000')
+    server.listen(3000, (err) => {
+      if (err) throw err
+      console.log('> Ready on http://localhost:3000')
+    })
+  })
+  .catch((ex) => {
+    console.error(ex.stack)
+    process.exit(1)
   })
-})
-.catch((ex) => {
-  console.error(ex.stack)
-  process.exit(1)
-})
diff --git a/examples/parameterized-routing/server.js b/examples/parameterized-routing/server.js
index c0b1a329974f1..74358d06d7b77 100644
--- a/examples/parameterized-routing/server.js
+++ b/examples/parameterized-routing/server.js
@@ -11,21 +11,21 @@ const route = pathMatch()
 const match = route('/blog/:id')
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const { pathname, query } = parse(req.url, true)
-    const params = match(pathname)
-    if (params === false) {
-      handle(req, res)
-      return
-    }
-    // assigning `query` into the params means that we still
-    // get the query string passed to our application
-    // i.e. /blog/foo?show-comments=true
-    app.render(req, res, '/blog', Object.assign(params, query))
+  .then(() => {
+    createServer((req, res) => {
+      const { pathname, query } = parse(req.url, true)
+      const params = match(pathname)
+      if (params === false) {
+        handle(req, res)
+        return
+      }
+      // assigning `query` into the params means that we still
+      // get the query string passed to our application
+      // i.e. /blog/foo?show-comments=true
+      app.render(req, res, '/blog', Object.assign(params, query))
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/root-static-files/server.js b/examples/root-static-files/server.js
index 3b6c21667207c..74743aaa48a04 100644
--- a/examples/root-static-files/server.js
+++ b/examples/root-static-files/server.js
@@ -9,23 +9,23 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    const rootStaticFiles = [
-      '/robots.txt',
-      '/sitemap.xml',
-      '/favicon.ico'
-    ]
-    if (rootStaticFiles.indexOf(parsedUrl.pathname) > -1) {
-      const path = join(__dirname, 'static', parsedUrl.pathname)
-      app.serveStatic(req, res, path)
-    } else {
-      handle(req, res, parsedUrl)
-    }
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      const rootStaticFiles = [
+        '/robots.txt',
+        '/sitemap.xml',
+        '/favicon.ico'
+      ]
+      if (rootStaticFiles.indexOf(parsedUrl.pathname) > -1) {
+        const path = join(__dirname, 'static', parsedUrl.pathname)
+        app.serveStatic(req, res, path)
+      } else {
+        handle(req, res, parsedUrl)
+      }
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/ssr-caching/server.js b/examples/ssr-caching/server.js
index 8f0ef4d8bd727..e5cb715a4ef28 100644
--- a/examples/ssr-caching/server.js
+++ b/examples/ssr-caching/server.js
@@ -14,28 +14,28 @@ const ssrCache = new LRUCache({
 })
 
 app.prepare()
-.then(() => {
-  const server = express()
+  .then(() => {
+    const server = express()
 
-  // Use the `renderAndCache` utility defined below to serve pages
-  server.get('/', (req, res) => {
-    renderAndCache(req, res, '/')
-  })
+    // Use the `renderAndCache` utility defined below to serve pages
+    server.get('/', (req, res) => {
+      renderAndCache(req, res, '/')
+    })
 
-  server.get('/blog/:id', (req, res) => {
-    const queryParams = { id: req.params.id }
-    renderAndCache(req, res, '/blog', queryParams)
-  })
+    server.get('/blog/:id', (req, res) => {
+      const queryParams = { id: req.params.id }
+      renderAndCache(req, res, '/blog', queryParams)
+    })
 
-  server.get('*', (req, res) => {
-    return handle(req, res)
-  })
+    server.get('*', (req, res) => {
+      return handle(req, res)
+    })
 
-  server.listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+    server.listen(port, (err) => {
+      if (err) throw err
+      console.log(`> Ready on http://localhost:${port}`)
+    })
   })
-})
 
 /*
  * NB: make sure to modify this to take into account anything that should trigger
diff --git a/examples/using-inferno/server.js b/examples/using-inferno/server.js
index 75750367f1980..5a493bdb7ee5c 100644
--- a/examples/using-inferno/server.js
+++ b/examples/using-inferno/server.js
@@ -18,13 +18,13 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    handle(req, res, parsedUrl)
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      handle(req, res, parsedUrl)
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/using-nerv/server.js b/examples/using-nerv/server.js
index e28d7afd94154..99bb3847a6925 100644
--- a/examples/using-nerv/server.js
+++ b/examples/using-nerv/server.js
@@ -17,13 +17,13 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    handle(req, res, parsedUrl)
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      handle(req, res, parsedUrl)
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/using-preact/server.js b/examples/using-preact/server.js
index a0cefda47f45d..3b516843e5fff 100644
--- a/examples/using-preact/server.js
+++ b/examples/using-preact/server.js
@@ -11,13 +11,13 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    handle(req, res, parsedUrl)
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      handle(req, res, parsedUrl)
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/with-ant-design/next.config.js b/examples/with-ant-design/next.config.js
index 7adc96594ded3..19948b9ce847f 100644
--- a/examples/with-ant-design/next.config.js
+++ b/examples/with-ant-design/next.config.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 const withCss = require('@zeit/next-css')
 
 // fix: prevents error when .css files are required by node
diff --git a/examples/with-cerebral/components/Page.js b/examples/with-cerebral/components/Page.js
index 28e4485b09fd3..04a800c9a89ee 100644
--- a/examples/with-cerebral/components/Page.js
+++ b/examples/with-cerebral/components/Page.js
@@ -10,24 +10,24 @@ export default connect({
   mounted: signal`clock.mounted`,
   unMounted: signal`clock.unMounted`
 },
-  class Page extends React.Component {
-    componentDidMount () {
-      this.props.mounted()
-    }
+class Page extends React.Component {
+  componentDidMount () {
+    this.props.mounted()
+  }
 
-    componentWillUnmount () {
-      this.props.unMounted()
-    }
-    render () {
-      return (
-        <div>
-          <h1>{this.props.title}</h1>
-          <Clock lastUpdate={this.props.lastUpdate} light={this.props.light} />
-          <nav>
-            <Link href={this.props.linkTo}><a>Navigate</a></Link>
-          </nav>
-        </div>
-      )
-    }
+  componentWillUnmount () {
+    this.props.unMounted()
+  }
+  render () {
+    return (
+      <div>
+        <h1>{this.props.title}</h1>
+        <Clock lastUpdate={this.props.lastUpdate} light={this.props.light} />
+        <nav>
+          <Link href={this.props.linkTo}><a>Navigate</a></Link>
+        </nav>
+      </div>
+    )
   }
+}
 )
diff --git a/examples/with-draft-js/pages/index.js b/examples/with-draft-js/pages/index.js
index 286b33053aac2..d415b2e527698 100644
--- a/examples/with-draft-js/pages/index.js
+++ b/examples/with-draft-js/pages/index.js
@@ -5,7 +5,7 @@ import {
   RichUtils,
   convertToRaw,
   convertFromRaw
-  } from 'draft-js'
+} from 'draft-js'
 
 export default class App extends React.Component {
   constructor (props) {
@@ -62,7 +62,7 @@ export default class App extends React.Component {
   setSelectionXY = () => {
     var r = window.getSelection().getRangeAt(0).getBoundingClientRect()
     var relative = document.body.parentNode.getBoundingClientRect()
-      // 2-a Set the selection coordinates in the state
+    // 2-a Set the selection coordinates in the state
     this.setState({
       selectionCoordinates: r,
       windowWidth: relative.width,
@@ -176,7 +176,7 @@ export default class App extends React.Component {
             this.elemHeight = elem ? elem.clientHeight : 0
           }}
           style={toolbarStyle}
-          >
+        >
           <ToolBar
             editorState={editorState}
             onToggle={this.toggleToolbar}
@@ -261,8 +261,8 @@ const ToolBar = (props) => {
           label={toolbarItem.label}
           onToggle={props.onToggle}
           style={toolbarItem.style}
-            />
-          )}
+        />
+      )}
     </div>
   )
 }
diff --git a/examples/with-firebase-authentication/credentials/client.js b/examples/with-firebase-authentication/credentials/client.js
index a9482b2597f7c..ce2ff946e1083 100644
--- a/examples/with-firebase-authentication/credentials/client.js
+++ b/examples/with-firebase-authentication/credentials/client.js
@@ -1,3 +1,3 @@
 module.exports = {
-    // TODO firebase client config
+  // TODO firebase client config
 }
diff --git a/examples/with-firebase-authentication/credentials/server.js b/examples/with-firebase-authentication/credentials/server.js
index aa1ebc6d741cb..dd94ff161c037 100644
--- a/examples/with-firebase-authentication/credentials/server.js
+++ b/examples/with-firebase-authentication/credentials/server.js
@@ -1,3 +1,3 @@
 module.exports = {
-    // TODO firebase server config
+  // TODO firebase server config
 }
diff --git a/examples/with-firebase-authentication/pages/index.js b/examples/with-firebase-authentication/pages/index.js
index 849736dac977b..b6ef3f73222c0 100644
--- a/examples/with-firebase-authentication/pages/index.js
+++ b/examples/with-firebase-authentication/pages/index.js
@@ -90,8 +90,8 @@ export default class Index extends Component {
     return <div>
       {
         user
-        ? <button onClick={this.handleLogout}>Logout</button>
-        : <button onClick={this.handleLogin}>Login</button>
+          ? <button onClick={this.handleLogout}>Logout</button>
+          : <button onClick={this.handleLogin}>Login</button>
       }
       {
         user &&
diff --git a/examples/with-firebase-authentication/server.js b/examples/with-firebase-authentication/server.js
index ec060a84e0557..109194070fe71 100644
--- a/examples/with-firebase-authentication/server.js
+++ b/examples/with-firebase-authentication/server.js
@@ -16,49 +16,49 @@ const firebase = admin.initializeApp({
 }, 'server')
 
 app.prepare()
-.then(() => {
-  const server = express()
+  .then(() => {
+    const server = express()
 
-  server.use(bodyParser.json())
-  server.use(session({
-    secret: 'geheimnis',
-    saveUninitialized: true,
-    store: new FileStore({path: '/tmp/sessions', secret: 'geheimnis'}),
-    resave: false,
-    rolling: true,
-    httpOnly: true,
-    cookie: { maxAge: 604800000 } // week
-  }))
+    server.use(bodyParser.json())
+    server.use(session({
+      secret: 'geheimnis',
+      saveUninitialized: true,
+      store: new FileStore({path: '/tmp/sessions', secret: 'geheimnis'}),
+      resave: false,
+      rolling: true,
+      httpOnly: true,
+      cookie: { maxAge: 604800000 } // week
+    }))
 
-  server.use((req, res, next) => {
-    req.firebaseServer = firebase
-    next()
-  })
+    server.use((req, res, next) => {
+      req.firebaseServer = firebase
+      next()
+    })
 
-  server.post('/api/login', (req, res) => {
-    if (!req.body) return res.sendStatus(400)
+    server.post('/api/login', (req, res) => {
+      if (!req.body) return res.sendStatus(400)
 
-    const token = req.body.token
-    firebase.auth().verifyIdToken(token)
-      .then((decodedToken) => {
-        req.session.decodedToken = decodedToken
-        return decodedToken
-      })
-      .then((decodedToken) => res.json({ status: true, decodedToken }))
-      .catch((error) => res.json({ error }))
-  })
+      const token = req.body.token
+      firebase.auth().verifyIdToken(token)
+        .then((decodedToken) => {
+          req.session.decodedToken = decodedToken
+          return decodedToken
+        })
+        .then((decodedToken) => res.json({ status: true, decodedToken }))
+        .catch((error) => res.json({ error }))
+    })
 
-  server.post('/api/logout', (req, res) => {
-    req.session.decodedToken = null
-    res.json({ status: true })
-  })
+    server.post('/api/logout', (req, res) => {
+      req.session.decodedToken = null
+      res.json({ status: true })
+    })
 
-  server.get('*', (req, res) => {
-    return handle(req, res)
-  })
+    server.get('*', (req, res) => {
+      return handle(req, res)
+    })
 
-  server.listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+    server.listen(port, (err) => {
+      if (err) throw err
+      console.log(`> Ready on http://localhost:${port}`)
+    })
   })
-})
diff --git a/examples/with-global-stylesheet/next.config.js b/examples/with-global-stylesheet/next.config.js
index f8935363a94ef..b983603436654 100644
--- a/examples/with-global-stylesheet/next.config.js
+++ b/examples/with-global-stylesheet/next.config.js
@@ -11,12 +11,12 @@ module.exports = {
           name: 'dist/[path][name].[ext]'
         }
       }
-    ,
+      ,
       {
         test: /\.css$/,
         use: ['babel-loader', 'raw-loader', 'postcss-loader']
       }
-    ,
+      ,
       {
         test: /\.s(a|c)ss$/,
         use: ['babel-loader', 'raw-loader', 'postcss-loader',
diff --git a/examples/with-ioc/server.js b/examples/with-ioc/server.js
index d8ea50a6880f6..59964a7a27f12 100644
--- a/examples/with-ioc/server.js
+++ b/examples/with-ioc/server.js
@@ -8,10 +8,10 @@ const app = next({ dev })
 const handler = routes.getRequestHandler(app)
 
 app.prepare()
-.then(() => {
-  createServer(handler)
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+  .then(() => {
+    createServer(handler)
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-})
diff --git a/examples/with-next-routes/server.js b/examples/with-next-routes/server.js
index d8ea50a6880f6..59964a7a27f12 100644
--- a/examples/with-next-routes/server.js
+++ b/examples/with-next-routes/server.js
@@ -8,10 +8,10 @@ const app = next({ dev })
 const handler = routes.getRequestHandler(app)
 
 app.prepare()
-.then(() => {
-  createServer(handler)
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+  .then(() => {
+    createServer(handler)
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-})
diff --git a/examples/with-pkg/server.js b/examples/with-pkg/server.js
index 8b26bacbc8361..55dad515bef1b 100644
--- a/examples/with-pkg/server.js
+++ b/examples/with-pkg/server.js
@@ -8,10 +8,10 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => handle(req, res, parse(req.url, true).pathname))
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+  .then(() => {
+    createServer((req, res) => handle(req, res, parse(req.url, true).pathname))
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-})
diff --git a/examples/with-polyfills/client/polyfills.js b/examples/with-polyfills/client/polyfills.js
index 8314bb59c3389..96fec73d58dbe 100644
--- a/examples/with-polyfills/client/polyfills.js
+++ b/examples/with-polyfills/client/polyfills.js
@@ -1,13 +1,11 @@
 /* eslint no-extend-native: 0 */
+// core-js comes with Next.js. So, you can import it like below
+import includes from 'core-js/library/fn/string/virtual/includes'
+import repeat from 'core-js/library/fn/string/virtual/repeat'
 
 // Add your polyfills
 // This files runs at the very beginning (even before React and Next.js core)
-
 console.log('Load your polyfills')
 
-// core-js comes with Next.js. So, you can import it like below
-import includes from 'core-js/library/fn/string/virtual/includes'
-import repeat from 'core-js/library/fn/string/virtual/repeat'
-
 String.prototype.includes = includes
 String.prototype.repeat = repeat
diff --git a/examples/with-pretty-url-routing/server.js b/examples/with-pretty-url-routing/server.js
index ee684913f9b78..f1dd2bd4a0acf 100644
--- a/examples/with-pretty-url-routing/server.js
+++ b/examples/with-pretty-url-routing/server.js
@@ -8,13 +8,13 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  const server = express()
+  .then(() => {
+    const server = express()
 
-  Router.forEachPattern((page, pattern, defaultParams) => server.get(pattern, (req, res) =>
-    app.render(req, res, `/${page}`, Object.assign({}, defaultParams, req.query, req.params))
-  ))
+    Router.forEachPattern((page, pattern, defaultParams) => server.get(pattern, (req, res) =>
+      app.render(req, res, `/${page}`, Object.assign({}, defaultParams, req.query, req.params))
+    ))
 
-  server.get('*', (req, res) => handle(req, res))
-  server.listen(port)
-})
+    server.get('*', (req, res) => handle(req, res))
+    server.listen(port)
+  })
diff --git a/examples/with-react-helmet/pages/_document.js b/examples/with-react-helmet/pages/_document.js
index 2403a6b4969bf..e9c440ca7b629 100644
--- a/examples/with-react-helmet/pages/_document.js
+++ b/examples/with-react-helmet/pages/_document.js
@@ -22,8 +22,8 @@ export default class extends Document {
   // should render on <head>
   get helmetHeadComponents () {
     return Object.keys(this.props.helmet)
-        .filter(el => el !== 'htmlAttributes' && el !== 'bodyAttributes')
-        .map(el => this.props.helmet[el].toComponent())
+      .filter(el => el !== 'htmlAttributes' && el !== 'bodyAttributes')
+      .map(el => this.props.helmet[el].toComponent())
   }
 
   get helmetJsx () {
diff --git a/examples/with-redux-observable/components/CharacterInfo.js b/examples/with-redux-observable/components/CharacterInfo.js
index 226f823839131..83eae70a8b232 100644
--- a/examples/with-redux-observable/components/CharacterInfo.js
+++ b/examples/with-redux-observable/components/CharacterInfo.js
@@ -39,5 +39,5 @@ export default connect(
     character: state.character,
     error: state.error,
     isFetchedOnServer: state.isFetchedOnServer
-  }),
+  })
 )(CharacterInfo)
diff --git a/examples/with-redux-observable/pages/index.js b/examples/with-redux-observable/pages/index.js
index 446917fc92d79..bb612f1daa7fd 100644
--- a/examples/with-redux-observable/pages/index.js
+++ b/examples/with-redux-observable/pages/index.js
@@ -46,5 +46,5 @@ export default withRedux(
   {
     startFetchingCharacters: actions.startFetchingCharacters,
     stopFetchingCharacters: actions.stopFetchingCharacters
-  },
+  }
 )(Counter)
diff --git a/examples/with-redux-observable/redux/index.js b/examples/with-redux-observable/redux/index.js
index 0d71563d6a3ed..c514dd721ec23 100644
--- a/examples/with-redux-observable/redux/index.js
+++ b/examples/with-redux-observable/redux/index.js
@@ -7,7 +7,7 @@ import { rootEpic } from './epics'
 
 export default function initStore (initialState) {
   const epicMiddleware = createEpicMiddleware(rootEpic)
-  const logger = createLogger({ collapsed: true })  // log every action to see what's happening behind the scenes.
+  const logger = createLogger({ collapsed: true }) // log every action to see what's happening behind the scenes.
   const reduxMiddleware = applyMiddleware(thunkMiddleware, epicMiddleware, logger)
 
   return createStore(reducer, initialState, reduxMiddleware)
diff --git a/examples/with-static-export/next.config.js b/examples/with-static-export/next.config.js
index ab0ac1cf2a87e..5988515f3bab3 100644
--- a/examples/with-static-export/next.config.js
+++ b/examples/with-static-export/next.config.js
@@ -15,7 +15,7 @@ module.exports = {
             query: { id: post.id }
           }
         }),
-      {},
+      {}
     )
 
     // combine the map of post pages with the home
diff --git a/examples/with-static-export/server.js b/examples/with-static-export/server.js
index b9183ccd26c31..81b6ef50d6432 100644
--- a/examples/with-static-export/server.js
+++ b/examples/with-static-export/server.js
@@ -7,22 +7,22 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  const server = express()
+  .then(() => {
+    const server = express()
 
-  // custom route for posts
-  server.get('/post/:id', (req, res) => {
-    return app.render(req, res, '/post', {
-      id: req.params.id
+    // custom route for posts
+    server.get('/post/:id', (req, res) => {
+      return app.render(req, res, '/post', {
+        id: req.params.id
+      })
     })
-  })
 
-  server.get('*', (req, res) => {
-    return handle(req, res)
-  })
+    server.get('*', (req, res) => {
+      return handle(req, res)
+    })
 
-  server.listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+    server.listen(port, (err) => {
+      if (err) throw err
+      console.log(`> Ready on http://localhost:${port}`)
+    })
   })
-})
diff --git a/examples/with-sw-precache/server.js b/examples/with-sw-precache/server.js
index 8f4eee1429f6c..073337accae2c 100644
--- a/examples/with-sw-precache/server.js
+++ b/examples/with-sw-precache/server.js
@@ -9,20 +9,20 @@ const app = next({ dev })
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    const { pathname } = parsedUrl
+  .then(() => {
+    createServer((req, res) => {
+      const parsedUrl = parse(req.url, true)
+      const { pathname } = parsedUrl
 
-    if (pathname === '/service-worker.js') {
-      const filePath = join(__dirname, '.next', pathname)
-      app.serveStatic(req, res, filePath)
-    } else {
-      handle(req, res, parsedUrl)
-    }
+      if (pathname === '/service-worker.js') {
+        const filePath = join(__dirname, '.next', pathname)
+        app.serveStatic(req, res, filePath)
+      } else {
+        handle(req, res, parsedUrl)
+      }
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/examples/with-tailwindcss/styles/config/tailwind.config.js b/examples/with-tailwindcss/styles/config/tailwind.config.js
index a588fe83e0e0b..c28c5f741d2d5 100644
--- a/examples/with-tailwindcss/styles/config/tailwind.config.js
+++ b/examples/with-tailwindcss/styles/config/tailwind.config.js
@@ -244,15 +244,15 @@ module.exports = {
   */
 
   textSizes: {
-    'xs': '.75rem',     // 12px
-    'sm': '.875rem',    // 14px
-    'base': '1rem',     // 16px
-    'lg': '1.125rem',   // 18px
-    'xl': '1.25rem',    // 20px
-    '2xl': '1.5rem',    // 24px
-    '3xl': '1.875rem',  // 30px
-    '4xl': '2.25rem',   // 36px
-    '5xl': '3rem'      // 48px
+    'xs': '.75rem', // 12px
+    'sm': '.875rem', // 14px
+    'base': '1rem', // 16px
+    'lg': '1.125rem', // 18px
+    'xl': '1.25rem', // 20px
+    '2xl': '1.5rem', // 24px
+    '3xl': '1.875rem', // 30px
+    '4xl': '2.25rem', // 36px
+    '5xl': '3rem' // 48px
   },
 
   /*
diff --git a/examples/with-universal-configuration-runtime/pages/index.js b/examples/with-universal-configuration-runtime/pages/index.js
index 690ff1ce1bb3d..2f3c875a09857 100644
--- a/examples/with-universal-configuration-runtime/pages/index.js
+++ b/examples/with-universal-configuration-runtime/pages/index.js
@@ -5,7 +5,7 @@ const {API_URL} = env
 
 export default class extends React.Component {
   static async getInitialProps () {
-        // fetch(`${API_URL}/some-path`)
+    // fetch(`${API_URL}/some-path`)
     return {}
   }
 
diff --git a/examples/with-url-object-routing/server.js b/examples/with-url-object-routing/server.js
index f346411ba2cdc..1515f22ce2361 100644
--- a/examples/with-url-object-routing/server.js
+++ b/examples/with-url-object-routing/server.js
@@ -11,19 +11,19 @@ const route = pathMatch()
 const match = route('/about/:name')
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const { pathname } = parse(req.url)
-    const params = match(pathname)
-    if (params === false) {
-      handle(req, res)
-      return
-    }
+  .then(() => {
+    createServer((req, res) => {
+      const { pathname } = parse(req.url)
+      const params = match(pathname)
+      if (params === false) {
+        handle(req, res)
+        return
+      }
 
-    app.render(req, res, '/about', params)
+      app.render(req, res, '/about', params)
+    })
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
diff --git a/lib/EventEmitter.js b/lib/EventEmitter.js
index 34a56873f7296..a88e55ae614ec 100644
--- a/lib/EventEmitter.js
+++ b/lib/EventEmitter.js
@@ -15,7 +15,7 @@ export default class EventEmitter {
 
   emit (event, ...data) {
     if (!this.listeners[event]) return
-    this.listeners[event].forEach(cb => cb(...data))
+    this.listeners[event].forEach(cb => cb(...data)) // eslint-disable-line standard/no-callback-literal
   }
 
   off (event, cb) {
diff --git a/lib/error-debug.js b/lib/error-debug.js
index e6e2a95914ee7..ecb04c3983f9e 100644
--- a/lib/error-debug.js
+++ b/lib/error-debug.js
@@ -10,8 +10,8 @@ export default ({ error, error: { name, message, module } }) => (
     {module ? <h1 style={styles.heading}>Error in {module.rawRequest}</h1> : null}
     {
       name === 'ModuleBuildError'
-      ? <pre style={styles.stack} dangerouslySetInnerHTML={{ __html: ansiHTML(encodeHtml(message)) }} />
-      : <StackTrace error={error} />
+        ? <pre style={styles.stack} dangerouslySetInnerHTML={{ __html: ansiHTML(encodeHtml(message)) }} />
+        : <StackTrace error={error} />
     }
   </div>
 )
diff --git a/lib/head.js b/lib/head.js
index 019cf3c1608dc..6c45f21b240ed 100644
--- a/lib/head.js
+++ b/lib/head.js
@@ -18,24 +18,24 @@ export function defaultHead () {
 
 function reduceComponents (components) {
   return components
-  .map((c) => c.props.children)
-  .map((children) => React.Children.toArray(children))
-  .reduce((a, b) => a.concat(b), [])
-  .reduce((a, b) => {
-    if (React.Fragment && b.type === React.Fragment) {
-      return a.concat(React.Children.toArray(b.props.children))
-    }
-    return a.concat(b)
-  }, [])
-  .reverse()
-  .concat(...defaultHead())
-  .filter((c) => !!c)
-  .filter(unique())
-  .reverse()
-  .map((c) => {
-    const className = (c.props && c.props.className ? c.props.className + ' ' : '') + 'next-head'
-    return React.cloneElement(c, { className })
-  })
+    .map((c) => c.props.children)
+    .map((children) => React.Children.toArray(children))
+    .reduce((a, b) => a.concat(b), [])
+    .reduce((a, b) => {
+      if (React.Fragment && b.type === React.Fragment) {
+        return a.concat(React.Children.toArray(b.props.children))
+      }
+      return a.concat(b)
+    }, [])
+    .reverse()
+    .concat(...defaultHead())
+    .filter((c) => !!c)
+    .filter(unique())
+    .reverse()
+    .map((c) => {
+      const className = (c.props && c.props.className ? c.props.className + ' ' : '') + 'next-head'
+      return React.cloneElement(c, { className })
+    })
 }
 
 function mapOnServer (head) {
diff --git a/lib/router/router.js b/lib/router/router.js
index 36bd3b26e5a2e..11c3360396d04 100644
--- a/lib/router/router.js
+++ b/lib/router/router.js
@@ -355,7 +355,7 @@ export default class Router {
   }
 
   async fetchRoute (route) {
-    return await this.pageLoader.loadPage(route)
+    return this.pageLoader.loadPage(route)
   }
 
   abortComponentLoad (as) {
diff --git a/package.json b/package.json
index b779fd5c6eb75..50e583f65f49d 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",
     "@zeit/next-css": "0.0.7",
-    "babel-eslint": "8.0.1",
+    "babel-eslint": "8.2.2",
     "babel-jest": "21.2.0",
     "babel-plugin-istanbul": "4.1.5",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
@@ -139,7 +139,7 @@
     "react": "16.2.0",
     "react-dom": "16.2.0",
     "rimraf": "2.6.2",
-    "standard": "9.0.2",
+    "standard": "11.0.1",
     "taskr": "1.1.0",
     "wd": "1.4.1"
   },
diff --git a/server/build/loaders/hot-self-accept-loader.js b/server/build/loaders/hot-self-accept-loader.js
index 75fd1fbb928a7..5af985c1535af 100644
--- a/server/build/loaders/hot-self-accept-loader.js
+++ b/server/build/loaders/hot-self-accept-loader.js
@@ -34,7 +34,7 @@ function getRoute (loaderContext) {
   const pagesDir = resolve(loaderContext.options.context, 'pages')
   const { resourcePath } = loaderContext
   const dir = [pagesDir, nextPagesDir]
-  .find((d) => resourcePath.indexOf(d) === 0)
+    .find((d) => resourcePath.indexOf(d) === 0)
   const path = relative(dir, resourcePath)
   return '/' + path.replace(/((^|\/)index)?\.js$/, '')
 }
diff --git a/server/build/plugins/pages-plugin.js b/server/build/plugins/pages-plugin.js
index 87ee582ce5099..8d111c78d4630 100644
--- a/server/build/plugins/pages-plugin.js
+++ b/server/build/plugins/pages-plugin.js
@@ -13,12 +13,12 @@ class PageChunkTemplatePlugin {
 
       let routeName = MATCH_ROUTE_NAME.exec(chunk.name)[1]
 
-        // We need to convert \ into / when we are in windows
-        // to get the proper route name
-        // Here we need to do windows check because it's possible
-        // to have "\" in the filename in unix.
-        // Anyway if someone did that, he'll be having issues here.
-        // But that's something we cannot avoid.
+      // We need to convert \ into / when we are in windows
+      // to get the proper route name
+      // Here we need to do windows check because it's possible
+      // to have "\" in the filename in unix.
+      // Anyway if someone did that, he'll be having issues here.
+      // But that's something we cannot avoid.
       if (/^win/.test(process.platform)) {
         routeName = routeName.replace(/\\/g, '/')
       }
diff --git a/server/build/plugins/unlink-file-plugin.js b/server/build/plugins/unlink-file-plugin.js
index b25d43563fddb..53b16f51a930e 100644
--- a/server/build/plugins/unlink-file-plugin.js
+++ b/server/build/plugins/unlink-file-plugin.js
@@ -10,7 +10,7 @@ export default class UnlinkFilePlugin {
   apply (compiler) {
     compiler.plugin('after-emit', (compilation, callback) => {
       const removed = Object.keys(this.prevAssets)
-      .filter((a) => IS_BUNDLED_PAGE.test(a) && !compilation.assets[a])
+        .filter((a) => IS_BUNDLED_PAGE.test(a) && !compilation.assets[a])
 
       this.prevAssets = compilation.assets
 
@@ -23,7 +23,7 @@ export default class UnlinkFilePlugin {
           throw err
         }
       }))
-      .then(() => callback(), callback)
+        .then(() => callback(), callback)
     })
   }
 }
diff --git a/server/hot-reloader.js b/server/hot-reloader.js
index 76ab8c7de3236..989aa699742b6 100644
--- a/server/hot-reloader.js
+++ b/server/hot-reloader.js
@@ -149,11 +149,11 @@ export default class HotReloader {
       )
 
       const failedChunkNames = new Set(compilation.errors
-      .map((e) => e.module.reasons)
-      .reduce((a, b) => a.concat(b), [])
-      .map((r) => r.module.chunks)
-      .reduce((a, b) => a.concat(b), [])
-      .map((c) => c.name))
+        .map((e) => e.module.reasons)
+        .reduce((a, b) => a.concat(b), [])
+        .map((r) => r.module.chunks)
+        .reduce((a, b) => a.concat(b), [])
+        .map((c) => c.name))
 
       const chunkHashes = new Map(
         compilation.chunks
diff --git a/server/index.js b/server/index.js
index 92c14925af0ab..07d175c313376 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,3 +1,4 @@
+/* eslint-disable import/first, no-return-await */
 require('@zeit/source-map-support').install()
 import { resolve, join, sep } from 'path'
 import { parse as parseUrl } from 'url'
diff --git a/server/render.js b/server/render.js
index 07a7ea8f78c2d..7abf7be9711c5 100644
--- a/server/render.js
+++ b/server/render.js
@@ -198,15 +198,15 @@ function serializeError (dev, err) {
 export function serveStatic (req, res, path) {
   return new Promise((resolve, reject) => {
     send(req, path)
-    .on('directory', () => {
+      .on('directory', () => {
       // We don't allow directories to be read.
-      const err = new Error('No directory access')
-      err.code = 'ENOENT'
-      reject(err)
-    })
-    .on('error', reject)
-    .pipe(res)
-    .on('finish', resolve)
+        const err = new Error('No directory access')
+        err.code = 'ENOENT'
+        reject(err)
+      })
+      .on('error', reject)
+      .pipe(res)
+      .on('finish', resolve)
   })
 }
 
diff --git a/test/integration/basic/pages/async-props.js b/test/integration/basic/pages/async-props.js
index 3dc68303eea4c..b23b2d0bfe394 100644
--- a/test/integration/basic/pages/async-props.js
+++ b/test/integration/basic/pages/async-props.js
@@ -2,7 +2,7 @@ import React from 'react'
 
 export default class AsyncProps extends React.Component {
   static async getInitialProps () {
-    return await fetchData()
+    return fetchData()
   }
 
   render () {
diff --git a/test/integration/basic/test/error-recovery.js b/test/integration/basic/test/error-recovery.js
index 6370c4239830e..7c94fb0bff791 100644
--- a/test/integration/basic/test/error-recovery.js
+++ b/test/integration/basic/test/error-recovery.js
@@ -29,7 +29,7 @@ export default (context, render) => {
       browser.close()
     })
 
-    it('should not show the default HMR error overlay', async() => {
+    it('should not show the default HMR error overlay', async () => {
       const browser = await webdriver(context.appPort, '/hmr/about')
       const text = await browser
         .elementByCss('p').text()
diff --git a/test/integration/custom-server/test/index.test.js b/test/integration/custom-server/test/index.test.js
index 6bcf36dff9b9a..0368f7e3c80f2 100644
--- a/test/integration/custom-server/test/index.test.js
+++ b/test/integration/custom-server/test/index.test.js
@@ -70,7 +70,7 @@ describe('Custom Server', () => {
       expect($dynamic('img').attr('src')).toBe(`http://127.0.0.1:${context.appPort}/static/myimage.png`)
     })
 
-    it('should support next/asset in client side', async() => {
+    it('should support next/asset in client side', async () => {
       const browser = await webdriver(context.appPort, '/')
       await browser
         .elementByCss('#go-asset').click()
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
index 688bbc8666145..8402d449557e7 100644
--- a/test/integration/production/test/index.test.js
+++ b/test/integration/production/test/index.test.js
@@ -65,9 +65,9 @@ describe('Production Usage', () => {
     it('should navigate via client side', async () => {
       const browser = await webdriver(appPort, '/')
       const text = await browser
-          .elementByCss('a').click()
-          .waitForElementByCss('.about-page')
-          .elementByCss('div').text()
+        .elementByCss('a').click()
+        .waitForElementByCss('.about-page')
+        .elementByCss('div').text()
 
       expect(text).toBe('About Page')
       browser.close()
@@ -98,8 +98,8 @@ describe('Production Usage', () => {
     it('should reload the page on page script error', async () => {
       const browser = await webdriver(appPort, '/counter')
       const counter = await browser
-          .elementByCss('#increase').click().click()
-          .elementByCss('#counter').text()
+        .elementByCss('#increase').click().click()
+        .elementByCss('#counter').text()
       expect(counter).toBe('Counter: 2')
 
       // When we go to the 404 page, it'll do a hard reload.
@@ -120,8 +120,8 @@ describe('Production Usage', () => {
     it('should reload the page on page script error with prefetch', async () => {
       const browser = await webdriver(appPort, '/counter')
       const counter = await browser
-          .elementByCss('#increase').click().click()
-          .elementByCss('#counter').text()
+        .elementByCss('#increase').click().click()
+        .elementByCss('#counter').text()
       expect(counter).toBe('Counter: 2')
 
       // Let the browser to prefetch the page and error it on the console.
diff --git a/test/integration/static/test/browser.js b/test/integration/static/test/browser.js
index c7d5b7f9c220a..d1bc169a02c6f 100644
--- a/test/integration/static/test/browser.js
+++ b/test/integration/static/test/browser.js
@@ -7,7 +7,7 @@ export default function (context) {
     it('should render the home page', async () => {
       const browser = await webdriver(context.port, '/')
       const text = await browser
-          .elementByCss('#home-page p').text()
+        .elementByCss('#home-page p').text()
 
       expect(text).toBe('This is the home page')
       browser.close()
@@ -16,9 +16,9 @@ export default function (context) {
     it('should do navigations via Link', async () => {
       const browser = await webdriver(context.port, '/')
       const text = await browser
-          .elementByCss('#about-via-link').click()
-          .waitForElementByCss('#about-page')
-          .elementByCss('#about-page p').text()
+        .elementByCss('#about-via-link').click()
+        .waitForElementByCss('#about-page')
+        .elementByCss('#about-page p').text()
 
       expect(text).toBe('This is the About page')
       browser.close()
@@ -27,9 +27,9 @@ export default function (context) {
     it('should do navigations via Router', async () => {
       const browser = await webdriver(context.port, '/')
       const text = await browser
-          .elementByCss('#about-via-router').click()
-          .waitForElementByCss('#about-page')
-          .elementByCss('#about-page p').text()
+        .elementByCss('#about-via-router').click()
+        .waitForElementByCss('#about-page')
+        .elementByCss('#about-page p').text()
 
       expect(text).toBe('This is the About page')
       browser.close()
@@ -38,11 +38,11 @@ export default function (context) {
     it('should do run client side javascript', async () => {
       const browser = await webdriver(context.port, '/')
       const text = await browser
-          .elementByCss('#counter').click()
-          .waitForElementByCss('#counter-page')
-          .elementByCss('#counter-increase').click()
-          .elementByCss('#counter-increase').click()
-          .elementByCss('#counter-page p').text()
+        .elementByCss('#counter').click()
+        .waitForElementByCss('#counter-page')
+        .elementByCss('#counter-increase').click()
+        .elementByCss('#counter-increase').click()
+        .elementByCss('#counter-page p').text()
 
       expect(text).toBe('Counter: 2')
       browser.close()
@@ -51,9 +51,9 @@ export default function (context) {
     it('should render pages using getInitialProps', async () => {
       const browser = await webdriver(context.port, '/')
       const text = await browser
-          .elementByCss('#get-initial-props').click()
-          .waitForElementByCss('#dynamic-page')
-          .elementByCss('#dynamic-page p').text()
+        .elementByCss('#get-initial-props').click()
+        .waitForElementByCss('#dynamic-page')
+        .elementByCss('#dynamic-page p').text()
 
       expect(text).toBe('cool dynamic text')
       browser.close()
@@ -62,9 +62,9 @@ export default function (context) {
     it('should render dynamic pages with custom urls', async () => {
       const browser = await webdriver(context.port, '/')
       const text = await browser
-          .elementByCss('#dynamic-1').click()
-          .waitForElementByCss('#dynamic-page')
-          .elementByCss('#dynamic-page p').text()
+        .elementByCss('#dynamic-1').click()
+        .waitForElementByCss('#dynamic-page')
+        .elementByCss('#dynamic-page p').text()
 
       expect(text).toBe('next export is nice')
       browser.close()
@@ -73,11 +73,11 @@ export default function (context) {
     it('should support client side naviagtion', async () => {
       const browser = await webdriver(context.port, '/')
       const text = await browser
-          .elementByCss('#counter').click()
-          .waitForElementByCss('#counter-page')
-          .elementByCss('#counter-increase').click()
-          .elementByCss('#counter-increase').click()
-          .elementByCss('#counter-page p').text()
+        .elementByCss('#counter').click()
+        .waitForElementByCss('#counter-page')
+        .elementByCss('#counter-increase').click()
+        .elementByCss('#counter-increase').click()
+        .elementByCss('#counter-page p').text()
 
       expect(text).toBe('Counter: 2')
 
@@ -97,15 +97,15 @@ export default function (context) {
     it('should render dynamic import components in the client', async () => {
       const browser = await webdriver(context.port, '/')
       await browser
-          .elementByCss('#dynamic-imports-page').click()
-          .waitForElementByCss('#dynamic-imports-page')
+        .elementByCss('#dynamic-imports-page').click()
+        .waitForElementByCss('#dynamic-imports-page')
 
       // Wait until browser loads the dynamic import chunk
       // TODO: We may need to find a better way to do this
       await waitFor(5000)
 
       const text = await browser
-          .elementByCss('#dynamic-imports-page p').text()
+        .elementByCss('#dynamic-imports-page p').text()
 
       expect(text).toBe('Welcome to dynamic imports.')
       browser.close()
@@ -116,9 +116,9 @@ export default function (context) {
 
       // Check for the query string content
       const text = await browser
-          .elementByCss('#with-hash').click()
-          .waitForElementByCss('#dynamic-page')
-          .elementByCss('#dynamic-page p').text()
+        .elementByCss('#with-hash').click()
+        .waitForElementByCss('#dynamic-page')
+        .elementByCss('#dynamic-page p').text()
 
       expect(text).toBe('zeit is awesome')
 
@@ -139,9 +139,9 @@ export default function (context) {
       const browser = await webdriver(context.port, '/button-link')
 
       const text = await browser
-          .elementByCss('button').click()
-          .waitForElementByCss('#home-page')
-          .elementByCss('#home-page p').text()
+        .elementByCss('button').click()
+        .waitForElementByCss('#home-page')
+        .elementByCss('#home-page p').text()
 
       expect(text).toBe('This is the home page')
       browser.close()
@@ -151,9 +151,9 @@ export default function (context) {
       it('should render the home page', async () => {
         const browser = await webdriver(context.port, '/')
         const text = await browser
-            .elementByCss('#level1-home-page').click()
-            .waitForElementByCss('#level1-home-page')
-            .elementByCss('#level1-home-page p').text()
+          .elementByCss('#level1-home-page').click()
+          .waitForElementByCss('#level1-home-page')
+          .elementByCss('#level1-home-page p').text()
 
         expect(text).toBe('This is the Level1 home page')
         browser.close()
@@ -162,9 +162,9 @@ export default function (context) {
       it('should render the about page', async () => {
         const browser = await webdriver(context.port, '/')
         const text = await browser
-            .elementByCss('#level1-about-page').click()
-            .waitForElementByCss('#level1-about-page')
-            .elementByCss('#level1-about-page p').text()
+          .elementByCss('#level1-about-page').click()
+          .waitForElementByCss('#level1-about-page')
+          .elementByCss('#level1-about-page p').text()
 
         expect(text).toBe('This is the Level1 about page')
         browser.close()
diff --git a/test/integration/static/test/ssr.js b/test/integration/static/test/ssr.js
index 0b060fe90a4ea..e291e90035e6d 100644
--- a/test/integration/static/test/ssr.js
+++ b/test/integration/static/test/ssr.js
@@ -18,27 +18,27 @@ export default function (context) {
       expect(filePathLink).toEqual('/file-name.md')
     })
 
-    it('should render a page with getInitialProps', async() => {
+    it('should render a page with getInitialProps', async () => {
       const html = await renderViaHTTP(context.port, '/dynamic')
       expect(html).toMatch(/cool dynamic text/)
     })
 
-    it('should render a dynamically rendered custom url page', async() => {
+    it('should render a dynamically rendered custom url page', async () => {
       const html = await renderViaHTTP(context.port, '/dynamic/one')
       expect(html).toMatch(/next export is nice/)
     })
 
-    it('should render pages with dynamic imports', async() => {
+    it('should render pages with dynamic imports', async () => {
       const html = await renderViaHTTP(context.port, '/dynamic-imports')
       expect(html).toMatch(/Welcome to dynamic imports/)
     })
 
-    it('should render paths with extensions', async() => {
+    it('should render paths with extensions', async () => {
       const html = await renderViaHTTP(context.port, '/file-name.md')
       expect(html).toMatch(/this file has an extension/)
     })
 
-    it('should give empty object for query if there is no query', async() => {
+    it('should give empty object for query if there is no query', async () => {
       const html = await renderViaHTTP(context.port, '/get-initial-props-with-no-query')
       expect(html).toMatch(/Query is: {}/)
     })
diff --git a/yarn.lock b/yarn.lock
index 8b5c3a6678723..dae54d70702d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,82 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.0.0-beta.42", "@babel/code-frame@^7.0.0-beta.40":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.42.tgz#a9c83233fa7cd06b39dc77adbb908616ff4f1962"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.42"
+
+"@babel/generator@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.42.tgz#777bb50f39c94a7e57f73202d833141f8159af33"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-function-name@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.42.tgz#b38b8f4f85168d1812c543dd700b5d549b0c4658"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.42"
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-get-function-arity@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.42.tgz#ad072e32f912c033053fc80478169aeadc22191e"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.42.tgz#0d0d5254220a9cc4e7e226240306b939dc210ee7"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/highlight@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.42.tgz#a502a1c0d6f99b2b0e81d468a1b0c0e81e3f3623"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/template@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.42.tgz#7186d4e70d44cdec975049ba0a73bdaf5cdee052"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+    babylon "7.0.0-beta.42"
+    lodash "^4.2.0"
+
+"@babel/traverse@^7.0.0-beta.40":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.42.tgz#f4bf4d1e33d41baf45205e2d0463591d57326285"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.42"
+    "@babel/generator" "7.0.0-beta.42"
+    "@babel/helper-function-name" "7.0.0-beta.42"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+    babylon "7.0.0-beta.42"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.42", "@babel/types@^7.0.0-beta.40":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.42.tgz#1e2118767684880f6963801b272fd2b3348efacc"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
 "@taskr/babel@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@taskr/babel/-/babel-1.1.0.tgz#f5af6b236395cbd013d3f67328ca73651e0299a1"
@@ -64,10 +140,10 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
 accepts@~1.3.3:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
   dependencies:
-    mime-types "~2.1.16"
+    mime-types "~2.1.18"
     negotiator "0.6.1"
 
 acorn-dynamic-import@^2.0.0:
@@ -96,9 +172,9 @@ acorn@^4.0.3, acorn@^4.0.4:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.4.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
+acorn@^5.0.0, acorn@^5.5.0:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
 
 aggregate-error@^1.0.0:
   version "1.0.0"
@@ -107,11 +183,7 @@ aggregate-error@^1.0.0:
     clean-stack "^1.0.0"
     indent-string "^3.0.0"
 
-ajv-keywords@^1.0.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-
-ajv-keywords@^2.0.0:
+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
@@ -119,14 +191,14 @@ ajv-keywords@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -136,12 +208,13 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
     json-schema-traverse "^0.3.0"
 
 ajv@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2"
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
+    uri-js "^3.0.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -165,13 +238,13 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
-ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
+ansi-escapes@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
 ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -189,13 +262,7 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
@@ -212,6 +279,13 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
 app-root-path@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
@@ -274,10 +348,18 @@ arr-diff@^2.0.0:
   dependencies:
     arr-flatten "^1.0.1"
 
-arr-flatten@^1.0.1:
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
@@ -290,6 +372,13 @@ array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
 
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -304,12 +393,9 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
-array.prototype.find@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -345,6 +431,10 @@ assert@^1.1.1:
   dependencies:
     util "0.10.3"
 
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -373,6 +463,10 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
+
 autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
@@ -396,15 +490,7 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-code-frame@7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-7.0.0-beta.0.tgz#418a7b5f3f7dc9a4670e61b1158b4c5661bec98d"
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -436,14 +522,16 @@ babel-core@6.26.0, babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.3.0:
     slash "^1.0.0"
     source-map "^0.5.6"
 
-babel-eslint@8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.1.tgz#5d718be7a328625d006022eb293ed3008cbd6346"
+babel-eslint@8.2.2:
+  version "8.2.2"
+  resolved "http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
   dependencies:
-    babel-code-frame "7.0.0-beta.0"
-    babel-traverse "7.0.0-beta.0"
-    babel-types "7.0.0-beta.0"
-    babylon "7.0.0-beta.22"
+    "@babel/code-frame" "^7.0.0-beta.40"
+    "@babel/traverse" "^7.0.0-beta.40"
+    "@babel/types" "^7.0.0-beta.40"
+    babylon "^7.0.0-beta.40"
+    eslint-scope "~3.7.1"
+    eslint-visitor-keys "^1.0.0"
 
 babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
@@ -500,15 +588,6 @@ babel-helper-explode-assignable-expression@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-function-name@7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-7.0.0-beta.0.tgz#d1b6779b647e5c5c31ebeb05e13b998e4d352d56"
-  dependencies:
-    babel-helper-get-function-arity "7.0.0-beta.0"
-    babel-template "7.0.0-beta.0"
-    babel-traverse "7.0.0-beta.0"
-    babel-types "7.0.0-beta.0"
-
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
@@ -519,12 +598,6 @@ babel-helper-function-name@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-get-function-arity@7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-7.0.0-beta.0.tgz#9d1ab7213bb5efe1ef1638a8ea1489969b5a8b6e"
-  dependencies:
-    babel-types "7.0.0-beta.0"
-
 babel-helper-get-function-arity@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
@@ -597,10 +670,6 @@ babel-loader@7.1.2:
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
 
-babel-messages@7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-7.0.0-beta.0.tgz#6df01296e49fc8fbd0637394326a167f36da817b"
-
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -1042,29 +1111,6 @@ babel-template@6.26.0, babel-template@^6.16.0, babel-template@^6.24.1, babel-tem
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-template@7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-7.0.0-beta.0.tgz#85083cf9e4395d5e48bf5154d7a8d6991cafecfb"
-  dependencies:
-    babel-traverse "7.0.0-beta.0"
-    babel-types "7.0.0-beta.0"
-    babylon "7.0.0-beta.22"
-    lodash "^4.2.0"
-
-babel-traverse@7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-7.0.0-beta.0.tgz#da14be9b762f62a2f060db464eaafdd8cd072a41"
-  dependencies:
-    babel-code-frame "7.0.0-beta.0"
-    babel-helper-function-name "7.0.0-beta.0"
-    babel-messages "7.0.0-beta.0"
-    babel-types "7.0.0-beta.0"
-    babylon "7.0.0-beta.22"
-    debug "^3.0.1"
-    globals "^10.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
 babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.25.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
@@ -1088,17 +1134,9 @@ babel-types@6.26.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babel-types@7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-7.0.0-beta.0.tgz#eb8b6e556470e6dcc4aef982d79ad229469b5169"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
-
-babylon@7.0.0-beta.22:
-  version "7.0.0-beta.22"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.22.tgz#74f0ad82ed7c7c3cfeab74cf684f815104161b65"
+babylon@7.0.0-beta.42, babylon@^7.0.0-beta.40:
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.42.tgz#67cfabcd4f3ec82999d29031ccdea89d0ba99657"
 
 babylon@^6.18.0:
   version "6.18.0"
@@ -1116,6 +1154,18 @@ base64-js@^1.0.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -1138,10 +1188,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
 bl@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
   dependencies:
-    readable-stream "^2.0.5"
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
 
 block-stream@*:
   version "0.0.9"
@@ -1206,6 +1257,23 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    kind-of "^6.0.2"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1292,6 +1360,10 @@ buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
+buffer-from@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1304,7 +1376,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1334,6 +1406,20 @@ cacache@^10.0.1:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
 caching-transform@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
@@ -1378,12 +1464,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000810"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000810.tgz#bd25830c41efab64339a2e381f49677343c84509"
+  version "1.0.30000820"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000820.tgz#7c20e25cea1768b261b724f82e3a6a253aaa1468"
 
 caniuse-lite@^1.0.30000792:
-  version "1.0.30000810"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000810.tgz#47585fffce0e9f3593a6feea4673b945424351d9"
+  version "1.0.30000820"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1408,7 +1494,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@2.3.2:
+chalk@2.3.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
   dependencies:
@@ -1426,13 +1512,9 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
-  dependencies:
-    ansi-styles "^3.2.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.2.0"
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
 cheerio@0.22.0:
   version "0.22.0"
@@ -1470,6 +1552,24 @@ chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.0"
+  optionalDependencies:
+    fsevents "^1.1.2"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -1485,8 +1585,8 @@ chromedriver@2.32.3:
     rimraf "^2.5.4"
 
 ci-info@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -1505,6 +1605,15 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 clean-stack@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
@@ -1513,12 +1622,18 @@ cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
-cli-cursor@^1.0.1, cli-cursor@^1.0.2:
+cli-cursor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
   dependencies:
     restore-cursor "^1.0.1"
 
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
 cli-spinners@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
@@ -1555,8 +1670,8 @@ clone@2.1.1:
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
 
 clone@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
 clor@^5.1.0:
   version "5.2.0"
@@ -1576,6 +1691,13 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
@@ -1619,8 +1741,8 @@ combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
     delayed-stream "~1.0.0"
 
 commander@^2.9.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
 commander@~2.13.0:
   version "2.13.0"
@@ -1630,6 +1752,14 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
+compare-versions@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
 compress-commons@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
@@ -1643,7 +1773,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.6.0, concat-stream@^1.5.0, concat-stream@^1.5.2:
+concat-stream@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1651,9 +1781,18 @@ concat-stream@1.6.0, concat-stream@^1.5.0, concat-stream@^1.5.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^1.5.0, concat-stream@^1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 configstore@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -1676,6 +1815,10 @@ constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
@@ -1711,13 +1854,17 @@ copy-concurrently@^1.0.0:
     rimraf "^2.5.4"
     run-queue "^1.0.0"
 
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
 core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -1868,8 +2015,8 @@ css-color-names@0.0.4:
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
 css-loader@^0.28.9:
-  version "0.28.10"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.10.tgz#40282e79230f7bcb4e483efa631d670b735ebf42"
+  version "0.28.11"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
   dependencies:
     babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
@@ -1993,13 +2140,13 @@ debug-log@^1.0.0, debug-log@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.6.8:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.1, debug@^3.1.0:
+debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -2009,6 +2156,10 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -2030,6 +2181,25 @@ define-properties@^1.1.2:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -2106,8 +2276,8 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
 diff@^3.2.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
 diffie-hellman@^5.0.0:
   version "5.0.2"
@@ -2117,14 +2287,14 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@^1.2.2:
+doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.0:
+doctrine@^2.0.2, doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
@@ -2184,8 +2354,8 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
 duplexify@^3.4.2, duplexify@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -2203,8 +2373,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
-  version "1.3.34"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz#d93498f40391bb0c16a603d8241b9951404157ed"
+  version "1.3.40"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -2278,8 +2448,8 @@ error-stack-parser@^2.0.0:
     stackframe "^1.0.3"
 
 es-abstract@^1.7.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -2296,11 +2466,12 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.39"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87"
+  version "0.10.41"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.41.tgz#bab3e982d750f0112f0cb9e6abed72c59eb33eb2"
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
+    next-tick "1"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
@@ -2356,15 +2527,15 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
 escodegen@^1.6.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.5.6"
+    source-map "~0.6.1"
 
 escope@^3.6.0:
   version "3.6.0"
@@ -2375,75 +2546,127 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-standard-jsx@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.3.0.tgz#cab0801a15a360bf63facb97ab22fbdd88d8a5e0"
+eslint-config-standard-jsx@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-5.0.0.tgz#4abfac554f38668e0078c664569e7b2384e5d2aa"
+
+eslint-config-standard@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz#87ee0d3c9d95382dc761958cbb23da9eea31e0ba"
+
+eslint-import-resolver-node@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.5.0"
 
-eslint-config-standard@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-7.1.0.tgz#47e769ea0739f5b2d5693b1a501c21c9650fafcf"
+eslint-module-utils@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+  dependencies:
+    debug "^2.6.8"
+    pkg-dir "^1.0.0"
 
-eslint-plugin-promise@~3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
+eslint-plugin-import@~2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.9.0.tgz#26002efbfca5989b7288ac047508bd24f217b169"
+  dependencies:
+    builtin-modules "^1.1.1"
+    contains-path "^0.1.0"
+    debug "^2.6.8"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.1"
+    eslint-module-utils "^2.1.1"
+    has "^1.0.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.3"
+    read-pkg-up "^2.0.0"
 
-eslint-plugin-react@~6.9.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.9.0.tgz#54c2e9906b76f9d10142030bdc34e9d6840a0bb2"
+eslint-plugin-node@~6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz#bf19642298064379315d7a4b2a75937376fa05e4"
   dependencies:
-    array.prototype.find "^2.0.1"
-    doctrine "^1.2.2"
-    jsx-ast-utils "^1.3.4"
+    ignore "^3.3.6"
+    minimatch "^3.0.4"
+    resolve "^1.3.3"
+    semver "^5.4.1"
 
-eslint-plugin-standard@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
+eslint-plugin-promise@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.7.0.tgz#f4bde5c2c77cdd69557a8f69a24d1ad3cfc9e67e"
 
-eslint@~3.18.0:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b"
+eslint-plugin-react@~7.7.0:
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
   dependencies:
-    babel-code-frame "^6.16.0"
-    chalk "^1.1.3"
-    concat-stream "^1.5.2"
-    debug "^2.1.1"
-    doctrine "^2.0.0"
-    escope "^3.6.0"
-    espree "^3.4.0"
+    doctrine "^2.0.2"
+    has "^1.0.1"
+    jsx-ast-utils "^2.0.1"
+    prop-types "^15.6.0"
+
+eslint-plugin-standard@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
+
+eslint-scope@^3.7.1, eslint-scope@~3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-visitor-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+
+eslint@~4.18.0:
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.2.tgz#0f81267ad1012e7d2051e186a9004cc2267b8d45"
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.2"
     esquery "^1.0.0"
-    estraverse "^4.2.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
-    glob "^7.0.3"
-    globals "^9.14.0"
-    ignore "^3.2.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
     imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
+    inquirer "^3.0.6"
     is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.7.5"
-    strip-bom "^3.0.0"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
     strip-json-comments "~2.0.1"
-    table "^3.7.8"
+    table "4.0.2"
     text-table "~0.2.0"
-    user-home "^2.0.0"
 
-espree@^3.4.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.3.tgz#931e0af64e7fbbed26b050a29daad1fc64799fa6"
+espree@^3.5.2:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
-    acorn "^5.4.0"
+    acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
 esprima@^2.6.0:
@@ -2465,11 +2688,10 @@ esquery@^1.0.0:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
   dependencies:
     estraverse "^4.1.0"
-    object-assign "^4.0.1"
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
@@ -2553,6 +2775,18 @@ expand-brackets@^0.1.4:
   dependencies:
     is-posix-bracket "^0.1.0"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -2603,16 +2837,50 @@ express@4.15.5:
     utils-merge "1.0.0"
     vary "~1.1.1"
 
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
+external-editor@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 extract-text-webpack-plugin@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
@@ -2679,13 +2947,19 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
-figures@^1.3.5, figures@^1.7.0:
+figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
   dependencies:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
@@ -2705,8 +2979,8 @@ fileset@^2.0.2:
     minimatch "^3.0.3"
 
 filesize@^3.2.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa"
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
 
 fill-range@^2.1.0:
   version "2.2.3"
@@ -2718,6 +2992,15 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 finalhandler@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
@@ -2786,13 +3069,13 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
 flush-write-stream@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
@@ -2841,6 +3124,12 @@ forwarded@~0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -2873,7 +3162,7 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@^1.0.0, fsevents@^1.1.1:
+fsevents@^1.0.0, fsevents@^1.1.1, fsevents@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
   dependencies:
@@ -2901,6 +3190,10 @@ function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -2936,14 +3229,18 @@ get-port@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
 
-get-stdin@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
 
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2963,6 +3260,13 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
 glob-promise@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.3.0.tgz#d1eb3625c4e6dcbb9b96eeae4425d5a3b135fed2"
@@ -2991,11 +3295,11 @@ global@^4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^10.0.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
+globals@^11.0.1, globals@^11.1.0:
+  version "11.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.4.0.tgz#b85c793349561c16076a3c13549238a27945f1bc"
 
-globals@^9.14.0, globals@^9.18.0:
+globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -3111,6 +3415,33 @@ has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
@@ -3187,8 +3518,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
@@ -3260,7 +3591,7 @@ husky@0.14.3:
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
 
-iconv-lite@0.4.19, iconv-lite@~0.4.13:
+iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
@@ -3275,8 +3606,8 @@ icss-utils@^2.1.0:
     postcss "^6.0.1"
 
 ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -3286,7 +3617,7 @@ ignore-loader@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ignore-loader/-/ignore-loader-0.1.2.tgz#d81f240376d0ba4f0d778972c3ad25874117a463"
 
-ignore@^3.0.9, ignore@^3.2.0:
+ignore@^3.0.9, ignore@^3.3.3, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
@@ -3335,22 +3666,23 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+inquirer@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    figures "^1.3.5"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
     lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
     through "^2.3.6"
 
 interpret@^1.0.0:
@@ -3358,8 +3690,8 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
 invariant@^2.2.0, invariant@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
@@ -3375,6 +3707,18 @@ is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
 
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -3403,12 +3747,40 @@ is-ci@^1.0.10:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
   dependencies:
-    ci-info "^1.0.0"
+    ci-info "^1.0.0"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
@@ -3423,15 +3795,21 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
-is-extendable@^0.1.1:
+is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
-is-extglob@^2.1.1:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
@@ -3457,6 +3835,12 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
@@ -3474,7 +3858,7 @@ is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
 
-is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
+is-my-json-valid@^2.12.4:
   version "2.17.2"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
   dependencies:
@@ -3500,17 +3884,27 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+  dependencies:
+    is-number "^4.0.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
 
 is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
   dependencies:
     is-path-inside "^1.0.0"
 
@@ -3524,6 +3918,12 @@ is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -3584,7 +3984,7 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-is-windows@^1.0.0:
+is-windows@^1.0.0, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
@@ -3602,6 +4002,10 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -3614,44 +4018,51 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
 istanbul-api@^1.1.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.2.2.tgz#e17cd519dd5ec4141197f246fdf380b75487f3b1"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
   dependencies:
     async "^2.1.4"
+    compare-versions "^3.1.0"
     fileset "^2.0.2"
-    istanbul-lib-coverage "^1.1.2"
-    istanbul-lib-hook "^1.1.0"
-    istanbul-lib-instrument "^1.9.2"
-    istanbul-lib-report "^1.1.3"
-    istanbul-lib-source-maps "^1.2.3"
-    istanbul-reports "^1.1.4"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-hook "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-report "^1.1.4"
+    istanbul-lib-source-maps "^1.2.4"
+    istanbul-reports "^1.3.0"
     js-yaml "^3.7.0"
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14"
+istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
 
-istanbul-lib-hook@^1.0.7, istanbul-lib-hook@^1.1.0:
+istanbul-lib-hook@^1.0.7:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz#84905bf47f7e0b401d6b840da7bad67086b4aab6"
+istanbul-lib-hook@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
     babylon "^6.18.0"
-    istanbul-lib-coverage "^1.1.2"
+    istanbul-lib-coverage "^1.2.0"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.1.1, istanbul-lib-report@^1.1.3:
+istanbul-lib-report@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz#2df12188c0fa77990c0d2176d2d0ba3394188259"
   dependencies:
@@ -3660,7 +4071,16 @@ istanbul-lib-report@^1.1.1, istanbul-lib-report@^1.1.3:
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.1, istanbul-lib-source-maps@^1.2.3:
+istanbul-lib-report@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+  dependencies:
+    istanbul-lib-coverage "^1.2.0"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.1:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6"
   dependencies:
@@ -3670,9 +4090,19 @@ istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.1, istanbul-lib-s
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-reports@^1.1.1, istanbul-reports@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.4.tgz#5ccba5e22b7b5a5d91d5e0a830f89be334bf97bd"
+istanbul-lib-source-maps@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.2.0"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.1.1, istanbul-reports@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
   dependencies:
     handlebars "^4.0.3"
 
@@ -3910,9 +4340,9 @@ js-yaml@3.6.1:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.1:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -3956,6 +4386,10 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -3976,7 +4410,11 @@ json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+
+json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
@@ -4007,9 +4445,11 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^1.3.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
+jsx-ast-utils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  dependencies:
+    array-includes "^3.0.3"
 
 junk@^1.0.1:
   version "1.0.3"
@@ -4019,7 +4459,7 @@ kew@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
 
-kind-of@^3.0.2:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -4031,6 +4471,14 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
@@ -4245,7 +4693,7 @@ lodash@4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652"
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.8.0:
+lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.8.0:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
@@ -4283,12 +4731,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
     js-tokens "^3.0.0"
 
 lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
 lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -4309,6 +4757,16 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
@@ -4401,6 +4859,24 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -4412,7 +4888,7 @@ mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.12, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
@@ -4481,6 +4957,13 @@ mississippi@^2.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mk-dirs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mk-dirs/-/mk-dirs-1.0.0.tgz#44ee67f82341c6762718e88e85e577882e1f67fd"
@@ -4505,8 +4988,8 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
     minimist "0.0.8"
 
 moment@^2.11.2:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
+  version "2.21.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -4531,9 +5014,9 @@ ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
 
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
 mz@2.7.0:
   version "2.7.0"
@@ -4544,8 +5027,25 @@ mz@2.7.0:
     thenify-all "^1.0.0"
 
 nan@^2.3.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -4555,6 +5055,14 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+neo-async@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
+
+next-tick@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+
 node-fetch@1.7.3, node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -4654,7 +5162,7 @@ normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1:
+normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -4717,8 +5225,8 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 "nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
 
 nyc@11.2.1:
   version "11.2.1"
@@ -4760,10 +5268,24 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-keys@^1.0.11, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
 object.assign@^4.0.4:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
@@ -4780,6 +5302,12 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  dependencies:
+    isobject "^3.0.1"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -4794,7 +5322,13 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
 
 onetime@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
 
 optimist@^0.6.1:
   version "0.6.1"
@@ -4839,7 +5373,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -4939,10 +5473,18 @@ parseurl@~1.3.1, parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
@@ -4957,7 +5499,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
@@ -5062,9 +5604,9 @@ platform@^1.3.3:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
 
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
 portfinder@1.0.13:
   version "1.0.13"
@@ -5074,6 +5616,10 @@ portfinder@1.0.13:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
 postcss-calc@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
@@ -5159,8 +5705,8 @@ postcss-load-plugins@^2.3.0:
     object-assign "^4.1.0"
 
 postcss-loader@^2.0.10:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.1.tgz#208935af3b1d65e1abb1a870a912dd12e7b36895"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.3.tgz#eb210da734e475a244f76ccd61f9860f5bb3ee09"
   dependencies:
     loader-utils "^1.1.0"
     postcss "^6.0.0"
@@ -5345,12 +5891,12 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     supports-color "^3.2.3"
 
 postcss@^6.0.0, postcss@^6.0.1:
-  version "6.0.19"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
+  version "6.0.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
   dependencies:
-    chalk "^2.3.1"
+    chalk "^2.3.2"
     source-map "^0.6.1"
-    supports-color "^5.2.0"
+    supports-color "^5.3.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
@@ -5387,9 +5933,9 @@ process@~0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
 
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+progress@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
 
 promise-inflight@^1.0.1:
   version "1.0.1"
@@ -5408,7 +5954,7 @@ prop-types-exact@1.1.1:
     has "^1.0.1"
     object.assign "^4.0.4"
 
-prop-types@15.6.0, prop-types@^15.6.0:
+prop-types@15.6.0:
   version "15.6.0"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
   dependencies:
@@ -5416,6 +5962,14 @@ prop-types@15.6.0, prop-types@^15.6.0:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.0:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proxy-addr@~1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@@ -5464,6 +6018,10 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
@@ -5537,8 +6095,8 @@ raw-body@2.3.2:
     unpipe "1.0.0"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -5603,9 +6161,9 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -5624,20 +6182,6 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
 recursive-copy@2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/recursive-copy/-/recursive-copy-2.0.6.tgz#d590f9eb5f165b96a1b80bc8f9cbcb5c6f9c89e9"
@@ -5689,6 +6233,13 @@ regex-cache@^0.4.2:
   dependencies:
     is-equal-shallow "^0.1.3"
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -5736,7 +6287,7 @@ repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
-repeat-string@^1.5.2:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -5799,8 +6350,8 @@ request@2.81.0:
     uuid "^3.0.0"
 
 request@^2.79.0, request@^2.81.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -5841,7 +6392,7 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-require-uncached@^1.0.2:
+require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
   dependencies:
@@ -5856,16 +6407,26 @@ resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@1.5.0, resolve@^1.1.6:
+resolve@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.3.3, resolve@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
+  dependencies:
+    path-parse "^1.0.5"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -5873,6 +6434,17 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 rewrite-imports@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/rewrite-imports/-/rewrite-imports-1.0.0.tgz#a4705c3829006e4f7541bf29d534d8d3b1717c83"
@@ -5896,15 +6468,15 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
   dependencies:
-    once "^1.3.0"
+    is-promise "^2.1.0"
 
 run-parallel@^1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.7.tgz#d8f40854b9e19d18c2e0e70180cc05cfc86b650f"
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.8.tgz#70e4e788f13a1ad9603254f6a2277f3843a5845c"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -5912,13 +6484,19 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
 rxjs@^5.0.0-beta.11:
-  version "5.5.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
+  version "5.5.8"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.8.tgz#b2b0809a57614ad6254c03d7446dea0d83ca3791"
   dependencies:
     symbol-observable "1.0.1"
 
@@ -5926,14 +6504,20 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0,
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
 sane@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.4.1.tgz#29f991208cf28636720efdc584293e7fd66663a5"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.0.tgz#6359cd676f5efd9988b264d8ce3b827dd6b27bec"
   dependencies:
-    anymatch "^1.3.0"
+    anymatch "^2.0.0"
     exec-sh "^0.2.0"
     fb-watchman "^2.0.0"
-    minimatch "^3.0.2"
+    micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
     watch "~0.18.0"
@@ -6024,6 +6608,24 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -6033,8 +6635,8 @@ setprototypeof@1.0.3:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.10"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -6053,14 +6655,6 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shelljs@^0.7.5:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shellwords@^0.1.0, shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -6077,10 +6671,43 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+
 slide@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -6103,12 +6730,26 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
+source-map-resolve@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
+  dependencies:
+    atob "^2.0.0"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   dependencies:
     source-map "^0.5.6"
 
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
 source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -6119,7 +6760,7 @@ source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.6:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -6134,19 +6775,33 @@ spawn-wrap@^1.3.8:
     signal-exit "^3.0.2"
     which "^1.3.0"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
 
 sprintf-js@^1.0.3:
   version "1.1.1"
@@ -6157,8 +6812,8 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -6171,8 +6826,8 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.2.4.tgz#9985e14041e65fc397af96542be35724ac11da52"
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
   dependencies:
     safe-buffer "^5.1.1"
 
@@ -6184,27 +6839,35 @@ staged-git-files@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35"
 
-standard-engine@~5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-5.4.0.tgz#e0e86959ea0786425d3383e40c1bf70d2f985579"
+standard-engine@~8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-8.0.1.tgz#0b77be8d7ab963675717dbeac1ef1d6675fb62f0"
   dependencies:
     deglob "^2.1.0"
-    get-stdin "^5.0.1"
-    home-or-tmp "^2.0.0"
+    get-stdin "^6.0.0"
     minimist "^1.1.0"
     pkg-conf "^2.0.0"
 
-standard@9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/standard/-/standard-9.0.2.tgz#9bd3b9467492e212b1914d78553943ff9b48fd99"
+standard@11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/standard/-/standard-11.0.1.tgz#49be40c76f1d564964b22bbf7309929ad0335e29"
+  dependencies:
+    eslint "~4.18.0"
+    eslint-config-standard "11.0.0"
+    eslint-config-standard-jsx "5.0.0"
+    eslint-plugin-import "~2.9.0"
+    eslint-plugin-node "~6.0.0"
+    eslint-plugin-promise "~3.7.0"
+    eslint-plugin-react "~7.7.0"
+    eslint-plugin-standard "~3.0.1"
+    standard-engine "~8.0.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
   dependencies:
-    eslint "~3.18.0"
-    eslint-config-standard "7.1.0"
-    eslint-config-standard-jsx "3.3.0"
-    eslint-plugin-promise "~3.4.0"
-    eslint-plugin-react "~6.9.0"
-    eslint-plugin-standard "~2.0.1"
-    standard-engine "~5.4.0"
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
 
 "statuses@>= 1.3.1 < 2":
   version "1.4.0"
@@ -6229,8 +6892,8 @@ stream-each@^1.1.0:
     stream-shift "^1.0.0"
 
 stream-http@^2.7.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -6275,14 +6938,20 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.0.3:
+string_decoder@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
@@ -6377,12 +7046,6 @@ supports-color@^4.2.1:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
@@ -6409,16 +7072,16 @@ symbol-tree@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+table@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
 
 tapable@^0.2.7:
   version "0.2.8"
@@ -6479,11 +7142,11 @@ term-size@^1.2.0:
     execa "^0.7.0"
 
 test-exclude@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.0.tgz#07e3613609a362c74516a717515e13322ab45b3c"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
   dependencies:
     arrify "^1.0.1"
-    micromatch "^2.3.11"
+    micromatch "^3.1.8"
     object-assign "^4.1.0"
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
@@ -6537,6 +7200,12 @@ tinydate@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tinydate/-/tinydate-1.0.0.tgz#20f31756a13959ef8c57ec133ba29b5ade042cac"
 
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -6553,6 +7222,28 @@ to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
 
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 touch@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
@@ -6560,8 +7251,8 @@ touch@3.1.0:
     nopt "~1.0.10"
 
 tough-cookie@^2.3.2, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
@@ -6668,6 +7359,15 @@ unfetch@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-3.0.0.tgz#8d1e0513a4ecd0e5ff2d41a6ba77771aae8b6482"
 
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
@@ -6704,10 +7404,21 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
+upath@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
+
 update-notifier@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
@@ -6722,6 +7433,16 @@ update-notifier@2.3.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
+uri-js@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
@@ -6735,11 +7456,11 @@ url@0.11.0, url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+use@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
   dependencies:
-    os-homedir "^1.0.0"
+    kind-of "^6.0.2"
 
 util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
@@ -6764,11 +7485,11 @@ uuid@^3.0.0, uuid@^3.1.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 vargs@0.1.0:
   version "0.1.0"
@@ -6820,12 +7541,12 @@ watch@~0.18.0:
     minimist "^1.2.0"
 
 watchpack@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed"
   dependencies:
-    async "^2.1.2"
-    chokidar "^1.7.0"
+    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
 
 wd@1.4.1:
   version "1.4.1"
@@ -6961,11 +7682,10 @@ wordwrap@~1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
 worker-farm@^1.3.1, worker-farm@^1.5.2:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.4.tgz#4debbe46b40edefcc717ebde74a90b1ae1e909a1"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
   dependencies:
     errno "~0.1.7"
-    xtend "~4.0.1"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"

From 4570f2d050e8110901c2ce3a1a544f46b605b1d6 Mon Sep 17 00:00:00 2001
From: Will Meier <willmeierart@gmail.com>
Date: Wed, 28 Mar 2018 14:30:42 -0600
Subject: [PATCH 02/73] Update with-apollo examples  (#4067)

* Update with-apollo examples to include note about top-level withData HOC

* Update with-apollo examples to include note about top-level withData HOC
---
 examples/with-apollo-and-redux-saga/README.md | 3 +++
 examples/with-apollo-and-redux/README.md      | 5 ++++-
 examples/with-apollo-auth/README.md           | 4 ++++
 examples/with-apollo/README.md                | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/examples/with-apollo-and-redux-saga/README.md b/examples/with-apollo-and-redux-saga/README.md
index 63f390839fe47..226e29f603bca 100644
--- a/examples/with-apollo-and-redux-saga/README.md
+++ b/examples/with-apollo-and-redux-saga/README.md
@@ -49,3 +49,6 @@ export default withReduxSaga(connect(mapStateToProps, null)(Index));
 ```
 
 `connect` must go inside `withReduxSaga` otherwise `connect` will not be able to find the store.
+
+### Note:
+In these *with-apollo* examples, the ```withData()``` HOC must wrap a top-level component from within the ```pages``` directory. Wrapping a child component with the HOC will result in a ```Warning: Failed prop type: The prop 'serverState' is marked as required in 'WithData(Apollo(Component))', but its value is 'undefined'``` error. Down-tree child components will have access to Apollo, and can be wrapped with any other sort of ```graphql()```, ```compose()```, etc HOC's.
diff --git a/examples/with-apollo-and-redux/README.md b/examples/with-apollo-and-redux/README.md
index 548a45563a018..5f3b19401409b 100644
--- a/examples/with-apollo-and-redux/README.md
+++ b/examples/with-apollo-and-redux/README.md
@@ -48,4 +48,7 @@ const mapStateToProps = state => ({
 });
 
 export default withRedux(connect(mapStateToProps, null)(Index));
-```
\ No newline at end of file
+```
+
+### Note:
+In these *with-apollo* examples, the ```withData()``` HOC must wrap a top-level component from within the ```pages``` directory. Wrapping a child component with the HOC will result in a ```Warning: Failed prop type: The prop 'serverState' is marked as required in 'WithData(Apollo(Component))', but its value is 'undefined'``` error. Down-tree child components will have access to Apollo, and can be wrapped with any other sort of ```graphql()```, ```compose()```, etc HOC's.
diff --git a/examples/with-apollo-auth/README.md b/examples/with-apollo-auth/README.md
index ff14ceffa572b..00482128d81cb 100644
--- a/examples/with-apollo-auth/README.md
+++ b/examples/with-apollo-auth/README.md
@@ -66,3 +66,7 @@ It is important to note the use of Apollo's `resetStore()` method after signing
 
 To get this example running locally, you will need to create a graph.cool
 account, and provide [the `project.graphcool` schema](https://github.com/zeit/next.js/blob/master/examples/with-apollo-auth/project.graphcool).
+
+
+### Note:
+In these *with-apollo* examples, the ```withData()``` HOC must wrap a top-level component from within the ```pages``` directory. Wrapping a child component with the HOC will result in a ```Warning: Failed prop type: The prop 'serverState' is marked as required in 'WithData(Apollo(Component))', but its value is 'undefined'``` error. Down-tree child components will have access to Apollo, and can be wrapped with any other sort of ```graphql()```, ```compose()```, etc HOC's.
diff --git a/examples/with-apollo/README.md b/examples/with-apollo/README.md
index 563485e857ea2..feee245d2965e 100644
--- a/examples/with-apollo/README.md
+++ b/examples/with-apollo/README.md
@@ -48,3 +48,6 @@ In this simple example, we integrate Apollo seamlessly with Next by wrapping our
 On initial page load, while on the server and inside `getInitialProps`, we invoke the Apollo method,  [`getDataFromTree`](http://dev.apollodata.com/react/server-side-rendering.html#getDataFromTree). This method returns a promise; at the point in which the promise resolves, our Apollo Client store is completely initialized.
 
 This example relies on [graph.cool](https://www.graph.cool) for its GraphQL backend.
+
+### Note:
+In these *with-apollo* examples, the ```withData()``` HOC must wrap a top-level component from within the ```pages``` directory. Wrapping a child component with the HOC will result in a ```Warning: Failed prop type: The prop 'serverState' is marked as required in 'WithData(Apollo(Component))', but its value is 'undefined'``` error. Down-tree child components will have access to Apollo, and can be wrapped with any other sort of ```graphql()```, ```compose()```, etc HOC's.

From 9f4e7076827b333538c1b2f97337d3bf93490838 Mon Sep 17 00:00:00 2001
From: Luis Fernando Alvarez D <luisito453@gmail.com>
Date: Wed, 28 Mar 2018 17:11:40 -0500
Subject: [PATCH 03/73] New example: with-now-env (#4073)

---
 examples/with-now-env/README.md        | 43 ++++++++++++++++++++++++++
 examples/with-now-env/next.config.js   | 27 ++++++++++++++++
 examples/with-now-env/now-secrets.json |  4 +++
 examples/with-now-env/now.json         |  7 +++++
 examples/with-now-env/package.json     | 17 ++++++++++
 examples/with-now-env/pages/index.js   | 22 +++++++++++++
 6 files changed, 120 insertions(+)
 create mode 100644 examples/with-now-env/README.md
 create mode 100644 examples/with-now-env/next.config.js
 create mode 100644 examples/with-now-env/now-secrets.json
 create mode 100644 examples/with-now-env/now.json
 create mode 100644 examples/with-now-env/package.json
 create mode 100644 examples/with-now-env/pages/index.js

diff --git a/examples/with-now-env/README.md b/examples/with-now-env/README.md
new file mode 100644
index 0000000000000..d10c776f9d1bc
--- /dev/null
+++ b/examples/with-now-env/README.md
@@ -0,0 +1,43 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-now-env)
+
+# Now-env example
+
+## How to use
+
+### Using `create-next-app`
+
+Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+
+```bash
+npx create-next-app --example with-now-env with-now-env-app
+# or
+yarn create next-app --example with-now-env with-now-env-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-now-env
+cd with-now-env
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run dev
+```
+
+Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
+
+```bash
+now
+```
+
+keep in mind that in order to deploy the app to `now` the env [secrets](https://zeit.co/docs/getting-started/secrets) defined in `now.json` should be listed in your account
+
+## The idea behind the example
+
+This example shows the usage of [now-env](https://github.com/zeit/now-env), it allows to use secrets in development that will be replaced in production by the secrets defined with [now](https://zeit.co/docs/getting-started/secrets)
diff --git a/examples/with-now-env/next.config.js b/examples/with-now-env/next.config.js
new file mode 100644
index 0000000000000..bf700816678f2
--- /dev/null
+++ b/examples/with-now-env/next.config.js
@@ -0,0 +1,27 @@
+/**
+ * After the next require you can use process.env to get your secrets
+ */
+require('now-env')
+
+console.log({
+  SECRET: process.env.SECRET,
+  ANOTHER_SECRET: process.env.ANOTHER_SECRET,
+  SECRET_FAIL: process.env.SECRET_FAIL
+})
+
+/**
+ * If some of the envs are public, like a google maps key, but you still
+ * want to keep them secret from the repo, the following code will allow you
+ * to share some variables with the client, configured at compile time.
+ */
+module.exports = {
+  webpack: config => {
+    config.plugins.forEach(plugin => {
+      if (plugin.constructor.name === 'DefinePlugin') {
+        plugin.definitions['process.env.SECRET'] = JSON.stringify(process.env.SECRET)
+      }
+    })
+
+    return config
+  }
+}
diff --git a/examples/with-now-env/now-secrets.json b/examples/with-now-env/now-secrets.json
new file mode 100644
index 0000000000000..169f57182acb9
--- /dev/null
+++ b/examples/with-now-env/now-secrets.json
@@ -0,0 +1,4 @@
+{
+  "@my-secret-key": "keep-it-secret",
+  "@my-other-secret-key": "keep-it-secret-too"
+}
diff --git a/examples/with-now-env/now.json b/examples/with-now-env/now.json
new file mode 100644
index 0000000000000..872ff148d78c6
--- /dev/null
+++ b/examples/with-now-env/now.json
@@ -0,0 +1,7 @@
+{
+  "env": {
+    "SECRET": "@my-secret-key",
+    "ANOTHER_SECRET": "@my-other-secret-key",
+    "SECRET_FAIL": "@this-is-not-defined"
+  }
+}
diff --git a/examples/with-now-env/package.json b/examples/with-now-env/package.json
new file mode 100644
index 0000000000000..9935d81a8b47a
--- /dev/null
+++ b/examples/with-now-env/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "with-now-env",
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "latest",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0"
+  },
+  "devDependencies": {
+    "now-env": "^3.0.4"
+  }
+}
diff --git a/examples/with-now-env/pages/index.js b/examples/with-now-env/pages/index.js
new file mode 100644
index 0000000000000..b2fd7a6a8f72d
--- /dev/null
+++ b/examples/with-now-env/pages/index.js
@@ -0,0 +1,22 @@
+export default () => (
+  <div className='hello'>
+    <p>
+      Hello World! Here's a secret shared with the client using webpack
+      DefinePlugin: <strong>{process.env.SECRET}</strong>, the secret is shared
+      at compile time, which means every reference to the secret is replaced
+      with its value
+    </p>
+    <style jsx>{`
+      .hello {
+        font: 15px Helvetica, Arial, sans-serif;
+        background: #eee;
+        padding: 100px;
+        text-align: center;
+        transition: 100ms ease-in background;
+      }
+      .hello:hover {
+        background: #ccc;
+      }
+    `}</style>
+  </div>
+)

From cfe748d4b5c1ec7ef9ec4adc4bec534a9616aed8 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 29 Mar 2018 10:17:44 +0200
Subject: [PATCH 04/73] Add note about getConfig

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index f42a28a8de58e..aec3d472a6747 100644
--- a/readme.md
+++ b/readme.md
@@ -1185,7 +1185,7 @@ module.exports = {
 ```js
 // pages/index.js
 import getConfig from 'next/config'
-const {serverRuntimeConfig, publicRuntimeConfig} = getConfig()
+const {serverRuntimeConfig, publicRuntimeConfig} = getConfig() // Only holds serverRuntimeConfig and publicRuntimeConfig from next.config.js nothing else.
 
 console.log(serverRuntimeConfig.mySecret) // Will only be available on the server side
 console.log(publicRuntimeConfig.staticFolder) // Will be available on both server and client

From 341c34d4bfc0b001b2dc018c44676368a289be84 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 29 Mar 2018 10:19:21 +0200
Subject: [PATCH 05/73] Move getConfig message to the line above in readme

---
 readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index aec3d472a6747..b55f24ed00ddb 100644
--- a/readme.md
+++ b/readme.md
@@ -1185,7 +1185,8 @@ module.exports = {
 ```js
 // pages/index.js
 import getConfig from 'next/config'
-const {serverRuntimeConfig, publicRuntimeConfig} = getConfig() // Only holds serverRuntimeConfig and publicRuntimeConfig from next.config.js nothing else.
+// Only holds serverRuntimeConfig and publicRuntimeConfig from next.config.js nothing else.
+const {serverRuntimeConfig, publicRuntimeConfig} = getConfig()
 
 console.log(serverRuntimeConfig.mySecret) // Will only be available on the server side
 console.log(publicRuntimeConfig.staticFolder) // Will be available on both server and client

From 2ba8ad9760ad705650919e179ede5893ec04146b Mon Sep 17 00:00:00 2001
From: Pavel Prichodko <prichodko.p@gmail.com>
Date: Thu, 29 Mar 2018 17:03:28 +0200
Subject: [PATCH 06/73] Add with-google-analytics example (#4036)

* Rename example with-analytics to with-segment-analytics

* Add with-google-analytics example
---
 examples/with-google-analytics/README.md      | 41 +++++++++++++++++++
 .../components/Header.js                      | 26 ++++++++++++
 .../with-google-analytics/components/Page.js  | 16 ++++++++
 examples/with-google-analytics/lib/gtag.js    | 17 ++++++++
 examples/with-google-analytics/package.json   | 13 ++++++
 .../with-google-analytics/pages/_document.js  | 41 +++++++++++++++++++
 examples/with-google-analytics/pages/about.js |  8 ++++
 .../with-google-analytics/pages/contact.js    | 39 ++++++++++++++++++
 examples/with-google-analytics/pages/index.js |  8 ++++
 .../README.md                                 | 10 ++---
 .../components/Header.js                      |  0
 .../package.json                              |  2 +-
 .../pages/_document.js                        |  0
 .../pages/about.js                            |  0
 .../pages/contact.js                          |  0
 .../pages/index.js                            |  0
 16 files changed, 215 insertions(+), 6 deletions(-)
 create mode 100644 examples/with-google-analytics/README.md
 create mode 100644 examples/with-google-analytics/components/Header.js
 create mode 100644 examples/with-google-analytics/components/Page.js
 create mode 100644 examples/with-google-analytics/lib/gtag.js
 create mode 100644 examples/with-google-analytics/package.json
 create mode 100644 examples/with-google-analytics/pages/_document.js
 create mode 100644 examples/with-google-analytics/pages/about.js
 create mode 100644 examples/with-google-analytics/pages/contact.js
 create mode 100644 examples/with-google-analytics/pages/index.js
 rename examples/{with-analytics => with-segment-analytics}/README.md (77%)
 rename examples/{with-analytics => with-segment-analytics}/components/Header.js (100%)
 rename examples/{with-analytics => with-segment-analytics}/package.json (86%)
 rename examples/{with-analytics => with-segment-analytics}/pages/_document.js (100%)
 rename examples/{with-analytics => with-segment-analytics}/pages/about.js (100%)
 rename examples/{with-analytics => with-segment-analytics}/pages/contact.js (100%)
 rename examples/{with-analytics => with-segment-analytics}/pages/index.js (100%)

diff --git a/examples/with-google-analytics/README.md b/examples/with-google-analytics/README.md
new file mode 100644
index 0000000000000..766aab7a0a295
--- /dev/null
+++ b/examples/with-google-analytics/README.md
@@ -0,0 +1,41 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-google-analytics)
+
+# Example app with analytics
+
+## How to use
+
+### Using `create-next-app`
+
+Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+
+```bash
+npx create-next-app --example with-google-analytics with-google-analytics-app
+# or
+yarn create next-app --example with-google-analytics with-google-analytics-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-google-analytics
+cd with-google-analytics
+```
+
+Install it and run:
+
+```bash
+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 [Next.js](https://github.com/zeit/next.js) along with [Google Analytics](https://developers.google.com/analytics/devguides/collection/gtagjs/). A custom [\_document](https://github.com/zeit/next.js/#custom-document) is used to inject [tracking snippet](https://developers.google.com/analytics/devguides/collection/gtagjs/) and track [pageviews](https://developers.google.com/analytics/devguides/collection/gtagjs/pages) and [event](https://developers.google.com/analytics/devguides/collection/gtagjs/events).
diff --git a/examples/with-google-analytics/components/Header.js b/examples/with-google-analytics/components/Header.js
new file mode 100644
index 0000000000000..9739e3eae90bd
--- /dev/null
+++ b/examples/with-google-analytics/components/Header.js
@@ -0,0 +1,26 @@
+import React from 'react'
+import Link from 'next/link'
+
+export default () => (
+  <header>
+    <nav>
+      <ul>
+        <li>
+          <Link href='/'>
+            <a>Home</a>
+          </Link>
+        </li>
+        <li>
+          <Link href='/about'>
+            <a>About</a>
+          </Link>
+        </li>
+        <li>
+          <Link href='/contact'>
+            <a>Contact</a>
+          </Link>
+        </li>
+      </ul>
+    </nav>
+  </header>
+)
diff --git a/examples/with-google-analytics/components/Page.js b/examples/with-google-analytics/components/Page.js
new file mode 100644
index 0000000000000..421c5f2b38764
--- /dev/null
+++ b/examples/with-google-analytics/components/Page.js
@@ -0,0 +1,16 @@
+import React from 'react'
+import Router from 'next/router'
+import Header from './Header'
+
+import * as gtag from '../lib/gtag'
+
+Router.onRouteChangeComplete = url => {
+  gtag.pageview(url)
+}
+
+export default ({ children }) => (
+  <div>
+    <Header />
+    {children}
+  </div>
+)
diff --git a/examples/with-google-analytics/lib/gtag.js b/examples/with-google-analytics/lib/gtag.js
new file mode 100644
index 0000000000000..3279ca6f77672
--- /dev/null
+++ b/examples/with-google-analytics/lib/gtag.js
@@ -0,0 +1,17 @@
+export const GA_TRACKING_ID = '<YOUR_GA_TRACKING_ID>'
+
+// https://developers.google.com/analytics/devguides/collection/gtagjs/pages
+export const pageview = url => {
+  window.gtag('config', GA_TRACKING_ID, {
+    page_location: url,
+  })
+}
+
+// https://developers.google.com/analytics/devguides/collection/gtagjs/events
+export const event = ({ action, category, label, value }) => {
+  window.gtag('event', action, {
+    event_category: category,
+    event_label: label,
+    value: value,
+  })
+}
diff --git a/examples/with-google-analytics/package.json b/examples/with-google-analytics/package.json
new file mode 100644
index 0000000000000..ba89a7174a6ff
--- /dev/null
+++ b/examples/with-google-analytics/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "with-google-analytics",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "latest",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0"
+  }
+}
diff --git a/examples/with-google-analytics/pages/_document.js b/examples/with-google-analytics/pages/_document.js
new file mode 100644
index 0000000000000..27b8a85dcedbb
--- /dev/null
+++ b/examples/with-google-analytics/pages/_document.js
@@ -0,0 +1,41 @@
+import React from 'react'
+import Document, { Head, Main, NextScript } from 'next/document'
+import flush from 'styled-jsx/server'
+
+import { GA_TRACKING_ID } from '../lib/gtag'
+
+export default class extends Document {
+  static getInitialProps ({ renderPage }) {
+    const { html, head, errorHtml, chunks } = renderPage()
+    const styles = flush()
+    return { html, head, errorHtml, chunks, styles }
+  }
+
+  render () {
+    return (
+      <html>
+        <Head>
+          {/* Global Site Tag (gtag.js) - Google Analytics */}
+          <script
+            async
+            src={`https://www.googletagmanager.com/gtag/js?id=${GA_TRACKING_ID}`}
+          />
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+
+            gtag('config', '${GA_TRACKING_ID}');
+          `}}
+          />
+        </Head>
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </html>
+    )
+  }
+}
diff --git a/examples/with-google-analytics/pages/about.js b/examples/with-google-analytics/pages/about.js
new file mode 100644
index 0000000000000..a340e5920c5cf
--- /dev/null
+++ b/examples/with-google-analytics/pages/about.js
@@ -0,0 +1,8 @@
+import React from 'react'
+import Page from '../components/Page'
+
+export default () => (
+  <Page>
+    <h1>This is the About page</h1>
+  </Page>
+)
diff --git a/examples/with-google-analytics/pages/contact.js b/examples/with-google-analytics/pages/contact.js
new file mode 100644
index 0000000000000..1d086ce12e6b6
--- /dev/null
+++ b/examples/with-google-analytics/pages/contact.js
@@ -0,0 +1,39 @@
+import React, { Component } from 'react'
+import Page from '../components/Page'
+
+import * as gtag from '../lib/gtag'
+
+export default class extends Component {
+  state = { message: '' }
+
+  handleInput = e => {
+    this.setState({ message: e.target.value })
+  }
+
+  handleSubmit = e => {
+    e.preventDefault()
+
+    gtag.event({
+      action: 'submit_form',
+      category: 'Contact',
+      label: this.state.message
+    })
+
+    this.setState({ message: '' })
+  }
+
+  render () {
+    return (
+      <Page>
+        <h1>This is the Contact page</h1>
+        <form onSubmit={this.handleSubmit}>
+          <label>
+            <span>Message:</span>
+            <textarea onInput={this.handleInput} value={this.state.message} />
+          </label>
+          <button type='submit'>submit</button>
+        </form>
+      </Page>
+    )
+  }
+}
diff --git a/examples/with-google-analytics/pages/index.js b/examples/with-google-analytics/pages/index.js
new file mode 100644
index 0000000000000..9969504759144
--- /dev/null
+++ b/examples/with-google-analytics/pages/index.js
@@ -0,0 +1,8 @@
+import React from 'react'
+import Page from '../components/Page'
+
+export default () => (
+  <Page>
+    <h1>This is the Home page</h1>
+  </Page>
+)
diff --git a/examples/with-analytics/README.md b/examples/with-segment-analytics/README.md
similarity index 77%
rename from examples/with-analytics/README.md
rename to examples/with-segment-analytics/README.md
index c72d8d3c888d7..dc9bb90683a5f 100644
--- a/examples/with-analytics/README.md
+++ b/examples/with-segment-analytics/README.md
@@ -1,4 +1,4 @@
-[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-analytics)
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-segment-analytics)
 
 # Example app with analytics
 
@@ -9,9 +9,9 @@
 Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
 
 ```bash
-npx create-next-app --example with-analytics with-analytics-app
+npx create-next-app --example with-segment-analytics with-segment-analytics-app
 # or
-yarn create next-app --example with-analytics with-analytics-app
+yarn create next-app --example with-segment-analytics with-segment-analytics-app
 ```
 
 ### Download manually
@@ -19,8 +19,8 @@ yarn create next-app --example with-analytics with-analytics-app
 Download the example [or clone the repo](https://github.com/zeit/next.js):
 
 ```bash
-curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-analytics
-cd with-analytics
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-segment-analytics
+cd with-segment-analytics
 ```
 
 Install it and run:
diff --git a/examples/with-analytics/components/Header.js b/examples/with-segment-analytics/components/Header.js
similarity index 100%
rename from examples/with-analytics/components/Header.js
rename to examples/with-segment-analytics/components/Header.js
diff --git a/examples/with-analytics/package.json b/examples/with-segment-analytics/package.json
similarity index 86%
rename from examples/with-analytics/package.json
rename to examples/with-segment-analytics/package.json
index c98d38dca6d0e..a1c212ba4eb44 100644
--- a/examples/with-analytics/package.json
+++ b/examples/with-segment-analytics/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-analytics",
+  "name": "with-segment-analytics",
   "scripts": {
     "dev": "next",
     "build": "next build",
diff --git a/examples/with-analytics/pages/_document.js b/examples/with-segment-analytics/pages/_document.js
similarity index 100%
rename from examples/with-analytics/pages/_document.js
rename to examples/with-segment-analytics/pages/_document.js
diff --git a/examples/with-analytics/pages/about.js b/examples/with-segment-analytics/pages/about.js
similarity index 100%
rename from examples/with-analytics/pages/about.js
rename to examples/with-segment-analytics/pages/about.js
diff --git a/examples/with-analytics/pages/contact.js b/examples/with-segment-analytics/pages/contact.js
similarity index 100%
rename from examples/with-analytics/pages/contact.js
rename to examples/with-segment-analytics/pages/contact.js
diff --git a/examples/with-analytics/pages/index.js b/examples/with-segment-analytics/pages/index.js
similarity index 100%
rename from examples/with-analytics/pages/index.js
rename to examples/with-segment-analytics/pages/index.js

From 3949c82bdfe268f841178979800aa8e71bbf412c Mon Sep 17 00:00:00 2001
From: Wes Bos <wesbos@gmail.com>
Date: Thu, 29 Mar 2018 12:01:12 -0400
Subject: [PATCH 07/73] Add missing url prop (#4078)

This was causing react-apollo  to crash on any SSR page that needed the page's query to make the GraphQL queries.

It's magically passed on the client, but we have to manually pass it to the composed component here
---
 examples/with-apollo/lib/withData.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/examples/with-apollo/lib/withData.js b/examples/with-apollo/lib/withData.js
index d854618af7dc4..2e6326bca3416 100644
--- a/examples/with-apollo/lib/withData.js
+++ b/examples/with-apollo/lib/withData.js
@@ -32,9 +32,16 @@ export default ComposedComponent => {
       // and extract the resulting data
       const apollo = initApollo()
       try {
+        // create the url prop which is passed to every page
+        const url = {
+          query: ctx.query,
+          asPath: ctx.asPath,
+          pathname: ctx.pathname,
+        };
+
         // Run all GraphQL queries
         await getDataFromTree(
-          <ComposedComponent ctx={ctx} {...composedInitialProps} />,
+          <ComposedComponent ctx={ctx} url={url} {...composedInitialProps} />,
           {
             router: {
               asPath: ctx.asPath,

From 069f45d74ed1bc88058876c2e80d96a5767c1989 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 29 Mar 2018 21:06:53 +0200
Subject: [PATCH 08/73] Upgrade @zeit/next-typescript in
 custom-server-typescript example (patch) fixes #4071

---
 examples/custom-server-typescript/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/custom-server-typescript/package.json b/examples/custom-server-typescript/package.json
index 11faa2f8b1a59..73d7869e0e611 100644
--- a/examples/custom-server-typescript/package.json
+++ b/examples/custom-server-typescript/package.json
@@ -7,14 +7,14 @@
   "dependencies": {
     "next": "latest",
     "react": "^16.2.0",
-    "react-dom": "^16.2.0"
+    "react-dom": "^16.2.0",
+    "@zeit/next-typescript": "0.0.11",
+    "typescript": "^2.7.1"
   },
   "devDependencies": {
     "@types/next": "^2.4.7",
     "@types/react": "^16.0.36",
-    "@zeit/next-typescript": "^0.0.8",
     "nodemon": "^1.12.1",
-    "ts-node": "^4.1.0",
-    "typescript": "^2.7.1"
+    "ts-node": "^4.1.0"
   }
 }

From 69ca73ca56b9dc6e8dae7385e63f128088f8908d Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Fri, 30 Mar 2018 00:05:52 +0200
Subject: [PATCH 09/73] Upgrade @zeit/next-typescript in with-typescript
 example (patch)

---
 examples/with-typescript/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-typescript/package.json b/examples/with-typescript/package.json
index cf30b7f6e52c7..378d2f2f5c9a2 100644
--- a/examples/with-typescript/package.json
+++ b/examples/with-typescript/package.json
@@ -14,7 +14,7 @@
   "devDependencies": {
     "@types/next": "^2.4.7",
     "@types/react": "^16.0.36",
-    "@zeit/next-typescript": "0.0.8",
+    "@zeit/next-typescript": "0.0.11",
     "typescript": "^2.7.1"
   }
 }

From 136dabc51de634ef3f2b16415c7824d4e98bced7 Mon Sep 17 00:00:00 2001
From: Carlo Palinckx <carlopalinckx@gmail.com>
Date: Fri, 30 Mar 2018 14:02:36 +0200
Subject: [PATCH 10/73] fixed small readme typo (#4083)

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index b55f24ed00ddb..4d81007d8401f 100644
--- a/readme.md
+++ b/readme.md
@@ -1012,7 +1012,7 @@ module.exports = {
 Or use a function:
 
 ```js
-module.exports = (phase, {defaultConfig}){
+module.exports = (phase, {defaultConfig}) => {
   //
   // https://github.com/zeit/
   return {

From e90f89633ca49a0105c362e6edbb8643182e8bde Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Fri, 30 Mar 2018 15:08:09 +0200
Subject: [PATCH 11/73] Add flow, pages-manifest.json, defaultPathMap for
 export (minor) (#4066)

* Initial implementation of next export without exportPathMap

* Shorter message

* Set up flow

* Create pages manifest

* Use pagesManifest for next export

* Fix tests

* Document defaultPathMap

* Replacing the path is no longer needed

* Use posix normalize for consistent behaviour

* Remove second instance of examples

* Add comment about what pages-manifest does

* Make windows path a route
---
 .babelrc                                      |  3 +-
 .flowconfig                                   |  2 ++
 lib/constants.js                              |  1 +
 package.json                                  |  1 +
 readme.md                                     |  2 +-
 server/build/plugins/pages-manifest-plugin.js | 30 +++++++++++++++++++
 server/build/webpack.js                       |  2 ++
 server/build/webpack/utils.js                 |  2 +-
 server/config.js                              | 12 ++++----
 server/export.js                              | 28 +++++++++++------
 server/require.js                             | 30 +++++--------------
 .../_resolvedata/dist/bundles/pages/_error.js |  3 ++
 .../_resolvedata/dist/pages-manifest.json     |  6 ++++
 test/isolated/require-page.test.js            | 18 +++++------
 yarn.lock                                     | 26 ++++++++--------
 15 files changed, 104 insertions(+), 62 deletions(-)
 create mode 100644 .flowconfig
 create mode 100644 server/build/plugins/pages-manifest-plugin.js
 create mode 100644 test/isolated/_resolvedata/dist/bundles/pages/_error.js
 create mode 100644 test/isolated/_resolvedata/dist/pages-manifest.json

diff --git a/.babelrc b/.babelrc
index 900da0c07bc95..2f687fa0ecaf4 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,7 +1,8 @@
 {
   "presets": [
     "env",
-    "react"
+    "react",
+    "flow"
   ],
   "plugins": [
     "transform-object-rest-spread",
diff --git a/.flowconfig b/.flowconfig
new file mode 100644
index 0000000000000..581592b12a09a
--- /dev/null
+++ b/.flowconfig
@@ -0,0 +1,2 @@
+[ignore]
+<PROJECT_ROOT>/examples/.*
\ No newline at end of file
diff --git a/lib/constants.js b/lib/constants.js
index 1877517a2ec7e..ec595fa6dad85 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -2,3 +2,4 @@ export const PHASE_EXPORT = 'phase-export'
 export const PHASE_PRODUCTION_BUILD = 'phase-production-build'
 export const PHASE_PRODUCTION_SERVER = 'phase-production-server'
 export const PHASE_DEVELOPMENT_SERVER = 'phase-development-server'
+export const PAGES_MANIFEST = 'pages-manifest.json'
diff --git a/package.json b/package.json
index 50e583f65f49d..bbc0a53f5a2a5 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,7 @@
     "babel-plugin-istanbul": "4.1.5",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
     "babel-preset-es2015": "6.24.1",
+    "babel-preset-flow": "6.23.0",
     "benchmark": "2.1.4",
     "cheerio": "0.22.0",
     "chromedriver": "2.32.3",
diff --git a/readme.md b/readme.md
index 4d81007d8401f..301735fdb5131 100644
--- a/readme.md
+++ b/readme.md
@@ -1259,7 +1259,7 @@ Simply develop your app as you normally do with Next.js. Then create a custom Ne
 ```js
 // next.config.js
 module.exports = {
-  exportPathMap: function() {
+  exportPathMap: function(defaultPathMap) {
     return {
       '/': { page: '/' },
       '/about': { page: '/about' },
diff --git a/server/build/plugins/pages-manifest-plugin.js b/server/build/plugins/pages-manifest-plugin.js
new file mode 100644
index 0000000000000..6052a0b9ed78a
--- /dev/null
+++ b/server/build/plugins/pages-manifest-plugin.js
@@ -0,0 +1,30 @@
+// @flow
+import { RawSource } from 'webpack-sources'
+import { MATCH_ROUTE_NAME } from '../../utils'
+import {PAGES_MANIFEST} from '../../../lib/constants'
+
+// This plugin creates a pages-manifest.json from page entrypoints.
+// This is used for mapping paths like `/` to `.next/dist/bundles/pages/index.js` when doing SSR
+// It's also used by next export to provide defaultPathMap
+export default class PagesManifestPlugin {
+  apply (compiler: any) {
+    compiler.plugin('emit', (compilation, callback) => {
+      const {entries} = compilation
+      const pages = {}
+
+      for (const entry of entries) {
+        const pagePath = MATCH_ROUTE_NAME.exec(entry.name)[1]
+
+        if (!pagePath) {
+          continue
+        }
+
+        const {name} = entry
+        pages[`/${pagePath.replace(/\\/g, '/')}`] = name
+      }
+
+      compilation.assets[PAGES_MANIFEST] = new RawSource(JSON.stringify(pages))
+      callback()
+    })
+  }
+}
diff --git a/server/build/webpack.js b/server/build/webpack.js
index 28338137a97d8..91be233cea18d 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -10,6 +10,7 @@ import PagesPlugin from './plugins/pages-plugin'
 import NextJsSsrImportPlugin from './plugins/nextjs-ssr-import'
 import DynamicChunksPlugin from './plugins/dynamic-chunks-plugin'
 import UnlinkFilePlugin from './plugins/unlink-file-plugin'
+import PagesManifestPlugin from './plugins/pages-manifest-plugin'
 import findBabelConfig from './babel/find-config'
 
 const nextDir = path.join(__dirname, '..', '..', '..')
@@ -254,6 +255,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
         'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production')
       }),
       !dev && new webpack.optimize.ModuleConcatenationPlugin(),
+      isServer && new PagesManifestPlugin(),
       !isServer && new PagesPlugin(),
       !isServer && new DynamicChunksPlugin(),
       isServer && new NextJsSsrImportPlugin(),
diff --git a/server/build/webpack/utils.js b/server/build/webpack/utils.js
index d674e8a672a0e..eaa3398c01959 100644
--- a/server/build/webpack/utils.js
+++ b/server/build/webpack/utils.js
@@ -9,7 +9,7 @@ export async function getPages (dir, {dev, isServer, pageExtensions}) {
   return getPageEntries(pageFiles, {isServer, pageExtensions})
 }
 
-async function getPagePaths (dir, {dev, isServer, pageExtensions}) {
+export async function getPagePaths (dir, {dev, isServer, pageExtensions}) {
   let pages
 
   if (dev) {
diff --git a/server/config.js b/server/config.js
index ecba94de38c0b..045a4ac8c3f38 100644
--- a/server/config.js
+++ b/server/config.js
@@ -1,3 +1,4 @@
+// @flow
 import findUp from 'find-up'
 
 const cache = new Map()
@@ -11,28 +12,29 @@ const defaultConfig = {
   configOrigin: 'default',
   useFileSystemPublicRoutes: true,
   generateEtags: true,
-  pageExtensions: ['jsx', 'js'] // jsx before js because otherwise regex matching will match js first
+  pageExtensions: ['jsx', 'js']
 }
 
-export default function getConfig (phase, dir, customConfig) {
+export default function getConfig (phase: string, dir: string, customConfig?: ?Object) {
   if (!cache.has(dir)) {
     cache.set(dir, loadConfig(phase, dir, customConfig))
   }
   return cache.get(dir)
 }
 
-export function loadConfig (phase, dir, customConfig) {
+export function loadConfig (phase: string, dir: string, customConfig?: ?Object) {
   if (customConfig && typeof customConfig === 'object') {
     customConfig.configOrigin = 'server'
     return withDefaults(customConfig)
   }
-  const path = findUp.sync('next.config.js', {
+  const path: string = findUp.sync('next.config.js', {
     cwd: dir
   })
 
   let userConfig = {}
 
   if (path && path.length) {
+    // $FlowFixMe
     const userConfigModule = require(path)
     userConfig = userConfigModule.default || userConfigModule
     if (typeof userConfigModule === 'function') {
@@ -44,6 +46,6 @@ export function loadConfig (phase, dir, customConfig) {
   return withDefaults(userConfig)
 }
 
-function withDefaults (config) {
+function withDefaults (config: Object) {
   return Object.assign({}, defaultConfig, config)
 }
diff --git a/server/export.js b/server/export.js
index 0a0fe9bd4ffd9..c2ed256468ebe 100644
--- a/server/export.js
+++ b/server/export.js
@@ -5,10 +5,9 @@ import walk from 'walk'
 import { extname, resolve, join, dirname, sep } from 'path'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
 import getConfig from './config'
-import {PHASE_EXPORT} from '../lib/constants'
+import {PHASE_EXPORT, PAGES_MANIFEST} from '../lib/constants'
 import { renderToHTML } from './render'
 import { getAvailableChunks } from './utils'
-import { printAndExit } from '../lib/utils'
 import { setAssetPrefix } from '../lib/asset'
 import * as envConfig from '../lib/runtime-config'
 
@@ -17,7 +16,7 @@ export default async function (dir, options, configuration) {
   const nextConfig = configuration || getConfig(PHASE_EXPORT, dir)
   const nextDir = join(dir, nextConfig.distDir)
 
-  log(`  using build directory: ${nextDir}`)
+  log(`> using build directory: ${nextDir}`)
 
   if (!existsSync(nextDir)) {
     console.error(
@@ -27,6 +26,17 @@ export default async function (dir, options, configuration) {
   }
 
   const buildId = readFileSync(join(nextDir, 'BUILD_ID'), 'utf8')
+  const pagesManifest = require(join(nextDir, 'dist', PAGES_MANIFEST))
+
+  const pages = Object.keys(pagesManifest)
+  const defaultPathMap = {}
+
+  for (const page of pages) {
+    if (page === '/_document') {
+      continue
+    }
+    defaultPathMap[page] = { page }
+  }
 
   // Initialize the output directory
   const outDir = options.outdir
@@ -73,13 +83,13 @@ export default async function (dir, options, configuration) {
 
   // Get the exportPathMap from the `next.config.js`
   if (typeof nextConfig.exportPathMap !== 'function') {
-    printAndExit(
-      '> Could not find "exportPathMap" function inside "next.config.js"\n' +
-      '> "next export" uses that function to build html pages.'
-    )
+    console.log('> No "exportPathMap" found in "next.config.js". Generating map from "./pages"')
+    nextConfig.exportPathMap = async (defaultMap) => {
+      return defaultMap
+    }
   }
 
-  const exportPathMap = await nextConfig.exportPathMap()
+  const exportPathMap = await nextConfig.exportPathMap(defaultPathMap)
   const exportPaths = Object.keys(exportPathMap)
 
   // Start the rendering process
@@ -115,7 +125,7 @@ export default async function (dir, options, configuration) {
   }
 
   for (const path of exportPaths) {
-    log(`  exporting path: ${path}`)
+    log(`> exporting path: ${path}`)
     if (!path.startsWith('/')) {
       throw new Error(`path "${path}" doesn't start with a backslash`)
     }
diff --git a/server/require.js b/server/require.js
index 0ced446d0bc72..dda23bc273818 100644
--- a/server/require.js
+++ b/server/require.js
@@ -1,5 +1,5 @@
-import {join, parse, normalize, sep} from 'path'
-import fs from 'mz/fs'
+import {join, posix} from 'path'
+import {PAGES_MANIFEST} from '../lib/constants'
 
 export function pageNotFoundError (page) {
   const err = new Error(`Cannot find module for page: ${page}`)
@@ -18,13 +18,8 @@ export function normalizePagePath (page) {
     page = `/${page}`
   }
 
-  // Windows compatibility
-  if (sep !== '/') {
-    page = page.replace(/\//g, sep)
-  }
-
   // Throw when using ../ etc in the pathname
-  const resolvedPage = normalize(page)
+  const resolvedPage = posix.normalize(page)
   if (page !== resolvedPage) {
     throw new Error('Requested and resolved page mismatch')
   }
@@ -33,7 +28,8 @@ export function normalizePagePath (page) {
 }
 
 export function getPagePath (page, {dir, dist}) {
-  const pageBundlesPath = join(dir, dist, 'dist', 'bundles', 'pages')
+  const serverBuildPath = join(dir, dist, 'dist')
+  const pagesManifest = require(join(serverBuildPath, PAGES_MANIFEST))
 
   try {
     page = normalizePagePath(page)
@@ -42,24 +38,14 @@ export function getPagePath (page, {dir, dist}) {
     throw pageNotFoundError(page)
   }
 
-  const pagePath = join(pageBundlesPath, page) // Path to the page that is to be loaded
-
-  // Don't allow wandering outside of the bundles directory
-  const pathDir = parse(pagePath).dir
-  if (pathDir.indexOf(pageBundlesPath) !== 0) {
-    console.error('Resolved page path goes outside of bundles path')
+  if (!pagesManifest[page]) {
     throw pageNotFoundError(page)
   }
 
-  return pagePath
+  return join(serverBuildPath, pagesManifest[page])
 }
 
 export default async function requirePage (page, {dir, dist}) {
-  const pagePath = getPagePath(page, {dir, dist}) + '.js'
-  const fileExists = await fs.exists(pagePath)
-  if (!fileExists) {
-    throw pageNotFoundError(page)
-  }
-
+  const pagePath = getPagePath(page, {dir, dist})
   return require(pagePath)
 }
diff --git a/test/isolated/_resolvedata/dist/bundles/pages/_error.js b/test/isolated/_resolvedata/dist/bundles/pages/_error.js
new file mode 100644
index 0000000000000..0af8646cffcd5
--- /dev/null
+++ b/test/isolated/_resolvedata/dist/bundles/pages/_error.js
@@ -0,0 +1,3 @@
+module.exports = {
+  test: 'error'
+}
\ No newline at end of file
diff --git a/test/isolated/_resolvedata/dist/pages-manifest.json b/test/isolated/_resolvedata/dist/pages-manifest.json
new file mode 100644
index 0000000000000..b42b6e044bb68
--- /dev/null
+++ b/test/isolated/_resolvedata/dist/pages-manifest.json
@@ -0,0 +1,6 @@
+{
+  "/index": "bundles/pages/index.js",
+  "/world": "bundles/pages/world.js",
+  "/_error": "bundles/pages/_error.js",
+  "/non-existent-child": "bundles/pages/non-existent-child.js"
+}
\ No newline at end of file
diff --git a/test/isolated/require-page.test.js b/test/isolated/require-page.test.js
index c3c0c2629db89..bdd368de9f91f 100644
--- a/test/isolated/require-page.test.js
+++ b/test/isolated/require-page.test.js
@@ -1,12 +1,10 @@
 /* global describe, it, expect */
 
-import { join, sep } from 'path'
+import { join } from 'path'
 import requirePage, {getPagePath, normalizePagePath, pageNotFoundError} from '../../dist/server/require'
 
-const dir = '/path/to/some/project'
-const dist = '.next'
-
-const pathToBundles = join(dir, dist, 'dist', 'bundles', 'pages')
+const sep = '/'
+const pathToBundles = join(__dirname, '_resolvedata', 'dist', 'bundles', 'pages')
 
 describe('pageNotFoundError', () => {
   it('Should throw error with ENOENT code', () => {
@@ -42,17 +40,17 @@ describe('normalizePagePath', () => {
 
 describe('getPagePath', () => {
   it('Should append /index to the / page', () => {
-    const pagePath = getPagePath('/', {dir, dist})
-    expect(pagePath).toBe(join(pathToBundles, `${sep}index`))
+    const pagePath = getPagePath('/', {dir: __dirname, dist: '_resolvedata'})
+    expect(pagePath).toBe(join(pathToBundles, `${sep}index.js`))
   })
 
   it('Should prepend / when a page does not have it', () => {
-    const pagePath = getPagePath('_error', {dir, dist})
-    expect(pagePath).toBe(join(pathToBundles, `${sep}_error`))
+    const pagePath = getPagePath('_error', {dir: __dirname, dist: '_resolvedata'})
+    expect(pagePath).toBe(join(pathToBundles, `${sep}_error.js`))
   })
 
   it('Should throw with paths containing ../', () => {
-    expect(() => getPagePath('/../../package.json', {dir, dist})).toThrow()
+    expect(() => getPagePath('/../../package.json', {dir: __dirname, dist: '_resolvedata'})).toThrow()
   })
 })
 
diff --git a/yarn.lock b/yarn.lock
index dae54d70702d1..6b6ac8532356e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -464,8 +464,8 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
 atob@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc"
 
 autoprefixer@^6.3.1:
   version "6.7.7"
@@ -1058,7 +1058,7 @@ babel-preset-es2015@6.24.1:
     babel-plugin-transform-es2015-unicode-regex "^6.24.1"
     babel-plugin-transform-regenerator "^6.24.1"
 
-babel-preset-flow@^6.23.0:
+babel-preset-flow@6.23.0, babel-preset-flow@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
   dependencies:
@@ -1464,12 +1464,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000820"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000820.tgz#7c20e25cea1768b261b724f82e3a6a253aaa1468"
+  version "1.0.30000821"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000821.tgz#3fcdc67c446a94a9cdd848248a4e3e54b2da7419"
 
 caniuse-lite@^1.0.30000792:
-  version "1.0.30000820"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2"
+  version "1.0.30000821"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000821.tgz#0f3223f1e048ed96451c56ca6cf197058c42cb93"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2373,8 +2373,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
-  version "1.3.40"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"
+  version "1.3.41"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.41.tgz#7e33643e00cd85edfd17e04194f6d00e73737235"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -2466,8 +2466,8 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.41"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.41.tgz#bab3e982d750f0112f0cb9e6abed72c59eb33eb2"
+  version "0.10.42"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
@@ -6870,8 +6870,8 @@ static-extend@^0.1.1:
     object-copy "^0.1.0"
 
 "statuses@>= 1.3.1 < 2":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
 
 statuses@~1.3.1:
   version "1.3.1"

From 56998a6193049b99cee84e2db0fb3356a59423fd Mon Sep 17 00:00:00 2001
From: Samatar <Samatar_267@hotmail.com>
Date: Fri, 30 Mar 2018 15:59:42 +0100
Subject: [PATCH 12/73] Remove mz-fs and glob-promise (#4026)

* Remove mz and add promisify util

* Remove glob-promise and promisify glob

* Use access instead of exists

* Use promisify for access
---
 package.json                               |  2 --
 server/build/index.js                      | 10 ++++++---
 server/build/plugins/unlink-file-plugin.js |  5 ++++-
 server/build/webpack/utils.js              |  5 ++++-
 server/index.js                            |  8 +++++--
 server/lib/promisify.js                    | 26 ++++++++++++++++++++++
 server/on-demand-entry-handler.js          |  5 ++++-
 7 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 server/lib/promisify.js

diff --git a/package.json b/package.json
index 10ce81a8c3f1e..b91cd982adcfd 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
     "fresh": "0.5.2",
     "friendly-errors-webpack-plugin": "1.6.1",
     "glob": "7.1.2",
-    "glob-promise": "3.3.0",
     "hoist-non-react-statics": "2.3.1",
     "htmlescape": "1.1.1",
     "http-errors": "1.6.2",
@@ -85,7 +84,6 @@
     "loader-utils": "1.1.0",
     "minimist": "1.2.0",
     "mkdirp-then": "1.2.0",
-    "mz": "2.7.0",
     "path-to-regexp": "2.1.0",
     "prop-types": "15.6.0",
     "prop-types-exact": "1.1.1",
diff --git a/server/build/index.js b/server/build/index.js
index e1f3bb91b3ff9..a76413f5f1c00 100644
--- a/server/build/index.js
+++ b/server/build/index.js
@@ -1,17 +1,21 @@
 import { join } from 'path'
-import fs from 'mz/fs'
+import promisify from '../lib/promisify'
+import fs from 'fs'
 import uuid from 'uuid'
 import webpack from 'webpack'
 import getConfig from '../config'
 import {PHASE_PRODUCTION_BUILD} from '../../lib/constants'
 import getBaseWebpackConfig from './webpack'
 
+const access = promisify(fs.access)
+const writeFile = promisify(fs.writeFile)
+
 export default async function build (dir, conf = null) {
   const config = getConfig(PHASE_PRODUCTION_BUILD, dir, conf)
   const buildId = uuid.v4()
 
   try {
-    await fs.access(dir, fs.constants.W_OK)
+    await access(dir, (fs.constants || fs).W_OK)
   } catch (err) {
     console.error(`> Failed, build directory is not writeable. https://err.sh/zeit/next.js/build-dir-not-writeable`)
     throw err
@@ -54,5 +58,5 @@ function runCompiler (compiler) {
 
 async function writeBuildId (dir, buildId, config) {
   const buildIdPath = join(dir, config.distDir, 'BUILD_ID')
-  await fs.writeFile(buildIdPath, buildId, 'utf8')
+  await writeFile(buildIdPath, buildId, 'utf8')
 }
diff --git a/server/build/plugins/unlink-file-plugin.js b/server/build/plugins/unlink-file-plugin.js
index 53b16f51a930e..096bda98a8bea 100644
--- a/server/build/plugins/unlink-file-plugin.js
+++ b/server/build/plugins/unlink-file-plugin.js
@@ -1,7 +1,10 @@
 import { join } from 'path'
-import { unlink } from 'mz/fs'
+import promisify from '../../lib/promisify'
+import fs from 'fs'
 import { IS_BUNDLED_PAGE } from '../../utils'
 
+const unlink = promisify(fs.unlink)
+
 export default class UnlinkFilePlugin {
   constructor () {
     this.prevAssets = {}
diff --git a/server/build/webpack/utils.js b/server/build/webpack/utils.js
index eaa3398c01959..876eac8b1c4d7 100644
--- a/server/build/webpack/utils.js
+++ b/server/build/webpack/utils.js
@@ -1,5 +1,8 @@
 import path from 'path'
-import glob from 'glob-promise'
+import promisify from '../../lib/promisify'
+import globModule from 'glob'
+
+const glob = promisify(globModule)
 
 const nextPagesDir = path.join(__dirname, '..', '..', '..', 'pages')
 
diff --git a/server/index.js b/server/index.js
index 07d175c313376..32249c12ced14 100644
--- a/server/index.js
+++ b/server/index.js
@@ -4,9 +4,9 @@ import { resolve, join, sep } from 'path'
 import { parse as parseUrl } from 'url'
 import { parse as parseQs } from 'querystring'
 import fs from 'fs'
-import fsAsync from 'mz/fs'
 import http, { STATUS_CODES } from 'http'
 import updateNotifier from '@zeit/check-updates'
+import promisify from './lib/promisify'
 import {
   renderToHTML,
   renderErrorToHTML,
@@ -24,6 +24,8 @@ import * as asset from '../lib/asset'
 import * as envConfig from '../lib/runtime-config'
 import { isResSent } from '../lib/utils'
 
+const access = promisify(fs.access)
+
 const blockedPages = {
   '/_document': true,
   '/_error': true
@@ -267,7 +269,9 @@ export default class Server {
 
         // [production] If the page is not exists, we need to send a proper Next.js style 404
         // Otherwise, it'll affect the multi-zones feature.
-        if (!(await fsAsync.exists(p))) {
+        try {
+          await access(p, (fs.constants || fs).R_OK)
+        } catch (err) {
           return await renderScriptError(req, res, page, { code: 'ENOENT' })
         }
 
diff --git a/server/lib/promisify.js b/server/lib/promisify.js
new file mode 100644
index 0000000000000..a281095274a5c
--- /dev/null
+++ b/server/lib/promisify.js
@@ -0,0 +1,26 @@
+const kCustomPromisifyArgsSymbol = Symbol('customPromisifyArgs')
+module.exports = function promisify (original) {
+  // Names to create an object from in case the callback receives multiple
+  // arguments, e.g. ['stdout', 'stderr'] for child_process.exec.
+  const argumentNames = original[kCustomPromisifyArgsSymbol]
+
+  return function fn (...args) {
+    return new Promise((resolve, reject) => {
+      try {
+        original.call(this, ...args, (err, ...values) => {
+          if (err) {
+            reject(err)
+          } else if (argumentNames !== undefined && values.length > 1) {
+            const obj = {}
+            for (var i = 0; i < argumentNames.length; i++) { obj[argumentNames[i]] = values[i] }
+            resolve(obj)
+          } else {
+            resolve(values[0])
+          }
+        })
+      } catch (err) {
+        reject(err)
+      }
+    })
+  }
+}
diff --git a/server/on-demand-entry-handler.js b/server/on-demand-entry-handler.js
index 5bca16e0bedc1..66e83a3bb97ab 100644
--- a/server/on-demand-entry-handler.js
+++ b/server/on-demand-entry-handler.js
@@ -3,7 +3,8 @@ import { EventEmitter } from 'events'
 import { join } from 'path'
 import { parse } from 'url'
 import touch from 'touch'
-import glob from 'glob-promise'
+import promisify from './lib/promisify'
+import globModule from 'glob'
 import {normalizePagePath, pageNotFoundError} from './require'
 import {createEntry} from './build/webpack/utils'
 import { MATCH_ROUTE_NAME, IS_BUNDLED_PAGE } from './utils'
@@ -12,6 +13,8 @@ const ADDED = Symbol('added')
 const BUILDING = Symbol('building')
 const BUILT = Symbol('built')
 
+const glob = promisify(globModule)
+
 export default function onDemandEntryHandler (devMiddleware, compilers, {
   dir,
   dev,

From 9711f74db7befa7472c37893e4609115ed5e928a Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Fri, 30 Mar 2018 21:00:26 +0200
Subject: [PATCH 13/73] Update yarn.lock

---
 yarn.lock | 61 +++++++++++++++++++++++--------------------------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6b6ac8532356e..e5542d9a15a3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -268,7 +268,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-any-promise@^1.0.0, any-promise@^1.1.0:
+any-promise@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
 
@@ -2250,7 +2250,7 @@ depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
-depd@~1.1.1:
+depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
@@ -2562,8 +2562,8 @@ eslint-import-resolver-node@^0.3.1:
     resolve "^1.5.0"
 
 eslint-module-utils@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
   dependencies:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
@@ -3267,10 +3267,6 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-promise@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.3.0.tgz#d1eb3625c4e6dcbb9b96eeae4425d5a3b135fed2"
-
 glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -3550,7 +3546,7 @@ htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-http-errors@1.6.2, http-errors@~1.6.2:
+http-errors@1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
   dependencies:
@@ -3559,6 +3555,15 @@ http-errors@1.6.2, http-errors@~1.6.2:
     setprototypeof "1.0.3"
     statuses ">= 1.3.1 < 2"
 
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -4399,8 +4404,8 @@ json-loader@^0.5.4:
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
 json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
@@ -5018,14 +5023,6 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-mz@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
 nan@^2.3.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -6634,6 +6631,10 @@ setprototypeof@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -6869,7 +6870,7 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2":
+"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
 
@@ -6946,8 +6947,8 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     strip-ansi "^4.0.0"
 
 string_decoder@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -7155,18 +7156,6 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-thenify-all@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
-  dependencies:
-    any-promise "^1.0.0"
-
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
@@ -7629,8 +7618,8 @@ whatwg-encoding@^1.0.1:
     iconv-lite "0.4.19"
 
 whatwg-fetch@>=0.10.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
 whatwg-url@^4.3.0:
   version "4.8.0"

From 812db745f8bbd371977b0f33991d9eaec2455538 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sat, 31 Mar 2018 00:00:41 +0200
Subject: [PATCH 14/73] Use printAndExit with error (#4086)

---
 bin/next-build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/next-build b/bin/next-build
index 5261802f47210..eb60720e6ab36 100755
--- a/bin/next-build
+++ b/bin/next-build
@@ -44,6 +44,5 @@ if (!existsSync(join(dir, 'pages'))) {
 
 build(dir)
   .catch((err) => {
-    console.error(err)
-    process.exit(1)
+    printAndExit(err)
   })

From b321e6e9426781504661704bd7e2e112b219840f Mon Sep 17 00:00:00 2001
From: "Tage A. L. K" <DevSpeak@users.noreply.github.com>
Date: Sat, 31 Mar 2018 08:11:36 +0200
Subject: [PATCH 15/73] Remove deprected and refactor with-apollo-auth (#4070)

* Remove deprected use of apollo-client-preset, and refactor

Changes
* Remove deprected use of apollo-client-preset in favor of apollo-boost
* Refactor for usage of react-apollo@2.1

* Use standard

Just ran standard --fix
---
 .../components/RegisterBox.js                 | 62 +++++++++++++++
 .../with-apollo-auth/components/SigninBox.js  | 57 +++++++++++++
 examples/with-apollo-auth/lib/initApollo.js   |  5 +-
 examples/with-apollo-auth/package.json        | 14 ++--
 .../with-apollo-auth/pages/create-account.js  | 79 ++-----------------
 examples/with-apollo-auth/pages/signin.js     | 72 ++---------------
 6 files changed, 142 insertions(+), 147 deletions(-)
 create mode 100644 examples/with-apollo-auth/components/RegisterBox.js
 create mode 100644 examples/with-apollo-auth/components/SigninBox.js

diff --git a/examples/with-apollo-auth/components/RegisterBox.js b/examples/with-apollo-auth/components/RegisterBox.js
new file mode 100644
index 0000000000000..3f8cadbdb1fb4
--- /dev/null
+++ b/examples/with-apollo-auth/components/RegisterBox.js
@@ -0,0 +1,62 @@
+import { Mutation, withApollo } from 'react-apollo'
+import gql from 'graphql-tag'
+import cookie from 'cookie'
+import redirect from '../lib/redirect'
+
+const CREATE_USER = gql`
+    mutation Create($name: String!, $email: String!, $password: String!) {
+        createUser(name: $name, authProvider: { email: { email: $email, password: $password }}) {
+            id
+        }
+        signinUser(email: { email: $email, password: $password }) {
+            token
+    }
+}
+`
+
+const RegisterBox = (props) => {
+  let name, email, password
+
+  return (
+    <Mutation mutation={CREATE_USER} onCompleted={(data) => {
+      // Store the token in cookie
+      document.cookie = cookie.serialize('token', data.signinUser.token, {
+        maxAge: 30 * 24 * 60 * 60 // 30 days
+      })
+      // Force a reload of all the current queries now that the user is
+      // logged in
+      props.client.resetStore().then(() => {
+        redirect({}, '/')
+      })
+    }} onError={(error) => {
+      // If you want to send error to external service?
+      console.log(error)
+    }}>
+      {(create, { data, error }) => (
+        <div>
+          <form onSubmit={e => {
+            e.preventDefault()
+            e.stopPropagation()
+
+            create({ variables: {
+              name: name.value,
+              email: email.value,
+              password: password.value
+            }})
+
+            name.value = email.value = password.value = ''
+          }}>
+            { error && <p>Issue occured while registering :(</p> }
+            <input name='name' placeholder='Name' ref={node => { name = node }} /><br />
+            <input name='email' placeholder='Email' ref={node => { email = node }} /><br />
+            <input name='password' placeholder='Password' ref={node => { password = node }} type='password' /><br />
+            <button>Register</button>
+          </form>
+        </div>
+      )}
+
+    </Mutation>
+  )
+}
+
+export default withApollo(RegisterBox)
diff --git a/examples/with-apollo-auth/components/SigninBox.js b/examples/with-apollo-auth/components/SigninBox.js
new file mode 100644
index 0000000000000..fd48f1c0712e6
--- /dev/null
+++ b/examples/with-apollo-auth/components/SigninBox.js
@@ -0,0 +1,57 @@
+import { Mutation, withApollo } from 'react-apollo'
+import gql from 'graphql-tag'
+import cookie from 'cookie'
+import redirect from '../lib/redirect'
+
+const SIGN_IN = gql`
+    mutation Signin($email: String!, $password: String!) {
+        signinUser(email: { email: $email, password: $password}) {
+            token
+        }
+    }
+`
+
+// TODO: Find a better name for component.
+const SigninBox = (props) => {
+  let email, password
+
+  return (
+    <Mutation mutation={SIGN_IN} onCompleted={(data) => {
+      // Store the token in cookie
+      document.cookie = cookie.serialize('token', data.signinUser.token, {
+        maxAge: 30 * 24 * 60 * 60 // 30 days
+      })
+      // Force a reload of all the current queries now that the user is
+      // logged in
+      props.client.resetStore().then(() => {
+        redirect({}, '/')
+      })
+    }} onError={(error) => {
+      // If you want to send error to external service?
+      console.log(error)
+    }}>
+      {(signinUser, { data, error }) => (
+        <div>
+          <form onSubmit={e => {
+            e.preventDefault()
+            e.stopPropagation()
+
+            signinUser({ variables: {
+              email: email.value,
+              password: password.value
+            }})
+
+            email.value = password.value = ''
+          }}>
+            { error && <p>No user found with that information.</p> }
+            <input name='email' placeholder='Email' ref={node => { email = node }} /><br />
+            <input name='password' placeholder='Password' ref={node => { password = node }} type='password' /><br />
+            <button>Sign in</button>
+          </form>
+        </div>
+      )}
+    </Mutation>
+  )
+}
+
+export default withApollo(SigninBox)
diff --git a/examples/with-apollo-auth/lib/initApollo.js b/examples/with-apollo-auth/lib/initApollo.js
index 05f39f3df469f..5dec4e7bed60c 100644
--- a/examples/with-apollo-auth/lib/initApollo.js
+++ b/examples/with-apollo-auth/lib/initApollo.js
@@ -1,6 +1,5 @@
-import { ApolloClient } from 'apollo-client'
+import { ApolloClient, InMemoryCache } from 'apollo-boost'
 import { createHttpLink } from 'apollo-link-http'
-import { InMemoryCache } from 'apollo-cache-inmemory'
 import { setContext } from 'apollo-link-context'
 import fetch from 'isomorphic-unfetch'
 
@@ -48,4 +47,4 @@ export default function initApollo (initialState, options) {
   }
 
   return apolloClient
-}
\ No newline at end of file
+}
diff --git a/examples/with-apollo-auth/package.json b/examples/with-apollo-auth/package.json
index c7a22a8e8fac7..b967968609eb9 100644
--- a/examples/with-apollo-auth/package.json
+++ b/examples/with-apollo-auth/package.json
@@ -10,16 +10,16 @@
     "test": "NODE_ENV=test ava"
   },
   "dependencies": {
-    "apollo-client-preset": "1.0.2",
-    "apollo-link-context": "1.0.0",
+    "apollo-boost": "^0.1.4",
+    "apollo-link-context": "^1.0.7",
     "cookie": "^0.3.1",
-    "graphql": "0.11.7",
+    "graphql": "^0.13.2",
     "isomorphic-unfetch": "^2.0.0",
     "next": "latest",
-    "prop-types": "^15.5.10",
-    "react": "^16.0.0",
-    "react-apollo": "2.0.0",
-    "react-dom": "^16.0.0"
+    "prop-types": "^15.6.1",
+    "react": "^16.2.0",
+    "react-apollo": "^2.1.1",
+    "react-dom": "^16.2.0"
   },
   "devDependencies": {
     "ava": "^0.19.1",
diff --git a/examples/with-apollo-auth/pages/create-account.js b/examples/with-apollo-auth/pages/create-account.js
index 7596807282703..a5b59d3d45950 100644
--- a/examples/with-apollo-auth/pages/create-account.js
+++ b/examples/with-apollo-auth/pages/create-account.js
@@ -1,13 +1,13 @@
 import React from 'react'
-import { graphql, withApollo, compose } from 'react-apollo'
-import cookie from 'cookie'
+import { compose } from 'react-apollo'
 import Link from 'next/link'
-import gql from 'graphql-tag'
 
 import withData from '../lib/withData'
 import redirect from '../lib/redirect'
 import checkLoggedIn from '../lib/checkLoggedIn'
 
+import RegisterBox from '../components/RegisterBox'
+
 class CreateAccount extends React.Component {
   static async getInitialProps (context, apolloClient) {
     const { loggedInUser } = await checkLoggedIn(context, apolloClient)
@@ -24,13 +24,8 @@ class CreateAccount extends React.Component {
   render () {
     return (
       <div>
-        {/* this.props.create is the mutation function provided by apollo below */}
-        <form onSubmit={this.props.create}>
-          <input type='text' placeholder='Your Name' name='name' /><br />
-          <input type='email' placeholder='Email' name='email' /><br />
-          <input type='password' placeholder='Password' name='password' /><br />
-          <button>Create account</button>
-        </form>
+        {/* RegisterBox handles all register logic. */}
+        <RegisterBox client={this.props.client} />
         <hr />
         Already have an account? <Link prefetch href='/signin'><a>Sign in</a></Link>
       </div>
@@ -38,67 +33,7 @@ class CreateAccount extends React.Component {
   }
 };
 
-export default compose(
+export default compose( // TODO: Maybe remove the usage of compose?
   // withData gives us server-side graphql queries before rendering
-  withData,
-  // withApollo exposes `this.props.client` used when logging out
-  withApollo,
-  graphql(
-    // The `createUser` & `signinUser` mutations are provided by graph.cool by
-    // default.
-    // Multiple mutations are executed by graphql sequentially
-    gql`
-      mutation Create($name: String!, $email: String!, $password: String!) {
-        createUser(name: $name, authProvider: { email: { email: $email, password: $password }}) {
-          id
-        }
-        signinUser(email: { email: $email, password: $password }) {
-          token
-        }
-      }
-    `,
-    {
-      // Use an unambiguous name for use in the `props` section below
-      name: 'createWithEmail',
-      // Apollo's way of injecting new props which are passed to the component
-      props: ({
-        createWithEmail,
-        // `client` is provided by the `withApollo` HOC
-        ownProps: { client }
-      }) => ({
-        // `create` is the name of the prop passed to the component
-        create: (event) => {
-          /* global FormData */
-          const data = new FormData(event.target)
-
-          event.preventDefault()
-          event.stopPropagation()
-
-          createWithEmail({
-            variables: {
-              email: data.get('email'),
-              password: data.get('password'),
-              name: data.get('name')
-            }
-          }).then(({ data: { signinUser: { token } } }) => {
-            // Store the token in cookie
-            document.cookie = cookie.serialize('token', token, {
-              maxAge: 30 * 24 * 60 * 60 // 30 days
-            })
-
-            // Force a reload of all the current queries now that the user is
-            // logged in
-            client.resetStore().then(() => {
-              // Now redirect to the homepage
-              redirect({}, '/')
-            })
-          }).catch((error) => {
-            // Something went wrong, such as incorrect password, or no network
-            // available, etc.
-            console.error(error)
-          })
-        }
-      })
-    }
-  )
+  withData
 )(CreateAccount)
diff --git a/examples/with-apollo-auth/pages/signin.js b/examples/with-apollo-auth/pages/signin.js
index 2c1ba925bc517..e0397651bbbde 100644
--- a/examples/with-apollo-auth/pages/signin.js
+++ b/examples/with-apollo-auth/pages/signin.js
@@ -1,13 +1,13 @@
 import React from 'react'
-import { graphql, withApollo, compose } from 'react-apollo'
-import cookie from 'cookie'
+import { compose } from 'react-apollo'
 import Link from 'next/link'
-import gql from 'graphql-tag'
 
 import withData from '../lib/withData'
 import redirect from '../lib/redirect'
 import checkLoggedIn from '../lib/checkLoggedIn'
 
+import SigninBox from '../components/SigninBox'
+
 class Signin extends React.Component {
   static async getInitialProps (context, apolloClient) {
     const { loggedInUser } = await checkLoggedIn(context, apolloClient)
@@ -24,12 +24,8 @@ class Signin extends React.Component {
   render () {
     return (
       <div>
-        {/* this.props.signin is the mutation function provided by apollo below */}
-        <form onSubmit={this.props.signin}>
-          <input type='email' placeholder='Email' name='email' /><br />
-          <input type='password' placeholder='Password' name='password' /><br />
-          <button>Sign in</button>
-        </form>
+        {/* SigninBox handles all login logic. */}
+        <SigninBox client={this.props.client} />
         <hr />
         New? <Link prefetch href='/create-account'><a>Create account</a></Link>
       </div>
@@ -37,61 +33,7 @@ class Signin extends React.Component {
   }
 };
 
-export default compose(
+export default compose( // TODO: Maybe remove the usage of compose?
   // withData gives us server-side graphql queries before rendering
-  withData,
-  // withApollo exposes `this.props.client` used when logging out
-  withApollo,
-  graphql(
-    // The `signinUser` mutation is provided by graph.cool by default
-    gql`
-      mutation Signin($email: String!, $password: String!) {
-        signinUser(email: { email: $email, password: $password }) {
-          token
-        }
-      }
-    `,
-    {
-      // Use an unambiguous name for use in the `props` section below
-      name: 'signinWithEmail',
-      // Apollo's way of injecting new props which are passed to the component
-      props: ({
-        signinWithEmail,
-        // `client` is provided by the `withApollo` HOC
-        ownProps: { client }
-      }) => ({
-        // `signin` is the name of the prop passed to the component
-        signin: (event) => {
-          /* global FormData */
-          const data = new FormData(event.target)
-
-          event.preventDefault()
-          event.stopPropagation()
-
-          signinWithEmail({
-            variables: {
-              email: data.get('email'),
-              password: data.get('password')
-            }
-          }).then(({ data: { signinUser: { token } } }) => {
-            // Store the token in cookie
-            document.cookie = cookie.serialize('token', token, {
-              maxAge: 30 * 24 * 60 * 60 // 30 days
-            })
-
-            // Force a reload of all the current queries now that the user is
-            // logged in
-            client.resetStore().then(() => {
-              // Now redirect to the homepage
-              redirect({}, '/')
-            })
-          }).catch((error) => {
-            // Something went wrong, such as incorrect password, or no network
-            // available, etc.
-            console.error(error)
-          })
-        }
-      })
-    }
-  )
+  withData
 )(Signin)

From 7e67152232f30d7c7ef8b178e60a36f54f3d594e Mon Sep 17 00:00:00 2001
From: Tim Phillips <3578574+tim-phillips@users.noreply.github.com>
Date: Fri, 30 Mar 2018 23:14:54 -0700
Subject: [PATCH 16/73] clarify .next in .gitignore text (#4087)

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 301735fdb5131..dc89540b3d71f 100644
--- a/readme.md
+++ b/readme.md
@@ -1241,7 +1241,7 @@ Next.js can be deployed to other hosting solutions too. Please have a look at th
 
 Note: `NODE_ENV` is properly configured by the `next` subcommands, if absent, to maximize performance. if you’re using Next.js [programmatically](#custom-server-and-routing), it’s your responsibility to set `NODE_ENV=production` manually!
 
-Note: we recommend putting `.next`, or your custom dist folder (Please have a look at ['Custom Config'](https://github.com/zeit/next.js#custom-configuration)). You can set a custom folder in config, `.npmignore`, or `.gitignore`. Otherwise, use `files` or `now.files` to opt-into a whitelist of files you want to deploy (and obviously exclude `.next` or your custom dist folder).
+Note: we recommend putting `.next`, or your [custom dist folder](https://github.com/zeit/next.js#custom-configuration), in `.gitignore` or `.npmignore`. Otherwise, use `files` or `now.files` to opt-into a whitelist of files you want to deploy, excluding `.next` or your custom dist folder.
 
 ## Static HTML export
 

From b43af823ddbb174e71234225ad64ac7769550147 Mon Sep 17 00:00:00 2001
From: Luis Fernando Alvarez D <luisito453@gmail.com>
Date: Sat, 31 Mar 2018 01:17:21 -0500
Subject: [PATCH 17/73] Updated example with-now-env (#4081)

* New example: with-now-env

* updated the example with-now-env
---
 examples/with-now-env/next.config.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/with-now-env/next.config.js b/examples/with-now-env/next.config.js
index bf700816678f2..e973ba8ff1b84 100644
--- a/examples/with-now-env/next.config.js
+++ b/examples/with-now-env/next.config.js
@@ -1,3 +1,4 @@
+const webpack = require('webpack')
 /**
  * After the next require you can use process.env to get your secrets
  */
@@ -16,12 +17,13 @@ console.log({
  */
 module.exports = {
   webpack: config => {
-    config.plugins.forEach(plugin => {
-      if (plugin.constructor.name === 'DefinePlugin') {
-        plugin.definitions['process.env.SECRET'] = JSON.stringify(process.env.SECRET)
-      }
-    })
-
+    config.plugins.push(
+      new webpack.DefinePlugin({
+        'process.env.SECRET': JSON.stringify(process.env.SECRET)
+      })
+      // Same as above
+      // new webpack.EnvironmentPlugin(['SECRET'])
+    )
     return config
   }
 }

From 9ec81c00fad040154df571701b73cb6e3b1b86fa Mon Sep 17 00:00:00 2001
From: Tim Teeling <tdteeling@gmail.com>
Date: Sat, 31 Mar 2018 03:01:46 -0400
Subject: [PATCH 18/73] Fix #3900 return 404 on asset hash mismatch in prod
 (#3941)

* Fix #3900 return 404 on asset hash mismatch in prod

* Make INVALID_BUILD_ID return 404
---
 server/render.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/render.js b/server/render.js
index 7abf7be9711c5..3f700657ea0f7 100644
--- a/server/render.js
+++ b/server/render.js
@@ -127,7 +127,7 @@ export async function renderScriptError (req, res, page, error) {
   // Asks CDNs and others to not to cache the errored page
   res.setHeader('Cache-Control', 'no-store, must-revalidate')
 
-  if (error.code === 'ENOENT') {
+  if (error.code === 'ENOENT' || error.message === 'INVALID_BUILD_ID') {
     res.statusCode = 404
     res.end('404 - Not Found')
     return

From 0b9b902a89e0afbd167226c71ad31677dbea914b Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sat, 31 Mar 2018 14:00:56 +0200
Subject: [PATCH 19/73] Get pages before entry function (#4089)

---
 server/build/webpack.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/build/webpack.js b/server/build/webpack.js
index 91be233cea18d..3052e4315c1ed 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -105,7 +105,15 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
     .split(process.platform === 'win32' ? ';' : ':')
     .filter((p) => !!p)
 
-  let totalPages
+  const pagesEntries = await getPages(dir, {dev, isServer, pageExtensions: config.pageExtensions.join('|')})
+  const totalPages = Object.keys(pagesEntries).length
+  const clientEntries = !isServer ? {
+    'main.js': [
+      dev && !isServer && path.join(__dirname, '..', '..', 'client', 'webpack-hot-middleware-client'),
+      dev && !isServer && path.join(__dirname, '..', '..', 'client', 'on-demand-entries-client'),
+      require.resolve(`../../client/next${dev ? '-dev' : ''}`)
+    ].filter(Boolean)
+  } : {}
 
   let webpackConfig = {
     devtool: dev ? 'source-map' : false,
@@ -114,20 +122,12 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
     target: isServer ? 'node' : 'web',
     externals: externalsConfig(dir, isServer),
     context: dir,
+    // Kept as function to be backwards compatible
     entry: async () => {
-      const pages = await getPages(dir, {dev, isServer, pageExtensions: config.pageExtensions.join('|')})
-      totalPages = Object.keys(pages).length
-      const mainJS = require.resolve(`../../client/next${dev ? '-dev' : ''}`)
-      const clientConfig = !isServer ? {
-        'main.js': [
-          dev && !isServer && path.join(__dirname, '..', '..', 'client', 'webpack-hot-middleware-client'),
-          dev && !isServer && path.join(__dirname, '..', '..', 'client', 'on-demand-entries-client'),
-          mainJS
-        ].filter(Boolean)
-      } : {}
       return {
-        ...clientConfig,
-        ...pages
+        ...clientEntries,
+        // Only _error and _document when in development. The rest is handled by on-demand-entries
+        ...pagesEntries
       }
     },
     output: {

From a48dc31e80ad3c569472bbc41e8a99e84ff919cc Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Sat, 31 Mar 2018 14:58:10 +0200
Subject: [PATCH 20/73] Release 6.0.0-canary.1

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

diff --git a/package.json b/package.json
index b91cd982adcfd..61d8c4587ea5d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "5.1.0",
+  "version": "6.0.0-canary.1",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From bd50a7c74a786ef82d61894a93608f45fdb4524b Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Sat, 31 Mar 2018 15:11:34 +0200
Subject: [PATCH 21/73] Better support React 16.3.0 (#4090)

* Better support React 16.3.0

https://github.com/mridgway/hoist-non-react-statics/pull/43

* Lock version
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 61d8c4587ea5d..3d9d6475a679b 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "fresh": "0.5.2",
     "friendly-errors-webpack-plugin": "1.6.1",
     "glob": "7.1.2",
-    "hoist-non-react-statics": "2.3.1",
+    "hoist-non-react-statics": "2.5.0",
     "htmlescape": "1.1.1",
     "http-errors": "1.6.2",
     "http-status": "1.0.1",

From b39958e78037f2c99b2a0212355f5538ba94e589 Mon Sep 17 00:00:00 2001
From: Jonathan James <jonjamz86@gmail.com>
Date: Sat, 31 Mar 2018 09:59:24 -0400
Subject: [PATCH 22/73] Fix serve command (#3989)

* Fix serve command

From the Firebase docs, you must use --only in order to run the local function emulator.
See https://firebase.google.com/docs/functions/local-emulator

* Add production env for firebase serve

Doesn't work without this

* Update text as suggested by @jthegedus
---
 examples/with-firebase-hosting/README.md    | 8 ++------
 examples/with-firebase-hosting/package.json | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/examples/with-firebase-hosting/README.md b/examples/with-firebase-hosting/README.md
index 5acc308ff9c50..63494e9a24cc6 100644
--- a/examples/with-firebase-hosting/README.md
+++ b/examples/with-firebase-hosting/README.md
@@ -43,13 +43,9 @@ npm run dev
 
 #### Run Firebase locally for testing:
 
-Unfortunately I have been unable to get any combination of
-
-```bash
-firebase serve --only functions,hosting
 ```
-
-to locally host the built Next.js app as expected. [This issue is where solutions are being explored](https://github.com/firebase/firebase-tools/issues/535) and they will be shared here and on the [Next.js repo's similar issue](https://github.com/zeit/next.js/issues/3167) when discovered.
+npm run serve
+```
 
 #### Deploy it to the cloud with Firebase:
 
diff --git a/examples/with-firebase-hosting/package.json b/examples/with-firebase-hosting/package.json
index 46088eea4ebad..850f45b1a48c5 100644
--- a/examples/with-firebase-hosting/package.json
+++ b/examples/with-firebase-hosting/package.json
@@ -4,7 +4,7 @@
   "description": "Host Next.js SSR app on Firebase Cloud Functions with Firebase Hosting redirects.",
   "scripts": {
     "dev": "next src/app",
-    "serve": "echo \"for details see:\n\thttps://github.com/firebase/firebase-tools/issues/535 \n\thttps://github.com/zeit/next.js/issues/3167\";",
+    "serve": "NODE_ENV=production firebase serve --only functions,hosting",
     "deploy": "firebase deploy",
     "clean": "rimraf \"dist/functions\" && rimraf \"dist/public\"",
     "build-public": "cpx \"src/public/**/*.*\" \"dist/public\" -C",

From c07cf5e83f952503d6d8d98c9c7e0f76a080c20b Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Sat, 31 Mar 2018 16:06:12 +0200
Subject: [PATCH 23/73] Upgrade Next in with-firebase-hosting

---
 examples/with-firebase-hosting/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-firebase-hosting/package.json b/examples/with-firebase-hosting/package.json
index 46088eea4ebad..8e00632d12ba2 100644
--- a/examples/with-firebase-hosting/package.json
+++ b/examples/with-firebase-hosting/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "firebase-admin": "5.8.1",
     "firebase-functions": "^0.8.1",
-    "next": "^5.0.1-canary.13",
+    "next": "^5.1.0",
     "react": "^16.2.0",
     "react-dom": "^16.2.0"
   },

From a785f303f4f3f9be589d6f4eb38e15aac706c276 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sat, 31 Mar 2018 16:08:16 +0200
Subject: [PATCH 24/73] Match externals ending in .js not everything with .js
 (#4091)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Makes sure highlight.js/styles/dark.css doesn’t get caught by externals.
---
 server/build/webpack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/build/webpack.js b/server/build/webpack.js
index 3052e4315c1ed..6d268ad111ae3 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -79,7 +79,7 @@ function externalsConfig (dir, isServer) {
         return callback()
       }
 
-      if (res.match(/node_modules[/\\].*\.js/)) {
+      if (res.match(/node_modules[/\\].*\.js$/)) {
         return callback(null, `commonjs ${request}`)
       }
 

From 085b2f806afd4d16e6f4754cce62e88d7bd47518 Mon Sep 17 00:00:00 2001
From: George Pantazis <gcpantazis@gmail.com>
Date: Sat, 31 Mar 2018 07:21:51 -0700
Subject: [PATCH 25/73] Add Router method to execute custom logic before
 popstate events (#3956)

* Add router method to inject code before popstate events

* Default _beforePopState, return true

* Fix link in README

* Re-order `if` statements per feedback
---
 lib/router/index.js  |  2 +-
 lib/router/router.js | 11 +++++++++++
 readme.md            | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/lib/router/index.js b/lib/router/index.js
index 665cde6dfd4ce..94586c780a2c9 100644
--- a/lib/router/index.js
+++ b/lib/router/index.js
@@ -15,8 +15,8 @@ const SingletonRouter = {
 
 // Create public properties and methods of the router in the SingletonRouter
 const propertyFields = ['components', 'pathname', 'route', 'query', 'asPath']
-const coreMethodFields = ['push', 'replace', 'reload', 'back', 'prefetch']
 const routerEvents = ['routeChangeStart', 'beforeHistoryChange', 'routeChangeComplete', 'routeChangeError']
+const coreMethodFields = ['push', 'replace', 'reload', 'back', 'prefetch', 'beforePopState']
 
 propertyFields.forEach((field) => {
   // Here we need to use Object.defineProperty because, we need to return
diff --git a/lib/router/router.js b/lib/router/router.js
index 11c3360396d04..ce3415c270699 100644
--- a/lib/router/router.js
+++ b/lib/router/router.js
@@ -40,6 +40,7 @@ export default class Router {
     this.subscriptions = new Set()
     this.componentLoadCancel = null
     this.onPopState = this.onPopState.bind(this)
+    this._beforePopState = () => true
 
     if (typeof window !== 'undefined') {
       // in order for `e.state` to work on the `onpopstate` event
@@ -66,6 +67,12 @@ export default class Router {
       return
     }
 
+    // If the downstream application returns falsy, return.
+    // They will then be responsible for handling the event.
+    if (!this._beforePopState(e.state)) {
+      return
+    }
+
     const { url, as, options } = e.state
     this.replace(url, as, options)
   }
@@ -265,6 +272,10 @@ export default class Router {
     this.notify(data)
   }
 
+  beforePopState (cb) {
+    this._beforePopState = cb
+  }
+
   onlyAHashChange (as) {
     if (!this.asPath) return false
     const [ oldUrlNoHash, oldHash ] = this.asPath.split('#')
diff --git a/readme.md b/readme.md
index dc89540b3d71f..8d5a278b6585d 100644
--- a/readme.md
+++ b/readme.md
@@ -458,6 +458,31 @@ export default () =>
   </div>
 ```
 
+#### Intercepting `popstate`
+
+In some cases (for example, if using a [custom router](#custom-server-and-routing)), you may wish
+to listen to `popstate` and react before the router acts on it.
+For example, you could use this to manipulate the request, or force an SSR refresh.
+
+```jsx
+import Router from 'next/router'
+
+Router.beforePopState(({ url, as, options }) => {
+  // I only want to allow these two routes!
+  if (as !== "/" || as !== "/other") {
+    // Have SSR render bad routes as a 404.
+    window.location.href = as
+    return false
+  }
+
+  return true
+});
+```
+
+If you return a falsy value from `beforePopState`, `Router` will not handle `popstate`;
+you'll be responsible for handling it, in that case.
+See [Disabling File-System Routing](#disabling-file-system-routing).
+
 Above `Router` object comes with the following API:
 
 - `route` - `String` of the current route
@@ -466,6 +491,7 @@ Above `Router` object comes with the following API:
 - `asPath` - `String` of the actual path (including the query) shows in the browser
 - `push(url, as=url)` - performs a `pushState` call with the given url
 - `replace(url, as=url)` - performs a `replaceState` call with the given url
+- `beforePopState(cb=function)` - intercept popstate before router processes the event.
 
 The second `as` parameter for `push` and `replace` is an optional _decoration_ of the URL. Useful if you configured custom routes on the server.
 
@@ -753,6 +779,13 @@ module.exports = {
 }
 ```
 
+Note that `useFileSystemPublicRoutes` simply disables filename routes from SSR; client-side routing
+may still access those paths. If using this option, you should guard against navigation to routes
+you do not want programmatically.
+
+You may also wish to configure the client-side Router to disallow client-side redirects to filename
+routes; please refer to [Intercepting `popstate`](#intercepting-popstate).
+
 #### Dynamic assetPrefix
 
 Sometimes we need to set the `assetPrefix` dynamically. This is useful when changing the `assetPrefix` based on incoming requests.

From 7f335cb032a713183d494db7583840b082e3fc9e Mon Sep 17 00:00:00 2001
From: Craig McNamara <craig@caring.com>
Date: Sat, 31 Mar 2018 07:34:52 -0700
Subject: [PATCH 26/73] Allow BUILD_ID to be set using `generateBuildId`
 (minor) (#3873)

* Allow BUILD_ID to be set in the environment

This makes multi server deploys with Capistrano possible.

* next.config.js generateBuildId support

enable customising the build id via config

* Provide default for generateBuildId

* This is not used
---
 readme.md             | 14 ++++++++++++++
 server/build/index.js |  5 ++---
 server/config.js      |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index 8d5a278b6585d..addf1c44c2c5f 100644
--- a/readme.md
+++ b/readme.md
@@ -1122,6 +1122,20 @@ module.exports = {
 }
 ```
 
+#### Configuring the build ID
+
+Next.js uses a constant generated at build time to identify which version of your application is being served. This can cause problems in multi-server deployments when `next build` is ran on every server. In order to keep a static build id between builds you can provide the `generateBuildId` function:
+
+```js
+// next.config.js
+module.exports = {
+  generateBuildId: async () => {
+    // For example get the latest git commit hash here
+    return 'my-build-id'
+  }
+}
+```
+
 ### Customizing webpack config
 
 <p><details>
diff --git a/server/build/index.js b/server/build/index.js
index a76413f5f1c00..79331024bde8d 100644
--- a/server/build/index.js
+++ b/server/build/index.js
@@ -1,10 +1,9 @@
 import { join } from 'path'
 import promisify from '../lib/promisify'
 import fs from 'fs'
-import uuid from 'uuid'
 import webpack from 'webpack'
 import getConfig from '../config'
-import {PHASE_PRODUCTION_BUILD} from '../../lib/constants'
+import { PHASE_PRODUCTION_BUILD } from '../../lib/constants'
 import getBaseWebpackConfig from './webpack'
 
 const access = promisify(fs.access)
@@ -12,7 +11,7 @@ const writeFile = promisify(fs.writeFile)
 
 export default async function build (dir, conf = null) {
   const config = getConfig(PHASE_PRODUCTION_BUILD, dir, conf)
-  const buildId = uuid.v4()
+  const buildId = await config.generateBuildId() // defaults to a uuid
 
   try {
     await access(dir, (fs.constants || fs).W_OK)
diff --git a/server/config.js b/server/config.js
index 045a4ac8c3f38..0d138d34c7ac8 100644
--- a/server/config.js
+++ b/server/config.js
@@ -1,5 +1,6 @@
 // @flow
 import findUp from 'find-up'
+import uuid from 'uuid'
 
 const cache = new Map()
 
@@ -11,6 +12,7 @@ const defaultConfig = {
   assetPrefix: '',
   configOrigin: 'default',
   useFileSystemPublicRoutes: true,
+  generateBuildId: () => uuid.v4(),
   generateEtags: true,
   pageExtensions: ['jsx', 'js']
 }

From c3318d8ef6ba078225f12f6a2a4ed73b5fc0a416 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sat, 31 Mar 2018 23:19:06 +0200
Subject: [PATCH 27/73] Make sure hot-self-accept-loader cleans up the route
 correctly (#4092)

---
 server/build/loaders/hot-self-accept-loader.js | 13 ++++++++++---
 server/build/webpack.js                        |  9 ++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/server/build/loaders/hot-self-accept-loader.js b/server/build/loaders/hot-self-accept-loader.js
index 5af985c1535af..76a658650afb0 100644
--- a/server/build/loaders/hot-self-accept-loader.js
+++ b/server/build/loaders/hot-self-accept-loader.js
@@ -1,9 +1,11 @@
 import { resolve, relative } from 'path'
+import loaderUtils from 'loader-utils'
 
 module.exports = function (content, sourceMap) {
   this.cacheable()
 
-  const route = getRoute(this)
+  const options = loaderUtils.getOptions(this)
+  const route = getRoute(this, options)
 
   // Webpack has a built in system to prevent default from colliding, giving it a random letter per export.
   // We can safely check if Component is undefined since all other pages imported into the entrypoint don't have __webpack_exports__.default
@@ -30,11 +32,16 @@ module.exports = function (content, sourceMap) {
 
 const nextPagesDir = resolve(__dirname, '..', '..', '..', 'pages')
 
-function getRoute (loaderContext) {
+function getRoute (loaderContext, options) {
   const pagesDir = resolve(loaderContext.options.context, 'pages')
   const { resourcePath } = loaderContext
   const dir = [pagesDir, nextPagesDir]
     .find((d) => resourcePath.indexOf(d) === 0)
-  const path = relative(dir, resourcePath)
+
+  if (!options.extensions) {
+    throw new Error('extensions is not provided to hot-self-accept-loader. Please upgrade all next-plugins to the latest version.')
+  }
+
+  const path = relative(dir, resourcePath).replace(options.extensions, '.js')
   return '/' + path.replace(/((^|\/)index)?\.js$/, '')
 }
diff --git a/server/build/webpack.js b/server/build/webpack.js
index 6d268ad111ae3..846fa31875139 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -177,15 +177,18 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
     module: {
       rules: [
         dev && !isServer && {
-          test: /\.(js|jsx)(\?[^?]*)?$/,
+          test: /\.(js|jsx)$/,
           loader: 'hot-self-accept-loader',
           include: [
             path.join(dir, 'pages'),
             nextPagesDir
-          ]
+          ],
+          options: {
+            extensions: /\.(js|jsx)$/
+          }
         },
         {
-          test: /\.+(js|jsx)$/,
+          test: /\.(js|jsx)$/,
           include: [dir],
           exclude: /node_modules/,
           use: defaultLoaders.babel

From 2fa49d70b7912cfbf63805e8b651f520b1b6645b Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Sun, 1 Apr 2018 00:06:18 +0200
Subject: [PATCH 28/73] 6.0.0-canary.2

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

diff --git a/package.json b/package.json
index 3d9d6475a679b..028e58f7a3d1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.0-canary.1",
+  "version": "6.0.0-canary.2",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From 9d4891f2950829a356b6098a40221573a44412e5 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Mon, 2 Apr 2018 21:18:33 +0200
Subject: [PATCH 29/73] Check if matched before reading value (#4096)

---
 server/build/plugins/pages-manifest-plugin.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/build/plugins/pages-manifest-plugin.js b/server/build/plugins/pages-manifest-plugin.js
index 6052a0b9ed78a..355f702cb9e36 100644
--- a/server/build/plugins/pages-manifest-plugin.js
+++ b/server/build/plugins/pages-manifest-plugin.js
@@ -13,7 +13,12 @@ export default class PagesManifestPlugin {
       const pages = {}
 
       for (const entry of entries) {
-        const pagePath = MATCH_ROUTE_NAME.exec(entry.name)[1]
+        const result = MATCH_ROUTE_NAME.exec(entry.name)
+        if (!result) {
+          continue
+        }
+
+        const pagePath = result[1]
 
         if (!pagePath) {
           continue

From 2d8c19a450b21df4e9f6ab8fe61c2272a0b9ac9f Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Tue, 3 Apr 2018 09:34:07 +0200
Subject: [PATCH 30/73] Upgrade Babel 6 to Babel 7 (major) (#4050)

Upgrade Babel 6 to Babel 7 (major)
---
 .babelrc                                      |   19 +-
 .../components/PageCount.js                   |    1 +
 examples/with-fela/FelaProvider.js            |    1 +
 .../with-redux-wrapper/components/AddCount.js |    1 +
 package.json                                  |   34 +-
 server/build/babel/find-config.js             |   16 -
 server/build/babel/plugins/handle-import.js   |    4 +-
 server/build/babel/preset.js                  |   20 +-
 server/build/webpack.js                       |   22 +-
 server/document.js                            |    1 +
 .../basic/pages/fragment-syntax.js            |    4 +
 test/integration/basic/test/index.test.js     |    1 +
 test/integration/basic/test/rendering.js      |    5 +
 yarn.lock                                     | 1361 ++++++++++-------
 14 files changed, 862 insertions(+), 628 deletions(-)
 delete mode 100644 server/build/babel/find-config.js
 create mode 100644 test/integration/basic/pages/fragment-syntax.js

diff --git a/.babelrc b/.babelrc
index 2f687fa0ecaf4..3d0c1e5e2c90d 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,19 +1,22 @@
 {
   "presets": [
-    "env",
-    "react",
-    "flow"
+    "@babel/preset-env",
+    "@babel/preset-react",
+    "@babel/preset-flow"
   ],
   "plugins": [
-    "transform-object-rest-spread",
-    "transform-class-properties",
-    "transform-runtime"
+    "@babel/plugin-proposal-object-rest-spread",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-transform-runtime"
   ],
   "env": {
     "test": {
       "presets": [
-        "es2015",
-        "./babel"
+        ["./babel", {
+          "preset-env": {
+            "modules": "commonjs"
+          }
+        }]
        ]
     }
   }
diff --git a/examples/with-apollo-and-redux-saga/components/PageCount.js b/examples/with-apollo-and-redux-saga/components/PageCount.js
index e9f977cdbd41d..a70b381707359 100644
--- a/examples/with-apollo-and-redux-saga/components/PageCount.js
+++ b/examples/with-apollo-and-redux-saga/components/PageCount.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 
diff --git a/examples/with-fela/FelaProvider.js b/examples/with-fela/FelaProvider.js
index fb82667caca89..9de749d4156dd 100755
--- a/examples/with-fela/FelaProvider.js
+++ b/examples/with-fela/FelaProvider.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 import { Component } from 'react'
 import PropTypes from 'prop-types'
 
diff --git a/examples/with-redux-wrapper/components/AddCount.js b/examples/with-redux-wrapper/components/AddCount.js
index 2bf76f3a7ed5a..91a9a2668af28 100644
--- a/examples/with-redux-wrapper/components/AddCount.js
+++ b/examples/with-redux-wrapper/components/AddCount.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 import React, {Component} from 'react'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
diff --git a/package.json b/package.json
index 028e58f7a3d1b..87724bfa3577b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.0-canary.2",
+  "version": "5.0.1-canary.17",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -52,22 +52,23 @@
     "bin/*": "standard"
   },
   "dependencies": {
+    "@babel/core": "7.0.0-beta.42",
+    "@babel/plugin-proposal-class-properties": "7.0.0-beta.42",
+    "@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.42",
+    "@babel/plugin-syntax-dynamic-import": "7.0.0-beta.42",
+    "@babel/plugin-transform-react-jsx-source": "7.0.0-beta.42",
+    "@babel/plugin-transform-runtime": "7.0.0-beta.42",
+    "@babel/preset-env": "7.0.0-beta.42",
+    "@babel/preset-react": "7.0.0-beta.42",
+    "@babel/runtime": "7.0.0-beta.42",
+    "@babel/template": "7.0.0-beta.42",
     "@zeit/check-updates": "1.1.1",
     "@zeit/source-map-support": "0.6.2",
     "ansi-html": "0.0.7",
-    "babel-core": "6.26.0",
-    "babel-loader": "7.1.2",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-loader": "8.0.0-beta.2",
     "babel-plugin-react-require": "3.0.0",
-    "babel-plugin-syntax-dynamic-import": "6.18.0",
-    "babel-plugin-transform-class-properties": "6.24.1",
-    "babel-plugin-transform-object-rest-spread": "6.26.0",
-    "babel-plugin-transform-react-jsx-source": "6.22.0",
-    "babel-plugin-transform-react-remove-prop-types": "0.4.8",
-    "babel-plugin-transform-runtime": "6.23.0",
-    "babel-preset-env": "1.6.0",
-    "babel-preset-react": "6.24.1",
-    "babel-runtime": "6.26.0",
-    "babel-template": "6.26.0",
+    "babel-plugin-transform-react-remove-prop-types": "0.4.13",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "cross-spawn": "5.1.0",
     "del": "3.0.0",
@@ -77,7 +78,7 @@
     "fresh": "0.5.2",
     "friendly-errors-webpack-plugin": "1.6.1",
     "glob": "7.1.2",
-    "hoist-non-react-statics": "2.5.0",
+    "hoist-non-react-statics": "2.3.1",
     "htmlescape": "1.1.1",
     "http-errors": "1.6.2",
     "http-status": "1.0.1",
@@ -106,7 +107,8 @@
     "write-file-webpack-plugin": "4.2.0"
   },
   "devDependencies": {
-    "@taskr/babel": "1.1.0",
+    "@babel/preset-flow": "7.0.0-beta.43",    
+    "@taskr/babel": "1.1.0-next.1",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",
@@ -115,8 +117,6 @@
     "babel-jest": "21.2.0",
     "babel-plugin-istanbul": "4.1.5",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
-    "babel-preset-es2015": "6.24.1",
-    "babel-preset-flow": "6.23.0",
     "benchmark": "2.1.4",
     "cheerio": "0.22.0",
     "chromedriver": "2.32.3",
diff --git a/server/build/babel/find-config.js b/server/build/babel/find-config.js
deleted file mode 100644
index 2acc7815500f4..0000000000000
--- a/server/build/babel/find-config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { join } from 'path'
-import buildConfigChain from 'babel-core/lib/transformation/file/options/build-config-chain'
-
-export default function findBabelConfig (dir) {
-  // We need to provide a location of a filename inside the `dir`.
-  // For the name of the file, we could be provide anything.
-  const filename = join(dir, 'filename.js')
-  const options = { babelrc: true, filename }
-
-  // First We need to build the config chain.
-  // Then we need to remove the config item with the location as "base".
-  // That's the config we are passing as the "options" below
-  const configList = buildConfigChain(options).filter(i => i.loc !== 'base')
-
-  return configList[0]
-}
diff --git a/server/build/babel/plugins/handle-import.js b/server/build/babel/plugins/handle-import.js
index 86397e9e2e5c3..fb93167f2110c 100644
--- a/server/build/babel/plugins/handle-import.js
+++ b/server/build/babel/plugins/handle-import.js
@@ -1,7 +1,7 @@
 // Based on https://github.com/airbnb/babel-plugin-dynamic-import-webpack
 // We've added support for SSR with this version
-import template from 'babel-template'
-import syntax from 'babel-plugin-syntax-dynamic-import'
+import template from '@babel/template'
+import syntax from '@babel/plugin-syntax-dynamic-import'
 import { dirname, resolve, sep } from 'path'
 import Crypto from 'crypto'
 
diff --git a/server/build/babel/preset.js b/server/build/babel/preset.js
index f66e85ac84ad1..600078444daa9 100644
--- a/server/build/babel/preset.js
+++ b/server/build/babel/preset.js
@@ -25,10 +25,10 @@ function styledJsxOptions (opts) {
 
 const envPlugins = {
   'development': [
-    require.resolve('babel-plugin-transform-react-jsx-source')
+    require('@babel/plugin-transform-react-jsx-source')
   ],
   'production': [
-    require.resolve('babel-plugin-transform-react-remove-prop-types')
+    require('babel-plugin-transform-react-remove-prop-types')
   ]
 }
 
@@ -36,23 +36,23 @@ const plugins = envPlugins[process.env.NODE_ENV] || envPlugins['development']
 
 module.exports = (context, opts = {}) => ({
   presets: [
-    [require.resolve('babel-preset-env'), {
+    [require('@babel/preset-env'), {
       modules: false,
       ...opts['preset-env']
     }],
-    require.resolve('babel-preset-react')
+    require('@babel/preset-react')
   ],
   plugins: [
-    require.resolve('babel-plugin-react-require'),
-    require.resolve('./plugins/handle-import'),
-    require.resolve('babel-plugin-transform-object-rest-spread'),
-    require.resolve('babel-plugin-transform-class-properties'),
-    [require.resolve('babel-plugin-transform-runtime'), opts['transform-runtime'] || {
+    require('babel-plugin-react-require'),
+    require('./plugins/handle-import'),
+    require('@babel/plugin-proposal-class-properties'),
+    require('@babel/plugin-proposal-object-rest-spread'),
+    [require('@babel/plugin-transform-runtime'), opts['transform-runtime'] || {
       helpers: false,
       polyfill: false,
       regenerator: true
     }],
-    [require.resolve('styled-jsx/babel'), styledJsxOptions(opts['styled-jsx'])],
+    [require('styled-jsx/babel'), styledJsxOptions(opts['styled-jsx'])],
     ...plugins
   ]
 })
diff --git a/server/build/webpack.js b/server/build/webpack.js
index 846fa31875139..ebc466a2d77f4 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -5,13 +5,16 @@ import UglifyJSPlugin from 'uglifyjs-webpack-plugin'
 import CaseSensitivePathPlugin from 'case-sensitive-paths-webpack-plugin'
 import WriteFilePlugin from 'write-file-webpack-plugin'
 import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'
+import {loadPartialConfig, createConfigItem} from '@babel/core'
 import {getPages} from './webpack/utils'
 import PagesPlugin from './plugins/pages-plugin'
 import NextJsSsrImportPlugin from './plugins/nextjs-ssr-import'
 import DynamicChunksPlugin from './plugins/dynamic-chunks-plugin'
 import UnlinkFilePlugin from './plugins/unlink-file-plugin'
 import PagesManifestPlugin from './plugins/pages-manifest-plugin'
-import findBabelConfig from './babel/find-config'
+
+const presetItem = createConfigItem(require('./babel/preset'), {type: 'preset'})
+const hotLoaderItem = createConfigItem(require('react-hot-loader/babel'), {type: 'plugin'})
 
 const nextDir = path.join(__dirname, '..', '..', '..')
 const nextNodeModulesDir = path.join(nextDir, 'node_modules')
@@ -29,29 +32,26 @@ function babelConfig (dir, {isServer, dev}) {
     cacheDirectory: true,
     presets: [],
     plugins: [
-      dev && !isServer && require.resolve('react-hot-loader/babel')
+      dev && !isServer && hotLoaderItem
     ].filter(Boolean)
   }
 
-  const externalBabelConfig = findBabelConfig(dir)
-  if (externalBabelConfig) {
+  const filename = path.join(dir, 'filename.js')
+  const externalBabelConfig = loadPartialConfig({ babelrc: true, filename })
+  if (externalBabelConfig && externalBabelConfig.babelrc) {
     // Log it out once
     if (!isServer) {
       console.log(`> Using external babel configuration`)
-      console.log(`> Location: "${externalBabelConfig.loc}"`)
+      console.log(`> Location: "${externalBabelConfig.babelrc}"`)
     }
-    // It's possible to turn off babelrc support via babelrc itself.
-    // In that case, we should add our default preset.
-    // That's why we need to do this.
-    const { options } = externalBabelConfig
-    mainBabelOptions.babelrc = options.babelrc !== false
+    // By default babel-loader will look for babelrc, so no need to set it to true
   } else {
     mainBabelOptions.babelrc = false
   }
 
   // Add our default preset if the no "babelrc" found.
   if (!mainBabelOptions.babelrc) {
-    mainBabelOptions.presets.push(require.resolve('./babel/preset'))
+    mainBabelOptions.presets.push(presetItem)
   }
 
   return mainBabelOptions
diff --git a/server/document.js b/server/document.js
index 9df49972fac18..3ab9eda757ae3 100644
--- a/server/document.js
+++ b/server/document.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import htmlescape from 'htmlescape'
diff --git a/test/integration/basic/pages/fragment-syntax.js b/test/integration/basic/pages/fragment-syntax.js
new file mode 100644
index 0000000000000..6b3568a612f18
--- /dev/null
+++ b/test/integration/basic/pages/fragment-syntax.js
@@ -0,0 +1,4 @@
+/* eslint-disable */
+import React from 'react'
+
+export default () => <>My component!</>
\ No newline at end of file
diff --git a/test/integration/basic/test/index.test.js b/test/integration/basic/test/index.test.js
index d2818ea5f1566..d1b1d3ade74af 100644
--- a/test/integration/basic/test/index.test.js
+++ b/test/integration/basic/test/index.test.js
@@ -36,6 +36,7 @@ describe('Basic Features', () => {
       renderViaHTTP(context.appPort, '/link'),
       renderViaHTTP(context.appPort, '/stateful'),
       renderViaHTTP(context.appPort, '/stateless'),
+      renderViaHTTP(context.appPort, '/fragment-syntax'),
       renderViaHTTP(context.appPort, '/custom-extension'),
       renderViaHTTP(context.appPort, '/styled-jsx'),
       renderViaHTTP(context.appPort, '/with-cdm'),
diff --git a/test/integration/basic/test/rendering.js b/test/integration/basic/test/rendering.js
index 830f4882dbef6..239ba3a23dd43 100644
--- a/test/integration/basic/test/rendering.js
+++ b/test/integration/basic/test/rendering.js
@@ -15,6 +15,11 @@ export default function ({ app }, suiteName, render, fetch) {
       expect(html.includes('My component!')).toBeTruthy()
     })
 
+    test('renders with fragment syntax', async () => {
+      const html = await render('/fragment-syntax')
+      expect(html.includes('My component!')).toBeTruthy()
+    })
+
     test('renders a stateful component', async () => {
       const $ = await get$('/stateful')
       const answer = $('#answer')
diff --git a/yarn.lock b/yarn.lock
index e5542d9a15a3a..08cebf89e29fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,58 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.42", "@babel/code-frame@^7.0.0-beta.40":
+"@babel/code-frame@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.42.tgz#a9c83233fa7cd06b39dc77adbb908616ff4f1962"
   dependencies:
     "@babel/highlight" "7.0.0-beta.42"
 
+"@babel/code-frame@7.0.0-beta.43", "@babel/code-frame@^7.0.0-beta.40":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.43.tgz#57281887da181b4f9a3e72151f54f3237bf011eb"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.43"
+
+"@babel/core@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.42.tgz#b3a838fddbd19663369a0b4892189fd8d3f82001"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.42"
+    "@babel/generator" "7.0.0-beta.42"
+    "@babel/helpers" "7.0.0-beta.42"
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/traverse" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+    babylon "7.0.0-beta.42"
+    convert-source-map "^1.1.0"
+    debug "^3.1.0"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    micromatch "^2.3.11"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/core@^7.0.0-beta.42":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.43.tgz#2e5d50b338b1484f4de7a92047e65b88f3fd2eed"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.43"
+    "@babel/generator" "7.0.0-beta.43"
+    "@babel/helpers" "7.0.0-beta.43"
+    "@babel/template" "7.0.0-beta.43"
+    "@babel/traverse" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.43"
+    babylon "7.0.0-beta.43"
+    convert-source-map "^1.1.0"
+    debug "^3.1.0"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    micromatch "^2.3.11"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/generator@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.42.tgz#777bb50f39c94a7e57f73202d833141f8159af33"
@@ -18,6 +64,59 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.43.tgz#9f32baf9fe6a4a79872d1825bb7541ed992573ca"
+  dependencies:
+    "@babel/types" "7.0.0-beta.43"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-annotate-as-pure@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.42.tgz#f2b0a3be684018b55fc308eb5408326f78479085"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.42.tgz#7305281eb996954c47f87ec7710e2a9a8edd8077"
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-builder-react-jsx@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0-beta.42.tgz#719510a0aa45e9b02909f2e252420e62900c406a"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+    esutils "^2.0.0"
+
+"@babel/helper-call-delegate@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.42.tgz#53294eb8c5e6e53af3efda4293ff3c1237772d37"
+  dependencies:
+    "@babel/helper-hoist-variables" "7.0.0-beta.42"
+    "@babel/traverse" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-define-map@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.42.tgz#e5aa10bd7eed2c23cc2873e5d15fbb4b40a30620"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+    lodash "^4.2.0"
+
+"@babel/helper-explode-assignable-expression@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.42.tgz#ae05c9e7ef9a085b0080b9e4f7a076851a2b17b5"
+  dependencies:
+    "@babel/traverse" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
 "@babel/helper-function-name@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.42.tgz#b38b8f4f85168d1812c543dd700b5d549b0c4658"
@@ -26,18 +125,134 @@
     "@babel/template" "7.0.0-beta.42"
     "@babel/types" "7.0.0-beta.42"
 
+"@babel/helper-function-name@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.43.tgz#c1f521f0782a0e544fdfae2d88b6a2895a38a498"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.43"
+    "@babel/template" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.43"
+
 "@babel/helper-get-function-arity@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.42.tgz#ad072e32f912c033053fc80478169aeadc22191e"
   dependencies:
     "@babel/types" "7.0.0-beta.42"
 
+"@babel/helper-get-function-arity@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.43.tgz#c00072b6d290ce037dc9037fe99037c7686a56e3"
+  dependencies:
+    "@babel/types" "7.0.0-beta.43"
+
+"@babel/helper-hoist-variables@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.42.tgz#6e51d75192923d96972a24c223b81126a7fabca1"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-module-imports@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.42.tgz#4de334b42fa889d560f15122f66c3bfe1f30cb77"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+    lodash "^4.2.0"
+
+"@babel/helper-module-transforms@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.42.tgz#4d260cc786e712e8440bef58dae28040b77a6183"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-beta.42"
+    "@babel/helper-simple-access" "7.0.0-beta.42"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.42"
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+    lodash "^4.2.0"
+
+"@babel/helper-optimise-call-expression@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.42.tgz#9ba770079001672a578fe833190cf03f973568b1"
+  dependencies:
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-plugin-utils@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.42.tgz#9aa8b3e5dc72abea6b4f686712a7363cb29ea057"
+
+"@babel/helper-plugin-utils@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.43.tgz#a5c95110e9bf53b96b339661c96c37efd0960568"
+
+"@babel/helper-regex@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.42.tgz#ba01d0cd94786561e2afeb8c8b0e544aa034a1e1"
+  dependencies:
+    lodash "^4.2.0"
+
+"@babel/helper-remap-async-to-generator@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.42.tgz#c27dd7789f3a9973493a67a7914ac9253e879071"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.42"
+    "@babel/helper-wrap-function" "7.0.0-beta.42"
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/traverse" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-replace-supers@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.42.tgz#fd984b6022982b71a1237d82d932ab69ff988aa4"
+  dependencies:
+    "@babel/helper-optimise-call-expression" "7.0.0-beta.42"
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/traverse" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helper-simple-access@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.42.tgz#9d32bed186b0bc365115c600817e791c22d72c74"
+  dependencies:
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+    lodash "^4.2.0"
+
 "@babel/helper-split-export-declaration@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.42.tgz#0d0d5254220a9cc4e7e226240306b939dc210ee7"
   dependencies:
     "@babel/types" "7.0.0-beta.42"
 
+"@babel/helper-split-export-declaration@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.43.tgz#1e95b16ce597df81ce1face60f5ea89a4631a7bf"
+  dependencies:
+    "@babel/types" "7.0.0-beta.43"
+
+"@babel/helper-wrap-function@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.42.tgz#5ffc6576902aa2a10fe6666e063bd45029c36db3"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-beta.42"
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/traverse" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helpers@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.42.tgz#151c1c4e9da1b6ce83d54c1be5fb8c9c57aa5044"
+  dependencies:
+    "@babel/template" "7.0.0-beta.42"
+    "@babel/traverse" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.42"
+
+"@babel/helpers@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.43.tgz#a45078bdd135012229c3bb209c86ef1f953ba041"
+  dependencies:
+    "@babel/template" "7.0.0-beta.43"
+    "@babel/traverse" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.43"
+
 "@babel/highlight@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.42.tgz#a502a1c0d6f99b2b0e81d468a1b0c0e81e3f3623"
@@ -46,6 +261,393 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/highlight@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.43.tgz#7bd0415ca160495a22b3a234f0841b4a9ab0de26"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/plugin-proposal-async-generator-functions@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.42.tgz#81465d19b6f5559092d9be4d11d6351131d08696"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-remap-async-to-generator" "7.0.0-beta.42"
+    "@babel/plugin-syntax-async-generators" "7.0.0-beta.42"
+
+"@babel/plugin-proposal-class-properties@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.42.tgz#2cd29050ab997567071b65896f92afc08a620748"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-syntax-class-properties" "7.0.0-beta.42"
+
+"@babel/plugin-proposal-object-rest-spread@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.42.tgz#56ebd55a8268165cb7cb43a5a232b60f5435a822"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.42"
+
+"@babel/plugin-proposal-optional-catch-binding@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0-beta.42.tgz#d885ba187d2ce6bbae0c227a67a38389c6f930f8"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.42"
+
+"@babel/plugin-proposal-unicode-property-regex@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0-beta.42.tgz#84f209398368c194c217edd8131420e0ddb79661"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-regex" "7.0.0-beta.42"
+    regexpu-core "^4.1.3"
+
+"@babel/plugin-syntax-async-generators@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.42.tgz#deccff2f01c2ed280493b0ba256b14df232ca299"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-syntax-class-properties@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.42.tgz#80ccce27907f22d0ffb49721e9d2cde311b41459"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-syntax-dynamic-import@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.42.tgz#90257d90098e2c9c2f49054269039eccd8bddd34"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-syntax-flow@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0-beta.43.tgz#f001288184d1b846d224251577edb29b5019b64a"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.43"
+
+"@babel/plugin-syntax-jsx@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0-beta.42.tgz#92ef7807bbec0e12a49815a409822262cbaa7ddd"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-syntax-object-rest-spread@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.42.tgz#aa789865abe78a4895d4a0be9de4d34b1a1d5063"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-syntax-optional-catch-binding@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0-beta.42.tgz#d3ebfaa463f42f5a35be5cbd2f27c1fc3bf96c1b"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-arrow-functions@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.42.tgz#b918eb8760c38d6503a1a9858fa073786b60ab2b"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-async-to-generator@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.42.tgz#c74e278b9722efeb7f2c7da5fbff7540c4a7f353"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-remap-async-to-generator" "7.0.0-beta.42"
+
+"@babel/plugin-transform-block-scoped-functions@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.42.tgz#34742dcf409106038e413e0d64b90e98df15f9eb"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-block-scoping@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.42.tgz#272c5cc2b46613ebcd2e19491b19263c36d2c3f4"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    lodash "^4.2.0"
+
+"@babel/plugin-transform-classes@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.42.tgz#3b9fdb2e36f9f16b011a2ddc4ebb610e3dc9edfb"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.42"
+    "@babel/helper-define-map" "7.0.0-beta.42"
+    "@babel/helper-function-name" "7.0.0-beta.42"
+    "@babel/helper-optimise-call-expression" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-replace-supers" "7.0.0-beta.42"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.42"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.42.tgz#153662309475099c6948827fc86edbd7fb26f09d"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-destructuring@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.42.tgz#1aaca42a00d9ef2b0307557c748f32e83ac44899"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-dotall-regex@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0-beta.42.tgz#af7ead30c1b6c3ea8a53973cfcfdbda9edc3c967"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-regex" "7.0.0-beta.42"
+    regexpu-core "^4.1.3"
+
+"@babel/plugin-transform-duplicate-keys@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.42.tgz#9678ab9480c6120e9b08014371c010bed481485a"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-exponentiation-operator@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.42.tgz#fe637583e8d00ff6d63461e274a63dd2f373baf5"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-flow-strip-types@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0-beta.43.tgz#2b44ed6e126b0796e57b53e0ece51a200a608bb0"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.43"
+    "@babel/plugin-syntax-flow" "7.0.0-beta.43"
+
+"@babel/plugin-transform-for-of@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.42.tgz#acf51c5986050e1aff054c8d2a95ef3f6bec153e"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-function-name@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.42.tgz#1eb004a9abde01010d47ec7629d46b1e4e2c6228"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-literals@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.42.tgz#61a34a82d757be4ddf937eda4b2d6c36b63b9c4e"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-modules-amd@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.42.tgz#f4c634f49b5051abf6cefcbae100b41ba1369eb6"
+  dependencies:
+    "@babel/helper-module-transforms" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-modules-commonjs@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.42.tgz#bdfb30e194c8841ec3ddd8a011974102d0d74afc"
+  dependencies:
+    "@babel/helper-module-transforms" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-simple-access" "7.0.0-beta.42"
+
+"@babel/plugin-transform-modules-systemjs@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-beta.42.tgz#424e25542b4d6ea6ea5f933df6ec9c345358b070"
+  dependencies:
+    "@babel/helper-hoist-variables" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-modules-umd@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-beta.42.tgz#2fbad368c83471c76f8dcace98492e4e3fdddc76"
+  dependencies:
+    "@babel/helper-module-transforms" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-new-target@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0-beta.42.tgz#8b309b67b6a92fd1ab6cb93bea0fa12359795c20"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-object-super@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.42.tgz#f19ae6007ff675ea0f52499d09f73ae9f96db1a0"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-replace-supers" "7.0.0-beta.42"
+
+"@babel/plugin-transform-parameters@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.42.tgz#58434afb01afb0a3aa82402142807fb70eb3fb56"
+  dependencies:
+    "@babel/helper-call-delegate" "7.0.0-beta.42"
+    "@babel/helper-get-function-arity" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-react-display-name@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0-beta.42.tgz#48766efd74d65fb9116ede6354f73299d73e66b9"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-react-jsx-self@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0-beta.42.tgz#f471407f6d87f5456db716ed7ed24dff6864c3de"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-syntax-jsx" "7.0.0-beta.42"
+
+"@babel/plugin-transform-react-jsx-source@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0-beta.42.tgz#2c41adf060e76b9f0652591cfcdaddd192a21898"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-syntax-jsx" "7.0.0-beta.42"
+
+"@babel/plugin-transform-react-jsx@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0-beta.42.tgz#a25731396ca87b07f10362a950deab4526345fac"
+  dependencies:
+    "@babel/helper-builder-react-jsx" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-syntax-jsx" "7.0.0-beta.42"
+
+"@babel/plugin-transform-regenerator@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.42.tgz#af164751340a7e513c53e614c6f1f90279e459ef"
+  dependencies:
+    regenerator-transform "^0.12.3"
+
+"@babel/plugin-transform-runtime@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0-beta.42.tgz#0142fa2937dd87fea10f5c7c4da9c8b8896bb740"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-shorthand-properties@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.42.tgz#fb0b66f4afd4a5a67d9d84a85cbf6f7fef0a7b4f"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-spread@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.42.tgz#4d7dde45c95e55d418477e1ea95dd6d9b71f15e4"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-sticky-regex@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.42.tgz#b0a5585ec24013dd6f0b1b8cc7a73423c4bc082f"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-regex" "7.0.0-beta.42"
+
+"@babel/plugin-transform-template-literals@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.42.tgz#7f05c5c003da8e485462cfc36f9d482b0a9a75df"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-typeof-symbol@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.42.tgz#7d93fcd194db78b839488cddddefbaa46032e327"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+
+"@babel/plugin-transform-unicode-regex@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.42.tgz#1e7bdcf678d9a9066d06e6d334ab41ca11ca00ad"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/helper-regex" "7.0.0-beta.42"
+    regexpu-core "^4.1.3"
+
+"@babel/preset-env@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.0.0-beta.42.tgz#671e688057c010b22a7811b965f7da5d79c472d3"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-beta.42"
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-proposal-async-generator-functions" "7.0.0-beta.42"
+    "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.42"
+    "@babel/plugin-proposal-optional-catch-binding" "7.0.0-beta.42"
+    "@babel/plugin-proposal-unicode-property-regex" "7.0.0-beta.42"
+    "@babel/plugin-syntax-async-generators" "7.0.0-beta.42"
+    "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.42"
+    "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.42"
+    "@babel/plugin-transform-arrow-functions" "7.0.0-beta.42"
+    "@babel/plugin-transform-async-to-generator" "7.0.0-beta.42"
+    "@babel/plugin-transform-block-scoped-functions" "7.0.0-beta.42"
+    "@babel/plugin-transform-block-scoping" "7.0.0-beta.42"
+    "@babel/plugin-transform-classes" "7.0.0-beta.42"
+    "@babel/plugin-transform-computed-properties" "7.0.0-beta.42"
+    "@babel/plugin-transform-destructuring" "7.0.0-beta.42"
+    "@babel/plugin-transform-dotall-regex" "7.0.0-beta.42"
+    "@babel/plugin-transform-duplicate-keys" "7.0.0-beta.42"
+    "@babel/plugin-transform-exponentiation-operator" "7.0.0-beta.42"
+    "@babel/plugin-transform-for-of" "7.0.0-beta.42"
+    "@babel/plugin-transform-function-name" "7.0.0-beta.42"
+    "@babel/plugin-transform-literals" "7.0.0-beta.42"
+    "@babel/plugin-transform-modules-amd" "7.0.0-beta.42"
+    "@babel/plugin-transform-modules-commonjs" "7.0.0-beta.42"
+    "@babel/plugin-transform-modules-systemjs" "7.0.0-beta.42"
+    "@babel/plugin-transform-modules-umd" "7.0.0-beta.42"
+    "@babel/plugin-transform-new-target" "7.0.0-beta.42"
+    "@babel/plugin-transform-object-super" "7.0.0-beta.42"
+    "@babel/plugin-transform-parameters" "7.0.0-beta.42"
+    "@babel/plugin-transform-regenerator" "7.0.0-beta.42"
+    "@babel/plugin-transform-shorthand-properties" "7.0.0-beta.42"
+    "@babel/plugin-transform-spread" "7.0.0-beta.42"
+    "@babel/plugin-transform-sticky-regex" "7.0.0-beta.42"
+    "@babel/plugin-transform-template-literals" "7.0.0-beta.42"
+    "@babel/plugin-transform-typeof-symbol" "7.0.0-beta.42"
+    "@babel/plugin-transform-unicode-regex" "7.0.0-beta.42"
+    browserslist "^3.0.0"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
+"@babel/preset-flow@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0-beta.43.tgz#0a81fc6db12b78e4bebccd07cc1eaab1292d1202"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.43"
+    "@babel/plugin-transform-flow-strip-types" "7.0.0-beta.43"
+
+"@babel/preset-react@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0-beta.42.tgz#e7a15ee1ab5305d5f8efd43cce01123e2bfdcc9d"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.42"
+    "@babel/plugin-syntax-jsx" "7.0.0-beta.42"
+    "@babel/plugin-transform-react-display-name" "7.0.0-beta.42"
+    "@babel/plugin-transform-react-jsx" "7.0.0-beta.42"
+    "@babel/plugin-transform-react-jsx-self" "7.0.0-beta.42"
+    "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.42"
+
+"@babel/runtime@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f"
+  dependencies:
+    core-js "^2.5.3"
+    regenerator-runtime "^0.11.1"
+
 "@babel/template@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.42.tgz#7186d4e70d44cdec975049ba0a73bdaf5cdee052"
@@ -55,7 +657,16 @@
     babylon "7.0.0-beta.42"
     lodash "^4.2.0"
 
-"@babel/traverse@^7.0.0-beta.40":
+"@babel/template@7.0.0-beta.43":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.43.tgz#0d34fa1da16835b23dd136b942c753ad97540c24"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.43"
+    babylon "7.0.0-beta.43"
+    lodash "^4.2.0"
+
+"@babel/traverse@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.42.tgz#f4bf4d1e33d41baf45205e2d0463591d57326285"
   dependencies:
@@ -70,7 +681,22 @@
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/types@7.0.0-beta.42", "@babel/types@^7.0.0-beta.40":
+"@babel/traverse@7.0.0-beta.43", "@babel/traverse@^7.0.0-beta.40":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.43.tgz#dad8700f1e51ed960de22c5060bf1c3e8c8fc494"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.43"
+    "@babel/generator" "7.0.0-beta.43"
+    "@babel/helper-function-name" "7.0.0-beta.43"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.43"
+    babylon "7.0.0-beta.43"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.42":
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.42.tgz#1e2118767684880f6963801b272fd2b3348efacc"
   dependencies:
@@ -78,11 +704,19 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@taskr/babel@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@taskr/babel/-/babel-1.1.0.tgz#f5af6b236395cbd013d3f67328ca73651e0299a1"
+"@babel/types@7.0.0-beta.43", "@babel/types@^7.0.0-beta.40":
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.43.tgz#9d82c2d773b6baec0474ddb774eafd7fb4511f8b"
   dependencies:
-    babel-core "^6.3.0"
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
+"@taskr/babel@1.1.0-next.1":
+  version "1.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@taskr/babel/-/babel-1.1.0-next.1.tgz#f66b56bd10d62a8a089b781805bc323f55cdd037"
+  dependencies:
+    "@babel/core" "^7.0.0-beta.42"
     flatten "^1.0.2"
     read-pkg-up "^2.0.0"
 
@@ -268,7 +902,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-any-promise@^1.1.0:
+any-promise@^1.0.0, any-promise@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
 
@@ -488,165 +1122,67 @@ aws-sign2@~0.7.0:
 
 aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@6.26.0, babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.3.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.7"
-    slash "^1.0.0"
-    source-map "^0.5.6"
-
-babel-eslint@8.2.2:
-  version "8.2.2"
-  resolved "http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
-  dependencies:
-    "@babel/code-frame" "^7.0.0-beta.40"
-    "@babel/traverse" "^7.0.0-beta.40"
-    "@babel/types" "^7.0.0-beta.40"
-    babylon "^7.0.0-beta.40"
-    eslint-scope "~3.7.1"
-    eslint-visitor-keys "^1.0.0"
-
-babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
-
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-builder-react-jsx@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    esutils "^2.0.2"
-
-babel-helper-call-delegate@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-define-map@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-helper-explode-assignable-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-  dependencies:
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-get-function-arity@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-hoist-variables@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-helper-optimise-call-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@7.0.0-bridge.0:
+  version "7.0.0-bridge.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
 
-babel-helper-regex@^6.24.1:
+babel-core@^6.0.0, babel-core@^6.26.0:
   version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
     babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
     babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
     lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
 
-babel-helper-remap-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+babel-eslint@8.2.2:
+  version "8.2.2"
+  resolved "http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
   dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    "@babel/code-frame" "^7.0.0-beta.40"
+    "@babel/traverse" "^7.0.0-beta.40"
+    "@babel/types" "^7.0.0-beta.40"
+    babylon "^7.0.0-beta.40"
+    eslint-scope "~3.7.1"
+    eslint-visitor-keys "^1.0.0"
 
-babel-helper-replace-supers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   dependencies:
-    babel-helper-optimise-call-expression "^6.24.1"
     babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
 
 babel-helpers@^6.24.1:
   version "6.24.1"
@@ -662,9 +1198,9 @@ babel-jest@21.2.0, babel-jest@^21.2.0:
     babel-plugin-istanbul "^4.0.0"
     babel-preset-jest "^21.2.0"
 
-babel-loader@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
+babel-loader@8.0.0-beta.2:
+  version "8.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.0-beta.2.tgz#4d5b67c964dc8c9cba866fd13d6b90df3acf8723"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -676,12 +1212,6 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-check-es2015-constants@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-istanbul@4.1.5, babel-plugin-istanbul@^4.0.0:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
@@ -698,372 +1228,22 @@ babel-plugin-react-require@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-react-require/-/babel-plugin-react-require-3.0.0.tgz#2e4e7b4496b93a654a1c80042276de4e4eeb20e3"
 
-babel-plugin-syntax-async-functions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-
-babel-plugin-syntax-class-properties@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
-
-babel-plugin-syntax-dynamic-import@6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-
-babel-plugin-syntax-flow@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
-
-babel-plugin-syntax-jsx@6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
+babel-plugin-syntax-jsx@6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
 
-babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
+babel-plugin-syntax-object-rest-spread@^6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
 
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-
-babel-plugin-transform-async-to-generator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.24.1"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-class-properties@6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-  dependencies:
-    babel-helper-define-map "^6.24.1"
-    babel-helper-function-name "^6.24.1"
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-helper-replace-supers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-for-of@^6.22.0, babel-plugin-transform-es2015-for-of@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-types "^6.26.0"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015-modules-umd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-  dependencies:
-    babel-helper-replace-supers "^6.24.1"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-  dependencies:
-    babel-helper-call-delegate "^6.24.1"
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-template-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0, babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
-
-babel-plugin-transform-exponentiation-operator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-flow-strip-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
-  dependencies:
-    babel-plugin-syntax-flow "^6.18.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-object-rest-spread@6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.26.0"
-
-babel-plugin-transform-react-display-name@^6.23.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-self@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-source@6.22.0, babel-plugin-transform-react-jsx-source@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
-  dependencies:
-    babel-helper-builder-react-jsx "^6.24.1"
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-remove-prop-types@0.4.8:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.8.tgz#0aff04bc1d6564ec49cf23bcffb99c11881958db"
-  dependencies:
-    babel-traverse "^6.25.0"
-
-babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
-  dependencies:
-    regenerator-transform "^0.10.0"
+babel-plugin-transform-react-remove-prop-types@0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.13.tgz#331cfc05099a808238311d78319c27460d481189"
 
 babel-plugin-transform-remove-strict-mode@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-strict-mode/-/babel-plugin-transform-remove-strict-mode-0.0.2.tgz#913685aab95439f3a0ed88e588fbd5e997890579"
 
-babel-plugin-transform-runtime@6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-preset-env@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.23.0"
-    babel-plugin-transform-es2015-classes "^6.23.0"
-    babel-plugin-transform-es2015-computed-properties "^6.22.0"
-    babel-plugin-transform-es2015-destructuring "^6.23.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
-    babel-plugin-transform-es2015-for-of "^6.23.0"
-    babel-plugin-transform-es2015-function-name "^6.22.0"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-umd "^6.23.0"
-    babel-plugin-transform-es2015-object-super "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.23.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
-    babel-plugin-transform-regenerator "^6.22.0"
-    browserslist "^2.1.2"
-    invariant "^2.2.2"
-    semver "^5.3.0"
-
-babel-preset-es2015@6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.24.1"
-    babel-plugin-transform-es2015-classes "^6.24.1"
-    babel-plugin-transform-es2015-computed-properties "^6.24.1"
-    babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
-    babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.24.1"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-umd "^6.24.1"
-    babel-plugin-transform-es2015-object-super "^6.24.1"
-    babel-plugin-transform-es2015-parameters "^6.24.1"
-    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
-    babel-plugin-transform-regenerator "^6.24.1"
-
-babel-preset-flow@6.23.0, babel-preset-flow@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
-  dependencies:
-    babel-plugin-transform-flow-strip-types "^6.22.0"
-
 babel-preset-jest@^21.2.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-21.2.0.tgz#ff9d2bce08abd98e8a36d9a8a5189b9173b85638"
@@ -1071,17 +1251,6 @@ babel-preset-jest@^21.2.0:
     babel-plugin-jest-hoist "^21.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
-babel-preset-react@6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-react-display-name "^6.23.0"
-    babel-plugin-transform-react-jsx "^6.24.1"
-    babel-plugin-transform-react-jsx-self "^6.22.0"
-    babel-plugin-transform-react-jsx-source "^6.22.0"
-    babel-preset-flow "^6.23.0"
-
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
@@ -1094,14 +1263,14 @@ babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@6.26.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@6.26.0, babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   dependencies:
@@ -1111,7 +1280,7 @@ babel-template@6.26.0, babel-template@^6.16.0, babel-template@^6.24.1, babel-tem
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.25.0, babel-traverse@^6.26.0:
+babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   dependencies:
@@ -1125,7 +1294,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.25.0, babel-tr
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@6.26.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+babel-types@6.26.0, babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   dependencies:
@@ -1134,10 +1303,14 @@ babel-types@6.26.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.42, babylon@^7.0.0-beta.40:
+babylon@7.0.0-beta.42:
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.42.tgz#67cfabcd4f3ec82999d29031ccdea89d0ba99657"
 
+babylon@7.0.0-beta.43, babylon@^7.0.0-beta.40:
+  version "7.0.0-beta.43"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.43.tgz#15128e7403d41b0e56cca2f110024cc1d8ada8cd"
+
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -1343,12 +1516,12 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^2.1.2:
-  version "2.11.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+browserslist@^3.0.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.4.tgz#fb9ad70fd09875137ae943a31ab815ed76896031"
   dependencies:
-    caniuse-lite "^1.0.30000792"
-    electron-to-chromium "^1.3.30"
+    caniuse-lite "^1.0.30000821"
+    electron-to-chromium "^1.3.41"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -1467,7 +1640,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000821"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000821.tgz#3fcdc67c446a94a9cdd848248a4e3e54b2da7419"
 
-caniuse-lite@^1.0.30000792:
+caniuse-lite@^1.0.30000821:
   version "1.0.30000821"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000821.tgz#0f3223f1e048ed96451c56ca6cf197058c42cb93"
 
@@ -1831,7 +2004,7 @@ content-type@1.0.4, content-type@~1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-convert-source-map@1.5.1, convert-source-map@^1.3.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
+convert-source-map@1.5.1, convert-source-map@^1.1.0, convert-source-map@^1.3.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -1862,7 +2035,7 @@ core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.3:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0"
 
@@ -2372,7 +2545,7 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.41:
   version "1.3.41"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.41.tgz#7e33643e00cd85edfd17e04194f6d00e73737235"
 
@@ -2682,8 +2855,8 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
 esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
     estraverse "^4.0.0"
 
@@ -2697,7 +2870,7 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
-esutils@^2.0.2:
+esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
@@ -2855,8 +3028,8 @@ extend@~3.0.0, extend@~3.0.1:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
 external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
     chardet "^0.4.0"
     iconv-lite "^0.4.17"
@@ -3267,6 +3440,10 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-promise@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.3.0.tgz#d1eb3625c4e6dcbb9b96eeae4425d5a3b135fed2"
+
 glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4993,8 +5170,8 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
     minimist "0.0.8"
 
 moment@^2.11.2:
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
+  version "2.22.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -5023,6 +5200,14 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
+mz@2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
 nan@^2.3.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -6208,20 +6393,24 @@ reduce-function-call@^1.0.1:
   dependencies:
     balanced-match "^0.4.2"
 
-regenerate@^1.2.1:
+regenerate-unicode-properties@^5.1.1:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-5.1.3.tgz#54f5891543468f36f2274b67c6bc4c033c27b308"
+  dependencies:
+    regenerate "^1.3.3"
+
+regenerate@^1.2.1, regenerate@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
 
-regenerator-runtime@^0.11.0:
+regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
-regenerator-transform@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+regenerator-transform@^0.12.3:
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.12.3.tgz#459adfb64f6a27164ab991b7873f45ab969eca8b"
   dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
     private "^0.1.6"
 
 regex-cache@^0.4.2:
@@ -6245,13 +6434,16 @@ regexpu-core@^1.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+regexpu-core@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.1.3.tgz#fb81616dbbc2a917a7419b33f8379144f51eb8d0"
   dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
+    regenerate "^1.3.3"
+    regenerate-unicode-properties "^5.1.1"
+    regjsgen "^0.3.0"
+    regjsparser "^0.2.1"
+    unicode-match-property-ecmascript "^1.0.3"
+    unicode-match-property-value-ecmascript "^1.0.1"
 
 registry-auth-token@^3.0.1:
   version "3.3.2"
@@ -6270,12 +6462,22 @@ regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
 
+regjsgen@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.3.0.tgz#0ee4a3e9276430cda25f1e789ea6c15b87b0cb43"
+
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.2.1.tgz#c3787553faf04e775c302102ef346d995000ec1c"
+  dependencies:
+    jsesc "~0.5.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -6418,7 +6620,7 @@ resolve@1.5.0:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.3.3, resolve@^1.5.0:
+resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
   dependencies:
@@ -7156,6 +7358,18 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  dependencies:
+    any-promise "^1.0.0"
+
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
@@ -7348,6 +7562,25 @@ unfetch@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-3.0.0.tgz#8d1e0513a4ecd0e5ff2d41a6ba77771aae8b6482"
 
+unicode-canonical-property-names-ecmascript@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.3.tgz#f6119f417467593c0086357c85546b6ad5abc583"
+
+unicode-match-property-ecmascript@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.3.tgz#db9b1cb4ffc67e0c5583780b1b59370e4cbe97b9"
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.2"
+    unicode-property-aliases-ecmascript "^1.0.3"
+
+unicode-match-property-value-ecmascript@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.1.tgz#fea059120a016f403afd3bf586162b4db03e0604"
+
+unicode-property-aliases-ecmascript@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.3.tgz#ac3522583b9e630580f916635333e00c5ead690d"
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"

From 09989f56ef31d86c6c8caeededad3e0db88c67dd Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Tue, 3 Apr 2018 09:39:35 +0200
Subject: [PATCH 31/73] 5.0.1-canary.18

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 87724bfa3577b..eff6c42009c82 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "5.0.1-canary.17",
+  "version": "5.0.1-canary.18",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -107,7 +107,7 @@
     "write-file-webpack-plugin": "4.2.0"
   },
   "devDependencies": {
-    "@babel/preset-flow": "7.0.0-beta.43",    
+    "@babel/preset-flow": "7.0.0-beta.43",
     "@taskr/babel": "1.1.0-next.1",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",

From af2fa8ee5703ad1faef92b1df59c0ffdda47b3fe Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Tue, 3 Apr 2018 09:50:03 +0200
Subject: [PATCH 32/73] Bring back 6.0.0-canary.2

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

diff --git a/package.json b/package.json
index eff6c42009c82..0d800023cad5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "5.0.1-canary.18",
+  "version": "6.0.0-canary.2",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From 746a6c083fcb0dbc889d814c248ea2567145607c Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Tue, 3 Apr 2018 09:55:12 +0200
Subject: [PATCH 33/73] 6.0.0-canary.3

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

diff --git a/package.json b/package.json
index 0d800023cad5a..6fd9665f133bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.0-canary.2",
+  "version": "6.0.0-canary.3",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From f2e56609cd61e2c3501ba867c0e9a70edcc5aba4 Mon Sep 17 00:00:00 2001
From: James Hegedus <jthegedus@users.noreply.github.com>
Date: Tue, 3 Apr 2018 22:19:05 +1000
Subject: [PATCH 34/73] Examples: stabalise README format and create-next-app
 usage (#4009)

* Examples: clarify language around Yarn create & npx

* add missing READMEs and create-next-app usage

* suggest people tag jthegedus in firebase related issues

* add yarn alt instructions

* cerebraljs example readme & fixes
---
 examples/active-class-name/README.md          |  5 +-
 examples/basic-css/README.md                  |  5 +-
 examples/custom-charset/{pages => }/README.md | 17 ++++-
 examples/custom-server-actionhero/README.md   | 32 ++++++--
 examples/custom-server-express/README.md      |  5 +-
 examples/custom-server-fastify/README.md      |  5 +-
 examples/custom-server-hapi/README.md         |  5 +-
 examples/custom-server-koa/README.md          |  5 +-
 examples/custom-server-micro/README.md        |  5 +-
 examples/custom-server-nodemon/README.md      |  5 +-
 examples/custom-server-polka/README.md        | 48 ++++++++++++
 examples/custom-server-typescript/README.md   |  5 +-
 examples/custom-server/README.md              |  5 +-
 examples/data-fetch/README.md                 |  5 +-
 examples/form-handler/README.md               |  5 +-
 examples/gh-pages/README.md                   | 31 +++++---
 examples/head-elements/README.md              |  5 +-
 examples/hello-world/README.md                |  5 +-
 examples/layout-component/README.md           |  5 +-
 examples/nested-components/README.md          |  5 +-
 .../README.md                                 | 23 +++++-
 examples/page-transitions/README.md           |  5 +-
 examples/parameterized-routing/README.md      |  5 +-
 examples/pass-server-data/README.md           | 17 ++++-
 examples/progressive-render/README.md         |  5 +-
 examples/root-static-files/README.md          |  5 +-
 examples/shared-modules/README.md             |  5 +-
 examples/ssr-caching/README.md                |  5 +-
 examples/svg-components/README.md             |  5 +-
 examples/using-inferno/README.md              |  5 +-
 examples/using-nerv/README.md                 |  5 +-
 examples/using-preact/README.md               |  5 +-
 examples/using-router/README.md               |  5 +-
 examples/using-with-router/README.md          |  5 +-
 examples/with-absolute-imports/README.md      |  5 +-
 .../README.md                                 |  5 +-
 examples/with-amp/README.md                   |  5 +-
 examples/with-ant-design/README.md            |  5 +-
 examples/with-antd-mobile/README.md           |  5 +-
 examples/with-aphrodite/README.md             |  5 +-
 examples/with-apollo-and-redux-saga/README.md |  5 +-
 examples/with-apollo-and-redux/README.md      |  5 +-
 examples/with-apollo-auth/README.md           |  5 +-
 examples/with-apollo/README.md                |  5 +-
 examples/with-asset-imports/README.md         |  5 +-
 examples/with-babel-macros/README.md          |  5 +-
 examples/with-cerebral/README.md              | 76 +++++++++++++++++++
 examples/with-configured-preset-env/.babelrc  | 33 ++++----
 examples/with-configured-preset-env/README.md | 44 +++++++++++
 examples/with-custom-babel-config/README.md   | 27 +++++--
 examples/with-custom-reverse-proxy/README.md  | 48 +++++++++---
 examples/with-cxs/README.md                   |  5 +-
 examples/with-data-prefetch/README.md         |  5 +-
 examples/with-dotenv/README.md                |  5 +-
 examples/with-draft-js/README.md              |  5 +-
 examples/with-dynamic-import/README.md        |  5 +-
 examples/with-electron/README.md              |  7 +-
 examples/with-emotion-fiber/README.md         | 44 +++++++++++
 examples/with-emotion/README.md               |  5 +-
 examples/with-fela/README.md                  |  5 +-
 .../with-firebase-authentication/README.md    |  5 +-
 examples/with-firebase-hosting/README.md      |  4 +-
 examples/with-flow/README.md                  |  5 +-
 examples/with-freactal/README.md              |  5 +-
 examples/with-glamor/README.md                |  5 +-
 examples/with-glamorous/README.md             |  5 +-
 .../with-global-stylesheet-simple/README.md   | 57 ++++++++++++--
 examples/with-global-stylesheet/README.md     | 29 ++++---
 examples/with-hashed-statics/README.md        |  5 +-
 .../with-higher-order-component/README.md     |  3 +
 examples/with-i18next/README.md               |  5 +-
 examples/with-ioc/README.md                   |  5 +-
 examples/with-jest/README.md                  | 20 ++++-
 examples/with-kea/README.md                   |  5 +-
 examples/with-loading/README.md               |  5 +-
 examples/with-markdown/README.md              |  5 +-
 examples/with-material-ui-next/README.md      |  5 +-
 examples/with-material-ui/README.md           |  5 +-
 examples/with-mobx-state-tree/README.md       | 30 ++++++--
 examples/with-mobx/README.md                  |  5 +-
 examples/with-next-css/README.md              |  5 +-
 examples/with-next-routes/README.md           |  5 +-
 examples/with-next-sass/README.md             | 16 +++-
 examples/with-noscript/README.md              |  5 +-
 examples/with-pkg/README.md                   |  5 +-
 examples/with-polyfills/README.md             | 15 ++++
 examples/with-portals/README.md               |  5 +-
 examples/with-prefetching/README.md           |  5 +-
 examples/with-pretty-url-routing/README.md    |  5 +-
 examples/with-react-ga/README.md              |  5 +-
 examples/with-react-helmet/README.md          | 14 ++--
 examples/with-react-i18next/README.md         | 73 +++++++++++++-----
 examples/with-react-intl/README.md            |  5 +-
 examples/with-react-md/README.md              |  6 +-
 examples/with-react-native-web/README.md      |  5 +-
 examples/with-react-toolbox/README.md         |  5 +-
 examples/with-react-uwp/README.md             |  6 +-
 examples/with-react-with-styles/README.md     |  5 +-
 examples/with-reasonml/README.md              | 18 ++++-
 examples/with-rebass/README.md                |  6 +-
 examples/with-recompose/README.md             |  5 +-
 examples/with-redux-code-splitting/README.md  |  5 +-
 examples/with-redux-observable/README.md      |  5 +-
 .../with-redux-reselect-recompose/README.md   |  5 +-
 examples/with-redux-saga/README.md            |  5 +-
 examples/with-redux-wrapper/README.md         |  5 +-
 examples/with-redux/README.md                 |  5 +-
 examples/with-reflux/README.md                | 44 +++++++++++
 examples/with-refnux/README.md                |  5 +-
 examples/with-relay-modern/README.md          | 17 ++++-
 examples/with-segment-analytics/README.md     |  5 +-
 examples/with-semantic-ui/README.md           |  5 +-
 examples/with-sentry/README.md                |  5 +-
 examples/with-shallow-routing/README.md       |  5 +-
 examples/with-socket.io/README.md             |  5 +-
 examples/with-static-export/README.md         |  5 +-
 examples/with-styled-components/README.md     |  5 +-
 examples/with-styled-jsx-plugins/README.md    |  5 +-
 examples/with-styled-jsx-scss/README.md       |  5 +-
 examples/with-styletron/README.md             |  5 +-
 examples/with-sw-precache/README.md           |  2 +-
 examples/with-tailwindcss/README.md           | 23 +++---
 examples/with-typescript/README.md            | 20 +++--
 .../README.md                                 |  6 +-
 .../with-universal-configuration/README.md    |  5 +-
 examples/with-url-object-routing/README.md    |  5 +-
 .../with-webpack-bundle-analyzer/README.md    |  8 +-
 .../README.md                                 |  8 +-
 examples/with-zones/README.md                 | 54 +++++++++++--
 129 files changed, 1135 insertions(+), 256 deletions(-)
 rename examples/custom-charset/{pages => }/README.md (66%)
 create mode 100644 examples/custom-server-polka/README.md
 create mode 100644 examples/with-cerebral/README.md
 create mode 100644 examples/with-configured-preset-env/README.md
 create mode 100644 examples/with-emotion-fiber/README.md
 create mode 100644 examples/with-reflux/README.md

diff --git a/examples/active-class-name/README.md b/examples/active-class-name/README.md
index 83d5ca9d88896..6b7a94f511d51 100644
--- a/examples/active-class-name/README.md
+++ b/examples/active-class-name/README.md
@@ -6,7 +6,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/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 active-class-name active-class-name-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/basic-css/README.md b/examples/basic-css/README.md
index ccca8b64faa3e..7a203f11920ad 100644
--- a/examples/basic-css/README.md
+++ b/examples/basic-css/README.md
@@ -6,7 +6,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/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 basic-css basic-css-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/custom-charset/pages/README.md b/examples/custom-charset/README.md
similarity index 66%
rename from examples/custom-charset/pages/README.md
rename to examples/custom-charset/README.md
index cc4798c68efec..b4dda2eb70d83 100644
--- a/examples/custom-charset/pages/README.md
+++ b/examples/custom-charset/README.md
@@ -1,9 +1,19 @@
-[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/custom-server)
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/custom-charset)
 
 # Custom server 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 custom-charset custom-charset-app
+# or
+yarn create next-app --example custom-charset custom-charset-app
+```
+
 ### Download manually
 
 Download the example [or clone the repo](https://github.com/zeit/next.js):
@@ -18,6 +28,9 @@ 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))
@@ -28,7 +41,7 @@ now
 
 ## The idea behind the example
 
-The HTTP/1.1 specification says - if charset is not set in the http header then the browser defaults use ISO-8859-1. 
+The HTTP/1.1 specification says - if charset is not set in the http header then the browser defaults use ISO-8859-1.
 For languages like Polish, Albanian, Hungarian, Czech, Slovak, Slovene, there will be broken characters encoding from SSR.
 
 You can overwrite Content-Type in getInitialProps. But if you want to handle it as a server side concern, you can use this as an simple example.
diff --git a/examples/custom-server-actionhero/README.md b/examples/custom-server-actionhero/README.md
index e4c0d6e509321..0270f447b1646 100644
--- a/examples/custom-server-actionhero/README.md
+++ b/examples/custom-server-actionhero/README.md
@@ -5,14 +5,36 @@ This configuration works with both Next and ActionHero hot reloading of code.
 
 A more detailed example showcasing how to use fetch and web sockets to interact with your API can be found here: https://github.com/actionhero/next-in-actionhero
 
-## To install:
-(assuming you have [node](http://nodejs.org/) and NPM installed)
+## How to use
 
-`npm install`
+### Using `create-next-app`
 
-## To Run:
-`npm start`
+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 custom-server-actionhero custom-server-actionhero-app
+# or
+yarn create next-app --example custom-server-actionhero custom-server-actionhero-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/custom-server-actionhero
+cd custom-server-actionhero
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run start
+# or
+yarn
+yarn start
+```
 
 ## How does this work?
 
diff --git a/examples/custom-server-express/README.md b/examples/custom-server-express/README.md
index f61a45dd9410c..0aff12936876b 100644
--- a/examples/custom-server-express/README.md
+++ b/examples/custom-server-express/README.md
@@ -6,7 +6,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/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 custom-server-express custom-server-express-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/custom-server-fastify/README.md b/examples/custom-server-fastify/README.md
index 25d388f1e2a14..f1e7ea24d6c0c 100644
--- a/examples/custom-server-fastify/README.md
+++ b/examples/custom-server-fastify/README.md
@@ -6,7 +6,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/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 custom-server-fastify custom-server-fastify-app
@@ -28,6 +28,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 Fastify
 Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
diff --git a/examples/custom-server-hapi/README.md b/examples/custom-server-hapi/README.md
index 787f1b5dbf1ec..11c65c22d99cc 100644
--- a/examples/custom-server-hapi/README.md
+++ b/examples/custom-server-hapi/README.md
@@ -6,7 +6,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/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 custom-server-hapi custom-server-hapi-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/custom-server-koa/README.md b/examples/custom-server-koa/README.md
index e4c32ff91259c..b03d3612966a8 100644
--- a/examples/custom-server-koa/README.md
+++ b/examples/custom-server-koa/README.md
@@ -6,7 +6,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/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 custom-server-koa custom-server-koa-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/custom-server-micro/README.md b/examples/custom-server-micro/README.md
index 39979b0f17417..2c2622dbc5d41 100644
--- a/examples/custom-server-micro/README.md
+++ b/examples/custom-server-micro/README.md
@@ -6,7 +6,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/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 custom-server-micro custom-server-micro-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/custom-server-nodemon/README.md b/examples/custom-server-nodemon/README.md
index 0ee78d271e27b..0ff1ff52d57e1 100644
--- a/examples/custom-server-nodemon/README.md
+++ b/examples/custom-server-nodemon/README.md
@@ -6,7 +6,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/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 custom-server-nodemon custom-server-nodemon-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/custom-server-polka/README.md b/examples/custom-server-polka/README.md
new file mode 100644
index 0000000000000..887d29dd196b3
--- /dev/null
+++ b/examples/custom-server-polka/README.md
@@ -0,0 +1,48 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/custom-server-polka)
+
+# Custom [Polka](https://github.com/lukeed/polka) Server 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 custom-server-polka custom-server-polka-app
+# or
+yarn create next-app --example custom-server-polka custom-server-polka-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/custom-server-polka
+cd custom-server-polka
+```
+
+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
+
+Most of the times the default Next server will be enough but sometimes you want to run your own server to customize routes or other kind of the app behavior. Next provides a [Custom server and routing](https://github.com/zeit/next.js#custom-server-and-routing) so you can customize as much as you want.
+
+Because the Next.js server is just a node.js module you can combine it with any other part of the node.js ecosystem. in this case we are using express to build a custom router on top of Next.
+
+The example shows a server that serves the component living in `pages/a.js` when the route `/b` is requested and `pages/b.js` when the route `/a` is accessed. This is obviously a non-standard routing strategy. You can see how this custom routing is being made inside `server.js`.
diff --git a/examples/custom-server-typescript/README.md b/examples/custom-server-typescript/README.md
index a440e61635b13..9526ac7805e00 100644
--- a/examples/custom-server-typescript/README.md
+++ b/examples/custom-server-typescript/README.md
@@ -6,7 +6,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/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 custom-server-typescript custom-server-typescript-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/custom-server/README.md b/examples/custom-server/README.md
index 79c1c393939cb..7d878728aba9e 100644
--- a/examples/custom-server/README.md
+++ b/examples/custom-server/README.md
@@ -6,7 +6,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/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 custom-server custom-server-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/data-fetch/README.md b/examples/data-fetch/README.md
index c30ba3327a700..4dd0c1ae1bbe7 100644
--- a/examples/data-fetch/README.md
+++ b/examples/data-fetch/README.md
@@ -6,7 +6,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/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 data-fetch data-fetch-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/form-handler/README.md b/examples/form-handler/README.md
index 370f5969361f9..0ddf8c8a566b8 100644
--- a/examples/form-handler/README.md
+++ b/examples/form-handler/README.md
@@ -6,7 +6,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/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 form-handler form-handler-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/gh-pages/README.md b/examples/gh-pages/README.md
index a2893e1a63730..a7b1f65085fe1 100644
--- a/examples/gh-pages/README.md
+++ b/examples/gh-pages/README.md
@@ -2,6 +2,16 @@
 
 ## 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 gh-pages gh-pages-app
+# or
+yarn create next-app --example gh-pages gh-pages-app
+```
+
 ### Download manually
 
 Download the example [or clone the repo](https://github.com/zeit/next.js):
@@ -16,17 +26,20 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 ### Deploy it to github
 
-Edit ```env-config.js``` and replace ```'Next-gh-page-example'``` by your project name.
+Edit `env-config.js` and replace `'Next-gh-page-example'` by your project name.
 
-Edit ```next.config.js``` and replace ```'Next-gh-page-example'``` by your project name.
+Edit `next.config.js` and replace `'Next-gh-page-example'` by your project name.
 
-1. Create repository.
-2. Link it to your github account.
-3. Publish your master branch.
+1.  Create repository.
+2.  Link it to your github account.
+3.  Publish your master branch.
 
 ```bash
 npm run deploy
@@ -34,22 +47,18 @@ npm run deploy
 
 Test it:
 
-Replace 'github-user-name' and 'github-project-name'
+Replace `<github-user-name>` and `<github-project-name>`
 
 ```bash
-
-https://github-user-name.github.io/github-project-name/
-
+https://<github-user-name>.github.io/<github-project-name>/
 ```
 
 Example:
 
 ```bash
-
 https://github.com/thierryc/Next-gh-page-example/
 
 https://thierryc.github.io/Next-gh-page-example/
-
 ```
 
 ## The idea behind the example
diff --git a/examples/head-elements/README.md b/examples/head-elements/README.md
index 8d32b78f7fa46..4d39d91a1d818 100644
--- a/examples/head-elements/README.md
+++ b/examples/head-elements/README.md
@@ -6,7 +6,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/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 head-elements head-elements-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/hello-world/README.md b/examples/hello-world/README.md
index 62e274686cdb3..01a18a3f36c74 100644
--- a/examples/hello-world/README.md
+++ b/examples/hello-world/README.md
@@ -6,7 +6,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/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 hello-world hello-world-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/layout-component/README.md b/examples/layout-component/README.md
index a347a77b082fa..bd8b514c48f6e 100644
--- a/examples/layout-component/README.md
+++ b/examples/layout-component/README.md
@@ -6,7 +6,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/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 layout-component layout-component-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/nested-components/README.md b/examples/nested-components/README.md
index fd2e1ad64a658..f2fe6da831ad8 100644
--- a/examples/nested-components/README.md
+++ b/examples/nested-components/README.md
@@ -6,7 +6,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/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 nested-components nested-components-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/only-client-render-external-dependencies/README.md b/examples/only-client-render-external-dependencies/README.md
index 6e135f8e19c0d..96ed406de8199 100644
--- a/examples/only-client-render-external-dependencies/README.md
+++ b/examples/only-client-render-external-dependencies/README.md
@@ -1,6 +1,20 @@
-# Hello World example
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/only-client-render-external-dependencies)
 
-## Only client render for external dependencies
+# Only client render for external dependencies
+
+## 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 only-client-render-external-dependencies only-client-render-external-dependencies-app
+# or
+yarn create next-app --example only-client-render-external-dependencies only-client-render-external-dependencies-app
+```
+
+### Download manually
 
 Download the example [or clone the repo](https://github.com/zeit/next.js):
 
@@ -14,6 +28,9 @@ 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))
@@ -24,4 +41,4 @@ now
 
 ## The idea behind the example
 
-This example shows how to use an external dependency that only allows client-render.
\ No newline at end of file
+This example shows how to use an external dependency that only allows client-render.
diff --git a/examples/page-transitions/README.md b/examples/page-transitions/README.md
index 5f537bbb534e4..b371d5c8b7b7e 100644
--- a/examples/page-transitions/README.md
+++ b/examples/page-transitions/README.md
@@ -6,7 +6,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/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 page-transitions page-transitions-app
@@ -26,6 +26,9 @@ cd page-transitions
 Install it and run:
 
 ```bash
+npm install
+npm run dev
+# or
 yarn
 yarn dev
 ```
diff --git a/examples/parameterized-routing/README.md b/examples/parameterized-routing/README.md
index e4df754f2eb2e..72d41e40316c2 100644
--- a/examples/parameterized-routing/README.md
+++ b/examples/parameterized-routing/README.md
@@ -6,7 +6,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/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 parameterized-routing parameterized-routing-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/pass-server-data/README.md b/examples/pass-server-data/README.md
index 8943155ab7cd9..d348235788ebc 100644
--- a/examples/pass-server-data/README.md
+++ b/examples/pass-server-data/README.md
@@ -4,6 +4,18 @@
 
 ## 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 pass-server-data pass-server-data-app
+# or
+yarn create next-app --example pass-server-data pass-server-data-app
+```
+
+### Download manually
+
 Download the example [or clone the repo](https://github.com/zeit/next.js):
 
 ```bash
@@ -16,6 +28,9 @@ 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))
@@ -39,7 +54,7 @@ data cached from an API call) in `operations/get-item.js`. It has two routes: a
 data from the get-item operation, passed as a query parameter in `routes/item.js`.
 
 We use this data in `pages/item.js` if rendered server-side, or make a fetch request if rendered client-side.
-The server knows whether or not to use next.js to render the route based on the Accept header, which will be 
+The server knows whether or not to use next.js to render the route based on the Accept header, which will be
 `application/json` when we fetch client-side.
 
 Take a look at the following files:
diff --git a/examples/progressive-render/README.md b/examples/progressive-render/README.md
index b98dc15b27dfe..b53803352d6cb 100644
--- a/examples/progressive-render/README.md
+++ b/examples/progressive-render/README.md
@@ -5,7 +5,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/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 progressive-render progressive-render-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/root-static-files/README.md b/examples/root-static-files/README.md
index 53879a1e69426..3aee7aab80de0 100644
--- a/examples/root-static-files/README.md
+++ b/examples/root-static-files/README.md
@@ -6,7 +6,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/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 root-static-files root-static-files-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/shared-modules/README.md b/examples/shared-modules/README.md
index 95cc44ddfaf91..0ae1ab6d9d144 100644
--- a/examples/shared-modules/README.md
+++ b/examples/shared-modules/README.md
@@ -5,7 +5,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/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 shared-modules shared-modules-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/ssr-caching/README.md b/examples/ssr-caching/README.md
index ce835c18e7bbb..1cd8757618064 100644
--- a/examples/ssr-caching/README.md
+++ b/examples/ssr-caching/README.md
@@ -6,7 +6,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/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 ssr-caching ssr-caching-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/svg-components/README.md b/examples/svg-components/README.md
index bdb2562809ed5..8502e3c27ba20 100644
--- a/examples/svg-components/README.md
+++ b/examples/svg-components/README.md
@@ -6,7 +6,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/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 svg-components svg-components-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/using-inferno/README.md b/examples/using-inferno/README.md
index 8d787acf0e383..9acab025dbd70 100644
--- a/examples/using-inferno/README.md
+++ b/examples/using-inferno/README.md
@@ -6,7 +6,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/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 using-inferno using-inferno-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/using-nerv/README.md b/examples/using-nerv/README.md
index f01441336b0b9..b25f94c772239 100644
--- a/examples/using-nerv/README.md
+++ b/examples/using-nerv/README.md
@@ -6,7 +6,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/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 using-nerv using-nerv-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/using-preact/README.md b/examples/using-preact/README.md
index aa8728f858368..130765685b871 100644
--- a/examples/using-preact/README.md
+++ b/examples/using-preact/README.md
@@ -6,7 +6,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/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 using-preact using-preact-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/using-router/README.md b/examples/using-router/README.md
index f12948790bc9e..ad75557a1d6d5 100644
--- a/examples/using-router/README.md
+++ b/examples/using-router/README.md
@@ -5,7 +5,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/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 using-router using-router-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/using-with-router/README.md b/examples/using-with-router/README.md
index 851368f0b187d..6d3f25371729e 100644
--- a/examples/using-with-router/README.md
+++ b/examples/using-with-router/README.md
@@ -5,7 +5,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/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 using-with-router using-with-router-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-absolute-imports/README.md b/examples/with-absolute-imports/README.md
index 769b354de30e8..d1e123a24746f 100644
--- a/examples/with-absolute-imports/README.md
+++ b/examples/with-absolute-imports/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/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-absolute-imports with-absolute-imports-app
@@ -26,6 +26,9 @@ 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))
diff --git a/examples/with-algolia-react-instantsearch/README.md b/examples/with-algolia-react-instantsearch/README.md
index eb07b499c0c68..019e790cf9b17 100644
--- a/examples/with-algolia-react-instantsearch/README.md
+++ b/examples/with-algolia-react-instantsearch/README.md
@@ -6,7 +6,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/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-algolia-react-instantsearch with-algolia-react-instantsearch-app
@@ -32,6 +32,9 @@ 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))
diff --git a/examples/with-amp/README.md b/examples/with-amp/README.md
index 58f185ecbdf47..1c41b452df648 100644
--- a/examples/with-amp/README.md
+++ b/examples/with-amp/README.md
@@ -6,7 +6,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/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-amp with-amp-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-ant-design/README.md b/examples/with-ant-design/README.md
index f8cbfb3a9c89a..88628c71d9b25 100644
--- a/examples/with-ant-design/README.md
+++ b/examples/with-ant-design/README.md
@@ -6,7 +6,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/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-ant-design with-ant-design-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-antd-mobile/README.md b/examples/with-antd-mobile/README.md
index a593e1be37665..64db6188e0058 100644
--- a/examples/with-antd-mobile/README.md
+++ b/examples/with-antd-mobile/README.md
@@ -5,7 +5,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/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-antd-mobile with-antd-mobile-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-aphrodite/README.md b/examples/with-aphrodite/README.md
index 187e5339f7b4d..1c215ae4cb90e 100644
--- a/examples/with-aphrodite/README.md
+++ b/examples/with-aphrodite/README.md
@@ -6,7 +6,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/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-aphrodite with-aphrodite-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-apollo-and-redux-saga/README.md b/examples/with-apollo-and-redux-saga/README.md
index 226e29f603bca..992160a0db44c 100644
--- a/examples/with-apollo-and-redux-saga/README.md
+++ b/examples/with-apollo-and-redux-saga/README.md
@@ -5,7 +5,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/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-apollo-and-redux-saga with-apollo-and-redux-saga-app
@@ -27,6 +27,9 @@ 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)):
diff --git a/examples/with-apollo-and-redux/README.md b/examples/with-apollo-and-redux/README.md
index 5f3b19401409b..9357e9248121b 100644
--- a/examples/with-apollo-and-redux/README.md
+++ b/examples/with-apollo-and-redux/README.md
@@ -5,7 +5,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/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-apollo-and-redux with-apollo-and-redux-app
@@ -27,6 +27,9 @@ 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)):
diff --git a/examples/with-apollo-auth/README.md b/examples/with-apollo-auth/README.md
index 00482128d81cb..281002f98b209 100644
--- a/examples/with-apollo-auth/README.md
+++ b/examples/with-apollo-auth/README.md
@@ -9,7 +9,7 @@ https://next-with-apollo-auth.now.sh
 
 ### 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/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-apollo-auth with-apollo-auth-app
@@ -31,6 +31,9 @@ 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)):
diff --git a/examples/with-apollo/README.md b/examples/with-apollo/README.md
index feee245d2965e..81b08227e466d 100644
--- a/examples/with-apollo/README.md
+++ b/examples/with-apollo/README.md
@@ -9,7 +9,7 @@ https://next-with-apollo.now.sh
 
 ### 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/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-apollo with-apollo-app
@@ -31,6 +31,9 @@ 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)):
diff --git a/examples/with-asset-imports/README.md b/examples/with-asset-imports/README.md
index c2f58c781e983..d46aec1b83e34 100644
--- a/examples/with-asset-imports/README.md
+++ b/examples/with-asset-imports/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/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-asset-imports with-asset-imports-app
@@ -26,6 +26,9 @@ 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))
diff --git a/examples/with-babel-macros/README.md b/examples/with-babel-macros/README.md
index 6780c9232b38f..6168f29dd0ec0 100644
--- a/examples/with-babel-macros/README.md
+++ b/examples/with-babel-macros/README.md
@@ -6,7 +6,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/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-babel-macros with-babel-macros-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-cerebral/README.md b/examples/with-cerebral/README.md
new file mode 100644
index 0000000000000..c216f6892db27
--- /dev/null
+++ b/examples/with-cerebral/README.md
@@ -0,0 +1,76 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-cerebral)
+
+# Declarative State & Side-effect management with [CerebralJS](https://cerebraljs.com/)
+
+## 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-cerebral with-cerebral-app
+# or
+yarn create next-app --example with-cerebral with-cerebral-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/master | tar -xz --strip=2 next.js-master/examples/with-cerebral
+cd with-cerebral
+```
+
+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
+
+Use [CerebralJS](https://cerebraljs.com/) to manage an apps state and side effects in a declarative manner:
+
+Declarative CerebralJS:
+
+```js
+[
+  setLoading(true),
+  getUser,
+  {
+    success: setUser,
+    error: setError,
+  },
+  setLoading(false),
+];
+```
+
+vs imperative JS:
+
+```js
+function getUser() {
+  this.isLoading = true;
+  ajax
+    .get("/user")
+    .then(user => {
+      this.data = user;
+      this.isLoading = false;
+    })
+    .catch(error => {
+      this.error = error;
+      this.isLoading = false;
+    });
+}
+```
diff --git a/examples/with-configured-preset-env/.babelrc b/examples/with-configured-preset-env/.babelrc
index f50191947c699..38d317aa9b9bc 100644
--- a/examples/with-configured-preset-env/.babelrc
+++ b/examples/with-configured-preset-env/.babelrc
@@ -1,25 +1,26 @@
 {
   "env": {
     "production": {
-      "presets": [
-        "next/babel"
-      ]
+      "presets": ["next/babel"]
     },
     "development": {
       "presets": [
-        ["next/babel", {
-          "preset-env": {
-	    "targets": {
-	      "browsers": "last 1 Chrome version",
-	      "node": true
-	    }
-          },
-	  "transform-runtime": {
-	    "regenerator": false,
-	    "useBuiltIns": true,
-	    "polyfill": false
-	  }
-        }]
+        [
+          "next/babel",
+          {
+            "preset-env": {
+              "targets": {
+                "browsers": "last 1 Chrome version",
+                "node": true
+              }
+            },
+            "transform-runtime": {
+              "regenerator": false,
+              "useBuiltIns": true,
+              "polyfill": false
+            }
+          }
+        ]
       ]
     }
   }
diff --git a/examples/with-configured-preset-env/README.md b/examples/with-configured-preset-env/README.md
new file mode 100644
index 0000000000000..9edb2f075fb31
--- /dev/null
+++ b/examples/with-configured-preset-env/README.md
@@ -0,0 +1,44 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-configured-preset-env)
+
+# Example preconfigured Babel [preset-env](https://github.com/babel/babel/tree/master/packages/babel-preset-env)
+
+## 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-configured-preset-env with-configured-preset-env-app
+# or
+yarn create next-app --example with-configured-preset-env with-configured-preset-env-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-configured-preset-env
+cd with-configured-preset-env
+```
+
+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 customize `.babelrc` with `@babel/preset-env`.
diff --git a/examples/with-custom-babel-config/README.md b/examples/with-custom-babel-config/README.md
index b6c429a7015d1..22cf28372fd8f 100644
--- a/examples/with-custom-babel-config/README.md
+++ b/examples/with-custom-babel-config/README.md
@@ -1,5 +1,20 @@
 [![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-custom-babel-config)
-# Example app using custom babel config
+
+# Using a custom Babel config
+
+## 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-custom-babel-config with-custom-babel-config-app
+# or
+yarn create next-app --example with-custom-babel-config with-custom-babel-config-app
+```
+
+### Download manually
 
 Download the example [or clone the repo](https://github.com/zeit/next.js):
 
@@ -13,6 +28,9 @@ 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))
@@ -30,10 +48,3 @@ This example features:
 * It uses '.babelrc' file in the app directory to add above preset.
 
 > Most of the time, when writing a custom `.babelrc` file, you need to add `next/babel` as a preset.
-
-## How to run it
-
-```sh
-npm install
-npm run dev
-```
diff --git a/examples/with-custom-reverse-proxy/README.md b/examples/with-custom-reverse-proxy/README.md
index bb5774a24df21..a24f03ad2df5a 100644
--- a/examples/with-custom-reverse-proxy/README.md
+++ b/examples/with-custom-reverse-proxy/README.md
@@ -1,3 +1,36 @@
+# Reverse Proxy 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-custom-reverse-proxy with-custom-reverse-proxy-app
+# or
+yarn create next-app --example with-custom-reverse-proxy with-custom-reverse-proxy-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/master | tar -xz --strip=2 next.js-master/examples/with-custom-reverse-proxy
+cd with-custom-reverse-proxy
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run dev
+# or
+yarn
+yarn dev
+```
+
 ## The idea behind the example
 
 This example applies this gist https://gist.github.com/jamsesso/67fd937b74989dc52e33 to Nextjs and provides:
@@ -7,21 +40,16 @@ This example applies this gist https://gist.github.com/jamsesso/67fd937b74989dc5
 
 Sorry for the extra packages. I belong to the minority camp of writing ES6 code on Windows developers. Essentially you only need `http-proxy-middleware` on top of bare-bone Nextjs setup to run this example.
 
-## How to run it
-
-```bash
-npm i; npm run build; npm run dev;
-```
-
 ## What it does
+
 Take any random query string to the index page and does a GET to `/api/<query string>` which gets routed internally to `https://swapi.co/api/<query string>`, or any API endpoint you wish to configure through the proxy.
 
 ## Expectation
 
-```
 /api/people/2 routed to https://swapi.co/api/people/2
 Try Reset
 
+```json
 {
   "name": "C-3PO",
   "height": "167",
@@ -40,13 +68,11 @@ Try Reset
     "https://swapi.co/api/films/3/",
     "https://swapi.co/api/films/1/"
   ],
-  "species": [
-    "https://swapi.co/api/species/2/"
-  ],
+  "species": ["https://swapi.co/api/species/2/"],
   "vehicles": [],
   "starships": [],
   "created": "2014-12-10T15:10:51.357000Z",
   "edited": "2014-12-20T21:17:50.309000Z",
   "url": "https://swapi.co/api/people/2/"
 }
-```
\ No newline at end of file
+```
diff --git a/examples/with-cxs/README.md b/examples/with-cxs/README.md
index 4d2fbbe8f1334..6b5f671eb11eb 100644
--- a/examples/with-cxs/README.md
+++ b/examples/with-cxs/README.md
@@ -6,7 +6,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/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-cxs with-cxs-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-data-prefetch/README.md b/examples/with-data-prefetch/README.md
index 25b087a277702..574aacffb344a 100644
--- a/examples/with-data-prefetch/README.md
+++ b/examples/with-data-prefetch/README.md
@@ -5,7 +5,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/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-data-prefetch with-data-prefetch-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-dotenv/README.md b/examples/with-dotenv/README.md
index 95cba84042f4f..a29b6fb296eb0 100644
--- a/examples/with-dotenv/README.md
+++ b/examples/with-dotenv/README.md
@@ -6,7 +6,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/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-dotenv with-dotenv-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-draft-js/README.md b/examples/with-draft-js/README.md
index 64c4531e2e7a5..680f37bb4c599 100644
--- a/examples/with-draft-js/README.md
+++ b/examples/with-draft-js/README.md
@@ -5,7 +5,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/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-draft-js
@@ -27,6 +27,9 @@ 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)):
diff --git a/examples/with-dynamic-import/README.md b/examples/with-dynamic-import/README.md
index 39e203be5617a..d3bd4aaa55015 100644
--- a/examples/with-dynamic-import/README.md
+++ b/examples/with-dynamic-import/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/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-dynamic-import with-dynamic-import-app
@@ -26,6 +26,9 @@ 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))
diff --git a/examples/with-electron/README.md b/examples/with-electron/README.md
index 3a07ccda4862e..e85894986ce67 100644
--- a/examples/with-electron/README.md
+++ b/examples/with-electron/README.md
@@ -6,7 +6,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/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-electron with-electron-app
@@ -27,7 +27,10 @@ Install it and run:
 
 ```bash
 npm install
-npm start
+npm run start
+# or
+yarn
+yarn start
 ```
 
 ## The idea behind the example
diff --git a/examples/with-emotion-fiber/README.md b/examples/with-emotion-fiber/README.md
new file mode 100644
index 0000000000000..8e09a42f317d2
--- /dev/null
+++ b/examples/with-emotion-fiber/README.md
@@ -0,0 +1,44 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-emotion-fiber)
+
+# Pass Server Data Directly to a Next.js Page during SSR
+
+## 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-emotion-fiber with-emotion-fiber-app
+# or
+yarn create next-app --example with-emotion-fiber with-emotion-fiber-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/master | tar -xz --strip=2 next.js-master/examples/with-emotion-fiber
+cd with-emotion-fiber
+```
+
+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
+
+Extract and inline critical css with [emotion](https://github.com/emotion-js/emotion) using [emotion-server](https://github.com/emotion-js/emotion/tree/master/packages/emotion-server) and [react-emotion](https://github.com/emotion-js/emotion/tree/master/packages/react-emotion).
diff --git a/examples/with-emotion/README.md b/examples/with-emotion/README.md
index 7ae15dceb9451..fc2d7d9d6d751 100644
--- a/examples/with-emotion/README.md
+++ b/examples/with-emotion/README.md
@@ -6,7 +6,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/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-emotion with-emotion-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-fela/README.md b/examples/with-fela/README.md
index 9a69f53b9f9dc..4579ed9fe8007 100755
--- a/examples/with-fela/README.md
+++ b/examples/with-fela/README.md
@@ -6,7 +6,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/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-fela with-fela-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-firebase-authentication/README.md b/examples/with-firebase-authentication/README.md
index 6637294e11b16..04cfd9bd98371 100644
--- a/examples/with-firebase-authentication/README.md
+++ b/examples/with-firebase-authentication/README.md
@@ -6,7 +6,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/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-firebase-authentication with-firebase-authentication-app
@@ -35,6 +35,9 @@ 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))
diff --git a/examples/with-firebase-hosting/README.md b/examples/with-firebase-hosting/README.md
index 63494e9a24cc6..8c70d74ea76ac 100644
--- a/examples/with-firebase-hosting/README.md
+++ b/examples/with-firebase-hosting/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/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-firebase-hosting with-firebase-hosting-app
@@ -65,6 +65,8 @@ The goal is to host the Next.js app on Firebase Cloud Functions with Firebase Ho
 
 This is based off of the work at https://github.com/geovanisouza92/serverless-firebase & https://github.com/jthegedus/firebase-functions-next-example as described [here](https://medium.com/@jthegedus/next-js-on-cloud-functions-for-firebase-with-firebase-hosting-7911465298f2).
 
+If you're having issues, feel free to tag @jthegedus in the [issue you create on the next.js repo](https://github.com/zeit/next.js/issues/new)
+
 ## Important
 
 * The empty `placeholder.html` file is so Firebase Hosting does not error on an empty `public/` folder and still hosts at the Firebase project URL.
diff --git a/examples/with-flow/README.md b/examples/with-flow/README.md
index a1f17e14df1b6..2d4125439bee7 100644
--- a/examples/with-flow/README.md
+++ b/examples/with-flow/README.md
@@ -5,7 +5,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/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-flow with-flow-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-freactal/README.md b/examples/with-freactal/README.md
index 9d520e59a8883..22f43df708e54 100644
--- a/examples/with-freactal/README.md
+++ b/examples/with-freactal/README.md
@@ -6,7 +6,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/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-freactal with-freactal-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-glamor/README.md b/examples/with-glamor/README.md
index 98fe5852bda3e..1c8ee279b5f1a 100644
--- a/examples/with-glamor/README.md
+++ b/examples/with-glamor/README.md
@@ -6,7 +6,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/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-glamor with-glamor-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-glamorous/README.md b/examples/with-glamorous/README.md
index 44afacb57f602..7144c24481e1c 100644
--- a/examples/with-glamorous/README.md
+++ b/examples/with-glamorous/README.md
@@ -6,7 +6,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/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-glamorous with-glamorous-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-global-stylesheet-simple/README.md b/examples/with-global-stylesheet-simple/README.md
index 948d70c78c1d8..d7cbd023c1150 100644
--- a/examples/with-global-stylesheet-simple/README.md
+++ b/examples/with-global-stylesheet-simple/README.md
@@ -1,6 +1,45 @@
 [![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-global-stylesheet-simple)
 
-## Global Stylesheet Example (Simple Version - CSS inside `node_modules`)
+# Global Stylesheet Example (Simple Version - CSS inside `node_modules`)
+
+## 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-global-stylesheet-simple with-global-stylesheet-simple-app
+# or
+yarn create next-app --example with-global-stylesheet-simple with-global-stylesheet-simple-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/master | tar -xz --strip=2 next.js-master/examples/with-global-stylesheet-simple
+cd with-global-stylesheet-simple
+```
+
+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 is an example of importing a CSS file located inside `node_modules` (ones you downloaded using `npm` or `yarn`).
 
@@ -12,8 +51,8 @@ Check out the [with-global-stylesheet](../with-global-stylesheet) example.
 
 ### How It Works
 
-- Install `babel-plugin-inline-import` using `npm` or `yarn`
-- Then, add this to your `.babelrc`:
+* Install `babel-plugin-inline-import` using `npm` or `yarn`
+* Then, add this to your `.babelrc`:
 
 ```js
 {
@@ -30,17 +69,19 @@ Check out the [with-global-stylesheet](../with-global-stylesheet) example.
 }
 ```
 
-- Install any CSS library using `npm` or `yarn`. In this example, I installed [`tachyons`](http://tachyons.io/).
-- Import the CSS file. Here, I'm importing a CSS file located at `node_modules/tachyons/css/tachyons.min.css`.
+* Install any CSS library using `npm` or `yarn`. In this example, I installed [`tachyons`](http://tachyons.io/).
+* Import the CSS file. Here, I'm importing a CSS file located at `node_modules/tachyons/css/tachyons.min.css`.
 
 ```js
-import tachyons from 'tachyons/css/tachyons.min.css'
+import tachyons from "tachyons/css/tachyons.min.css";
 ```
 
-- Add it globally using `styled-jsx`:
+* Add it globally using `styled-jsx`:
 
 ```js
-<style jsx global>{tachyons}</style>
+<style jsx global>
+  {tachyons}
+</style>
 ```
 
 ### Result ([`index.js`](pages/index.js)):
diff --git a/examples/with-global-stylesheet/README.md b/examples/with-global-stylesheet/README.md
index 1d84005cc78ec..d31912eaf54bf 100644
--- a/examples/with-global-stylesheet/README.md
+++ b/examples/with-global-stylesheet/README.md
@@ -1,14 +1,14 @@
 [![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-global-stylesheet)
+
 # Global Stylesheet example
 
 This is an example of how you can include a global stylesheet in a next.js webapp.
 
-
 ## How to use
 
 ### 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/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-global-stylesheet with-global-stylesheet-app
@@ -27,8 +27,13 @@ cd with-global-stylesheet
 
 To get this example running you just need to
 
-    npm install .
-    npm run dev
+```bash
+npm install
+npm run dev
+# or
+yarn
+yarn dev
+```
 
 Visit [http://localhost:3000](http://localhost:3000) and try to modify `styles/index.scss` changing color. Your changes should be picked up instantly.
 
@@ -41,23 +46,23 @@ Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.
 now
 ```
 
-
 ## The idea behind the example
 
 The strategy here is to transpile the stylesheet file to a css-in-js file so that it can be loaded and hot reloaded both on the server and the client. For this purpose I created a babel loader plugin called [babel-loader-wrap-in-js](https://github.com/davibe/babel-plugin-wrap-in-js).
 
 Another babel plugin [module-resolver](https://github.com/tleunen/babel-plugin-module-resolver) enables us to import stylesheets from js (e.g. pages or components) through a `styles` directory alias rather than relative paths.
 
-The `sass-loader` is configured with `includePaths: ['styles', 'node_modules']` so that your scss can `@import` from those places, again without relative paths, for maximum convenience and ability to use npm-published libraries.  Furthermore, `glob` paths are also supported, so one could for example add `'node_modules/@material/*'` to the `includePaths`, which would make [material-components-web](https://github.com/material-components/material-components-web) (if you'd like) even easier to work with.
+The `sass-loader` is configured with `includePaths: ['styles', 'node_modules']` so that your scss can `@import` from those places, again without relative paths, for maximum convenience and ability to use npm-published libraries. Furthermore, `glob` paths are also supported, so one could for example add `'node_modules/@material/*'` to the `includePaths`, which would make [material-components-web](https://github.com/material-components/material-components-web) (if you'd like) even easier to work with.
 
-Furthermore, PostCSS is used to [pre-process](https://medium.com/@ddprrt/deconfusing-pre-and-post-processing-d68e3bd078a3) both `css` and `scss` stylesheets, the latter after Sass pre-processing.  This is to illustrate `@import 'normalize.css';` from `node_modules` thanks to `postcss-easy-import`.  [Autoprefixer](https://github.com/postcss/autoprefixer) is also added as a "best practice".  Consider [cssnext](http://cssnext.io) instead, which includes `autoprefixer` as well as many other CSS spec features.
+Furthermore, PostCSS is used to [pre-process](https://medium.com/@ddprrt/deconfusing-pre-and-post-processing-d68e3bd078a3) both `css` and `scss` stylesheets, the latter after Sass pre-processing. This is to illustrate `@import 'normalize.css';` from `node_modules` thanks to `postcss-easy-import`. [Autoprefixer](https://github.com/postcss/autoprefixer) is also added as a "best practice". Consider [cssnext](http://cssnext.io) instead, which includes `autoprefixer` as well as many other CSS spec features.
 
 This project shows how you can set it up. Have a look at:
-- .babelrc
-- next.config.js
-- pages/index.js
-- postcss.config.js
-- styles/index.scss
+
+* .babelrc
+* next.config.js
+* pages/index.js
+* postcss.config.js
+* styles/index.scss
 
 Please, report any issue on enhancement related to this example to its original
 github repository https://github.com/davibe/next.js-css-global-style-test
diff --git a/examples/with-hashed-statics/README.md b/examples/with-hashed-statics/README.md
index 49fe56bd45b93..55d488a5574a2 100644
--- a/examples/with-hashed-statics/README.md
+++ b/examples/with-hashed-statics/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/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-hashed-statics with-hashed-statics-app
@@ -26,6 +26,9 @@ 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))
diff --git a/examples/with-higher-order-component/README.md b/examples/with-higher-order-component/README.md
index dc74ec10f765d..a8c92ddf5ee30 100644
--- a/examples/with-higher-order-component/README.md
+++ b/examples/with-higher-order-component/README.md
@@ -26,6 +26,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 **yarn**
diff --git a/examples/with-i18next/README.md b/examples/with-i18next/README.md
index 7e269733964e1..cb5f7a51ccebf 100644
--- a/examples/with-i18next/README.md
+++ b/examples/with-i18next/README.md
@@ -5,7 +5,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/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-i18next with-i18next-app
@@ -27,6 +27,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 alternatively
diff --git a/examples/with-ioc/README.md b/examples/with-ioc/README.md
index c5fa01db7cc90..543e3a4138071 100644
--- a/examples/with-ioc/README.md
+++ b/examples/with-ioc/README.md
@@ -5,7 +5,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/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-ioc with-ioc-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-jest/README.md b/examples/with-jest/README.md
index 6727d6a5d16a5..28bef7b5c0e8a 100644
--- a/examples/with-jest/README.md
+++ b/examples/with-jest/README.md
@@ -1,11 +1,12 @@
 [![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-jest)
-# Example app with jest tests
+
+# Example app with Jest tests
 
 ## How to use
 
 ### 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/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-jest with-jest-app
@@ -22,11 +23,22 @@ curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2
 cd with-jest
 ```
 
-Install it and test:
+Install it and run:
 
 ```bash
 npm install
-npm test
+npm run dev
+# or
+yarn
+yarn dev
+```
+
+## Run Jest tests
+
+```bash
+npm run test
+# or
+yarn test
 ```
 
 ## The idea behind the example
diff --git a/examples/with-kea/README.md b/examples/with-kea/README.md
index a5f8cbeeada1f..5316b2ddc4281 100644
--- a/examples/with-kea/README.md
+++ b/examples/with-kea/README.md
@@ -6,7 +6,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/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-kea with-kea-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-loading/README.md b/examples/with-loading/README.md
index 0789958cca5bc..5ef16cad5f75d 100644
--- a/examples/with-loading/README.md
+++ b/examples/with-loading/README.md
@@ -5,7 +5,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/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-loading with-loading-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-markdown/README.md b/examples/with-markdown/README.md
index 496069de1e2e9..effea282331fd 100644
--- a/examples/with-markdown/README.md
+++ b/examples/with-markdown/README.md
@@ -6,7 +6,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/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-markdown with-markdown
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-material-ui-next/README.md b/examples/with-material-ui-next/README.md
index 5a54e30c2e767..03417995926ca 100644
--- a/examples/with-material-ui-next/README.md
+++ b/examples/with-material-ui-next/README.md
@@ -5,7 +5,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/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-material-ui-next with-material-ui-next-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-material-ui/README.md b/examples/with-material-ui/README.md
index ccbe23fdeb8c5..2b6f9a8dc8df6 100644
--- a/examples/with-material-ui/README.md
+++ b/examples/with-material-ui/README.md
@@ -5,7 +5,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/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-material-ui with-material-ui-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-mobx-state-tree/README.md b/examples/with-mobx-state-tree/README.md
index 066120b28f3c7..0809aad025973 100644
--- a/examples/with-mobx-state-tree/README.md
+++ b/examples/with-mobx-state-tree/README.md
@@ -4,11 +4,23 @@
 
 ## 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-mobx-state-tree with-mobx-state-tree-app
+# or
+yarn create next-app --example with-mobx-state-tree with-mobx-state-tree-app
+```
+
+### Download manually
+
 Download the example [or clone the repo](https://github.com/zeit/next.js):
 
 ```bash
-curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-mobx
-cd with-mobx
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-mobx-state-tree
+cd with-mobx-state-tree
 ```
 
 Install it and run:
@@ -16,6 +28,9 @@ 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))
@@ -23,21 +38,20 @@ Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.
 ```bash
 now
 ```
+
 ## Notes
+
 This example is a mobx port of the [with-redux](https://github.com/zeit/next.js/tree/master/examples/with-redux) example. Decorator support is activated by adding a `.babelrc` file at the root of the project:
 
 ```json
 {
-  "presets": [
-    "next/babel"
-  ],
-  "plugins": [
-    "transform-decorators-legacy"
-  ]
+  "presets": ["next/babel"],
+  "plugins": ["transform-decorators-legacy"]
 }
 ```
 
 ### Rehydrating with server data
+
 After initializing the store (and possibly making changes such as fetching data), `getInitialProps` must stringify the store in order to pass it as props to the client. `mobx-state-tree` comes out of the box with a handy method for doing this called `getSnapshot`. The snapshot is sent to the client as `props.initialState` where the pages's `constructor()` may use it to rehydrate the client store.
 
 ## The idea behind the example
diff --git a/examples/with-mobx/README.md b/examples/with-mobx/README.md
index bbd186cc80a20..8e61557a0ffd9 100644
--- a/examples/with-mobx/README.md
+++ b/examples/with-mobx/README.md
@@ -6,7 +6,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/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-mobx with-mobx-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-next-css/README.md b/examples/with-next-css/README.md
index 1a73dc2aba495..6d599e0195007 100644
--- a/examples/with-next-css/README.md
+++ b/examples/with-next-css/README.md
@@ -6,7 +6,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/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-css with-next-css-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-next-routes/README.md b/examples/with-next-routes/README.md
index b99df98e483e7..33a153a6c621b 100644
--- a/examples/with-next-routes/README.md
+++ b/examples/with-next-routes/README.md
@@ -5,7 +5,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/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-routes with-next-routes-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-next-sass/README.md b/examples/with-next-sass/README.md
index e240fa1940c83..16000a5eb21e5 100644
--- a/examples/with-next-sass/README.md
+++ b/examples/with-next-sass/README.md
@@ -6,7 +6,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/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-sass with-next-sass-app
@@ -27,12 +27,22 @@ Install it and run:
 
 ```bash
 npm install
+npm run dev
+# or
+yarn
+yarn dev
+```
+
+Run production build with:
+
+```bash
 npm run build
 npm run start
+# or
+yarn build
+yarn start
 ```
 
-The dev mode is also support via `npm run dev`
-
 ## The idea behind the example
 
 This example features:
diff --git a/examples/with-noscript/README.md b/examples/with-noscript/README.md
index e83a9d7a55e2c..1971324b355b1 100644
--- a/examples/with-noscript/README.md
+++ b/examples/with-noscript/README.md
@@ -6,7 +6,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/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-noscript with-noscript-app
@@ -25,6 +25,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 **yarn**
diff --git a/examples/with-pkg/README.md b/examples/with-pkg/README.md
index 2b7c948e32277..152bb2985b17c 100644
--- a/examples/with-pkg/README.md
+++ b/examples/with-pkg/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/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-pkg with-pkg-app
@@ -26,6 +26,9 @@ 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))
diff --git a/examples/with-polyfills/README.md b/examples/with-polyfills/README.md
index 818caaa68113b..321238f7f47c7 100644
--- a/examples/with-polyfills/README.md
+++ b/examples/with-polyfills/README.md
@@ -4,6 +4,18 @@
 
 ## 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-polyfills with-polyfills-app
+# or
+yarn create next-app --example with-polyfills with-polyfills-app
+```
+
+### Download manually
+
 Download the example [or clone the repo](https://github.com/zeit/next.js):
 
 ```bash
@@ -16,6 +28,9 @@ 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))
diff --git a/examples/with-portals/README.md b/examples/with-portals/README.md
index d8de5616dd01e..18fa3fa8bebbc 100644
--- a/examples/with-portals/README.md
+++ b/examples/with-portals/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/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-portals with-portals-app
@@ -26,6 +26,9 @@ 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))
diff --git a/examples/with-prefetching/README.md b/examples/with-prefetching/README.md
index 21b2c6f9e084b..5f5836e121408 100644
--- a/examples/with-prefetching/README.md
+++ b/examples/with-prefetching/README.md
@@ -5,7 +5,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/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-prefetching with-prefetching-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-pretty-url-routing/README.md b/examples/with-pretty-url-routing/README.md
index 2a2db41a9e3aa..8ef6423270a40 100644
--- a/examples/with-pretty-url-routing/README.md
+++ b/examples/with-pretty-url-routing/README.md
@@ -6,7 +6,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/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-pretty-url-routing with-pretty-url-routing-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-react-ga/README.md b/examples/with-react-ga/README.md
index 2be00e93526c6..879b92bf71678 100644
--- a/examples/with-react-ga/README.md
+++ b/examples/with-react-ga/README.md
@@ -6,7 +6,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/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-react-ga with-react-ga-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-react-helmet/README.md b/examples/with-react-helmet/README.md
index e5b04ad73a1ac..93e87df9bfcb3 100644
--- a/examples/with-react-helmet/README.md
+++ b/examples/with-react-helmet/README.md
@@ -6,7 +6,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/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-react-helmet with-react-helmet-app
@@ -28,20 +28,22 @@ Install it and run:
 ```bash
 npm install
 npm run dev
-```
-_Or alternatively:_
-```bash
+# or
+yarn
+yarn dev
+# or
 yarn
-yarn run dev
+yarn dev
 ```
 
-
 Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
 
 ```bash
 now
 ```
+
 ## Notes
+
 This an minimalistic example of how to combine next.js and [react-helmet](https://github.com/nfl/react-helmet).
 The title of the page shall be changed to "Hello next.js!"
 The rest is all up to you.
diff --git a/examples/with-react-i18next/README.md b/examples/with-react-i18next/README.md
index 34498cb4a5002..7563e908cca48 100644
--- a/examples/with-react-i18next/README.md
+++ b/examples/with-react-i18next/README.md
@@ -1,13 +1,45 @@
-# Getting started
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-react-i18next)
 
-Example with [react-i18next](https://github.com/i18next/react-i18next).
+# Internationalization with [react-i18next](https://github.com/i18next/react-i18next).
+
+## 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
-# npm install
-# npm run dev
+npx create-next-app --example with-react-i18next with-react-i18next-app
+# or
+yarn create next-app --example with-react-i18next with-react-i18next-app
 ```
 
-**open:**
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/master | tar -xz --strip=2 next.js-master/examples/with-react-i18next
+cd with-react-i18next
+```
+
+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
+```
+
+### Testing the app
 
 auto detecting user language: [http://localhost:3000](http://localhost:3000)
 
@@ -15,37 +47,36 @@ german: [http://localhost:3000/?lng=de](http://localhost:3000/?lng=de)
 
 english: [http://localhost:3000/?lng=en](http://localhost:3000/?lng=en)
 
-
 ## The idea behind the example
 
 This example app shows how to integrate [react-i18next](https://github.com/i18next/react-i18next) with [Next](https://github.com/zeit/next.js).
 
 **Plus:**
 
-- Routing and separating translations into multiple files (lazy load them on client routing)
-- Child components (pure or using translation hoc)
+* Routing and separating translations into multiple files (lazy load them on client routing)
+* Child components (pure or using translation hoc)
 
 ### Features of this example app
 
-- Server-side language negotiation
-- Full control and usage of i18next on express server using [i18next-express-middleware](https://github.com/i18next/i18next-express-middleware) which asserts no async request collisions resulting in wrong language renderings
-- Support for save missing features to get untranslated keys automatically created `locales/{lng}/{namespace}.missing.json` -> never miss to translate a key
-- Proper pass down on translations via initialProps
-- Taking advantage of multiple translation files including lazy loading on client (no need to load all translations upfront)
-- Use express to also serve translations for clientside
-- In contrast to react-intl the translations are visible both during development and in production
+* Server-side language negotiation
+* Full control and usage of i18next on express server using [i18next-express-middleware](https://github.com/i18next/i18next-express-middleware) which asserts no async request collisions resulting in wrong language renderings
+* Support for save missing features to get untranslated keys automatically created `locales/{lng}/{namespace}.missing.json` -> never miss to translate a key
+* Proper pass down on translations via initialProps
+* Taking advantage of multiple translation files including lazy loading on client (no need to load all translations upfront)
+* Use express to also serve translations for clientside
+* In contrast to react-intl the translations are visible both during development and in production
 
 ### learn more
 
-- [next.js](https://github.com/zeit/next.js)
-- [react-i18next repository](https://github.com/i18next/react-i18next)
-- [react-i18next documentation](https://react.i18next.com)
+* [next.js](https://github.com/zeit/next.js)
+* [react-i18next repository](https://github.com/i18next/react-i18next)
+* [react-i18next documentation](https://react.i18next.com)
 
 **Translation features:**
 
-- [i18next repository](https://github.com/i18next/i18next)
-- [i18next documentation](https://www.i18next.com)
+* [i18next repository](https://github.com/i18next/i18next)
+* [i18next documentation](https://www.i18next.com)
 
 **Translation management:**
 
-- [locize](http://locize.com)
+* [locize](http://locize.com)
diff --git a/examples/with-react-intl/README.md b/examples/with-react-intl/README.md
index 31e1bd8783130..4cd7adc50ccb5 100644
--- a/examples/with-react-intl/README.md
+++ b/examples/with-react-intl/README.md
@@ -5,7 +5,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/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-react-intl with-react-intl-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-react-md/README.md b/examples/with-react-md/README.md
index c9ba6fd778443..9bca93ebdeb23 100644
--- a/examples/with-react-md/README.md
+++ b/examples/with-react-md/README.md
@@ -8,7 +8,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/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-react-md with-react-md-app
@@ -31,6 +31,10 @@ Install it and run:
 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
 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
+yarn dev
 ```
 
 Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
diff --git a/examples/with-react-native-web/README.md b/examples/with-react-native-web/README.md
index 7bcfc7587740d..51dd07dbca3e8 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`
 
-Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+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-react-native-web
@@ -26,6 +26,9 @@ 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))
diff --git a/examples/with-react-toolbox/README.md b/examples/with-react-toolbox/README.md
index 81a1c435e4789..d61fcd0b6041b 100644
--- a/examples/with-react-toolbox/README.md
+++ b/examples/with-react-toolbox/README.md
@@ -6,7 +6,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/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-react-toolbox with-react-toolbox-app
@@ -26,6 +26,9 @@ cd with-react-toolbox
 Install it and run:
 
 ```bash
+npm install
+npm run dev
+# or
 yarn
 yarn dev
 ```
diff --git a/examples/with-react-uwp/README.md b/examples/with-react-uwp/README.md
index f031fad899c55..a09732130e9c7 100644
--- a/examples/with-react-uwp/README.md
+++ b/examples/with-react-uwp/README.md
@@ -5,7 +5,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/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-react-uwp with-react-uwp-app
@@ -27,6 +27,9 @@ 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))
@@ -38,4 +41,3 @@ now
 ## The idea behind the example
 
 This example features how you use [react-uwp](https://github.com/myxvisual/react-uwp) (React Components that Implement Microsoft's UWP Design & Fluent Design.) with Next.js.
-
diff --git a/examples/with-react-with-styles/README.md b/examples/with-react-with-styles/README.md
index 7e6d0cdd4d043..d757b3d084ce1 100644
--- a/examples/with-react-with-styles/README.md
+++ b/examples/with-react-with-styles/README.md
@@ -6,7 +6,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/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-react-with-styles with-react-with-styles-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-reasonml/README.md b/examples/with-reasonml/README.md
index b67e1a3d3a99e..8f6ee30f49e35 100644
--- a/examples/with-reasonml/README.md
+++ b/examples/with-reasonml/README.md
@@ -1,11 +1,12 @@
 [![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-reasonml)
+
 # Example app using ReasonML & ReasonReact components
 
 ## How to use
 
 ### 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/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-reasonml with-reasonml-app
@@ -26,8 +27,20 @@ Install it and run:
 
 ```bash
 npm install
-npm run build
 npm run dev
+# or
+yarn
+yarn dev
+```
+
+Build and run:
+
+```bash
+npm run build
+npm run start
+# or
+yarn build
+yarn start
 ```
 
 Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
@@ -35,6 +48,7 @@ Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.
 ```bash
 now
 ```
+
 ### Recommendation:
 
 Run BuckleScript build system `bsb -w` and `next -w` separately. For the sake
diff --git a/examples/with-rebass/README.md b/examples/with-rebass/README.md
index 55d9e36f37876..aea1bc4947a0c 100644
--- a/examples/with-rebass/README.md
+++ b/examples/with-rebass/README.md
@@ -8,7 +8,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/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-rebass with-rebass-app
@@ -31,6 +31,10 @@ Install it and run:
 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
 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
+yarn dev
 ```
 
 Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
diff --git a/examples/with-recompose/README.md b/examples/with-recompose/README.md
index 83a431f7c4ad3..96cdda0fb85b0 100644
--- a/examples/with-recompose/README.md
+++ b/examples/with-recompose/README.md
@@ -6,7 +6,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/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-recompose with-recompose-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-redux-code-splitting/README.md b/examples/with-redux-code-splitting/README.md
index 6c78041d34b5b..25ebe62f631ee 100644
--- a/examples/with-redux-code-splitting/README.md
+++ b/examples/with-redux-code-splitting/README.md
@@ -7,7 +7,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/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-redux-code-splitting with-redux-code-splitting-app
@@ -29,6 +29,9 @@ 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))
diff --git a/examples/with-redux-observable/README.md b/examples/with-redux-observable/README.md
index af00498a2dc79..11aa762af1dbe 100644
--- a/examples/with-redux-observable/README.md
+++ b/examples/with-redux-observable/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/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-redux-observable with-redux-observable-app
@@ -26,6 +26,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 
diff --git a/examples/with-redux-reselect-recompose/README.md b/examples/with-redux-reselect-recompose/README.md
index e8fd68fb3ffad..8cd15c8195c1b 100644
--- a/examples/with-redux-reselect-recompose/README.md
+++ b/examples/with-redux-reselect-recompose/README.md
@@ -6,7 +6,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/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-redux-reselect-recompose with-redux-reselect-recompose-app
@@ -28,6 +28,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 OR
diff --git a/examples/with-redux-saga/README.md b/examples/with-redux-saga/README.md
index 3fd40b797d845..789ad337b0b31 100644
--- a/examples/with-redux-saga/README.md
+++ b/examples/with-redux-saga/README.md
@@ -8,7 +8,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/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-redux-saga with-redux-saga-app
@@ -30,6 +30,9 @@ 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))
diff --git a/examples/with-redux-wrapper/README.md b/examples/with-redux-wrapper/README.md
index 97897d028e0bf..19cf4c5df9e7e 100644
--- a/examples/with-redux-wrapper/README.md
+++ b/examples/with-redux-wrapper/README.md
@@ -6,7 +6,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/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-redux-wrapper with-redux-wrapper-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-redux/README.md b/examples/with-redux/README.md
index 74cbd67228db3..00001521869bd 100644
--- a/examples/with-redux/README.md
+++ b/examples/with-redux/README.md
@@ -6,7 +6,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/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-redux with-redux-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-reflux/README.md b/examples/with-reflux/README.md
new file mode 100644
index 0000000000000..5f03c9f3fd0c8
--- /dev/null
+++ b/examples/with-reflux/README.md
@@ -0,0 +1,44 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-reflux)
+
+# Pass Server Data Directly to a Next.js Page during SSR
+
+## 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-reflux with-reflux-app
+# or
+yarn create next-app --example with-reflux with-reflux-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/master | tar -xz --strip=2 next.js-master/examples/with-reflux
+cd with-reflux
+```
+
+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
+
+Use [reflux](https://github.com/reflux/refluxjs) to manage an application store with unidirectional dataflow.
diff --git a/examples/with-refnux/README.md b/examples/with-refnux/README.md
index 38d67c3312342..26cfb5a62a77d 100644
--- a/examples/with-refnux/README.md
+++ b/examples/with-refnux/README.md
@@ -6,7 +6,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/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-refnux with-refnux-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-relay-modern/README.md b/examples/with-relay-modern/README.md
index 4998e121e5e2b..b317d1df2c642 100644
--- a/examples/with-relay-modern/README.md
+++ b/examples/with-relay-modern/README.md
@@ -1,11 +1,12 @@
 [![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-relay-modern)
+
 # Relay Modern Example
 
 ## How to use
 
 ### 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/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-relay-modern with-relay-modern-app
@@ -26,22 +27,32 @@ Install it:
 
 ```bash
 npm install
+# or
+yarn
 ```
 
-Download schema introspection data from configured Relay endpoint 
+Download schema introspection data from configured Relay endpoint
 
 ```bash
 npm run schema
+# or
+yarn schema
 ```
 
 Run Relay ahead-of-time compilation (should be re-run after any edits to components that query data with Relay)
+
 ```bash
 npm run relay
+# or
+yarn relay
 ```
 
 Run the project
+
 ```bash
 npm run dev
+# or
+yarn dev
 ```
 
 Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download)):
@@ -54,6 +65,6 @@ now
 
 [Relay Modern](https://facebook.github.io/relay/docs/relay-modern.html) is a new version of Relay designed from the ground up to be easier to use, more extensible and, most of all, able to improve performance on mobile devices. Relay Modern accomplishes this with static queries and ahead-of-time code generation.
 
-In this simple example, we integrate Relay Modern seamlessly with Next by wrapping our *pages* inside a [higher-order component (HOC)](https://facebook.github.io/react/docs/higher-order-components.html). Using the HOC pattern we're able to pass down a query result data created by Relay into our React component hierarchy defined inside each page of our Next application. The HOC takes `options` argument that allows to specify a `query` that will be executed on the server when a page is being loaded. 
+In this simple example, we integrate Relay Modern seamlessly with Next by wrapping our _pages_ inside a [higher-order component (HOC)](https://facebook.github.io/react/docs/higher-order-components.html). Using the HOC pattern we're able to pass down a query result data created by Relay into our React component hierarchy defined inside each page of our Next application. The HOC takes `options` argument that allows to specify a `query` that will be executed on the server when a page is being loaded.
 
 This example relies on [graph.cool](https://www.graph.cool) for its GraphQL backend.
diff --git a/examples/with-segment-analytics/README.md b/examples/with-segment-analytics/README.md
index dc9bb90683a5f..7d6d2bf609602 100644
--- a/examples/with-segment-analytics/README.md
+++ b/examples/with-segment-analytics/README.md
@@ -6,7 +6,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/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-segment-analytics with-segment-analytics-app
@@ -26,6 +26,9 @@ cd with-segment-analytics
 Install it and run:
 
 ```bash
+npm install
+npm run dev
+# or
 yarn
 yarn dev
 ```
diff --git a/examples/with-semantic-ui/README.md b/examples/with-semantic-ui/README.md
index 02e6f10690102..714bcae83ae29 100644
--- a/examples/with-semantic-ui/README.md
+++ b/examples/with-semantic-ui/README.md
@@ -6,7 +6,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/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-semantic-ui with-semantic-ui-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-sentry/README.md b/examples/with-sentry/README.md
index 7219d21df7022..0794b06079362 100644
--- a/examples/with-sentry/README.md
+++ b/examples/with-sentry/README.md
@@ -6,7 +6,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/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-sentry with-sentry-app
@@ -24,6 +24,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 **yarn**
diff --git a/examples/with-shallow-routing/README.md b/examples/with-shallow-routing/README.md
index 6fec2b11277d1..24acd5ef8be6a 100644
--- a/examples/with-shallow-routing/README.md
+++ b/examples/with-shallow-routing/README.md
@@ -6,7 +6,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/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-shallow-routing with-shallow-routing-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-socket.io/README.md b/examples/with-socket.io/README.md
index 15d8c47556136..418c45fe912a6 100644
--- a/examples/with-socket.io/README.md
+++ b/examples/with-socket.io/README.md
@@ -6,7 +6,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/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-socket.io with-socket.io-app
@@ -28,6 +28,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 ## The idea behind the example
diff --git a/examples/with-static-export/README.md b/examples/with-static-export/README.md
index b241c5a20e949..0ed895d3e1061 100644
--- a/examples/with-static-export/README.md
+++ b/examples/with-static-export/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/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-static-export with-static-export-app
@@ -29,6 +29,9 @@ Install it and run:
 ```bash
 npm install
 npm run dev
+# or
+yarn
+yarn dev
 ```
 
 ## The idea behind the example
diff --git a/examples/with-styled-components/README.md b/examples/with-styled-components/README.md
index ae9c1eec475bb..dcb3f04f809fa 100644
--- a/examples/with-styled-components/README.md
+++ b/examples/with-styled-components/README.md
@@ -6,7 +6,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/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-styled-components with-styled-components-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-styled-jsx-plugins/README.md b/examples/with-styled-jsx-plugins/README.md
index 38a0de4cce556..6897010ecc2ca 100644
--- a/examples/with-styled-jsx-plugins/README.md
+++ b/examples/with-styled-jsx-plugins/README.md
@@ -6,7 +6,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/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-styled-jsx-plugins with-styled-jsx-plugins-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-styled-jsx-scss/README.md b/examples/with-styled-jsx-scss/README.md
index 85dbb59fc8527..748dd6f7021e0 100644
--- a/examples/with-styled-jsx-scss/README.md
+++ b/examples/with-styled-jsx-scss/README.md
@@ -6,7 +6,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/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-styled-jsx-scss with-styled-jsx-scss-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-styletron/README.md b/examples/with-styletron/README.md
index ebdeeb5b4213f..c4a03db70a1dd 100644
--- a/examples/with-styletron/README.md
+++ b/examples/with-styletron/README.md
@@ -6,7 +6,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/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-styletron with-styletron-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-sw-precache/README.md b/examples/with-sw-precache/README.md
index b6c2eefe8e63d..832201223e8c9 100644
--- a/examples/with-sw-precache/README.md
+++ b/examples/with-sw-precache/README.md
@@ -6,7 +6,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/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-sw-precache with-sw-precache-app
diff --git a/examples/with-tailwindcss/README.md b/examples/with-tailwindcss/README.md
index 6acb3903a7aa7..5716648e779b6 100644
--- a/examples/with-tailwindcss/README.md
+++ b/examples/with-tailwindcss/README.md
@@ -8,7 +8,7 @@ This is an example of how you can include a global stylesheet in a next.js webap
 
 ### 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/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-tailwindcss with-tailwindcss-app
@@ -18,15 +18,6 @@ yarn create next-app --example with-tailwindcss with-tailwindcss-app
 
 ### Download manually
 
-If you like [create-next-app](https://github.com/segmentio/create-next-app) and/or [yarn](https://yarnpkg.com/en/docs/cli/create) simply run:
-
-```bash
-yarn create next-app --example with-tailwindcss my-app
-cd my-app
-```
-
-*Otherwise:*
-
 Download the example [or clone the repo](https://github.com/zeit/next.js):
 
 ```bash
@@ -38,8 +29,13 @@ cd with-tailwindcss
 
 To get this example running you just need to
 
-    yarn install .
-    yarn dev
+```bash
+npm install
+npm run dev
+# or
+yarn
+yarn dev
+```
 
 Visit [http://localhost:3000](http://localhost:3000) and try to modify `styles/index.css`.
 
@@ -73,7 +69,8 @@ some webpack loaders. If you are curious about using loaders with next look at t
 [example](https://github.com/zeit/next.js/tree/canary/examples/with-global-stylesheet).
 
 This project shows how you can set it up. Have a look at:
-* pages/_document.js
+
+* pages/\_document.js
 * styles/config/postcss.config.js
 * styles/config/tailwind.config.js
 * styles/index.css
diff --git a/examples/with-typescript/README.md b/examples/with-typescript/README.md
index 703d7237894b5..916f1163f74a7 100644
--- a/examples/with-typescript/README.md
+++ b/examples/with-typescript/README.md
@@ -1,14 +1,14 @@
 [![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-typescript)
 
-# TypeScript Next.js example  
+# TypeScript Next.js example
 
-This is a really simple project that show the usage of Next.js with TypeScript.  
+This is a really simple project that show the usage of Next.js with TypeScript.
 
 ## How to use it?
 
 ### 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/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-typescript with-typescript-app
@@ -19,16 +19,22 @@ yarn create next-app --example with-typescript with-typescript-app
 ### Download manually
 
 Download the example [or clone the repo](https://github.com/zeit/next.js):
-  
+
 ```bash
 curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-typescript
 cd with-typescript
 ```
 
 Install it and run:
- 
-```
+
+```bash
 npm install
 npm run dev
-```  
+# or
+yarn
+yarn dev
+```
+
+## The idea behind the example
 
+Use the [@zeit/next-typescript](https://github.com/zeit/next-plugins/tree/master/packages/next-typescript) plugin to inject the Webpack config required to compile TypeScript to JavaScript. For information about using a TSConfig have a [look at the plugin page](https://github.com/zeit/next-plugins/tree/master/packages/next-typescript/#readme).
diff --git a/examples/with-universal-configuration-runtime/README.md b/examples/with-universal-configuration-runtime/README.md
index ab236a50dc0c4..61d7ff3b4b09f 100644
--- a/examples/with-universal-configuration-runtime/README.md
+++ b/examples/with-universal-configuration-runtime/README.md
@@ -6,7 +6,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/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-universal-configuration-runtime with-universal-configuration-runtime-app
@@ -28,6 +28,9 @@ Install it and run:
 ```bash
 npm install
 API_URL='https://example.com' npm run dev
+# or
+yarn
+API_URL='https://example.com' yarn dev
 ```
 
 Deploy it to the cloud with [now](https://zeit.co/now) ([download](https://zeit.co/download))
@@ -39,4 +42,3 @@ now
 ## The idea behind the example
 
 This example show how to set custom environment variables for your application at runtime
-
diff --git a/examples/with-universal-configuration/README.md b/examples/with-universal-configuration/README.md
index 9b6071ee451e0..6ae8c6d55b83a 100644
--- a/examples/with-universal-configuration/README.md
+++ b/examples/with-universal-configuration/README.md
@@ -6,7 +6,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/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-universal-configuration with-universal-configuration-app
@@ -28,6 +28,9 @@ 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))
diff --git a/examples/with-url-object-routing/README.md b/examples/with-url-object-routing/README.md
index 5d9bd7cfd3610..c5641f6e875c6 100644
--- a/examples/with-url-object-routing/README.md
+++ b/examples/with-url-object-routing/README.md
@@ -5,7 +5,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/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-url-object-routing with-url-object-routing-app
@@ -27,6 +27,9 @@ 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))
diff --git a/examples/with-webpack-bundle-analyzer/README.md b/examples/with-webpack-bundle-analyzer/README.md
index f657882559f44..047bda1236b99 100644
--- a/examples/with-webpack-bundle-analyzer/README.md
+++ b/examples/with-webpack-bundle-analyzer/README.md
@@ -6,7 +6,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/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-webpack-bundle-analyzer with-webpack-bundle-analyzer-app
@@ -27,6 +27,10 @@ Install it
 
 ```bash
 npm install
+npm run dev
+# or
+yarn
+yarn dev
 ```
 
 ## The idea behind the example
@@ -37,4 +41,6 @@ To analyze your webpack output, invoke the following command:
 
 ```bash
 npm run analyze
+# or
+yarn analyze
 ```
diff --git a/examples/with-webpack-bundle-size-analyzer/README.md b/examples/with-webpack-bundle-size-analyzer/README.md
index 85de05776243c..5788d33d93bc6 100644
--- a/examples/with-webpack-bundle-size-analyzer/README.md
+++ b/examples/with-webpack-bundle-size-analyzer/README.md
@@ -6,7 +6,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/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-webpack-bundle-size-analyzer with-webpack-bundle-size-analyzer-app
@@ -27,6 +27,10 @@ Install it
 
 ```bash
 npm install
+npm run dev
+# or
+yarn
+yarn dev
 ```
 
 ## The idea behind the example
@@ -37,4 +41,6 @@ To analyze your webpack output, invoke the following command:
 
 ```bash
 npm run analyze
+# or
+yarn analyze
 ```
diff --git a/examples/with-zones/README.md b/examples/with-zones/README.md
index eef1743e403ca..81ba49cf87d81 100644
--- a/examples/with-zones/README.md
+++ b/examples/with-zones/README.md
@@ -2,6 +2,37 @@
 
 # Using multiple zones
 
+## 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-zones with-zones-app
+# or
+yarn create next-app --example with-zones with-zones-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-zones
+cd with-zones
+```
+
+Install it and run:
+
+```bash
+npm install
+# or
+yarn
+```
+
+## The idead behind this example
+
 With Next.js you can use multiple apps as a single app using it's multi-zones feature.
 This is an example showing how to use it.
 
@@ -13,12 +44,17 @@ Now let's start two of our app using:
 ```bash
 npm run home
 npm run blog
+# or
+yarn home
+yarn blog
 ```
 
 Then start the proxy:
 
 ```bash
 npm run proxy
+# or
+yarn proxy
 ```
 
 Now you can visit http://localhost:9000 and access and develop both apps a single app.
@@ -30,8 +66,12 @@ This is the place we define rules for our proxy. Here are the rules(in `rules.js
 ```json
 {
   "rules": [
-    {"pathname": "/blog", "method":["GET", "POST", "OPTIONS"], "dest": "http://localhost:5000"},
-    {"pathname": "/**", "dest": "http://localhost:4000"}
+    {
+      "pathname": "/blog",
+      "method": ["GET", "POST", "OPTIONS"],
+      "dest": "http://localhost:5000"
+    },
+    { "pathname": "/**", "dest": "http://localhost:4000" }
   ]
 }
 ```
@@ -41,7 +81,7 @@ These rules are based on ZEIT now [path alias](https://zeit.co/docs/features/pat
 ## Special Notes
 
 * All pages should be unique across zones. A page with the same name should not exist in multiple zones. Otherwise, there'll be unexpected behaviour in client side navigation.
-    * According to the above example, a page named `blog` should not be exist in the `home` zone.
+  * According to the above example, a page named `blog` should not be exist in the `home` zone.
 
 ## Production Deployment
 
@@ -51,19 +91,19 @@ Here's how are going to deploy this application into production.
 * Then update `rules-prod.json` accordingly.
 * Now deploy both apps:
 
-~~~sh
+```bash
 cd home
 now && now alias
 cd ../blog
 now && now alias
 cd ..
-~~~
+```
 
 * Finally, set the path alias rules with
 
-~~~sh
+```bash
 now alias with-zones.now.sh -r rules-prod.json
-~~~
+```
 
 > You can use a domain name of your choice in the above command instead of `with-zones.now.sh`.
 

From 4e8d075383661da42c5a45579fd42fe2dce59541 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Tue, 3 Apr 2018 14:43:56 +0200
Subject: [PATCH 35/73] Speed up tests (#4102)

---
 .babelrc      | 13 +------------
 test/.babelrc |  9 +++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 test/.babelrc

diff --git a/.babelrc b/.babelrc
index 3d0c1e5e2c90d..44642072f4d0b 100644
--- a/.babelrc
+++ b/.babelrc
@@ -8,16 +8,5 @@
     "@babel/plugin-proposal-object-rest-spread",
     "@babel/plugin-proposal-class-properties",
     "@babel/plugin-transform-runtime"
-  ],
-  "env": {
-    "test": {
-      "presets": [
-        ["./babel", {
-          "preset-env": {
-            "modules": "commonjs"
-          }
-        }]
-       ]
-    }
-  }
+  ]
 }
diff --git a/test/.babelrc b/test/.babelrc
new file mode 100644
index 0000000000000..27c7237aeb802
--- /dev/null
+++ b/test/.babelrc
@@ -0,0 +1,9 @@
+{
+  "presets": [
+    ["next/babel", {
+      "preset-env": {
+        "modules": "commonjs"
+      }
+    }]
+  ]
+}
\ No newline at end of file

From cb566bd6f035d6e40e501c8704fc546dff6036b5 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Tue, 3 Apr 2018 22:08:04 +0200
Subject: [PATCH 36/73] Redo #4090 (#4104)

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

diff --git a/package.json b/package.json
index 6fd9665f133bd..6b098e238bee6 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "fresh": "0.5.2",
     "friendly-errors-webpack-plugin": "1.6.1",
     "glob": "7.1.2",
-    "hoist-non-react-statics": "2.3.1",
+    "hoist-non-react-statics": "2.5.0",
     "htmlescape": "1.1.1",
     "http-errors": "1.6.2",
     "http-status": "1.0.1",

From b393833aeab99647fc9851981b2156c497927206 Mon Sep 17 00:00:00 2001
From: Tobias Timm <tbs.timm@gmail.com>
Date: Wed, 4 Apr 2018 13:18:28 +0200
Subject: [PATCH 37/73] Update doc for @zeit/next-stylus (#4107)

---
 readme.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index addf1c44c2c5f..3994141bf24c7 100644
--- a/readme.md
+++ b/readme.md
@@ -165,13 +165,14 @@ export default () => <p style={{ color: 'red' }}>hi there</p>
 
 To use more sophisticated CSS-in-JS solutions, you typically have to implement style flushing for server-side rendering. We enable this by allowing you to define your own [custom `<Document>`](#user-content-custom-document) component that wraps each page.
 
-#### Importing CSS / Sass / Less files
+#### Importing CSS / Sass / Less / Stylus files
 
-To support importing `.css` `.scss` or `.less` files you can use these modules, which configure sensible defaults for server rendered applications.
+To support importing `.css`, `.scss`, `.less` or `.styl` files you can use these modules, which configure sensible defaults for server rendered applications.
 
 - [@zeit/next-css](https://github.com/zeit/next-plugins/tree/master/packages/next-css)
 - [@zeit/next-sass](https://github.com/zeit/next-plugins/tree/master/packages/next-sass)
 - [@zeit/next-less](https://github.com/zeit/next-plugins/tree/master/packages/next-less)
+- [@zeit/next-stylus](https://github.com/zeit/next-plugins/tree/master/packages/next-stylus)
 
 ### Static file serving (e.g.: images)
 

From dac2f39a257a690124abf372c25d2c2b0e769d23 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Thu, 5 Apr 2018 03:48:11 +0200
Subject: [PATCH 38/73] Add support for exportPathMap in development (#4094)

* Add support for exportPathMap in development

* Add comment about what it does
---
 server/index.js                            | 19 ++++++++++++++---
 test/integration/static/test/dev.js        | 24 ++++++++++++++++++++++
 test/integration/static/test/index.test.js | 23 +++++++++++++++++++--
 3 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 test/integration/static/test/dev.js

diff --git a/server/index.js b/server/index.js
index 32249c12ced14..be7f4881a4c30 100644
--- a/server/index.js
+++ b/server/index.js
@@ -81,7 +81,6 @@ export default class Server {
     })
 
     this.setAssetPrefix(assetPrefix)
-    this.defineRoutes()
   }
 
   getHotReloader (dir, options) {
@@ -119,6 +118,7 @@ export default class Server {
   }
 
   async prepare () {
+    await this.defineRoutes()
     if (this.hotReloader) {
       await this.hotReloader.start()
     }
@@ -139,7 +139,7 @@ export default class Server {
     }
   }
 
-  defineRoutes () {
+  async defineRoutes () {
     const routes = {
       '/_next-prefetcher.js': async (req, res, params) => {
         const p = join(__dirname, '../client/next-prefetcher-bundle.js')
@@ -303,9 +303,22 @@ export default class Server {
     }
 
     if (this.nextConfig.useFileSystemPublicRoutes) {
+      // Makes `next export` exportPathMap work in development mode.
+      // So that the user doesn't have to define a custom server reading the exportPathMap
+      if (this.dev && this.nextConfig.exportPathMap) {
+        console.log('Defining routes from exportPathMap')
+        const exportPathMap = await this.nextConfig.exportPathMap({}) // In development we can't give a default path mapping
+        for (const path in exportPathMap) {
+          const options = exportPathMap[path]
+          routes[path] = async (req, res, params, parsedUrl) => {
+            await this.render(req, res, options.page, options.query, parsedUrl)
+          }
+        }
+      }
+
       routes['/:path*'] = async (req, res, params, parsedUrl) => {
         const { pathname, query } = parsedUrl
-        await this.render(req, res, pathname, query)
+        await this.render(req, res, pathname, query, parsedUrl)
       }
     }
 
diff --git a/test/integration/static/test/dev.js b/test/integration/static/test/dev.js
new file mode 100644
index 0000000000000..468a011b2351f
--- /dev/null
+++ b/test/integration/static/test/dev.js
@@ -0,0 +1,24 @@
+/* global describe, it, expect */
+import webdriver from 'next-webdriver'
+
+export default function (context) {
+  describe('Render in development mode', () => {
+    it('should render the home page', async () => {
+      const browser = await webdriver(context.port, '/')
+      const text = await browser
+        .elementByCss('#home-page p').text()
+
+      expect(text).toBe('This is the home page')
+      browser.close()
+    })
+
+    it('should render pages only existent in exportPathMap page', async () => {
+      const browser = await webdriver(context.port, '/dynamic/one')
+      const text = await browser
+        .elementByCss('#dynamic-page p').text()
+
+      expect(text).toBe('next export is nice')
+      browser.close()
+    })
+  })
+}
diff --git a/test/integration/static/test/index.test.js b/test/integration/static/test/index.test.js
index 44d826b826a45..5ea24f5eb4536 100644
--- a/test/integration/static/test/index.test.js
+++ b/test/integration/static/test/index.test.js
@@ -5,16 +5,22 @@ import {
   nextBuild,
   nextExport,
   startStaticServer,
-  stopApp
+  launchApp,
+  stopApp,
+  killApp,
+  findPort,
+  renderViaHTTP
 } from 'next-test-utils'
 
 import ssr from './ssr'
 import browser from './browser'
+import dev from './dev'
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 5
 
 const appDir = join(__dirname, '../')
 const context = {}
+const devContext = {}
 
 describe('Static Export', () => {
   beforeAll(async () => {
@@ -24,9 +30,22 @@ describe('Static Export', () => {
 
     context.server = await startStaticServer(join(appDir, 'out'))
     context.port = context.server.address().port
+
+    devContext.appPort = await findPort()
+    devContext.server = await launchApp(join(__dirname, '../'), devContext.appPort, true)
+
+    // pre-build all pages at the start
+    await Promise.all([
+      renderViaHTTP(devContext.appPort, '/'),
+      renderViaHTTP(devContext.appPort, '/dynamic/one')
+    ])
+  })
+  afterAll(() => {
+    stopApp(context.server)
+    killApp(devContext.server)
   })
-  afterAll(() => stopApp(context.server))
 
   ssr(context)
   browser(context)
+  dev(context)
 })

From c486682b44ba74069fcf8ea809fbcdb3ab1dce53 Mon Sep 17 00:00:00 2001
From: Odin Ugedal <odin@ugedal.com>
Date: Sat, 7 Apr 2018 12:41:26 +0200
Subject: [PATCH 39/73] Relay modern example fixes (#4120)

* Fix with-relay-modern example

Starting with react-relay 1.5.0 the schema canno't be in the same dir as
the src. This can be fixed by excluding the schema dir. Globs should
also be inside quotation marks, to avoid non-deterministic behavior of
different shells.

* Add missing key on BlogPosts
---
 examples/with-relay-modern/components/BlogPosts.js | 3 ++-
 examples/with-relay-modern/package.json            | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/examples/with-relay-modern/components/BlogPosts.js b/examples/with-relay-modern/components/BlogPosts.js
index 780224c969574..0d1f54e5cdea8 100644
--- a/examples/with-relay-modern/components/BlogPosts.js
+++ b/examples/with-relay-modern/components/BlogPosts.js
@@ -7,7 +7,7 @@ const BlogPosts = props => {
     <div>
       <h1>Blog posts</h1>
       {props.viewer.allBlogPosts.edges.map(({ node }) =>
-        <BlogPostPreview post={node} />
+        <BlogPostPreview key={node.id}post={node} />
       )}
     </div>
   )
@@ -20,6 +20,7 @@ export default createFragmentContainer(BlogPosts, {
                 edges {
                     node {
                         ...BlogPostPreview_post
+                        id
                     }
                 }
             }
diff --git a/examples/with-relay-modern/package.json b/examples/with-relay-modern/package.json
index 5f56d608ef108..d7be3b935deb9 100644
--- a/examples/with-relay-modern/package.json
+++ b/examples/with-relay-modern/package.json
@@ -7,7 +7,7 @@
     "dev": "next",
     "build": "next build",
     "start": "next start",
-    "relay": "relay-compiler --src ./ --exclude **/.next/** **/node_modules/** **/test/**  **/__generated__/** --schema ./schema/schema.graphql",
+    "relay": "relay-compiler --src ./ --exclude '**/.next/**' '**/node_modules/**' '**/test/**'  '**/__generated__/**' --exclude './schema/**' --schema ./schema/schema.graphql",
     "schema": "graphql get-schema dev"
   },
   "author": "",
@@ -19,12 +19,12 @@
     "next": "latest",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
-    "react-relay": "^1.4.1"
+    "react-relay": "^1.5.0"
   },
   "devDependencies": {
-    "graphql-cli": "^1.0.0-beta.4",
     "babel-plugin-relay": "^1.4.1",
     "graphcool": "^1.2.1",
-    "relay-compiler": "^1.4.1"
+    "graphql-cli": "^1.0.0-beta.4",
+    "relay-compiler": "^1.5.0"
   }
 }

From 769d8e3a84eacc3e8c63fe2c3250cef223730308 Mon Sep 17 00:00:00 2001
From: Seth Etter <sethetter@gmail.com>
Date: Mon, 9 Apr 2018 11:41:41 -0500
Subject: [PATCH 40/73] Update next-typescript version in
 custom-typescript-server example (#4130)

---
 examples/custom-server-typescript/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/custom-server-typescript/package.json b/examples/custom-server-typescript/package.json
index 73d7869e0e611..c4e943af2a471 100644
--- a/examples/custom-server-typescript/package.json
+++ b/examples/custom-server-typescript/package.json
@@ -8,7 +8,7 @@
     "next": "latest",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
-    "@zeit/next-typescript": "0.0.11",
+    "@zeit/next-typescript": "0.1.1",
     "typescript": "^2.7.1"
   },
   "devDependencies": {

From 15dde33794622919d20709da97fa412a01831807 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Thu, 12 Apr 2018 09:47:42 +0200
Subject: [PATCH 41/73] Add build manifest (#4119)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add build manifest

* Split out css since they don’t have exact name

* Remove pages map

* Fix locations test

* Re-run tests

* Get consistent open ports

* Fix static tests

* Add comment about Cache-Control header
---
 bin/next-export                               |  8 +--
 lib/constants.js                              |  1 +
 package.json                                  |  1 -
 readme.md                                     |  4 +-
 server/build/plugins/build-manifest-plugin.js | 46 +++++++++++++++
 server/build/webpack.js                       |  8 ++-
 server/document.js                            | 40 ++++++-------
 server/export.js                              | 11 +---
 server/index.js                               | 56 ++-----------------
 server/render.js                              |  5 +-
 test/integration/dist-dir/test/index.test.js  |  5 +-
 test/integration/static/.gitignore            |  1 +
 test/integration/static/next.config.js        | 33 ++++++-----
 test/integration/static/test/index.test.js    | 10 ++--
 test/lib/next-test-utils.js                   |  5 +-
 test/lib/next-webdriver.js                    |  4 ++
 yarn.lock                                     | 44 ++-------------
 17 files changed, 125 insertions(+), 157 deletions(-)
 create mode 100644 server/build/plugins/build-manifest-plugin.js
 create mode 100644 test/integration/static/.gitignore

diff --git a/bin/next-export b/bin/next-export
index a98f6ae7a7d9e..c9ac30b368a67 100755
--- a/bin/next-export
+++ b/bin/next-export
@@ -57,8 +57,6 @@ const options = {
   outdir: argv.outdir ? resolve(argv.outdir) : resolve(dir, 'out')
 }
 
-exportApp(dir, options)
-  .catch((err) => {
-    console.error(err)
-    process.exit(1)
-  })
+exportApp(dir, options).catch((err) => {
+  printAndExit(err)
+})
diff --git a/lib/constants.js b/lib/constants.js
index ec595fa6dad85..19cb799242e5e 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -3,3 +3,4 @@ export const PHASE_PRODUCTION_BUILD = 'phase-production-build'
 export const PHASE_PRODUCTION_SERVER = 'phase-production-server'
 export const PHASE_DEVELOPMENT_SERVER = 'phase-development-server'
 export const PAGES_MANIFEST = 'pages-manifest.json'
+export const BUILD_MANIFEST = 'build-manifest.json'
diff --git a/package.json b/package.json
index 6b098e238bee6..d372fad240206 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,6 @@
     "node-fetch": "1.7.3",
     "node-notifier": "5.1.2",
     "nyc": "11.2.1",
-    "portfinder": "1.0.13",
     "react": "16.2.0",
     "react-dom": "16.2.0",
     "rimraf": "2.6.2",
diff --git a/readme.md b/readme.md
index 3994141bf24c7..0505d64e50f69 100644
--- a/readme.md
+++ b/readme.md
@@ -943,9 +943,9 @@ import flush from 'styled-jsx/server'
 
 export default class MyDocument extends Document {
   static getInitialProps({ renderPage }) {
-    const { html, head, errorHtml, chunks } = renderPage()
+    const { html, head, errorHtml, chunks, buildManifest } = renderPage()
     const styles = flush()
-    return { html, head, errorHtml, chunks, styles }
+    return { html, head, errorHtml, chunks, styles, buildManifest }
   }
 
   render() {
diff --git a/server/build/plugins/build-manifest-plugin.js b/server/build/plugins/build-manifest-plugin.js
new file mode 100644
index 0000000000000..be2e5fee26ff7
--- /dev/null
+++ b/server/build/plugins/build-manifest-plugin.js
@@ -0,0 +1,46 @@
+// @flow
+import { RawSource } from 'webpack-sources'
+import {BUILD_MANIFEST} from '../../../lib/constants'
+
+// This plugin creates a build-manifest.json for all assets that are being output
+// It has a mapping of "entry" filename to real filename. Because the real filename can be hashed in production
+export default class BuildManifestPlugin {
+  apply (compiler: any) {
+    compiler.plugin('emit', (compilation, callback) => {
+      const {chunks} = compilation
+      const assetMap = {pages: {}, css: []}
+
+      for (const chunk of chunks) {
+        if (!chunk.name || !chunk.files) {
+          continue
+        }
+
+        const files = []
+
+        for (const file of chunk.files) {
+          if (/\.map$/.test(file)) {
+            continue
+          }
+
+          if (/\.hot-update\.js$/.test(file)) {
+            continue
+          }
+
+          if (/\.css$/.exec(file)) {
+            assetMap.css.push(file)
+            continue
+          }
+
+          files.push(file)
+        }
+
+        if (files.length > 0) {
+          assetMap[chunk.name] = files
+        }
+      }
+
+      compilation.assets[BUILD_MANIFEST] = new RawSource(JSON.stringify(assetMap))
+      callback()
+    })
+  }
+}
diff --git a/server/build/webpack.js b/server/build/webpack.js
index ebc466a2d77f4..344ee32c99bf0 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -12,6 +12,7 @@ import NextJsSsrImportPlugin from './plugins/nextjs-ssr-import'
 import DynamicChunksPlugin from './plugins/dynamic-chunks-plugin'
 import UnlinkFilePlugin from './plugins/unlink-file-plugin'
 import PagesManifestPlugin from './plugins/pages-manifest-plugin'
+import BuildManifestPlugin from './plugins/build-manifest-plugin'
 
 const presetItem = createConfigItem(require('./babel/preset'), {type: 'preset'})
 const hotLoaderItem = createConfigItem(require('react-hot-loader/babel'), {type: 'plugin'})
@@ -259,6 +260,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
       }),
       !dev && new webpack.optimize.ModuleConcatenationPlugin(),
       isServer && new PagesManifestPlugin(),
+      !isServer && new BuildManifestPlugin(),
       !isServer && new PagesPlugin(),
       !isServer && new DynamicChunksPlugin(),
       isServer && new NextJsSsrImportPlugin(),
@@ -266,7 +268,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
       // In production we move common modules into the existing main.js bundle
       !isServer && new webpack.optimize.CommonsChunkPlugin({
         name: 'main.js',
-        filename: 'main.js',
+        filename: dev ? 'static/commons/main.js' : 'static/commons/main-[chunkhash].js',
         minChunks (module, count) {
           // React and React DOM are used everywhere in Next.js. So they should always be common. Even in development mode, to speed up compilation.
           if (module.resource && module.resource.includes(`${sep}react-dom${sep}`) && count >= 0) {
@@ -297,8 +299,8 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
       }),
       // We use a manifest file in development to speed up HMR
       dev && !isServer && new webpack.optimize.CommonsChunkPlugin({
-        name: 'manifest',
-        filename: 'manifest.js'
+        name: 'manifest.js',
+        filename: dev ? 'static/commons/manifest.js' : 'static/commons/manifest-[chunkhash].js'
       })
     ].filter(Boolean)
   }
diff --git a/server/document.js b/server/document.js
index 3ab9eda757ae3..48fcdbc5fbaaa 100644
--- a/server/document.js
+++ b/server/document.js
@@ -10,9 +10,9 @@ const Fragment = React.Fragment || function Fragment ({ children }) {
 
 export default class Document extends Component {
   static getInitialProps ({ renderPage }) {
-    const { html, head, errorHtml, chunks } = renderPage()
+    const { html, head, errorHtml, chunks, buildManifest } = renderPage()
     const styles = flush()
-    return { html, head, errorHtml, chunks, styles }
+    return { html, head, errorHtml, chunks, styles, buildManifest }
   }
 
   static childContextTypes = {
@@ -40,32 +40,33 @@ export class Head extends Component {
   }
 
   getChunkPreloadLink (filename) {
-    const { __NEXT_DATA__ } = this.context._documentProps
+    const { __NEXT_DATA__, buildManifest } = this.context._documentProps
     let { assetPrefix, buildId } = __NEXT_DATA__
-    const hash = buildId
 
-    return (
-      <link
+    const files = buildManifest[filename]
+
+    return files.map(file => {
+      return <link
         key={filename}
         rel='preload'
-        href={`${assetPrefix}/_next/${hash}/${filename}`}
+        href={`${assetPrefix}/_next/${file}`}
         as='script'
       />
-    )
+    })
   }
 
   getPreloadMainLinks () {
     const { dev } = this.context._documentProps
     if (dev) {
       return [
-        this.getChunkPreloadLink('manifest.js'),
-        this.getChunkPreloadLink('main.js')
+        ...this.getChunkPreloadLink('manifest.js'),
+        ...this.getChunkPreloadLink('main.js')
       ]
     }
 
     // In the production mode, we have a single asset with all the JS content.
     return [
-      this.getChunkPreloadLink('main.js')
+      ...this.getChunkPreloadLink('main.js')
     ]
   }
 
@@ -125,31 +126,32 @@ export class NextScript extends Component {
   }
 
   getChunkScript (filename, additionalProps = {}) {
-    const { __NEXT_DATA__ } = this.context._documentProps
+    const { __NEXT_DATA__, buildManifest } = this.context._documentProps
     let { assetPrefix, buildId } = __NEXT_DATA__
-    const hash = buildId
 
-    return (
+    const files = buildManifest[filename]
+
+    return files.map((file) => (
       <script
         key={filename}
-        src={`${assetPrefix}/_next/${hash}/${filename}`}
+        src={`${assetPrefix}/_next/${file}`}
         {...additionalProps}
       />
-    )
+    ))
   }
 
   getScripts () {
     const { dev } = this.context._documentProps
     if (dev) {
       return [
-        this.getChunkScript('manifest.js'),
-        this.getChunkScript('main.js')
+        ...this.getChunkScript('manifest.js'),
+        ...this.getChunkScript('main.js')
       ]
     }
 
     // In the production mode, we have a single asset with all the JS content.
     // So, we can load the script with async
-    return [this.getChunkScript('main.js', { async: true })]
+    return [...this.getChunkScript('main.js', { async: true })]
   }
 
   getDynamicChunks () {
diff --git a/server/export.js b/server/export.js
index c2ed256468ebe..89967165face1 100644
--- a/server/export.js
+++ b/server/export.js
@@ -19,10 +19,7 @@ export default async function (dir, options, configuration) {
   log(`> using build directory: ${nextDir}`)
 
   if (!existsSync(nextDir)) {
-    console.error(
-      `Build directory ${nextDir} does not exist. Make sure you run "next build" before running "next start" or "next export".`
-    )
-    process.exit(1)
+    throw new Error(`Build directory ${nextDir} does not exist. Make sure you run "next build" before running "next start" or "next export".`)
   }
 
   const buildId = readFileSync(join(nextDir, 'BUILD_ID'), 'utf8')
@@ -53,12 +50,6 @@ export default async function (dir, options, configuration) {
     )
   }
 
-  // Copy main.js
-  await cp(
-    join(nextDir, 'main.js'),
-    join(outDir, '_next', buildId, 'main.js')
-  )
-
   // Copy .next/static directory
   if (existsSync(join(nextDir, 'static'))) {
     log('  copying "static build" directory')
diff --git a/server/index.js b/server/index.js
index be7f4881a4c30..1d993c0084825 100644
--- a/server/index.js
+++ b/server/index.js
@@ -162,57 +162,6 @@ export default class Server {
         await this.serveStatic(req, res, p)
       },
 
-      '/_next/:buildId/manifest.js': async (req, res, params) => {
-        if (!this.dev) return this.send404(res)
-
-        this.handleBuildId(params.buildId, res)
-        const p = join(this.dir, this.dist, 'manifest.js')
-        await this.serveStatic(req, res, p)
-      },
-
-      '/_next/:buildId/manifest.js.map': async (req, res, params) => {
-        if (!this.dev) return this.send404(res)
-
-        this.handleBuildId(params.buildId, res)
-        const p = join(this.dir, this.dist, 'manifest.js.map')
-        await this.serveStatic(req, res, p)
-      },
-
-      '/_next/:buildId/main.js': async (req, res, params) => {
-        if (this.dev) {
-          this.handleBuildId(params.buildId, res)
-          const p = join(this.dir, this.dist, 'main.js')
-          await this.serveStatic(req, res, p)
-        } else {
-          const buildId = params.buildId
-          if (!this.handleBuildId(buildId, res)) {
-            const error = new Error('INVALID_BUILD_ID')
-            const customFields = { buildIdMismatched: true }
-
-            return await renderScriptError(req, res, '/_error', error, customFields, this.renderOpts)
-          }
-
-          const p = join(this.dir, this.dist, 'main.js')
-          await this.serveStatic(req, res, p)
-        }
-      },
-
-      '/_next/:buildId/main.js.map': async (req, res, params) => {
-        if (this.dev) {
-          this.handleBuildId(params.buildId, res)
-          const p = join(this.dir, this.dist, 'main.js.map')
-          await this.serveStatic(req, res, p)
-        } else {
-          const buildId = params.buildId
-          if (!this.handleBuildId(buildId, res)) {
-            return await this.render404(req, res)
-          }
-
-          const p = join(this.dir, this.dist, 'main.js.map')
-          await this.serveStatic(req, res, p)
-        }
-      },
-
       '/_next/:buildId/page/:path*.js.map': async (req, res, params) => {
         const paths = params.path || ['']
         const page = `/${paths.join('/')}`
@@ -279,6 +228,11 @@ export default class Server {
       },
 
       '/_next/static/:path*': async (req, res, params) => {
+        // The commons folder holds commonschunk files
+        // In development they don't have a hash, and shouldn't be cached by the browser.
+        if (this.dev && params.path[0] === 'commons') {
+          res.setHeader('Cache-Control', 'no-store, must-revalidate')
+        }
         const p = join(this.dir, this.dist, 'static', ...(params.path || []))
         await this.serveStatic(req, res, p)
       },
diff --git a/server/render.js b/server/render.js
index 3f700657ea0f7..aa98a5f858a70 100644
--- a/server/render.js
+++ b/server/render.js
@@ -12,6 +12,7 @@ import Head, { defaultHead } from '../lib/head'
 import App from '../lib/app'
 import ErrorDebug from '../lib/error-debug'
 import { flushChunks } from '../lib/dynamic'
+import { BUILD_MANIFEST } from '../lib/constants'
 
 const logger = console
 
@@ -54,6 +55,7 @@ async function doRender (req, res, pathname, query, {
   }
 
   const documentPath = join(dir, dist, 'dist', 'bundles', 'pages', '_document')
+  const buildManifest = require(join(dir, dist, BUILD_MANIFEST))
 
   let [Component, Document] = await Promise.all([
     requirePage(page, {dir, dist}),
@@ -94,7 +96,7 @@ async function doRender (req, res, pathname, query, {
     }
     const chunks = loadChunks({ dev, dir, dist, availableChunks })
 
-    return { html, head, errorHtml, chunks }
+    return { html, head, errorHtml, chunks, buildManifest }
   }
 
   const docProps = await loadGetInitialProps(Document, { ...ctx, renderPage })
@@ -117,6 +119,7 @@ async function doRender (req, res, pathname, query, {
     dev,
     dir,
     staticMarkup,
+    buildManifest,
     ...docProps
   })
 
diff --git a/test/integration/dist-dir/test/index.test.js b/test/integration/dist-dir/test/index.test.js
index b0c9e7a2d6a2c..2e7b99e1f456f 100644
--- a/test/integration/dist-dir/test/index.test.js
+++ b/test/integration/dist-dir/test/index.test.js
@@ -39,11 +39,10 @@ describe('Production Usage', () => {
 
   describe('File locations', () => {
     it('should build the app within the given `dist` directory', () => {
-      expect(existsSync(join(__dirname, '/../dist/main.js'))).toBeTruthy()
+      expect(existsSync(join(__dirname, '/../dist/BUILD_ID'))).toBeTruthy()
     })
-
     it('should not build the app within the default `.next` directory', () => {
-      expect(existsSync(join(__dirname, '/../.next/main.js'))).toBeFalsy()
+      expect(existsSync(join(__dirname, '/../.next/BUILD_ID'))).toBeFalsy()
     })
   })
 })
diff --git a/test/integration/static/.gitignore b/test/integration/static/.gitignore
new file mode 100644
index 0000000000000..3ec8dc5141d75
--- /dev/null
+++ b/test/integration/static/.gitignore
@@ -0,0 +1 @@
+.next-dev
diff --git a/test/integration/static/next.config.js b/test/integration/static/next.config.js
index 96c6be7eaa392..fc2c1d2b55c3c 100644
--- a/test/integration/static/next.config.js
+++ b/test/integration/static/next.config.js
@@ -1,17 +1,22 @@
-module.exports = {
-  exportPathMap: function () {
-    return {
-      '/': { page: '/' },
-      '/about': { page: '/about' },
-      '/asset': { page: '/asset' },
-      '/button-link': { page: '/button-link' },
-      '/get-initial-props-with-no-query': { page: '/get-initial-props-with-no-query' },
-      '/counter': { page: '/counter' },
-      '/dynamic-imports': { page: '/dynamic-imports' },
-      '/dynamic': { page: '/dynamic', query: { text: 'cool dynamic text' } },
-      '/dynamic/one': { page: '/dynamic', query: { text: 'next export is nice' } },
-      '/dynamic/two': { page: '/dynamic', query: { text: 'zeit is awesome' } },
-      '/file-name.md': { page: '/dynamic', query: { text: 'this file has an extension' } }
+const {PHASE_DEVELOPMENT_SERVER} = require('next/constants')
+
+module.exports = (phase) => {
+  return {
+    distDir: phase === PHASE_DEVELOPMENT_SERVER ? '.next-dev' : '.next',
+    exportPathMap: function () {
+      return {
+        '/': { page: '/' },
+        '/about': { page: '/about' },
+        '/asset': { page: '/asset' },
+        '/button-link': { page: '/button-link' },
+        '/get-initial-props-with-no-query': { page: '/get-initial-props-with-no-query' },
+        '/counter': { page: '/counter' },
+        '/dynamic-imports': { page: '/dynamic-imports' },
+        '/dynamic': { page: '/dynamic', query: { text: 'cool dynamic text' } },
+        '/dynamic/one': { page: '/dynamic', query: { text: 'next export is nice' } },
+        '/dynamic/two': { page: '/dynamic', query: { text: 'zeit is awesome' } },
+        '/file-name.md': { page: '/dynamic', query: { text: 'this file has an extension' } }
+      }
     }
   }
 }
diff --git a/test/integration/static/test/index.test.js b/test/integration/static/test/index.test.js
index 5ea24f5eb4536..3fea134be7d10 100644
--- a/test/integration/static/test/index.test.js
+++ b/test/integration/static/test/index.test.js
@@ -31,13 +31,13 @@ describe('Static Export', () => {
     context.server = await startStaticServer(join(appDir, 'out'))
     context.port = context.server.address().port
 
-    devContext.appPort = await findPort()
-    devContext.server = await launchApp(join(__dirname, '../'), devContext.appPort, true)
+    devContext.port = await findPort()
+    devContext.server = await launchApp(join(__dirname, '../'), devContext.port, true)
 
     // pre-build all pages at the start
     await Promise.all([
-      renderViaHTTP(devContext.appPort, '/'),
-      renderViaHTTP(devContext.appPort, '/dynamic/one')
+      renderViaHTTP(devContext.port, '/'),
+      renderViaHTTP(devContext.port, '/dynamic/one')
     ])
   })
   afterAll(() => {
@@ -47,5 +47,5 @@ describe('Static Export', () => {
 
   ssr(context)
   browser(context)
-  dev(context)
+  dev(devContext)
 })
diff --git a/test/lib/next-test-utils.js b/test/lib/next-test-utils.js
index d916e95364034..174b55b5e99fc 100644
--- a/test/lib/next-test-utils.js
+++ b/test/lib/next-test-utils.js
@@ -3,7 +3,7 @@ import qs from 'querystring'
 import http from 'http'
 import express from 'express'
 import path from 'path'
-import portfinder from 'portfinder'
+import getPort from 'get-port'
 import { spawn } from 'child_process'
 import { readFileSync, writeFileSync, existsSync, unlinkSync } from 'fs'
 import fkill from 'fkill'
@@ -63,8 +63,7 @@ export function fetchViaHTTP (appPort, pathname, query) {
 }
 
 export function findPort () {
-  portfinder.basePort = 20000 + Math.ceil(Math.random() * 10000)
-  return portfinder.getPortPromise()
+  return getPort()
 }
 
 // Launch the app in dev mode.
diff --git a/test/lib/next-webdriver.js b/test/lib/next-webdriver.js
index 9ccbd6ad3dc49..55c2ccd2b18bf 100644
--- a/test/lib/next-webdriver.js
+++ b/test/lib/next-webdriver.js
@@ -1,6 +1,10 @@
 import wd from 'wd'
 
 export default async function (appPort, pathname) {
+  if (typeof appPort === 'undefined') {
+    throw new Error('appPort is undefined')
+  }
+
   const url = `http://localhost:${appPort}${pathname}`
   console.log(`> Start loading browser with url: ${url}`)
 
diff --git a/yarn.lock b/yarn.lock
index 08cebf89e29fe..3ad3f8a275bdc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -902,7 +902,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-any-promise@^1.0.0, any-promise@^1.1.0:
+any-promise@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
 
@@ -1083,7 +1083,7 @@ async@2.0.1:
   dependencies:
     lodash "^4.8.0"
 
-async@^1.4.0, async@^1.5.2:
+async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -3440,10 +3440,6 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-promise@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.3.0.tgz#d1eb3625c4e6dcbb9b96eeae4425d5a3b135fed2"
-
 glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -3675,11 +3671,7 @@ hoek@4.x.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
 
-hoist-non-react-statics@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
-
-hoist-non-react-statics@^2.5.0:
+hoist-non-react-statics@2.5.0, hoist-non-react-statics@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
 
@@ -5163,7 +5155,7 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -5200,14 +5192,6 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-mz@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
 nan@^2.3.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -5790,14 +5774,6 @@ pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
-portfinder@1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -7358,18 +7334,6 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-thenify-all@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
-  dependencies:
-    any-promise "^1.0.0"
-
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"

From eca8e8f64bc746debe270a8e5969ec16735518c0 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Thu, 12 Apr 2018 10:33:22 +0200
Subject: [PATCH 42/73] Expose app.js (#4129)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Expose pages/_app.js

* Add tests for _app and _document

* Uncomment deprecation warnings

* Add documentation for _app, improve documentation of _document

* Update docs / test for _document

* Add _document to client compiler in development

* Add missing app.js to comment

* Only warn once

* Add url-deprecated error page

* Combine tests

* Yse same message for all methods of ‘props.url’

* Update docs around _app

* Update documentation

* Quotes

* Update table of contents
---
 app.js                                        |   1 +
 client/index.js                               |  18 ++-
 client/webpack-hot-middleware-client.js       |  14 +++
 errors/url-deprecated.md                      |  23 ++++
 lib/app.js                                    |  76 ++++++++----
 lib/router/router.js                          |   7 +-
 package.json                                  |   3 +-
 pages/_app.js                                 |   1 +
 readme.md                                     | 112 ++++++++++++++++--
 server/build/webpack.js                       |   6 +-
 server/build/webpack/utils.js                 |  11 +-
 server/document.js                            |   2 +
 server/index.js                               |  17 +--
 server/render.js                              |  22 ++--
 test/integration/app-document/pages/_app.js   |  44 +++++++
 .../app-document/pages/_document.js           |  24 ++++
 test/integration/app-document/pages/about.js  |   6 +
 test/integration/app-document/pages/index.js  |   5 +
 test/integration/app-document/test/client.js  |  84 +++++++++++++
 .../app-document/test/index.test.js           |  33 ++++++
 .../app-document/test/rendering.js            |  36 ++++++
 21 files changed, 477 insertions(+), 68 deletions(-)
 create mode 100644 app.js
 create mode 100644 errors/url-deprecated.md
 create mode 100644 pages/_app.js
 create mode 100644 test/integration/app-document/pages/_app.js
 create mode 100644 test/integration/app-document/pages/_document.js
 create mode 100644 test/integration/app-document/pages/about.js
 create mode 100644 test/integration/app-document/pages/index.js
 create mode 100644 test/integration/app-document/test/client.js
 create mode 100644 test/integration/app-document/test/index.test.js
 create mode 100644 test/integration/app-document/test/rendering.js

diff --git a/app.js b/app.js
new file mode 100644
index 0000000000000..0bcca7647b16e
--- /dev/null
+++ b/app.js
@@ -0,0 +1 @@
+module.exports = require('./dist/lib/app')
diff --git a/client/index.js b/client/index.js
index e29a523d3ec1b..149e222daa35f 100644
--- a/client/index.js
+++ b/client/index.js
@@ -3,7 +3,6 @@ import ReactDOM from 'react-dom'
 import HeadManager from './head-manager'
 import { createRouter } from '../lib/router'
 import EventEmitter from '../lib/EventEmitter'
-import App from '../lib/app'
 import { loadGetInitialProps, getURL } from '../lib/utils'
 import PageLoader from '../lib/page-loader'
 import * as asset from '../lib/asset'
@@ -69,6 +68,7 @@ export let router
 export let ErrorComponent
 let ErrorDebugComponent
 let Component
+let App
 let stripAnsi = (s) => s
 
 export const emitter = new EventEmitter()
@@ -82,16 +82,23 @@ export default async ({ ErrorDebugComponent: passedDebugComponent, stripAnsi: pa
   stripAnsi = passedStripAnsi || stripAnsi
   ErrorDebugComponent = passedDebugComponent
   ErrorComponent = await pageLoader.loadPage('/_error')
+  App = await pageLoader.loadPage('/_app')
 
   try {
     Component = await pageLoader.loadPage(page)
+
+    if (typeof Component !== 'function') {
+      throw new Error(`The default export is not a React Component in page: "${pathname}"`)
+    }
   } catch (err) {
     console.error(stripAnsi(`${err.message}\n${err.stack}`))
     Component = ErrorComponent
   }
 
   router = createRouter(pathname, query, asPath, {
+    initialProps: props,
     pageLoader,
+    App,
     Component,
     ErrorComponent,
     err
@@ -136,7 +143,7 @@ export async function renderError (error) {
   console.error(stripAnsi(errorMessage))
 
   if (prod) {
-    const initProps = { err: error, pathname, query, asPath }
+    const initProps = {Component: ErrorComponent, router, ctx: {err: error, pathname, query, asPath}}
     const props = await loadGetInitialProps(ErrorComponent, initProps)
     renderReactElement(createElement(ErrorComponent, props), errorContainer)
   } else {
@@ -145,18 +152,19 @@ export async function renderError (error) {
 }
 
 async function doRender ({ Component, props, hash, err, emitter: emitterProp = emitter }) {
+  // Usual getInitialProps fetching is handled in next/router
+  // this is for when ErrorComponent gets replaced by Component by HMR
   if (!props && Component &&
     Component !== ErrorComponent &&
     lastAppProps.Component === ErrorComponent) {
-    // fetch props if ErrorComponent was replaced with a page component by HMR
     const { pathname, query, asPath } = router
-    props = await loadGetInitialProps(Component, { err, pathname, query, asPath })
+    props = await loadGetInitialProps(App, {Component, router, ctx: {err, pathname, query, asPath}})
   }
 
   Component = Component || lastAppProps.Component
   props = props || lastAppProps.props
 
-  const appProps = { Component, props, hash, err, router, headManager }
+  const appProps = { Component, hash, err, router, headManager, ...props }
   // lastAppProps has to be set before ReactDom.render to account for ReactDom throwing an error.
   lastAppProps = appProps
 
diff --git a/client/webpack-hot-middleware-client.js b/client/webpack-hot-middleware-client.js
index e05b01957fdd4..1fd58e57df7f0 100644
--- a/client/webpack-hot-middleware-client.js
+++ b/client/webpack-hot-middleware-client.js
@@ -27,6 +27,13 @@ export default () => {
         return
       }
 
+      // If the App component changes we have to reload the current route
+      if (route === '/_app') {
+        Router.reload(Router.route)
+        return
+      }
+
+      // Since _document is server only we need to reload the full page when it changes.
       if (route === '/_document') {
         window.location.reload()
         return
@@ -36,6 +43,13 @@ export default () => {
     },
 
     change (route) {
+      // If the App component changes we have to reload the current route
+      if (route === '/_app') {
+        Router.reload(Router.route)
+        return
+      }
+
+      // Since _document is server only we need to reload the full page when it changes.
       if (route === '/_document') {
         window.location.reload()
         return
diff --git a/errors/url-deprecated.md b/errors/url-deprecated.md
new file mode 100644
index 0000000000000..5c9c2a73f7f9d
--- /dev/null
+++ b/errors/url-deprecated.md
@@ -0,0 +1,23 @@
+# Url is deprecated
+
+#### Why This Error Occurred
+
+In version prior to 6.x `url` got magically injected into every page component, since this is confusing and can now be added by the user using a custom `_app.js` we have deprecated this feature. To be removed in Next.js 7.0
+
+#### Possible Ways to Fix It
+
+The easiest way to get the same values that `url` had is to use `withRouter`:
+
+```js
+import { withRouter } from 'next/router'
+
+class Page extends React.Component {
+  render() {
+    const {router} = this.props
+    console.log(router)
+    return <div>{router.pathname}</div>
+  }
+}
+
+export default withRouter(Page)
+```
diff --git a/lib/app.js b/lib/app.js
index bae48f0b97679..c749f9ef30812 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import shallowEquals from './shallow-equals'
-import { warn } from './utils'
+import { execOnce, warn, loadGetInitialProps } from './utils'
 import { makePublicRouterInstance } from './router'
 
 export default class App extends Component {
@@ -9,16 +9,26 @@ export default class App extends Component {
     hasError: null
   }
 
+  static displayName = 'App'
+
+  static async getInitialProps ({ Component, router, ctx }) {
+    const pageProps = await loadGetInitialProps(Component, ctx)
+    return {pageProps}
+  }
+
   static childContextTypes = {
+    _containerProps: PropTypes.any,
     headManager: PropTypes.object,
     router: PropTypes.object
   }
 
   getChildContext () {
     const { headManager } = this.props
+    const {hasError} = this.state
     return {
       headManager,
-      router: makePublicRouterInstance(this.props.router)
+      router: makePublicRouterInstance(this.props.router),
+      _containerProps: {...this.props, hasError}
     }
   }
 
@@ -29,22 +39,19 @@ export default class App extends Component {
   }
 
   render () {
-    if (this.state.hasError) return null
-
-    const { Component, props, hash, router } = this.props
+    const {router, Component, pageProps} = this.props
     const url = createUrl(router)
-    // If there no component exported we can't proceed.
-    // We'll tackle that here.
-    if (typeof Component !== 'function') {
-      throw new Error(`The default export is not a React Component in page: "${url.pathname}"`)
-    }
-    const containerProps = { Component, props, hash, router, url }
-
-    return <Container {...containerProps} />
+    return <Container>
+      <Component url={url} {...pageProps} />
+    </Container>
   }
 }
 
-class Container extends Component {
+export class Container extends Component {
+  static contextTypes = {
+    _containerProps: PropTypes.any
+  }
+
   componentDidMount () {
     this.scrollToHash()
   }
@@ -71,10 +78,16 @@ class Container extends Component {
   }
 
   render () {
-    const { Component, props, url } = this.props
+    const { hasError } = this.context._containerProps
+
+    if (hasError) {
+      return null
+    }
+
+    const {children} = this.props
 
     if (process.env.NODE_ENV === 'production') {
-      return (<Component {...props} url={url} />)
+      return <>{children}</>
     } else {
       const ErrorDebug = require('./error-debug').default
       const { AppContainer } = require('react-hot-loader')
@@ -83,39 +96,50 @@ class Container extends Component {
       // https://github.com/gaearon/react-hot-loader/issues/442
       return (
         <AppContainer warnings={false} errorReporter={ErrorDebug}>
-          <Component {...props} url={url} />
+          {children}
         </AppContainer>
       )
     }
   }
 }
 
-function createUrl (router) {
+const warnUrl = execOnce(() => warn(`Warning: the 'url' property is deprecated. https://err.sh/next.js/url-deprecated`))
+
+export function createUrl (router) {
   return {
-    query: router.query,
-    pathname: router.pathname,
-    asPath: router.asPath,
+    get query () {
+      warnUrl()
+      return router.query
+    },
+    get pathname () {
+      warnUrl()
+      return router.pathname
+    },
+    get asPath () {
+      warnUrl()
+      return router.asPath
+    },
     back: () => {
-      warn(`Warning: 'url.back()' is deprecated. Use "window.history.back()"`)
+      warnUrl()
       router.back()
     },
     push: (url, as) => {
-      warn(`Warning: 'url.push()' is deprecated. Use "next/router" APIs.`)
+      warnUrl()
       return router.push(url, as)
     },
     pushTo: (href, as) => {
-      warn(`Warning: 'url.pushTo()' is deprecated. Use "next/router" APIs.`)
+      warnUrl()
       const pushRoute = as ? href : null
       const pushUrl = as || href
 
       return router.push(pushRoute, pushUrl)
     },
     replace: (url, as) => {
-      warn(`Warning: 'url.replace()' is deprecated. Use "next/router" APIs.`)
+      warnUrl()
       return router.replace(url, as)
     },
     replaceTo: (href, as) => {
-      warn(`Warning: 'url.replaceTo()' is deprecated. Use "next/router" APIs.`)
+      warnUrl()
       const replaceRoute = as ? href : null
       const replaceUrl = as || href
 
diff --git a/lib/router/router.js b/lib/router/router.js
index ce3415c270699..5193be435b81e 100644
--- a/lib/router/router.js
+++ b/lib/router/router.js
@@ -15,7 +15,7 @@ const historyMethodWarning = execOnce((method) => {
 })
 
 export default class Router {
-  constructor (pathname, query, as, { pageLoader, Component, ErrorComponent, err } = {}) {
+  constructor (pathname, query, as, { initialProps, pageLoader, App, Component, ErrorComponent, err } = {}) {
     // represents the current component key
     this.route = toRoute(pathname)
 
@@ -25,7 +25,7 @@ export default class Router {
     // Otherwise, this cause issues when when going back and
     // come again to the errored page.
     if (Component !== ErrorComponent) {
-      this.components[this.route] = { Component, err }
+      this.components[this.route] = { Component, props: initialProps, err }
     }
 
     // Handling Router Events
@@ -33,6 +33,7 @@ export default class Router {
 
     this.pageLoader = pageLoader
     this.prefetchQueue = new PQueue({ concurrency: 2 })
+    this.App = App
     this.ErrorComponent = ErrorComponent
     this.pathname = pathname
     this.query = query
@@ -350,7 +351,7 @@ export default class Router {
     const cancel = () => { cancelled = true }
     this.componentLoadCancel = cancel
 
-    const props = await loadGetInitialProps(Component, ctx)
+    const props = await loadGetInitialProps(this.App, {Component, router: this, ctx})
 
     if (cancel === this.componentLoadCancel) {
       this.componentLoadCancel = null
diff --git a/package.json b/package.json
index d372fad240206..74277b985d109 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,8 @@
     "asset.js",
     "error.js",
     "constants.js",
-    "config.js"
+    "config.js",
+    "app.js"
   ],
   "bin": {
     "next": "./dist/bin/next"
diff --git a/pages/_app.js b/pages/_app.js
new file mode 100644
index 0000000000000..c96c4b94f9a62
--- /dev/null
+++ b/pages/_app.js
@@ -0,0 +1 @@
+module.exports = require('next/app')
diff --git a/readme.md b/readme.md
index 0505d64e50f69..34d1edeadc907 100644
--- a/readme.md
+++ b/readme.md
@@ -22,12 +22,20 @@ Next.js is a minimalistic framework for server-rendered React applications.
   - [CSS](#css)
     - [Built-in CSS support](#built-in-css-support)
     - [CSS-in-JS](#css-in-js)
+    - [Importing CSS / Sass / Less / Stylus files](#importing-css--sass--less--stylus-files)
   - [Static file serving (e.g.: images)](#static-file-serving-eg-images)
   - [Populating `<head>`](#populating-head)
   - [Fetching data and component lifecycle](#fetching-data-and-component-lifecycle)
   - [Routing](#routing)
     - [With `<Link>`](#with-link)
+      - [With URL object](#with-url-object)
+      - [Replace instead of push url](#replace-instead-of-push-url)
+      - [Using a component that supports `onClick`](#using-a-component-that-supports-onclick)
+      - [Forcing the Link to expose `href` to its child](#forcing-the-link-to-expose-href-to-its-child)
+      - [Disabling the scroll changes to top on page](#disabling-the-scroll-changes-to-top-on-page)
     - [Imperatively](#imperatively)
+    - [Intercepting `popstate`](#intercepting-popstate)
+      - [With URL object](#with-url-object-1)
       - [Router Events](#router-events)
       - [Shallow Routing](#shallow-routing)
     - [Using a Higher Order Component](#using-a-higher-order-component)
@@ -35,16 +43,34 @@ Next.js is a minimalistic framework for server-rendered React applications.
     - [With `<Link>`](#with-link-1)
     - [Imperatively](#imperatively-1)
   - [Custom server and routing](#custom-server-and-routing)
+    - [Disabling file-system routing](#disabling-file-system-routing)
+    - [Dynamic assetPrefix](#dynamic-assetprefix)
   - [Dynamic Import](#dynamic-import)
+    - [1. Basic Usage (Also does SSR)](#1-basic-usage-also-does-ssr)
+    - [2. With Custom Loading Component](#2-with-custom-loading-component)
+    - [3. With No SSR](#3-with-no-ssr)
+    - [4. With Multiple Modules At Once](#4-with-multiple-modules-at-once)
+  - [Custom `<App>`](#custom-app)
   - [Custom `<Document>`](#custom-document)
   - [Custom error handling](#custom-error-handling)
+  - [Reusing the built-in error page](#reusing-the-built-in-error-page)
   - [Custom configuration](#custom-configuration)
+    - [Setting a custom build directory](#setting-a-custom-build-directory)
+    - [Disabling etag generation](#disabling-etag-generation)
+    - [Configuring the onDemandEntries](#configuring-the-ondemandentries)
+    - [Configuring extensions looked for when resolving pages in `pages`](#configuring-extensions-looked-for-when-resolving-pages-in-pages)
+    - [Configuring the build ID](#configuring-the-build-id)
   - [Customizing webpack config](#customizing-webpack-config)
   - [Customizing babel config](#customizing-babel-config)
+    - [Exposing configuration to the server / client side](#exposing-configuration-to-the-server--client-side)
   - [CDN support with Asset Prefix](#cdn-support-with-asset-prefix)
 - [Production deployment](#production-deployment)
 - [Static HTML export](#static-html-export)
+  - [Usage](#usage)
+  - [Limitation](#limitation)
 - [Multi Zones](#multi-zones)
+  - [How to define a zone](#how-to-define-a-zone)
+  - [How to merge them](#how-to-merge-them)
 - [Recipes](#recipes)
 - [FAQ](#faq)
 - [Contributing](#contributing)
@@ -923,6 +949,77 @@ const HelloBundle = dynamic({
 export default () => <HelloBundle title="Dynamic Bundle" />
 ```
 
+### Custom `<App>`
+
+<p><details>
+  <summary><b>Examples</b></summary>
+  <ul><li><a href="./examples/layout-component">Using `_app.js` for layout</a></li></ul>
+  <ul><li><a href="./examples/componentdidcatch">Using `_app.js` to override `componentDidCatch`</a></li></ul>
+</details></p>
+
+Next.js uses the `App` component to initialize pages. You can override it and control the page initialization. Which allows you can do amazing things like:
+
+- Persisting layout between page changes
+- Keeping state when navigating pages
+- Custom error handling using `componentDidCatch`
+- Inject additional data into pages (for example by processing GraphQL queries)
+
+To override, create the `./pages/_app.js` file and override the App class as shown below:
+
+```js
+import App, {Container} from 'next/app'
+import React from 'react'
+
+export default class MyApp extends App {
+  static async getInitialProps ({ Component, router, ctx }) {
+    let pageProps = {}
+
+    if (Component.getInitialProps) {
+      pageProps = await Component.getInitialProps(ctx)
+    }
+
+    return {pageProps}
+  }
+
+  render () {
+    const {Component, pageProps} = this.props
+    return <Container>
+      <Component {...pageProps} />
+    </Container>
+  }
+}
+```
+
+When using state inside app the `hasError` property has to be defined:
+
+```js
+import App, {Container} from 'next/app'
+import React from 'react'
+
+export default class MyApp extends App {
+  static async getInitialProps ({ Component, router, ctx }) {
+    let pageProps = {}
+
+    if (Component.getInitialProps) {
+      pageProps = await Component.getInitialProps(ctx)
+    }
+
+    return {pageProps}
+  }
+
+  state = {
+    hasError: null
+  }
+
+  render () {
+    const {Component, pageProps} = this.props
+    return <Container>
+      <Component {...pageProps} />
+    </Container>
+  }
+}
+```
+
 ### Custom `<Document>`
 
 <p><details>
@@ -931,6 +1028,10 @@ export default () => <HelloBundle title="Dynamic Bundle" />
   <ul><li><a href="./examples/with-amp">Google AMP</a></li></ul>
 </details></p>
 
+- Is rendered on the server side
+- Is used to change the initial server side rendered document markup
+- Commonly used to implement server side rendering for css-in-js libraries like [styled-components](./examples/with-styled-components), [glamorous](./examples/with-glamorous) or [emotion](with-emotion). [styled-jsx](https://github.com/zeit/styled-jsx) is included with Next.js by default.
+
 Pages in `Next.js` skip the definition of the surrounding document's markup. For example, you never include `<html>`, `<body>`, etc. To override that default behavior, you must create a file at `./pages/_document.js`, where you can extend the `Document` class:
 
 ```jsx
@@ -939,13 +1040,11 @@ Pages in `Next.js` skip the definition of the surrounding document's markup. For
 
 // ./pages/_document.js
 import Document, { Head, Main, NextScript } from 'next/document'
-import flush from 'styled-jsx/server'
 
 export default class MyDocument extends Document {
-  static getInitialProps({ renderPage }) {
-    const { html, head, errorHtml, chunks, buildManifest } = renderPage()
-    const styles = flush()
-    return { html, head, errorHtml, chunks, styles, buildManifest }
+  static async getInitialProps(ctx) {
+    const initialProps = await Document.getInitialProps(ctx)
+    return { ...initialProps }
   }
 
   render() {
@@ -955,7 +1054,6 @@ export default class MyDocument extends Document {
           <style>{`body { margin: 0 } /* custom! */`}</style>
         </Head>
         <body className="custom_class">
-          {this.props.customValue}
           <Main />
           <NextScript />
         </body>
@@ -969,7 +1067,7 @@ The `ctx` object is equivalent to the one received in all [`getInitialProps`](#f
 
 - `renderPage` (`Function`) a callback that executes the actual React rendering logic (synchronously). It's useful to decorate this function in order to support server-rendering wrappers like Aphrodite's [`renderStatic`](https://github.com/Khan/aphrodite#server-side-rendering)
 
-__Note: React-components outside of `<Main />` will not be initialised by the browser. If you need shared components in all your pages (like a menu or a toolbar), do _not_ add application logic  here, but take a look at [this example](https://github.com/zeit/next.js/tree/master/examples/layout-component).__
+__Note: React-components outside of `<Main />` will not be initialised by the browser. Do _not_ add application logic here. If you need shared components in all your pages (like a menu or a toolbar), take a look at the `App` component instead.__
 
 ### Custom error handling
 
diff --git a/server/build/webpack.js b/server/build/webpack.js
index 344ee32c99bf0..55fccd029e9c3 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -22,7 +22,8 @@ const nextNodeModulesDir = path.join(nextDir, 'node_modules')
 const nextPagesDir = path.join(nextDir, 'pages')
 const defaultPages = [
   '_error.js',
-  '_document.js'
+  '_document.js',
+  '_app.js'
 ]
 const interpolateNames = new Map(defaultPages.map((p) => {
   return [path.join(nextPagesDir, p), `dist/bundles/pages/${p}`]
@@ -71,11 +72,12 @@ function externalsConfig (dir, isServer) {
         return callback()
       }
 
-      // Webpack itself has to be compiled because it doesn't always use module relative paths
+      // Default pages have to be transpiled
       if (res.match(/node_modules[/\\]next[/\\]dist[/\\]pages/)) {
         return callback()
       }
 
+      // Webpack itself has to be compiled because it doesn't always use module relative paths
       if (res.match(/node_modules[/\\]webpack/)) {
         return callback()
       }
diff --git a/server/build/webpack/utils.js b/server/build/webpack/utils.js
index 876eac8b1c4d7..960226543feea 100644
--- a/server/build/webpack/utils.js
+++ b/server/build/webpack/utils.js
@@ -16,8 +16,9 @@ export async function getPagePaths (dir, {dev, isServer, pageExtensions}) {
   let pages
 
   if (dev) {
-    // In development we only compile _document.js and _error.js when starting, since they're always needed. All other pages are compiled with on demand entries
-    pages = await glob(isServer ? `pages/+(_document|_error).+(${pageExtensions})` : `pages/_error.+(${pageExtensions})`, { cwd: dir })
+    // In development we only compile _document.js, _error.js and _app.js when starting, since they're always needed. All other pages are compiled with on demand entries
+    // _document also has to be in the client compiler in development because we want to detect HMR changes and reload the client
+    pages = await glob(`pages/+(_document|_app|_error).+(${pageExtensions})`, { cwd: dir })
   } else {
     // In production get all pages from the pages directory
     pages = await glob(isServer ? `pages/**/*.+(${pageExtensions})` : `pages/**/!(_document)*.+(${pageExtensions})`, { cwd: dir })
@@ -57,6 +58,12 @@ export function getPageEntries (pagePaths, {isServer = false, pageExtensions} =
     entries[entry.name] = entry.files
   }
 
+  const appPagePath = path.join(nextPagesDir, '_app.js')
+  const appPageEntry = createEntry(appPagePath, {name: 'pages/_app.js'}) // default app.js
+  if (!entries[appPageEntry.name]) {
+    entries[appPageEntry.name] = appPageEntry.files
+  }
+
   const errorPagePath = path.join(nextPagesDir, '_error.js')
   const errorPageEntry = createEntry(errorPagePath, {name: 'pages/_error.js'}) // default error.js
   if (!entries[errorPageEntry.name]) {
diff --git a/server/document.js b/server/document.js
index 48fcdbc5fbaaa..92f6a90636450 100644
--- a/server/document.js
+++ b/server/document.js
@@ -91,6 +91,7 @@ export class Head extends Component {
     return <head {...this.props}>
       {(head || []).map((h, i) => React.cloneElement(h, { key: h.key || i }))}
       {page !== '/_error' && <link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} as='script' />}
+      <link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_app.js`} as='script' />
       <link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_error.js`} as='script' />
       {this.getPreloadDynamicChunks()}
       {this.getPreloadMainLinks()}
@@ -204,6 +205,7 @@ export class NextScript extends Component {
         `
       }} />}
       {page !== '/_error' && <script async id={`__NEXT_PAGE__${pathname}`} src={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} />}
+      <script async id={`__NEXT_PAGE__/_app`} src={`${assetPrefix}/_next/${buildId}/page/_app.js`} />
       <script async id={`__NEXT_PAGE__/_error`} src={`${assetPrefix}/_next/${buildId}/page/_error.js`} />
       {staticMarkup ? null : this.getDynamicChunks()}
       {staticMarkup ? null : this.getScripts()}
diff --git a/server/index.js b/server/index.js
index 1d993c0084825..05f1f2b28c6b9 100644
--- a/server/index.js
+++ b/server/index.js
@@ -28,6 +28,7 @@ const access = promisify(fs.access)
 
 const blockedPages = {
   '/_document': true,
+  '/_app': true,
   '/_error': true
 }
 
@@ -178,20 +179,6 @@ export default class Server {
         await serveStatic(req, res, path)
       },
 
-      // This is very similar to the following route.
-      // But for this one, the page already built when the Next.js process starts.
-      // There's no need to build it in on-demand manner and check for other things.
-      // So, it's clean to have a seperate route for this.
-      '/_next/:buildId/page/_error.js': async (req, res, params) => {
-        if (!this.handleBuildId(params.buildId, res)) {
-          const error = new Error('INVALID_BUILD_ID')
-          return await renderScriptError(req, res, '/_error', error)
-        }
-
-        const p = join(this.dir, `${this.dist}/bundles/pages/_error.js`)
-        await this.serveStatic(req, res, p)
-      },
-
       '/_next/:buildId/page/:path*.js': async (req, res, params) => {
         const paths = params.path || ['']
         const page = `/${paths.join('/')}`
@@ -201,7 +188,7 @@ export default class Server {
           return await renderScriptError(req, res, page, error)
         }
 
-        if (this.dev) {
+        if (this.dev && page !== '/_error' && page !== '/_app') {
           try {
             await this.hotReloader.ensurePage(page)
           } catch (error) {
diff --git a/server/render.js b/server/render.js
index aa98a5f858a70..4da7bd03b570e 100644
--- a/server/render.js
+++ b/server/render.js
@@ -9,7 +9,6 @@ import { Router } from '../lib/router'
 import { loadGetInitialProps, isResSent } from '../lib/utils'
 import { getAvailableChunks } from './utils'
 import Head, { defaultHead } from '../lib/head'
-import App from '../lib/app'
 import ErrorDebug from '../lib/error-debug'
 import { flushChunks } from '../lib/dynamic'
 import { BUILD_MANIFEST } from '../lib/constants'
@@ -55,17 +54,26 @@ async function doRender (req, res, pathname, query, {
   }
 
   const documentPath = join(dir, dist, 'dist', 'bundles', 'pages', '_document')
+  const appPath = join(dir, dist, 'dist', 'bundles', 'pages', '_app')
   const buildManifest = require(join(dir, dist, BUILD_MANIFEST))
-
-  let [Component, Document] = await Promise.all([
+  let [Component, Document, App] = await Promise.all([
     requirePage(page, {dir, dist}),
-    require(documentPath)
+    require(documentPath),
+    require(appPath)
   ])
+
   Component = Component.default || Component
+
+  if (typeof Component !== 'function') {
+    throw new Error(`The default export is not a React Component in page: "${pathname}"`)
+  }
+
+  App = App.default || App
   Document = Document.default || Document
   const asPath = req.url
   const ctx = { err, req, res, pathname, query, asPath }
-  const props = await loadGetInitialProps(Component, ctx)
+  const router = new Router(pathname, query, asPath)
+  const props = await loadGetInitialProps(App, {Component, router, ctx})
 
   // the response might be finshed on the getinitialprops call
   if (isResSent(res)) return
@@ -73,8 +81,8 @@ async function doRender (req, res, pathname, query, {
   const renderPage = (enhancer = Page => Page) => {
     const app = createElement(App, {
       Component: enhancer(Component),
-      props,
-      router: new Router(pathname, query, asPath)
+      router,
+      ...props
     })
 
     const render = staticMarkup ? renderToStaticMarkup : renderToString
diff --git a/test/integration/app-document/pages/_app.js b/test/integration/app-document/pages/_app.js
new file mode 100644
index 0000000000000..ed72d04ea36d7
--- /dev/null
+++ b/test/integration/app-document/pages/_app.js
@@ -0,0 +1,44 @@
+import App, {Container} from 'next/app'
+import React from 'react'
+
+class Layout extends React.Component {
+  state = {
+    random: false
+  }
+
+  componentDidMount () {
+    this.setState({random: Math.random()})
+  }
+
+  render () {
+    const {children} = this.props
+    const {random} = this.state
+    return <div>
+      <p id='hello-app'>Hello App</p>
+      <p id='hello-hmr'>Hello HMR</p>
+      <p id='random-number'>{random}</p>
+      {children}
+    </div>
+  }
+}
+
+export default class MyApp extends App {
+  static async getInitialProps ({ Component, router, ctx }) {
+    let pageProps = {}
+
+    if (Component.getInitialProps) {
+      pageProps = await Component.getInitialProps(ctx)
+    }
+
+    return {pageProps}
+  }
+
+  render () {
+    const {Component, pageProps} = this.props
+    return <Container>
+      <Layout>
+        <Component {...pageProps} />
+      </Layout>
+    </Container>
+  }
+}
diff --git a/test/integration/app-document/pages/_document.js b/test/integration/app-document/pages/_document.js
new file mode 100644
index 0000000000000..05ac34d01a129
--- /dev/null
+++ b/test/integration/app-document/pages/_document.js
@@ -0,0 +1,24 @@
+import Document, { Head, Main, NextScript } from 'next/document'
+
+export default class MyDocument extends Document {
+  static async getInitialProps (ctx) {
+    const initialProps = await Document.getInitialProps(ctx)
+    return { ...initialProps, customProperty: 'Hello Document' }
+  }
+
+  render () {
+    return (
+      <html>
+        <Head>
+          <style>{`body { margin: 0 } /* custom! */`}</style>
+        </Head>
+        <body className='custom_class'>
+          <p id='custom-property'>{this.props.customProperty}</p>
+          <p id='document-hmr'>Hello Document HMR</p>
+          <Main />
+          <NextScript />
+        </body>
+      </html>
+    )
+  }
+}
diff --git a/test/integration/app-document/pages/about.js b/test/integration/app-document/pages/about.js
new file mode 100644
index 0000000000000..b11173d69e1f5
--- /dev/null
+++ b/test/integration/app-document/pages/about.js
@@ -0,0 +1,6 @@
+import Link from 'next/link'
+
+export default () => <div>
+  <div className='page-about'>about</div>
+  <Link href='/'><a id='home-link'>home</a></Link>
+</div>
diff --git a/test/integration/app-document/pages/index.js b/test/integration/app-document/pages/index.js
new file mode 100644
index 0000000000000..0b040022f065f
--- /dev/null
+++ b/test/integration/app-document/pages/index.js
@@ -0,0 +1,5 @@
+import Link from 'next/link'
+export default () => <div>
+  <div className='page-index'>index</div>
+  <Link href='/about'><a id='about-link'>about</a></Link>
+</div>
diff --git a/test/integration/app-document/test/client.js b/test/integration/app-document/test/client.js
new file mode 100644
index 0000000000000..e6cab7c184314
--- /dev/null
+++ b/test/integration/app-document/test/client.js
@@ -0,0 +1,84 @@
+/* global describe, it, expect */
+
+import webdriver from 'next-webdriver'
+import { readFileSync, writeFileSync } from 'fs'
+import { join } from 'path'
+import { check } from 'next-test-utils'
+
+export default (context, render) => {
+  describe('Client side', () => {
+    it('should detect the changes to pages/_app.js and display it', async () => {
+      const browser = await webdriver(context.appPort, '/')
+      const text = await browser
+        .elementByCss('#hello-hmr').text()
+      expect(text).toBe('Hello HMR')
+
+      const appPath = join(__dirname, '../', 'pages', '_app.js')
+
+      const originalContent = readFileSync(appPath, 'utf8')
+      const editedContent = originalContent.replace('Hello HMR', 'Hi HMR')
+
+      // change the content
+      writeFileSync(appPath, editedContent, 'utf8')
+
+      await check(
+        () => browser.elementByCss('body').text(),
+        /Hi HMR/
+      )
+
+      // add the original content
+      writeFileSync(appPath, originalContent, 'utf8')
+
+      await check(
+        () => browser.elementByCss('body').text(),
+        /Hello HMR/
+      )
+
+      browser.close()
+    })
+
+    it('should detect the changes to pages/_document.js and display it', async () => {
+      const browser = await webdriver(context.appPort, '/')
+      const text = await browser
+        .elementByCss('#hello-hmr').text()
+      expect(text).toBe('Hello HMR')
+
+      const appPath = join(__dirname, '../', 'pages', '_document.js')
+
+      const originalContent = readFileSync(appPath, 'utf8')
+      const editedContent = originalContent.replace('Hello Document HMR', 'Hi Document HMR')
+
+      // change the content
+      writeFileSync(appPath, editedContent, 'utf8')
+
+      await check(
+        () => browser.elementByCss('body').text(),
+        /Hi Document HMR/
+      )
+
+      // add the original content
+      writeFileSync(appPath, originalContent, 'utf8')
+
+      await check(
+        () => browser.elementByCss('body').text(),
+        /Hello Document HMR/
+      )
+
+      browser.close()
+    })
+
+    it('should keep state between page navigations', async () => {
+      const browser = await webdriver(context.appPort, '/')
+
+      const randomNumber = await browser.elementByCss('#random-number').text()
+
+      const switchedRandomNumer = await browser
+        .elementByCss('#about-link').click()
+        .waitForElementByCss('.page-about')
+        .elementByCss('#random-number').text()
+
+      expect(switchedRandomNumer).toBe(randomNumber)
+      browser.close()
+    })
+  })
+}
diff --git a/test/integration/app-document/test/index.test.js b/test/integration/app-document/test/index.test.js
new file mode 100644
index 0000000000000..13cb89076ef8b
--- /dev/null
+++ b/test/integration/app-document/test/index.test.js
@@ -0,0 +1,33 @@
+/* global jasmine, describe, beforeAll, afterAll */
+
+import { join } from 'path'
+import {
+  renderViaHTTP,
+  fetchViaHTTP,
+  findPort,
+  launchApp,
+  killApp
+} from 'next-test-utils'
+
+// test suits
+import rendering from './rendering'
+import client from './client'
+
+const context = {}
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 5
+
+describe('Document and App', () => {
+  beforeAll(async () => {
+    context.appPort = await findPort()
+    context.server = await launchApp(join(__dirname, '../'), context.appPort, true)
+
+    // pre-build all pages at the start
+    await Promise.all([
+      renderViaHTTP(context.appPort, '/')
+    ])
+  })
+  afterAll(() => killApp(context.server))
+
+  rendering(context, 'Rendering via HTTP', (p, q) => renderViaHTTP(context.appPort, p, q), (p, q) => fetchViaHTTP(context.appPort, p, q))
+  client(context, (p, q) => renderViaHTTP(context.appPort, p, q))
+})
diff --git a/test/integration/app-document/test/rendering.js b/test/integration/app-document/test/rendering.js
new file mode 100644
index 0000000000000..3d1d305782c81
--- /dev/null
+++ b/test/integration/app-document/test/rendering.js
@@ -0,0 +1,36 @@
+/* global describe, test, expect */
+
+import cheerio from 'cheerio'
+
+export default function ({ app }, suiteName, render, fetch) {
+  async function get$ (path, query) {
+    const html = await render(path, query)
+    return cheerio.load(html)
+  }
+
+  describe(suiteName, () => {
+    describe('_document', () => {
+      test('It has a custom body class', async () => {
+        const $ = await get$('/')
+        expect($('body').hasClass('custom_class'))
+      })
+
+      test('It injects custom head tags', async () => {
+        const $ = await get$('/')
+        expect($('head').text().includes('body { margin: 0 }'))
+      })
+
+      test('It passes props from Document.getInitialProps to Document', async () => {
+        const $ = await get$('/')
+        expect($('#custom-property').text() === 'Hello Document')
+      })
+    })
+
+    describe('_app', () => {
+      test('It shows a custom tag', async () => {
+        const $ = await get$('/')
+        expect($('hello-app').text() === 'Hello App')
+      })
+    })
+  })
+}

From 09e506482123f4657f3cb170710ba7987a216a97 Mon Sep 17 00:00:00 2001
From: Christian Nwamba <nwambachristian@gmail.com>
Date: Thu, 12 Apr 2018 09:40:32 +0100
Subject: [PATCH 43/73] Fixed typo (#4144)

which allows you can -> which allows you to
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 34d1edeadc907..adeef402d5ab0 100644
--- a/readme.md
+++ b/readme.md
@@ -957,7 +957,7 @@ export default () => <HelloBundle title="Dynamic Bundle" />
   <ul><li><a href="./examples/componentdidcatch">Using `_app.js` to override `componentDidCatch`</a></li></ul>
 </details></p>
 
-Next.js uses the `App` component to initialize pages. You can override it and control the page initialization. Which allows you can do amazing things like:
+Next.js uses the `App` component to initialize pages. You can override it and control the page initialization. Which allows you to do amazing things like:
 
 - Persisting layout between page changes
 - Keeping state when navigating pages

From fbd023c0320e99db6b8ea01cf77a357c0e2ffc63 Mon Sep 17 00:00:00 2001
From: Prateek Rastogi <prastogi34@gmail.com>
Date: Thu, 12 Apr 2018 15:52:37 +0530
Subject: [PATCH 44/73] added example of integration with videojs (#4139)

* added videojs integration example

* added videojs example

* lint fix

* Revert "lint fix"

This reverts commit 39010fa0b58a66d06b91987a5bef46c044181470.

* removed unexpected lint fix
---
 examples/with-videojs/README.md            | 41 ++++++++++++++++++++++
 examples/with-videojs/components/Player.js | 35 ++++++++++++++++++
 examples/with-videojs/next.config.js       | 20 +++++++++++
 examples/with-videojs/package.json         | 19 ++++++++++
 examples/with-videojs/pages/index.js       | 27 ++++++++++++++
 5 files changed, 142 insertions(+)
 create mode 100644 examples/with-videojs/README.md
 create mode 100644 examples/with-videojs/components/Player.js
 create mode 100644 examples/with-videojs/next.config.js
 create mode 100644 examples/with-videojs/package.json
 create mode 100644 examples/with-videojs/pages/index.js

diff --git a/examples/with-videojs/README.md b/examples/with-videojs/README.md
new file mode 100644
index 0000000000000..c7244c0822e0c
--- /dev/null
+++ b/examples/with-videojs/README.md
@@ -0,0 +1,41 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-videojs)
+
+# video.js example
+
+## How to use
+
+### Using `create-next-app`
+
+Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+
+```bash
+npx create-next-app --example with-videojs with-videojs-app
+# or
+yarn create next-app --example with-videojs with-videojs-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-videojs
+cd with-videojs
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run 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 Next.js along with [Video.js](http://videojs.com) including handling of default styles.
diff --git a/examples/with-videojs/components/Player.js b/examples/with-videojs/components/Player.js
new file mode 100644
index 0000000000000..5b7d1f4072e25
--- /dev/null
+++ b/examples/with-videojs/components/Player.js
@@ -0,0 +1,35 @@
+import React, { Component } from 'react'
+import videojs from 'video.js'
+import 'videojs-youtube'
+import 'video.js/dist/video-js.css'
+
+class Player extends Component {
+  componentDidMount () {
+    // instantiate Video.js
+    this.player = videojs(this.videoNode, this.props, function onPlayerReady () {
+      console.log('onPlayerReady', this)
+    })
+  }
+
+  // destroy player on unmount
+  componentWillUnmount () {
+    if (this.player) {
+      this.player.dispose()
+    }
+  }
+
+  // wrap the player in a div with a `data-vjs-player` attribute
+  // so videojs won't create additional wrapper in the DOM
+  // see https://github.com/videojs/video.js/pull/3856
+  render () {
+    return (
+      <div>
+        <div data-vjs-player>
+          <video ref={node => (this.videoNode = node)} className='video-js' />
+        </div>
+      </div>
+    )
+  }
+}
+
+export default Player
diff --git a/examples/with-videojs/next.config.js b/examples/with-videojs/next.config.js
new file mode 100644
index 0000000000000..9313dfca28534
--- /dev/null
+++ b/examples/with-videojs/next.config.js
@@ -0,0 +1,20 @@
+const withCss = require('@zeit/next-css')
+
+module.exports = withCss({
+  webpack (config) {
+    config.module.rules.push({
+      test: /\.(png|svg|eot|otf|ttf|woff|woff2)$/,
+      use: {
+        loader: 'url-loader',
+        options: {
+          limit: 100000,
+          publicPath: './',
+          outputPath: 'static/',
+          name: '[name].[ext]'
+        }
+      }
+    })
+
+    return config
+  }
+})
diff --git a/examples/with-videojs/package.json b/examples/with-videojs/package.json
new file mode 100644
index 0000000000000..95d9f8a62ab6f
--- /dev/null
+++ b/examples/with-videojs/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "with-videojs",
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "@zeit/next-css": "^0.1.2",
+    "next": "6.0.0-canary.2",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "url-loader": "^0.6.2",
+    "video.js": "^6.7.3",
+    "videojs-youtube": "^2.4.1"
+  },
+  "license": "ISC"
+}
diff --git a/examples/with-videojs/pages/index.js b/examples/with-videojs/pages/index.js
new file mode 100644
index 0000000000000..e1930fd835f85
--- /dev/null
+++ b/examples/with-videojs/pages/index.js
@@ -0,0 +1,27 @@
+import Head from 'next/head'
+import React from 'react'
+import Player from '../components/Player'
+
+export default class Index extends React.Component {
+  render () {
+    const videoJsOptions = {
+      techOrder: ['youtube'],
+      autoplay: true,
+      controls: true,
+      sources: [{
+        src: 'https://www.youtube.com/watch?v=jiLkBxw2pbs',
+        type: 'video/youtube'
+      }]
+    }
+
+    return (
+      <div>
+        <Head>
+          <link rel='stylesheet' href='/_next/static/style.css' />
+        </Head>
+
+        <Player {...videoJsOptions} />
+      </div>
+    )
+  }
+}

From f6949349c1264310c3a41c5f7eb9dbf082debadf Mon Sep 17 00:00:00 2001
From: Tim Phillips <3578574+tim-phillips@users.noreply.github.com>
Date: Fri, 13 Apr 2018 03:29:35 -0700
Subject: [PATCH 45/73] Link to popstate doc on MDN (#4150)

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index adeef402d5ab0..6df3edd1c990c 100644
--- a/readme.md
+++ b/readme.md
@@ -488,7 +488,7 @@ export default () =>
 #### Intercepting `popstate`
 
 In some cases (for example, if using a [custom router](#custom-server-and-routing)), you may wish
-to listen to `popstate` and react before the router acts on it.
+to listen to [`popstate`](https://developer.mozilla.org/en-US/docs/Web/Events/popstate) and react before the router acts on it.
 For example, you could use this to manipulate the request, or force an SSR refresh.
 
 ```jsx

From c5c5564dbf7502462dd74a45a7f50a35a8a9593d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harun=20=C4=90uli=C4=87?= <HarunD@users.noreply.github.com>
Date: Fri, 13 Apr 2018 16:53:59 +0200
Subject: [PATCH 46/73] Added with-jest-typescript example (#4124)

* Added with-jest-typescript example with files and readme

* Updated package.json

As per the comment, updated the package.json so the info is same as in other examples.

* Proper name in package.json
---
 examples/with-jest-typescript/README.md       | 44 ++++++++++++
 examples/with-jest-typescript/jest.config.js  | 21 ++++++
 examples/with-jest-typescript/jest.setup.js   |  4 ++
 examples/with-jest-typescript/next.config.js  |  2 +
 examples/with-jest-typescript/package.json    | 29 ++++++++
 examples/with-jest-typescript/pages/cars.tsx  |  5 ++
 examples/with-jest-typescript/pages/index.tsx |  3 +
 examples/with-jest-typescript/pages/login.tsx |  5 ++
 .../src/components/NiceCheckbox/index.tsx     | 20 ++++++
 .../src/components/NiceCheckbox/test.tsx      | 17 +++++
 .../src/modules/auth/Login.tsx                | 70 +++++++++++++++++++
 .../src/modules/auth/__tests__/Login.test.tsx | 38 ++++++++++
 .../src/modules/auth/types.ts                 |  4 ++
 .../src/modules/cars/Detail.tsx               | 25 +++++++
 .../src/modules/cars/Overview.tsx             | 65 +++++++++++++++++
 .../modules/cars/__tests__/Detail.test.tsx    | 31 ++++++++
 .../modules/cars/__tests__/Overview.test.tsx  | 64 +++++++++++++++++
 .../src/modules/cars/types.ts                 | 10 +++
 examples/with-jest-typescript/tsconfig.json   | 33 +++++++++
 19 files changed, 490 insertions(+)
 create mode 100644 examples/with-jest-typescript/README.md
 create mode 100644 examples/with-jest-typescript/jest.config.js
 create mode 100644 examples/with-jest-typescript/jest.setup.js
 create mode 100644 examples/with-jest-typescript/next.config.js
 create mode 100644 examples/with-jest-typescript/package.json
 create mode 100644 examples/with-jest-typescript/pages/cars.tsx
 create mode 100644 examples/with-jest-typescript/pages/index.tsx
 create mode 100644 examples/with-jest-typescript/pages/login.tsx
 create mode 100644 examples/with-jest-typescript/src/components/NiceCheckbox/index.tsx
 create mode 100644 examples/with-jest-typescript/src/components/NiceCheckbox/test.tsx
 create mode 100644 examples/with-jest-typescript/src/modules/auth/Login.tsx
 create mode 100644 examples/with-jest-typescript/src/modules/auth/__tests__/Login.test.tsx
 create mode 100644 examples/with-jest-typescript/src/modules/auth/types.ts
 create mode 100644 examples/with-jest-typescript/src/modules/cars/Detail.tsx
 create mode 100644 examples/with-jest-typescript/src/modules/cars/Overview.tsx
 create mode 100644 examples/with-jest-typescript/src/modules/cars/__tests__/Detail.test.tsx
 create mode 100644 examples/with-jest-typescript/src/modules/cars/__tests__/Overview.test.tsx
 create mode 100644 examples/with-jest-typescript/src/modules/cars/types.ts
 create mode 100644 examples/with-jest-typescript/tsconfig.json

diff --git a/examples/with-jest-typescript/README.md b/examples/with-jest-typescript/README.md
new file mode 100644
index 0000000000000..9bd607c7f0b83
--- /dev/null
+++ b/examples/with-jest-typescript/README.md
@@ -0,0 +1,44 @@
+# Example app with Jest tests inside a NextJS TypeScript app
+
+## 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-jest-typescript with-jest-typescript-app
+# or
+yarn create next-app --example with-jest-typescript with-jest-typescript-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-jest-typescript
+cd with-jest-typescript
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run dev
+# or
+yarn
+yarn dev
+```
+
+## Run Jest tests
+
+```bash
+npm run test
+# or
+yarn test
+```
+
+## The idea behind the example
+
+This example shows a configuration and several examples for a running Jest tests in a NextJS TypeScript app
\ No newline at end of file
diff --git a/examples/with-jest-typescript/jest.config.js b/examples/with-jest-typescript/jest.config.js
new file mode 100644
index 0000000000000..a839f1d1e7887
--- /dev/null
+++ b/examples/with-jest-typescript/jest.config.js
@@ -0,0 +1,21 @@
+const TEST_REGEX = '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|js?|tsx?|ts?)$'
+
+module.exports = {
+  setupFiles: ['<rootDir>/jest.setup.js'],
+  globals: {
+    'ts-jest': {
+      'useBabelrc': true
+    }
+  },
+  testRegex: TEST_REGEX,
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  },
+  testPathIgnorePatterns: [
+    '<rootDir>/.next/', '<rootDir>/node_modules/'
+  ],
+  moduleFileExtensions: [
+    'ts', 'tsx', 'js', 'jsx'
+  ],
+  collectCoverage: true
+}
diff --git a/examples/with-jest-typescript/jest.setup.js b/examples/with-jest-typescript/jest.setup.js
new file mode 100644
index 0000000000000..c2bb88ffc3f2a
--- /dev/null
+++ b/examples/with-jest-typescript/jest.setup.js
@@ -0,0 +1,4 @@
+const Enzyme = require('enzyme')
+const Adapter = require('enzyme-adapter-react-16')
+
+Enzyme.configure({adapter: new Adapter()})
diff --git a/examples/with-jest-typescript/next.config.js b/examples/with-jest-typescript/next.config.js
new file mode 100644
index 0000000000000..d8b638bd63029
--- /dev/null
+++ b/examples/with-jest-typescript/next.config.js
@@ -0,0 +1,2 @@
+const withTypescript = require('@zeit/next-typescript')
+module.exports = withTypescript()
diff --git a/examples/with-jest-typescript/package.json b/examples/with-jest-typescript/package.json
new file mode 100644
index 0000000000000..8f2b4249156bc
--- /dev/null
+++ b/examples/with-jest-typescript/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "with-jest-typescript",
+  "version": "1.0.0",
+  "scripts": {
+    "test": "NODE_ENV=test jest",
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "^5.0.0",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^22.2.2",
+    "@types/next": "^2.4.8",
+    "@types/react": "^16.0.41",
+    "@types/react-dom": "^16.0.4",
+    "@zeit/next-typescript": "^0.0.11",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-16": "^1.1.1",
+    "jest": "^22.4.3",
+    "react-addons-test-utils": "^15.6.2",
+    "react-test-renderer": "^16.2.0",
+    "ts-jest": "^22.4.2",
+    "typescript": "^2.7.2"
+  }
+}
diff --git a/examples/with-jest-typescript/pages/cars.tsx b/examples/with-jest-typescript/pages/cars.tsx
new file mode 100644
index 0000000000000..6f41208718d67
--- /dev/null
+++ b/examples/with-jest-typescript/pages/cars.tsx
@@ -0,0 +1,5 @@
+import CarsOverview from './../src/modules/cars/Overview';
+
+const CarsPage = () => <CarsOverview/>;
+
+export default CarsPage;
\ No newline at end of file
diff --git a/examples/with-jest-typescript/pages/index.tsx b/examples/with-jest-typescript/pages/index.tsx
new file mode 100644
index 0000000000000..d2f5d88bee5bd
--- /dev/null
+++ b/examples/with-jest-typescript/pages/index.tsx
@@ -0,0 +1,3 @@
+const IndexPage = () => <h1>Testing Next.js App written in TypeScript with Jest</h1>;
+
+export default IndexPage;
\ No newline at end of file
diff --git a/examples/with-jest-typescript/pages/login.tsx b/examples/with-jest-typescript/pages/login.tsx
new file mode 100644
index 0000000000000..5b78a62f299bb
--- /dev/null
+++ b/examples/with-jest-typescript/pages/login.tsx
@@ -0,0 +1,5 @@
+import Login from './../src/modules/auth/Login';
+
+const LoginPage = () => <Login/>;
+
+export default LoginPage;
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/components/NiceCheckbox/index.tsx b/examples/with-jest-typescript/src/components/NiceCheckbox/index.tsx
new file mode 100644
index 0000000000000..562a19f4af90c
--- /dev/null
+++ b/examples/with-jest-typescript/src/components/NiceCheckbox/index.tsx
@@ -0,0 +1,20 @@
+import * as React from 'react';
+
+interface NiceCheckboxProps {
+    rootID : string;
+    id : string;
+    name : string;
+    value : string;
+    label : string;
+}
+
+const NiceCheckbox : React.SFC < NiceCheckboxProps > = (props : NiceCheckboxProps) : JSX.Element => {
+    return (
+        <div className="NiceCheckbox" id={props.rootID}>
+            <input type="checkbox" id={props.id} name={props.name} value={props.value}/>
+            <label htmlFor={props.id}>{props.label}</label>
+        </div>
+    );
+};
+
+export default NiceCheckbox;
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/components/NiceCheckbox/test.tsx b/examples/with-jest-typescript/src/components/NiceCheckbox/test.tsx
new file mode 100644
index 0000000000000..04c87a529e71c
--- /dev/null
+++ b/examples/with-jest-typescript/src/components/NiceCheckbox/test.tsx
@@ -0,0 +1,17 @@
+/* eslint-env jest */
+import React from 'react';
+import {shallow} from 'enzyme';
+
+import NiceCheckbox from './index';
+
+describe('NiceCheckbox', () => {
+    it('renders the checkbox with correct label', () => {
+        const wrapper = shallow(<NiceCheckbox
+            rootID="NiceCarCheckbox"
+            id="CarAvailability"
+            name="is_available"
+            value="yes"
+            label="Is this car available?"/>);
+        expect(wrapper.find('#NiceCarCheckbox').find('label').text()).toEqual('Is this car available?');
+    });
+});
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/modules/auth/Login.tsx b/examples/with-jest-typescript/src/modules/auth/Login.tsx
new file mode 100644
index 0000000000000..28d03548ccb59
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/auth/Login.tsx
@@ -0,0 +1,70 @@
+import React, {ChangeEvent} from 'react';
+import Router from 'next/router';
+
+import * as T from './types';
+
+export interface LoginProps {}
+
+export interface LoginState {
+    credentials : T.LoginCredentials;
+    isLoginLoading : boolean;
+}
+
+export default class Login extends React.Component < LoginProps,
+LoginState > {
+    constructor(props : LoginProps) {
+        super(props);
+
+        this.state = {
+            isLoginLoading: false,
+            credentials: {
+                email: null,
+                password: null
+            }
+        }
+    }
+
+    handleCredentialsChange = (e : ChangeEvent < HTMLInputElement >) => {
+        let {credentials} = this.state;
+        credentials[e.target.name] = e.target.value;
+
+        this.setState({credentials});
+    }
+
+    handleLoginSubmit = (e : React.MouseEvent < HTMLElement >) => {
+        e.preventDefault();
+        this.setState({isLoginLoading: true});
+
+        setTimeout(() => {
+            this.setState({isLoginLoading: false});
+            Router.replace('/cars');
+        }, 500);
+    }
+
+    render() {
+        const {credentials} = this.state;
+
+        return (
+            <div>
+                <h1>Login</h1>
+                <form>
+                    <input
+                        id="formEmail"
+                        name="email"
+                        type="text"
+                        value={credentials.email}
+                        onChange={this.handleCredentialsChange}/>
+                    <input
+                        name="password"
+                        type="password"
+                        value={credentials.password}
+                        onChange={this.handleCredentialsChange}/>
+
+                    <button id="loginSubmit" onClick={this.handleLoginSubmit}>{this.state.isLoginLoading
+                            ? 'Logging in...'
+                            : 'Log in'}</button>
+                </form>
+            </div>
+        );
+    }
+}
diff --git a/examples/with-jest-typescript/src/modules/auth/__tests__/Login.test.tsx b/examples/with-jest-typescript/src/modules/auth/__tests__/Login.test.tsx
new file mode 100644
index 0000000000000..6d51c9eb5d9fa
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/auth/__tests__/Login.test.tsx
@@ -0,0 +1,38 @@
+/* eslint-env jest */
+import React from 'react';
+import {shallow} from 'enzyme';
+
+import Login from './../Login';
+
+describe('Login', () => {
+    it('renders the h1 title', () => {
+        const login = shallow(<Login/>);
+        expect(login.find('h1').text()).toEqual('Login');
+    });
+
+    it('renders the form', () => {
+        const login = shallow(<Login/>);
+        expect(login.find('form')).toHaveLength(1);
+    });
+
+    it('changes the text of email', () => {
+        const login = shallow(<Login/>);
+        login
+            .find('#formEmail')
+            .simulate('change', {
+                target: {
+                    name: 'email',
+                    value: 'some@test.com'
+                }
+            });
+        expect(login.update().find('#formEmail').props().value).toEqual('some@test.com');
+    });
+
+    it('changes the text of login button after clicking it', () => {
+        const login = shallow(<Login/>);
+        login
+            .find('#loginSubmit')
+            .simulate('click', {preventDefault() {}});
+        expect(login.update().find('#loginSubmit').text()).toEqual('Logging in...');
+    });
+});
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/modules/auth/types.ts b/examples/with-jest-typescript/src/modules/auth/types.ts
new file mode 100644
index 0000000000000..c234113c8aec3
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/auth/types.ts
@@ -0,0 +1,4 @@
+export interface LoginCredentials {
+    email: string;
+    password: string;
+}
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/modules/cars/Detail.tsx b/examples/with-jest-typescript/src/modules/cars/Detail.tsx
new file mode 100644
index 0000000000000..9cbab8eaddd82
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/cars/Detail.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react';
+
+import * as T from './types';
+
+interface DetailProps {
+    car : T.Car;
+}
+
+const Detail : React.SFC < DetailProps > = ({car} : DetailProps) => {
+    return (
+        <div className="CarDetail">
+            <h1>{`${car.make} ${car.model}`}</h1>
+            <p>Engine : {car.engine}</p>
+            <p>Year : {car.year}</p>
+            <p>Mileage : {car.mileage}</p>
+            <p>Equipment :
+            </p>
+            <ul>{car.equipment && car
+                    .equipment
+                    .map((e : string, index : number) => <li key={index}>{e}</li>)}</ul>
+        </div>
+    );
+};
+
+export default Detail;
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/modules/cars/Overview.tsx b/examples/with-jest-typescript/src/modules/cars/Overview.tsx
new file mode 100644
index 0000000000000..27114c823952b
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/cars/Overview.tsx
@@ -0,0 +1,65 @@
+import * as React from 'react';
+
+import * as T from './types';
+
+export interface CarsOverviewProps {
+    cars : T.CarList;
+}
+
+export interface CarsOverviewState {
+    selectedCar : T.Car;
+}
+
+export default class CarsOverview extends React.Component < CarsOverviewProps,
+CarsOverviewState > {
+    constructor(props : CarsOverviewProps) {
+        super(props);
+
+        this.state = {
+            selectedCar: null
+        }
+    }
+
+    handleSelectCar = (car : T.Car) : void => {
+        this.setState({selectedCar: car});
+    }
+
+    renderCarsList = (cars : T.CarList) : JSX.Element => {
+        if (!cars || cars.length === 0) {
+            return (
+                <p>No cars</p>
+            );
+        }
+
+        return (
+            <ul>{cars.map((car : T.Car, index : number) : JSX.Element => <li key={index} onClick={() => this.handleSelectCar(car)}>{car.make} {car.model}</li>)}</ul>
+        );
+    }
+
+    renderCarInfo = (car : T.Car) : JSX.Element => {        
+        if (!car) {
+            return null;
+        }
+
+        return (
+            <div className="CarInfo">
+                <h2>{`${car.make} ${car.model}`}</h2>
+                <section>{car.engine}</section>
+            </div>
+        );
+    }
+
+    render() {
+        return (
+            <div>
+                <h1>Cars Overview</h1>
+
+                <div className="Cars__List">
+                    {this.renderCarsList(this.props.cars)}
+                </div>
+
+                {this.renderCarInfo(this.state.selectedCar)}
+            </div>
+        );
+    }
+}
diff --git a/examples/with-jest-typescript/src/modules/cars/__tests__/Detail.test.tsx b/examples/with-jest-typescript/src/modules/cars/__tests__/Detail.test.tsx
new file mode 100644
index 0000000000000..d0744601e9144
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/cars/__tests__/Detail.test.tsx
@@ -0,0 +1,31 @@
+/* eslint-env jest */
+import React from 'react';
+import {shallow} from 'enzyme';
+
+import Detail from './../Detail';
+
+const __CAR__ = {
+    make: 'Volvo',
+    model: 'XC60',
+    engine: 'T5',
+    year: 2018,
+    mileage: 123,
+    equipment: ['Leather', 'Seat heating', 'City Safety']
+};
+
+describe('Car detail', () => {
+    it('renders correct title', () => {
+        const detail = shallow(<Detail car={__CAR__}/>);
+        expect(detail.find('h1').text()).toEqual('Volvo XC60');
+    });
+
+    it('renders correct list item', () => {
+        const detail = shallow(<Detail car={__CAR__}/>);
+        expect(detail.childAt(1).text()).toEqual('Engine : T5');
+    });
+
+    it('renders correct equipment list item', () => {
+        const detail = shallow(<Detail car={__CAR__}/>);
+        expect(detail.children().find('ul').childAt(1).text()).toEqual('Seat heating');
+    });
+});
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/modules/cars/__tests__/Overview.test.tsx b/examples/with-jest-typescript/src/modules/cars/__tests__/Overview.test.tsx
new file mode 100644
index 0000000000000..f54787e4527e3
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/cars/__tests__/Overview.test.tsx
@@ -0,0 +1,64 @@
+/* eslint-env jest */
+import React from 'react';
+import {shallow} from 'enzyme';
+
+import Overview from './../Overview';
+
+const __CARS__ = [
+    {
+        make: 'Volvo',
+        model: 'C30',
+        engine: 'T5',
+        year: 2018,
+        mileage: 123,
+        equipment: ['Leather', 'Seat heating', 'City Safety']
+    }, {
+        make: 'Volvo',
+        model: 'XC60',
+        engine: 'D5',
+        year: 2018,
+        mileage: 456,
+        equipment: ['Leather', 'Seat heating', 'City Safety']
+    }, {
+        make: 'Volvo',
+        model: 'XC90',
+        engine: 'T6',
+        year: 2018,
+        mileage: 789,
+        equipment: ['Leather', 'Seat heating', 'City Safety']
+    }
+];
+
+describe('Cars overview', () => {
+    it('renders the h1 title', () => {
+        const overview = shallow(<Overview cars={[]}/>);
+        expect(overview.find('h1').text()).toEqual('Cars Overview');
+    });
+
+    it('renders empty cars list when no cars are provided', () => {
+        const overview = shallow(<Overview cars={[]}/>);
+        expect(overview.find('.Cars__List').children().find('p').text()).toEqual('No cars');
+    });
+
+    it('renders cars list with 3 items when 3 cars are provided', () => {
+        const overview = shallow(<Overview cars={__CARS__}/>);
+        expect(overview.find('.Cars__List').children().find('ul').children()).toHaveLength(3);
+    });
+
+    it('renders cars list with the expected item on third place', () => {
+        const overview = shallow(<Overview cars={__CARS__}/>);
+        expect(overview.find('.Cars__List').children().find('ul').childAt(2).text()).toEqual('Volvo XC90');
+    });
+
+    it('renders car detail after clicking on an item in cars list', () => {
+        const overview = shallow(<Overview cars={__CARS__}/>);
+        overview
+            .find('.Cars__List')
+            .children()
+            .find('ul')
+            .childAt(1)
+            .simulate('click', {preventDefault() {}});
+
+        expect(overview.update().find('.CarInfo').find('h2').text()).toEqual('Volvo XC60');
+    });
+});
\ No newline at end of file
diff --git a/examples/with-jest-typescript/src/modules/cars/types.ts b/examples/with-jest-typescript/src/modules/cars/types.ts
new file mode 100644
index 0000000000000..e0f20427edbd2
--- /dev/null
+++ b/examples/with-jest-typescript/src/modules/cars/types.ts
@@ -0,0 +1,10 @@
+export interface Car {
+    make : string;
+    model : string;
+    engine : string;
+    year : number;
+    mileage : number;
+    equipment : string[];
+}
+
+export type CarList = Array < Car >;
\ No newline at end of file
diff --git a/examples/with-jest-typescript/tsconfig.json b/examples/with-jest-typescript/tsconfig.json
new file mode 100644
index 0000000000000..ace24fb16c70d
--- /dev/null
+++ b/examples/with-jest-typescript/tsconfig.json
@@ -0,0 +1,33 @@
+{
+    "compileOnSave": false,
+    "compilerOptions": {
+        "target": "esnext",
+        "module": "esnext",
+        "jsx": "preserve",
+        "allowJs": true,
+        "moduleResolution": "node",
+        "allowSyntheticDefaultImports": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "removeComments": false,
+        "preserveConstEnums": true,
+        "sourceMap": true,
+        "skipLibCheck": true,
+        "baseUrl": ".",
+        "typeRoots": [
+            "./node_modules/@types"
+        ],
+        "lib": [
+            "dom",
+            "es2015",
+            "es2016"
+        ]
+    },
+    "exclude": [
+        "node_modules",
+        "**/*.spec.ts",
+        "**/*.spec.tsx",
+        "**/*.test.ts",
+        "**/*.test.tsx",
+    ]
+}
\ No newline at end of file

From 676d82abf9d1752fa89ccd432584e62da8e0bf05 Mon Sep 17 00:00:00 2001
From: Fouad Matin <fm@fouad.co>
Date: Fri, 13 Apr 2018 22:49:06 -0700
Subject: [PATCH 47/73] fix(examples/using-preact): use latest next-preact
 (#4152)

---
 examples/using-preact/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/using-preact/package.json b/examples/using-preact/package.json
index 3bf304e028f6e..46a715e029f5f 100644
--- a/examples/using-preact/package.json
+++ b/examples/using-preact/package.json
@@ -7,7 +7,7 @@
     "start": "NODE_ENV=production node server.js"
   },
   "dependencies": {
-    "@zeit/next-preact": "0.0.4",
+    "@zeit/next-preact": "0.0.7",
     "next": "latest",
     "preact": "8.2.7",
     "preact-compat": "3.18.0"

From 05b7286454c3b7ce502167c78a4a57119655a3c1 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sat, 14 Apr 2018 10:18:41 +0200
Subject: [PATCH 48/73] =?UTF-8?q?Use=20object=20directly=20since=20webpack?=
 =?UTF-8?q?=20doesn=E2=80=99t=20parse=20the=20string=20(#4140)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/build/webpack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/build/webpack.js b/server/build/webpack.js
index 55fccd029e9c3..33c65ee580a44 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -142,7 +142,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
       strictModuleExceptionHandling: true,
       devtoolModuleFilenameTemplate (info) {
         if (dev) {
-          return '[absolute-resource-path]'
+          return info.absoluteResourcePath
         }
 
         return `${info.absoluteResourcePath.replace(dir, '.').replace(nextDir, './node_modules/next')}`

From 5187d142eadb20f3ba23f4b637ae59f5a24e64c7 Mon Sep 17 00:00:00 2001
From: Bhargav Ponnapalli <imbhargav5@gmail.com>
Date: Tue, 3 Apr 2018 12:39:30 +0530
Subject: [PATCH 49/73] Added example for usage with rematch (#4095)

* Usage with rematch

* Run lint fix

* Add counter-display example and readme
---
 examples/with-rematch/README.md               | 53 +++++++++++++++
 examples/with-rematch/package.json            | 19 ++++++
 examples/with-rematch/pages/github-users.js   | 57 +++++++++++++++++
 examples/with-rematch/pages/index.js          | 38 +++++++++++
 .../shared/components/counter-display.js      | 31 +++++++++
 .../with-rematch/shared/components/header.js  | 27 ++++++++
 .../with-rematch/shared/models/counter.js     | 19 ++++++
 examples/with-rematch/shared/models/github.js | 39 +++++++++++
 examples/with-rematch/shared/models/index.js  |  5 ++
 examples/with-rematch/shared/store.js         | 15 +++++
 .../with-rematch/shared/utils/withRematch.js  | 64 +++++++++++++++++++
 11 files changed, 367 insertions(+)
 create mode 100644 examples/with-rematch/README.md
 create mode 100644 examples/with-rematch/package.json
 create mode 100644 examples/with-rematch/pages/github-users.js
 create mode 100644 examples/with-rematch/pages/index.js
 create mode 100644 examples/with-rematch/shared/components/counter-display.js
 create mode 100644 examples/with-rematch/shared/components/header.js
 create mode 100644 examples/with-rematch/shared/models/counter.js
 create mode 100644 examples/with-rematch/shared/models/github.js
 create mode 100644 examples/with-rematch/shared/models/index.js
 create mode 100644 examples/with-rematch/shared/store.js
 create mode 100644 examples/with-rematch/shared/utils/withRematch.js

diff --git a/examples/with-rematch/README.md b/examples/with-rematch/README.md
new file mode 100644
index 0000000000000..2aff90322c61c
--- /dev/null
+++ b/examples/with-rematch/README.md
@@ -0,0 +1,53 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-rematch)
+
+# Rematch example
+
+## How to use
+
+### Using `create-next-app`
+
+Download [`create-next-app`](https://github.com/segmentio/create-next-app) to bootstrap the example:
+
+```bash
+npx create-next-app --example with-rematch with-rematch-app
+# or
+yarn create next-app --example with-rematch with-rematch-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-rematch
+cd with-rematch
+```
+
+Install it and run:
+
+```bash
+npm install
+npm run 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 has two pages. The first page has a counter which can be incremented synchronously or asynchronously. The second page is a page which shows a list of github users. It fetches data from the github api using this [endpoint](api.github.com/users).
+
+Since rematch is utility which uses redux under the hood, some elements like `store.js` and `withRematch` are very similar to the `with-redux` example. Please go through the `with-redux` example [here](https://github.com/zeit/next.js/tree/master/examples/with-redux) before reading further if you are not familiar with how redux is integrated with nextjs. Rematch is just an extension for Redux so a lot of elements are the same.
+
+**Directory structure**
+
+Besides the `pages` directory, there is a directory called shared which holds all of the code belonging to rematch. `Rematch` has a lot lesser boilerplate than `Redux` because it is able to put actions(including async actions), _models_ and reducers together. Hence, a `models` directory is present, which contains the logic for `counter` and `github` users.
+
+Some features of this example are :
+
+* Pages are connected to rematch using `withRematch` util. These pages are capable of accessing values from the store and dispatching changes
+* Components are inside the `shared/components` folder. The `counter-display` component is connected to the store using the `connect` function to show how components which are not pages, can connect with Rematch.
+* The file `shared/store` exports an initStore function which is used by `withRematch` to create store universally on the server and on the client.
diff --git a/examples/with-rematch/package.json b/examples/with-rematch/package.json
new file mode 100644
index 0000000000000..8bdae15fbd4d8
--- /dev/null
+++ b/examples/with-rematch/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "with-rematch",
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "@rematch/core": "0.6.0",
+    "isomorphic-unfetch": "2.0.0",
+    "next": "5.1.0",
+    "react": "16.3.0",
+    "react-dom": "16.3.0",
+    "react-redux": "5.0.7",
+    "redux": "3.7.2"
+  },
+  "license": "ISC"
+}
diff --git a/examples/with-rematch/pages/github-users.js b/examples/with-rematch/pages/github-users.js
new file mode 100644
index 0000000000000..0fb41991b6206
--- /dev/null
+++ b/examples/with-rematch/pages/github-users.js
@@ -0,0 +1,57 @@
+import React, { Component } from 'react'
+import Link from 'next/link'
+import { dispatch } from '@rematch/core'
+import { initStore } from '../shared/store'
+import withRematch from '../shared/utils/withRematch'
+import Header from '../shared/components/header'
+import CounterDisplay from '../shared/components/counter-display'
+
+class Github extends Component {
+  static async getInitialProps ({ isServer, initialState }) {
+    if (isServer) {
+      await dispatch.github.fetchUsers()
+    }
+    return {}
+  }
+  render () {
+    return (
+      <div>
+        <Header />
+        <h1> Github users </h1>
+        <p>
+          Server rendered github user list. You can also reload the users from
+          the api by clicking the <b>Get users</b> button below.
+        </p>
+        {this.props.isLoading ? <p>Loading ...</p> : null}
+        <p>
+          <button onClick={this.props.fetchUsers}>Get users</button>
+        </p>
+        {this.props.userList.map(user => (
+          <div key={user.login}>
+            <Link href={user.html_url} passHref>
+              <a>
+                <img height='45' width='45' src={user.avatar_url} />
+                <span> Username - {user.login}</span>
+              </a>
+            </Link>
+            <br />
+          </div>
+        ))}
+        <br />
+
+        <CounterDisplay />
+      </div>
+    )
+  }
+}
+
+const mapState = state => ({
+  userList: state.github.users,
+  isLoading: state.github.isLoading
+})
+
+const mapDispatch = ({ github: { fetchUsers } }) => ({
+  fetchUsers: () => fetchUsers()
+})
+
+export default withRematch(initStore, mapState, mapDispatch)(Github)
diff --git a/examples/with-rematch/pages/index.js b/examples/with-rematch/pages/index.js
new file mode 100644
index 0000000000000..79a78a61583f8
--- /dev/null
+++ b/examples/with-rematch/pages/index.js
@@ -0,0 +1,38 @@
+import React, { Component } from 'react'
+import { dispatch } from '@rematch/core'
+import { initStore } from '../shared/store'
+import withRematch from '../shared/utils/withRematch'
+import Header from '../shared/components/header'
+
+class Home extends Component {
+  render () {
+    return (
+      <div>
+        <Header />
+        <h1> Counter </h1>
+        <h3>The count is {this.props.counter}</h3>
+        <p>
+          <button onClick={this.props.increment}>increment</button>
+          <button onClick={() => dispatch.counter.increment(1)}>
+            increment (using dispatch function)
+          </button>
+          <button onClick={this.props.incrementBy(5)}>increment by 5</button>
+          <button onClick={this.props.incrementAsync}>incrementAsync</button>
+        </p>
+        <br />
+      </div>
+    )
+  }
+}
+
+const mapState = state => ({
+  counter: state.counter
+})
+
+const mapDispatch = ({ counter: { increment, incrementAsync } }) => ({
+  increment: () => increment(1),
+  incrementBy: amount => () => increment(amount),
+  incrementAsync: () => incrementAsync(1)
+})
+
+export default withRematch(initStore, mapState, mapDispatch)(Home)
diff --git a/examples/with-rematch/shared/components/counter-display.js b/examples/with-rematch/shared/components/counter-display.js
new file mode 100644
index 0000000000000..f6beda2daadca
--- /dev/null
+++ b/examples/with-rematch/shared/components/counter-display.js
@@ -0,0 +1,31 @@
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
+
+class CounterDisplay extends Component {
+  render () {
+    return (
+      <div>
+        <h3> Counter </h3>
+        <p>
+          This counter is connected via the <b>connect</b> function. Components
+          which are not pages can be connected using the connect function just
+          like redux components.
+        </p>
+        <p>Current value {this.props.counter} </p>
+        <p>
+          <button onClick={this.props.incrementBy3}>Increment</button>
+        </p>
+      </div>
+    )
+  }
+}
+
+const mapState = state => ({
+  counter: state.counter
+})
+
+const mapDispatch = ({ counter: { increment, incrementAsync } }) => ({
+  incrementBy3: () => increment(3)
+})
+
+export default connect(mapState, mapDispatch)(CounterDisplay)
diff --git a/examples/with-rematch/shared/components/header.js b/examples/with-rematch/shared/components/header.js
new file mode 100644
index 0000000000000..e3c04b4f1a32b
--- /dev/null
+++ b/examples/with-rematch/shared/components/header.js
@@ -0,0 +1,27 @@
+import React, { Component } from 'react'
+import Link from 'next/link'
+
+class Header extends Component {
+  render () {
+    return (
+      <div>
+        <nav>
+          <ul>
+            <li>
+              <Link href='/' passHref>
+                <a>Home</a>
+              </Link>
+            </li>
+            <li>
+              <Link href='/github-users' passHref>
+                <a>Async Example </a>
+              </Link>
+            </li>
+          </ul>
+        </nav>
+      </div>
+    )
+  }
+}
+
+export default Header
diff --git a/examples/with-rematch/shared/models/counter.js b/examples/with-rematch/shared/models/counter.js
new file mode 100644
index 0000000000000..5a641df20ba1f
--- /dev/null
+++ b/examples/with-rematch/shared/models/counter.js
@@ -0,0 +1,19 @@
+const counter = {
+  state: 0, // initial state
+  reducers: {
+    // handle state changes with pure functions
+    increment (state, payload) {
+      return state + payload
+    }
+  },
+  effects: {
+    // handle state changes with impure functions.
+    // use async/await for async actions
+    async incrementAsync (payload, rootState) {
+      await new Promise(resolve => setTimeout(resolve, 1000))
+      this.increment(payload)
+    }
+  }
+}
+
+export default counter
diff --git a/examples/with-rematch/shared/models/github.js b/examples/with-rematch/shared/models/github.js
new file mode 100644
index 0000000000000..7436698e5acbe
--- /dev/null
+++ b/examples/with-rematch/shared/models/github.js
@@ -0,0 +1,39 @@
+import fetch from 'isomorphic-unfetch'
+
+const github = {
+  state: {
+    users: [],
+    isLoading: false
+  }, // initial state
+  reducers: {
+    requestUsers (state) {
+      return {
+        users: [],
+        isLoading: true
+      }
+    },
+    receiveUsers (state, payload) {
+      return {
+        isLoading: false,
+        users: payload
+      }
+    }
+  },
+  effects: {
+    // handle state changes with impure functions.
+    // use async/await for async actions
+    async fetchUsers (payload, rootState) {
+      try {
+        this.requestUsers()
+        const response = await fetch('https://api.github.com/users')
+        const users = await response.json()
+        this.receiveUsers(users)
+      } catch (err) {
+        console.log(err)
+        this.receiveUsers([])
+      }
+    }
+  }
+}
+
+export default github
diff --git a/examples/with-rematch/shared/models/index.js b/examples/with-rematch/shared/models/index.js
new file mode 100644
index 0000000000000..14082a26bc1a1
--- /dev/null
+++ b/examples/with-rematch/shared/models/index.js
@@ -0,0 +1,5 @@
+import counter from './counter'
+import github from './github'
+
+export { counter }
+export { github }
diff --git a/examples/with-rematch/shared/store.js b/examples/with-rematch/shared/store.js
new file mode 100644
index 0000000000000..d968768b574a0
--- /dev/null
+++ b/examples/with-rematch/shared/store.js
@@ -0,0 +1,15 @@
+import { init } from '@rematch/core'
+import { counter, github } from './models'
+
+// rematch store with initialValue set to 5
+export const initStore = (initialState = { counter: 5 }) => {
+  return init({
+    models: {
+      counter,
+      github
+    },
+    redux: {
+      initialState
+    }
+  })
+}
diff --git a/examples/with-rematch/shared/utils/withRematch.js b/examples/with-rematch/shared/utils/withRematch.js
new file mode 100644
index 0000000000000..5b6b9468a7c19
--- /dev/null
+++ b/examples/with-rematch/shared/utils/withRematch.js
@@ -0,0 +1,64 @@
+import React from 'react'
+import { connect, Provider } from 'react-redux'
+
+const __NEXT_REMATCH_STORE__ = '__NEXT_REMATCH_STORE__'
+
+// https://github.com/iliakan/detect-node
+const checkServer = () =>
+  Object.prototype.toString.call(global.process) === '[object process]'
+
+const getOrCreateStore = (initStore, initialState) => {
+  // Always make a new store if server
+  if (checkServer() || typeof window === 'undefined') {
+    return initStore(initialState)
+  }
+
+  // Memoize store in global variable if client
+  if (!window[__NEXT_REMATCH_STORE__]) {
+    window[__NEXT_REMATCH_STORE__] = initStore(initialState)
+  }
+  return window[__NEXT_REMATCH_STORE__]
+}
+
+export default (...args) => Component => {
+  // First argument is initStore, the rest are redux connect arguments and get passed
+  const [initStore, ...connectArgs] = args
+
+  const ComponentWithRematch = (props = {}) => {
+    const { store, initialProps, initialState } = props
+
+    // Connect page to redux with connect arguments
+    const ConnectedComponent = connect.apply(null, connectArgs)(Component)
+
+    // Wrap with redux Provider with store
+    // Create connected page with initialProps
+    return React.createElement(
+      Provider,
+      {
+        store:
+          store && store.dispatch
+            ? store
+            : getOrCreateStore(initStore, initialState)
+      },
+      React.createElement(ConnectedComponent, initialProps)
+    )
+  }
+
+  ComponentWithRematch.getInitialProps = async (props = {}) => {
+    const isServer = checkServer()
+    const store = getOrCreateStore(initStore)
+
+    // Run page getInitialProps with store and isServer
+    const initialProps = Component.getInitialProps
+      ? await Component.getInitialProps({ ...props, isServer, store })
+      : {}
+
+    return {
+      store,
+      initialState: store.getState(),
+      initialProps
+    }
+  }
+
+  return ComponentWithRematch
+}

From 925d79ef3344a874302059b975226f292b7f7142 Mon Sep 17 00:00:00 2001
From: Edheltur <kanaroooo@gmail.com>
Date: Wed, 18 Apr 2018 14:48:57 +0500
Subject: [PATCH 50/73] react-hot-loader: 4.0.0 -> 4.0.1 (#4167)

# Conflicts:
#	yarn.lock
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 74277b985d109..eec7f5ade6c06 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "path-to-regexp": "2.1.0",
     "prop-types": "15.6.0",
     "prop-types-exact": "1.1.1",
-    "react-hot-loader": "4.0.0",
+    "react-hot-loader": "4.0.1",
     "recursive-copy": "2.0.6",
     "resolve": "1.5.0",
     "send": "0.16.1",

From 68626c5147b1a3f05eb6b1c5202ad6f54bb01bb1 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Wed, 18 Apr 2018 18:18:06 +0200
Subject: [PATCH 51/73] Improved stacktraces (minor) (#4156)

* Handle production errors correctly

* Improved source map support

* Make react-hot-loader hold state again

* Remove console.log

* Load modules on demand

* Catch errors in rewriteErrorTrace

* Update comment

* Update comment

* Remove source-map-support

* Load modules in next-dev

* Make sure error logged has sourcemaps too

* Add tests for production runtime errors

* Add tests for development runtime errors. Fix issue with client side errors in development

* Move functionality back to renderError now that error handling is consistent

* Rename to applySourcemaps
---
 client/index.js                               | 79 ++++++++++++-------
 client/next-dev.js                            |  8 +-
 client/source-map-support.js                  | 54 +++++++++++++
 lib/app.js                                    | 45 ++++-------
 lib/error-debug.js                            | 70 ++++++++++++----
 package.json                                  |  1 -
 server/build/babel/preset.js                  | 15 +---
 server/build/webpack.js                       | 15 ++--
 server/index.js                               |  3 +-
 server/lib/source-map-support.js              | 57 +++++++++++++
 server/render.js                              |  5 +-
 .../error-in-the-browser-global-scope.js      |  5 ++
 .../basic/pages/error-inside-browser-page.js  |  9 +++
 .../basic/test/client-navigation.js           | 19 +++++
 test/integration/basic/test/rendering.js      |  3 +
 .../pages/error-in-browser-render.js          |  9 +++
 .../production/pages/error-in-ssr-render.js   |  6 ++
 .../integration/production/test/index.test.js | 20 +++++
 yarn.lock                                     |  8 +-
 19 files changed, 322 insertions(+), 109 deletions(-)
 create mode 100644 client/source-map-support.js
 create mode 100644 server/lib/source-map-support.js
 create mode 100644 test/integration/basic/pages/error-in-the-browser-global-scope.js
 create mode 100644 test/integration/basic/pages/error-inside-browser-page.js
 create mode 100644 test/integration/production/pages/error-in-browser-render.js
 create mode 100644 test/integration/production/pages/error-in-ssr-render.js

diff --git a/client/index.js b/client/index.js
index 149e222daa35f..942a207926bc1 100644
--- a/client/index.js
+++ b/client/index.js
@@ -1,4 +1,4 @@
-import { createElement } from 'react'
+import React from 'react'
 import ReactDOM from 'react-dom'
 import HeadManager from './head-manager'
 import { createRouter } from '../lib/router'
@@ -66,33 +66,44 @@ const errorContainer = document.getElementById('__next-error')
 let lastAppProps
 export let router
 export let ErrorComponent
+let HotAppContainer
 let ErrorDebugComponent
 let Component
 let App
 let stripAnsi = (s) => s
+let applySourcemaps = (e) => e
 
 export const emitter = new EventEmitter()
 
-export default async ({ ErrorDebugComponent: passedDebugComponent, stripAnsi: passedStripAnsi } = {}) => {
+export default async ({
+  HotAppContainer: passedHotAppContainer,
+  ErrorDebugComponent: passedDebugComponent,
+  stripAnsi: passedStripAnsi,
+  applySourcemaps: passedApplySourcemaps
+} = {}) => {
   // Wait for all the dynamic chunks to get loaded
   for (const chunkName of chunks) {
     await pageLoader.waitForChunk(chunkName)
   }
 
   stripAnsi = passedStripAnsi || stripAnsi
+  applySourcemaps = passedApplySourcemaps || applySourcemaps
+  HotAppContainer = passedHotAppContainer
   ErrorDebugComponent = passedDebugComponent
   ErrorComponent = await pageLoader.loadPage('/_error')
   App = await pageLoader.loadPage('/_app')
 
+  let initialErr = err
+
   try {
     Component = await pageLoader.loadPage(page)
 
     if (typeof Component !== 'function') {
       throw new Error(`The default export is not a React Component in page: "${pathname}"`)
     }
-  } catch (err) {
-    console.error(stripAnsi(`${err.message}\n${err.stack}`))
-    Component = ErrorComponent
+  } catch (error) {
+    // This catches errors like throwing in the top level of a module
+    initialErr = error
   }
 
   router = createRouter(pathname, query, asPath, {
@@ -101,7 +112,7 @@ export default async ({ ErrorDebugComponent: passedDebugComponent, stripAnsi: pa
     App,
     Component,
     ErrorComponent,
-    err
+    err: initialErr
   })
 
   router.subscribe(({ Component, props, hash, err }) => {
@@ -109,14 +120,14 @@ export default async ({ ErrorDebugComponent: passedDebugComponent, stripAnsi: pa
   })
 
   const hash = location.hash.substring(1)
-  render({ Component, props, hash, err, emitter })
+  render({ Component, props, hash, err: initialErr, emitter })
 
   return emitter
 }
 
 export async function render (props) {
   if (props.err) {
-    await renderError(props.err)
+    await renderError(props)
     return
   }
 
@@ -124,31 +135,37 @@ export async function render (props) {
     await doRender(props)
   } catch (err) {
     if (err.abort) return
-    await renderError(err)
+    await renderError({...props, err})
   }
 }
 
 // This method handles all runtime and debug errors.
 // 404 and 500 errors are special kind of errors
 // and they are still handle via the main render method.
-export async function renderError (error) {
-  const prod = process.env.NODE_ENV === 'production'
-  // We need to unmount the current app component because it's
-  // in the inconsistant state.
-  // Otherwise, we need to face issues when the issue is fixed and
-  // it's get notified via HMR
-  ReactDOM.unmountComponentAtNode(appContainer)
-
-  const errorMessage = `${error.message}\n${error.stack}`
-  console.error(stripAnsi(errorMessage))
-
-  if (prod) {
-    const initProps = {Component: ErrorComponent, router, ctx: {err: error, pathname, query, asPath}}
-    const props = await loadGetInitialProps(ErrorComponent, initProps)
-    renderReactElement(createElement(ErrorComponent, props), errorContainer)
-  } else {
-    renderReactElement(createElement(ErrorDebugComponent, { error }), errorContainer)
+export async function renderError (props) {
+  const {err} = props
+
+  // In development we apply sourcemaps to the error
+  if (process.env.NODE_ENV !== 'production') {
+    await applySourcemaps(err)
+  }
+
+  const str = stripAnsi(`${err.message}\n${err.stack}${err.info ? `\n\n${err.info.componentStack}` : ''}`)
+  console.error(str)
+
+  if (process.env.NODE_ENV !== 'production') {
+    // We need to unmount the current app component because it's
+    // in the inconsistant state.
+    // Otherwise, we need to face issues when the issue is fixed and
+    // it's get notified via HMR
+    ReactDOM.unmountComponentAtNode(appContainer)
+    renderReactElement(<ErrorDebugComponent error={err} />, errorContainer)
+    return
   }
+
+  // In production we do a normal render with the `ErrorComponent` as component.
+  // `App` will handle the calling of `getInitialProps`, which will include the `err` on the context
+  await doRender({...props, err, Component: ErrorComponent})
 }
 
 async function doRender ({ Component, props, hash, err, emitter: emitterProp = emitter }) {
@@ -172,7 +189,15 @@ async function doRender ({ Component, props, hash, err, emitter: emitterProp = e
 
   // We need to clear any existing runtime error messages
   ReactDOM.unmountComponentAtNode(errorContainer)
-  renderReactElement(createElement(App, appProps), appContainer)
+
+  // In development we render react-hot-loader's wrapper component
+  if (HotAppContainer) {
+    renderReactElement(<HotAppContainer errorReporter={ErrorDebugComponent} warnings={false}>
+      <App {...appProps} />
+    </HotAppContainer>, appContainer)
+  } else {
+    renderReactElement(<App {...appProps} />, appContainer)
+  }
 
   emitterProp.emit('after-reactdom-render', { Component, ErrorComponent, appProps })
 }
diff --git a/client/next-dev.js b/client/next-dev.js
index 7f5e13e0005f2..07e86f79d0ad8 100644
--- a/client/next-dev.js
+++ b/client/next-dev.js
@@ -1,14 +1,14 @@
 import stripAnsi from 'strip-ansi'
 import initNext, * as next from './'
-import ErrorDebugComponent from '../lib/error-debug'
+import {ClientDebug} from '../lib/error-debug'
 import initOnDemandEntries from './on-demand-entries-client'
 import initWebpackHMR from './webpack-hot-middleware-client'
-
-require('@zeit/source-map-support/browser-source-map-support')
+import {AppContainer as HotAppContainer} from 'react-hot-loader'
+import {applySourcemaps} from './source-map-support'
 
 window.next = next
 
-initNext({ ErrorDebugComponent, stripAnsi })
+initNext({ HotAppContainer, ErrorDebugComponent: ClientDebug, applySourcemaps, stripAnsi })
   .then((emitter) => {
     initOnDemandEntries()
     initWebpackHMR()
diff --git a/client/source-map-support.js b/client/source-map-support.js
new file mode 100644
index 0000000000000..f29526feaadc8
--- /dev/null
+++ b/client/source-map-support.js
@@ -0,0 +1,54 @@
+// @flow
+import fetch from 'unfetch'
+const filenameRE = /\(([^)]+\.js):(\d+):(\d+)\)$/
+
+export async function applySourcemaps (e: any): Promise<void> {
+  if (!e || typeof e.stack !== 'string' || e.sourceMapsApplied) {
+    return
+  }
+
+  const lines = e.stack.split('\n')
+
+  const result = await Promise.all(lines.map((line) => {
+    return rewriteTraceLine(line)
+  }))
+
+  e.stack = result.join('\n')
+  // This is to make sure we don't apply the sourcemaps twice on the same object
+  e.sourceMapsApplied = true
+}
+
+async function rewriteTraceLine (trace: string): Promise<string> {
+  const m = trace.match(filenameRE)
+  if (m == null) {
+    return trace
+  }
+
+  const filePath = m[1]
+  if (filePath.match(/node_modules/)) {
+    return trace
+  }
+
+  const mapPath = `${filePath}.map`
+
+  const res = await fetch(mapPath)
+  if (res.status !== 200) {
+    return trace
+  }
+
+  const mapContents = await res.json()
+  const {SourceMapConsumer} = require('source-map')
+  const map = new SourceMapConsumer(mapContents)
+  const originalPosition = map.originalPositionFor({
+    line: Number(m[2]),
+    column: Number(m[3])
+  })
+
+  if (originalPosition.source != null) {
+    const { source, line, column } = originalPosition
+    const mappedPosition = `(${source.replace(/^webpack:\/\/\//, '')}:${String(line)}:${String(column)})`
+    return trace.replace(filenameRE, mappedPosition)
+  }
+
+  return trace
+}
diff --git a/lib/app.js b/lib/app.js
index c749f9ef30812..df899cf7942d0 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -5,10 +5,6 @@ import { execOnce, warn, loadGetInitialProps } from './utils'
 import { makePublicRouterInstance } from './router'
 
 export default class App extends Component {
-  state = {
-    hasError: null
-  }
-
   static displayName = 'App'
 
   static async getInitialProps ({ Component, router, ctx }) {
@@ -24,18 +20,25 @@ export default class App extends Component {
 
   getChildContext () {
     const { headManager } = this.props
-    const {hasError} = this.state
     return {
       headManager,
       router: makePublicRouterInstance(this.props.router),
-      _containerProps: {...this.props, hasError}
+      _containerProps: {...this.props}
     }
   }
 
-  componentDidCatch (error, info) {
-    error.stack = `${error.stack}\n\n${info.componentStack}`
-    window.next.renderError(error)
-    this.setState({ hasError: true })
+  componentDidCatch (err, info) {
+    // To provide clearer stacktraces in error-debug.js in development
+    // To provide clearer stacktraces in app.js in production
+    err.info = info
+
+    if (process.env.NODE_ENV === 'production') {
+      // In production we render _error.js
+      window.next.renderError({err})
+    } else {
+      // In development we throw the error up to AppContainer from react-hot-loader
+      throw err
+    }
   }
 
   render () {
@@ -78,28 +81,8 @@ export class Container extends Component {
   }
 
   render () {
-    const { hasError } = this.context._containerProps
-
-    if (hasError) {
-      return null
-    }
-
     const {children} = this.props
-
-    if (process.env.NODE_ENV === 'production') {
-      return <>{children}</>
-    } else {
-      const ErrorDebug = require('./error-debug').default
-      const { AppContainer } = require('react-hot-loader')
-
-      // includes AppContainer which bypasses shouldComponentUpdate method
-      // https://github.com/gaearon/react-hot-loader/issues/442
-      return (
-        <AppContainer warnings={false} errorReporter={ErrorDebug}>
-          {children}
-        </AppContainer>
-      )
-    }
+    return <>{children}</>
   }
 }
 
diff --git a/lib/error-debug.js b/lib/error-debug.js
index ecb04c3983f9e..a3ca80e19d8e4 100644
--- a/lib/error-debug.js
+++ b/lib/error-debug.js
@@ -1,27 +1,68 @@
 import React from 'react'
 import ansiHTML from 'ansi-html'
 import Head from './head'
+import {applySourcemaps} from '../client/source-map-support'
 
-export default ({ error, error: { name, message, module } }) => (
-  <div style={styles.errorDebug}>
-    <Head>
-      <meta name='viewport' content='width=device-width, initial-scale=1.0' />
-    </Head>
-    {module ? <h1 style={styles.heading}>Error in {module.rawRequest}</h1> : null}
-    {
-      name === 'ModuleBuildError'
-        ? <pre style={styles.stack} dangerouslySetInnerHTML={{ __html: ansiHTML(encodeHtml(message)) }} />
-        : <StackTrace error={error} />
+// On the client side the error can come from multiple places for example react-hot-loader or client/index.js
+// `componentDidCatch` doesn't support asynchronous execution, so we have to handle sourcemap support here
+export class ClientDebug extends React.Component {
+  state = {
+    mappedError: null
+  }
+  componentDidMount () {
+    const {error} = this.props
+
+    // If sourcemaps were already applied there is no need to set the state
+    if (error.sourceMapsApplied) {
+      return
     }
-  </div>
-)
 
-const StackTrace = ({ error: { name, message, stack } }) => (
+    // Since componentDidMount doesn't handle errors we use then/catch here
+    applySourcemaps(error).then(() => {
+      this.setState({mappedError: error})
+    }).catch(console.error)
+  }
+
+  render () {
+    const {mappedError} = this.state
+    const {error} = this.props
+    if (!error.sourceMapsApplied && mappedError === null) {
+      return <div style={styles.errorDebug}>
+        <h1 style={styles.heading}>Loading stacktrace...</h1>
+      </div>
+    }
+
+    return <ErrorDebug error={error} />
+  }
+}
+
+// On the server side the error has sourcemaps already applied, so `ErrorDebug` is rendered directly.
+export default function ErrorDebug ({error}) {
+  const { name, message, module } = error
+  return (
+    <div style={styles.errorDebug}>
+      <Head>
+        <meta name='viewport' content='width=device-width, initial-scale=1.0' />
+      </Head>
+      {module ? <h1 style={styles.heading}>Error in {module.rawRequest}</h1> : null}
+      {
+        name === 'ModuleBuildError'
+          ? <pre style={styles.stack} dangerouslySetInnerHTML={{ __html: ansiHTML(encodeHtml(message)) }} />
+          : <StackTrace error={error} />
+      }
+    </div>
+  )
+}
+
+const StackTrace = ({ error: { name, message, stack, info } }) => (
   <div>
     <div style={styles.heading}>{message || name}</div>
     <pre style={styles.stack}>
       {stack}
     </pre>
+    {info && <pre style={styles.stack}>
+      {info.componentStack}
+    </pre>}
   </div>
 )
 
@@ -36,7 +77,8 @@ const styles = {
     right: 0,
     top: 0,
     bottom: 0,
-    zIndex: 9999
+    zIndex: 9999,
+    color: '#b3adac'
   },
 
   stack: {
diff --git a/package.json b/package.json
index 74277b985d109..b583f3719cb8b 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
     "@babel/runtime": "7.0.0-beta.42",
     "@babel/template": "7.0.0-beta.42",
     "@zeit/check-updates": "1.1.1",
-    "@zeit/source-map-support": "0.6.2",
     "ansi-html": "0.0.7",
     "babel-core": "7.0.0-bridge.0",
     "babel-loader": "8.0.0-beta.2",
diff --git a/server/build/babel/preset.js b/server/build/babel/preset.js
index 600078444daa9..57a7fa95289ab 100644
--- a/server/build/babel/preset.js
+++ b/server/build/babel/preset.js
@@ -23,17 +23,6 @@ function styledJsxOptions (opts) {
   return opts
 }
 
-const envPlugins = {
-  'development': [
-    require('@babel/plugin-transform-react-jsx-source')
-  ],
-  'production': [
-    require('babel-plugin-transform-react-remove-prop-types')
-  ]
-}
-
-const plugins = envPlugins[process.env.NODE_ENV] || envPlugins['development']
-
 module.exports = (context, opts = {}) => ({
   presets: [
     [require('@babel/preset-env'), {
@@ -53,6 +42,6 @@ module.exports = (context, opts = {}) => ({
       regenerator: true
     }],
     [require('styled-jsx/babel'), styledJsxOptions(opts['styled-jsx'])],
-    ...plugins
-  ]
+    process.env.NODE_ENV === 'production' && require('babel-plugin-transform-react-remove-prop-types')
+  ].filter(Boolean)
 })
diff --git a/server/build/webpack.js b/server/build/webpack.js
index 33c65ee580a44..d5c0971cc57fb 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -16,6 +16,7 @@ import BuildManifestPlugin from './plugins/build-manifest-plugin'
 
 const presetItem = createConfigItem(require('./babel/preset'), {type: 'preset'})
 const hotLoaderItem = createConfigItem(require('react-hot-loader/babel'), {type: 'plugin'})
+const reactJsxSourceItem = createConfigItem(require('@babel/plugin-transform-react-jsx-source'), {type: 'plugin'})
 
 const nextDir = path.join(__dirname, '..', '..', '..')
 const nextNodeModulesDir = path.join(nextDir, 'node_modules')
@@ -34,7 +35,8 @@ function babelConfig (dir, {isServer, dev}) {
     cacheDirectory: true,
     presets: [],
     plugins: [
-      dev && !isServer && hotLoaderItem
+      dev && !isServer && hotLoaderItem,
+      dev && reactJsxSourceItem
     ].filter(Boolean)
   }
 
@@ -119,7 +121,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
   } : {}
 
   let webpackConfig = {
-    devtool: dev ? 'source-map' : false,
+    devtool: dev ? 'cheap-module-source-map' : false,
     name: isServer ? 'server' : 'client',
     cache: true,
     target: isServer ? 'node' : 'web',
@@ -139,14 +141,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
       libraryTarget: 'commonjs2',
       // This saves chunks with the name given via require.ensure()
       chunkFilename: '[name]-[chunkhash].js',
-      strictModuleExceptionHandling: true,
-      devtoolModuleFilenameTemplate (info) {
-        if (dev) {
-          return info.absoluteResourcePath
-        }
-
-        return `${info.absoluteResourcePath.replace(dir, '.').replace(nextDir, './node_modules/next')}`
-      }
+      strictModuleExceptionHandling: true
     },
     performance: { hints: false },
     resolve: {
diff --git a/server/index.js b/server/index.js
index 05f1f2b28c6b9..09e2de170e81a 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,5 +1,4 @@
 /* eslint-disable import/first, no-return-await */
-require('@zeit/source-map-support').install()
 import { resolve, join, sep } from 'path'
 import { parse as parseUrl } from 'url'
 import { parse as parseQs } from 'querystring'
@@ -337,6 +336,8 @@ export default class Server {
         res.statusCode = 404
         return this.renderErrorToHTML(null, req, res, pathname, query)
       } else {
+        const {applySourcemaps} = require('./lib/source-map-support')
+        await applySourcemaps(err)
         if (!this.quiet) console.error(err)
         res.statusCode = 500
         return this.renderErrorToHTML(err, req, res, pathname, query)
diff --git a/server/lib/source-map-support.js b/server/lib/source-map-support.js
new file mode 100644
index 0000000000000..fdd6c466719a4
--- /dev/null
+++ b/server/lib/source-map-support.js
@@ -0,0 +1,57 @@
+// @flow
+const filenameRE = /\(([^)]+\.js):(\d+):(\d+)\)$/
+
+export async function applySourcemaps (e: any): Promise<void> {
+  if (!e || typeof e.stack !== 'string' || e.sourceMapsApplied) {
+    return
+  }
+
+  const lines = e.stack.split('\n')
+
+  const result = await Promise.all(lines.map((line) => {
+    return rewriteTraceLine(line)
+  }))
+
+  e.stack = result.join('\n')
+  // This is to make sure we don't apply the sourcemaps twice on the same object
+  e.sourceMapsApplied = true
+}
+
+async function rewriteTraceLine (trace: string): Promise<string> {
+  const m = trace.match(filenameRE)
+  if (m == null) {
+    return trace
+  }
+
+  const filePath = m[1]
+  const mapPath = `${filePath}.map`
+
+  // Load these on demand.
+  const fs = require('fs')
+  const promisify = require('./promisify')
+
+  const readFile = promisify(fs.readFile)
+  const access = promisify(fs.access)
+
+  try {
+    await access(mapPath, (fs.constants || fs).R_OK)
+  } catch (err) {
+    return trace
+  }
+
+  const mapContents = await readFile(mapPath)
+  const {SourceMapConsumer} = require('source-map')
+  const map = new SourceMapConsumer(JSON.parse(mapContents))
+  const originalPosition = map.originalPositionFor({
+    line: Number(m[2]),
+    column: Number(m[3])
+  })
+
+  if (originalPosition.source != null) {
+    const { source, line, column } = originalPosition
+    const mappedPosition = `(${source.replace(/^webpack:\/\/\//, '')}:${String(line)}:${String(column)})`
+    return trace.replace(filenameRE, mappedPosition)
+  }
+
+  return trace
+}
diff --git a/server/render.js b/server/render.js
index 4da7bd03b570e..016e465af16b8 100644
--- a/server/render.js
+++ b/server/render.js
@@ -12,6 +12,7 @@ import Head, { defaultHead } from '../lib/head'
 import ErrorDebug from '../lib/error-debug'
 import { flushChunks } from '../lib/dynamic'
 import { BUILD_MANIFEST } from '../lib/constants'
+import { applySourcemaps } from './lib/source-map-support'
 
 const logger = console
 
@@ -49,6 +50,8 @@ async function doRender (req, res, pathname, query, {
 } = {}) {
   page = page || pathname
 
+  await applySourcemaps(err)
+
   if (hotReloader) { // In dev mode we use on demand entries to compile the page before rendering
     await ensurePage(page, { dir, hotReloader })
   }
@@ -95,7 +98,7 @@ async function doRender (req, res, pathname, query, {
       if (err && dev) {
         errorHtml = render(createElement(ErrorDebug, { error: err }))
       } else if (err) {
-        errorHtml = render(app)
+        html = render(app)
       } else {
         html = render(app)
       }
diff --git a/test/integration/basic/pages/error-in-the-browser-global-scope.js b/test/integration/basic/pages/error-in-the-browser-global-scope.js
new file mode 100644
index 0000000000000..e9a5b0e904bb9
--- /dev/null
+++ b/test/integration/basic/pages/error-in-the-browser-global-scope.js
@@ -0,0 +1,5 @@
+if (typeof window !== 'undefined') {
+  throw new Error('An Expected error occured')
+}
+
+export default () => <div />
diff --git a/test/integration/basic/pages/error-inside-browser-page.js b/test/integration/basic/pages/error-inside-browser-page.js
new file mode 100644
index 0000000000000..0047b6c21fc3c
--- /dev/null
+++ b/test/integration/basic/pages/error-inside-browser-page.js
@@ -0,0 +1,9 @@
+import React from 'react'
+export default class ErrorInRenderPage extends React.Component {
+  render () {
+    if (typeof window !== 'undefined') {
+      throw new Error('An Expected error occured')
+    }
+    return <div />
+  }
+}
diff --git a/test/integration/basic/test/client-navigation.js b/test/integration/basic/test/client-navigation.js
index 7fbec21bbb0b7..192cc523f845d 100644
--- a/test/integration/basic/test/client-navigation.js
+++ b/test/integration/basic/test/client-navigation.js
@@ -1,6 +1,7 @@
 /* global describe, it, expect */
 
 import webdriver from 'next-webdriver'
+import {waitFor} from 'next-test-utils'
 
 export default (context, render) => {
   describe('Client Navigation', () => {
@@ -454,6 +455,24 @@ export default (context, render) => {
       })
     })
 
+    describe('runtime errors', () => {
+      it('should show ErrorDebug when a client side error is thrown inside a component', async () => {
+        const browser = await webdriver(context.appPort, '/error-inside-browser-page')
+        await waitFor(2000)
+        const text = await browser.elementByCss('body').text()
+        expect(text).toMatch(/An Expected error occured/)
+        expect(text).toMatch(/pages\/error-inside-browser-page\.js:5:0/)
+      })
+
+      it('should show ErrorDebug when a client side error is thrown outside a component', async () => {
+        const browser = await webdriver(context.appPort, '/error-in-the-browser-global-scope')
+        await waitFor(2000)
+        const text = await browser.elementByCss('body').text()
+        expect(text).toMatch(/An Expected error occured/)
+        expect(text).toMatch(/pages\/error-in-the-browser-global-scope\.js:2:0/)
+      })
+    })
+
     describe('with 404 pages', () => {
       it('should 404 on not existent page', async () => {
         const browser = await webdriver(context.appPort, '/non-existent')
diff --git a/test/integration/basic/test/rendering.js b/test/integration/basic/test/rendering.js
index 239ba3a23dd43..3ac0a82bd2ca3 100644
--- a/test/integration/basic/test/rendering.js
+++ b/test/integration/basic/test/rendering.js
@@ -104,11 +104,14 @@ export default function ({ app }, suiteName, render, fetch) {
     test('error-inside-page', async () => {
       const $ = await get$('/error-inside-page')
       expect($('pre').text()).toMatch(/This is an expected error/)
+      // Check if the the source map line is correct
+      expect($('body').text()).toMatch(/pages\/error-inside-page\.js:2:0/)
     })
 
     test('error-in-the-global-scope', async () => {
       const $ = await get$('/error-in-the-global-scope')
       expect($('pre').text()).toMatch(/aa is not defined/)
+      expect($('body').text()).toMatch(/pages\/error-in-the-global-scope\.js:1:0/)
     })
 
     test('asPath', async () => {
diff --git a/test/integration/production/pages/error-in-browser-render.js b/test/integration/production/pages/error-in-browser-render.js
new file mode 100644
index 0000000000000..0047b6c21fc3c
--- /dev/null
+++ b/test/integration/production/pages/error-in-browser-render.js
@@ -0,0 +1,9 @@
+import React from 'react'
+export default class ErrorInRenderPage extends React.Component {
+  render () {
+    if (typeof window !== 'undefined') {
+      throw new Error('An Expected error occured')
+    }
+    return <div />
+  }
+}
diff --git a/test/integration/production/pages/error-in-ssr-render.js b/test/integration/production/pages/error-in-ssr-render.js
new file mode 100644
index 0000000000000..9b2d456865414
--- /dev/null
+++ b/test/integration/production/pages/error-in-ssr-render.js
@@ -0,0 +1,6 @@
+import React from 'react'
+export default class ErrorInRenderPage extends React.Component {
+  render () {
+    throw new Error('An Expected error occured')
+  }
+}
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
index 8402d449557e7..f298ad93fed28 100644
--- a/test/integration/production/test/index.test.js
+++ b/test/integration/production/test/index.test.js
@@ -74,6 +74,26 @@ describe('Production Usage', () => {
     })
   })
 
+  describe('Runtime errors', () => {
+    it('should render a server side error on the client side', async () => {
+      const browser = await webdriver(appPort, '/error-in-ssr-render')
+      await waitFor(2000)
+      const text = await browser.elementByCss('body').text()
+      // this makes sure we don't leak the actual error to the client side in production
+      expect(text).toMatch(/Internal Server Error\./)
+      const headingText = await browser.elementByCss('h1').text()
+      // This makes sure we render statusCode on the client side correctly
+      expect(headingText).toBe('500')
+    })
+
+    it('should render a client side component error', async () => {
+      const browser = await webdriver(appPort, '/error-in-browser-render')
+      await waitFor(2000)
+      const text = await browser.elementByCss('body').text()
+      expect(text).toMatch(/An unexpected error has occurred\./)
+    })
+  })
+
   describe('Misc', () => {
     it('should handle already finished responses', async () => {
       const res = {
diff --git a/yarn.lock b/yarn.lock
index 3ad3f8a275bdc..92b93fcd97635 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -759,12 +759,6 @@
     postcss-loader "^2.0.10"
     style-loader "^0.19.1"
 
-"@zeit/source-map-support@0.6.2":
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/@zeit/source-map-support/-/source-map-support-0.6.2.tgz#0efd478f24a606726948165e53a8efe89e24036f"
-  dependencies:
-    source-map "^0.6.0"
-
 abab@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -6929,7 +6923,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@0.6.1, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 

From 65a9a63af109483898d0df0b3b0aa5b9f83f11b1 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Wed, 18 Apr 2018 21:32:50 +0200
Subject: [PATCH 52/73] 6.0.0-canary.4

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

diff --git a/package.json b/package.json
index 64326a9893260..9388091363cbb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.0-canary.3",
+  "version": "6.0.0-canary.4",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From a691dd06cfba0a847b946158adf471e41ce56b59 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Wed, 18 Apr 2018 21:39:57 +0200
Subject: [PATCH 53/73] State is no longer used since #4156

---
 readme.md | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/readme.md b/readme.md
index 6df3edd1c990c..e3ca7f2ef12bf 100644
--- a/readme.md
+++ b/readme.md
@@ -990,36 +990,6 @@ export default class MyApp extends App {
 }
 ```
 
-When using state inside app the `hasError` property has to be defined:
-
-```js
-import App, {Container} from 'next/app'
-import React from 'react'
-
-export default class MyApp extends App {
-  static async getInitialProps ({ Component, router, ctx }) {
-    let pageProps = {}
-
-    if (Component.getInitialProps) {
-      pageProps = await Component.getInitialProps(ctx)
-    }
-
-    return {pageProps}
-  }
-
-  state = {
-    hasError: null
-  }
-
-  render () {
-    const {Component, pageProps} = this.props
-    return <Container>
-      <Component {...pageProps} />
-    </Container>
-  }
-}
-```
-
 ### Custom `<Document>`
 
 <p><details>

From 1d884efe78bbe3989e8a9381208895b738128129 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sun, 22 Apr 2018 13:20:24 -0700
Subject: [PATCH 54/73] Fix url prop override (#4191)

* Fix url prop override

* Remove console.log
---
 lib/app.js                                       |  2 +-
 .../integration/basic/pages/url-prop-override.js | 16 ++++++++++++++++
 test/integration/basic/pages/url-prop.js         |  7 +++++++
 test/integration/basic/test/index.test.js        |  2 ++
 test/integration/basic/test/rendering.js         | 16 ++++++++++++++++
 5 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/basic/pages/url-prop-override.js
 create mode 100644 test/integration/basic/pages/url-prop.js

diff --git a/lib/app.js b/lib/app.js
index df899cf7942d0..c4f722aef7afe 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -45,7 +45,7 @@ export default class App extends Component {
     const {router, Component, pageProps} = this.props
     const url = createUrl(router)
     return <Container>
-      <Component url={url} {...pageProps} />
+      <Component {...pageProps} url={url} />
     </Container>
   }
 }
diff --git a/test/integration/basic/pages/url-prop-override.js b/test/integration/basic/pages/url-prop-override.js
new file mode 100644
index 0000000000000..8a879e958be7a
--- /dev/null
+++ b/test/integration/basic/pages/url-prop-override.js
@@ -0,0 +1,16 @@
+import React from 'react'
+export default class extends React.Component {
+  static getInitialProps () {
+    return {
+      url: 'test' // This gets overridden by Next in lib/_app.js
+    }
+  }
+  render () {
+    const {url} = this.props
+    return <div>
+      <p id='pathname'>{url.pathname}</p>
+      <p id='query'>{Object.keys(url.query).length}</p>
+      <p id='aspath'>{url.asPath}</p>
+    </div>
+  }
+}
diff --git a/test/integration/basic/pages/url-prop.js b/test/integration/basic/pages/url-prop.js
new file mode 100644
index 0000000000000..ab4391857fb6a
--- /dev/null
+++ b/test/integration/basic/pages/url-prop.js
@@ -0,0 +1,7 @@
+export default ({url}) => {
+  return <div>
+    <p id='pathname'>{url.pathname}</p>
+    <p id='query'>{Object.keys(url.query).length}</p>
+    <p id='aspath'>{url.asPath}</p>
+  </div>
+}
diff --git a/test/integration/basic/test/index.test.js b/test/integration/basic/test/index.test.js
index d1b1d3ade74af..71f1238d0d333 100644
--- a/test/integration/basic/test/index.test.js
+++ b/test/integration/basic/test/index.test.js
@@ -40,6 +40,8 @@ describe('Basic Features', () => {
       renderViaHTTP(context.appPort, '/custom-extension'),
       renderViaHTTP(context.appPort, '/styled-jsx'),
       renderViaHTTP(context.appPort, '/with-cdm'),
+      renderViaHTTP(context.appPort, '/url-prop'),
+      renderViaHTTP(context.appPort, '/url-prop-override'),
 
       renderViaHTTP(context.appPort, '/nav'),
       renderViaHTTP(context.appPort, '/nav/about'),
diff --git a/test/integration/basic/test/rendering.js b/test/integration/basic/test/rendering.js
index 3ac0a82bd2ca3..92d8e3110b051 100644
--- a/test/integration/basic/test/rendering.js
+++ b/test/integration/basic/test/rendering.js
@@ -119,6 +119,22 @@ export default function ({ app }, suiteName, render, fetch) {
       expect($('.as-path-content').text()).toBe('/nav/as-path?aa=10')
     })
 
+    describe('Url prop', () => {
+      it('should provide pathname, query and asPath', async () => {
+        const $ = await get$('/url-prop')
+        expect($('#pathname').text()).toBe('/url-prop')
+        expect($('#query').text()).toBe('0')
+        expect($('#aspath').text()).toBe('/url-prop')
+      })
+
+      it('should override props.url, even when getInitialProps returns url as property', async () => {
+        const $ = await get$('/url-prop-override')
+        expect($('#pathname').text()).toBe('/url-prop-override')
+        expect($('#query').text()).toBe('0')
+        expect($('#aspath').text()).toBe('/url-prop-override')
+      })
+    })
+
     describe('404', () => {
       it('should 404 on not existent page', async () => {
         const $ = await get$('/non-existent')

From f373d25c0d30296b55d824c819accc8ac0e909e9 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sun, 22 Apr 2018 15:43:24 -0700
Subject: [PATCH 55/73] Replaced update checker (#4192)

* Use update-check

* Check for tty
---
 package.json    |   2 +-
 server/index.js |  16 +++-
 yarn.lock       | 236 ++++++------------------------------------------
 3 files changed, 39 insertions(+), 215 deletions(-)

diff --git a/package.json b/package.json
index 9388091363cbb..6049040bf5e31 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,6 @@
     "@babel/preset-react": "7.0.0-beta.42",
     "@babel/runtime": "7.0.0-beta.42",
     "@babel/template": "7.0.0-beta.42",
-    "@zeit/check-updates": "1.1.1",
     "ansi-html": "0.0.7",
     "babel-core": "7.0.0-bridge.0",
     "babel-loader": "8.0.0-beta.2",
@@ -97,6 +96,7 @@
     "touch": "3.1.0",
     "uglifyjs-webpack-plugin": "1.1.6",
     "unfetch": "3.0.0",
+    "update-check": "1.3.2",
     "url": "0.11.0",
     "uuid": "3.1.0",
     "walk": "2.3.9",
diff --git a/server/index.js b/server/index.js
index 09e2de170e81a..703c15c3da9e0 100644
--- a/server/index.js
+++ b/server/index.js
@@ -4,7 +4,6 @@ import { parse as parseUrl } from 'url'
 import { parse as parseQs } from 'querystring'
 import fs from 'fs'
 import http, { STATUS_CODES } from 'http'
-import updateNotifier from '@zeit/check-updates'
 import promisify from './lib/promisify'
 import {
   renderToHTML,
@@ -44,10 +43,6 @@ export default class Server {
 
     this.hotReloader = dev ? this.getHotReloader(this.dir, { quiet, config: this.nextConfig }) : null
 
-    if (dev) {
-      updateNotifier(pkg, 'next')
-    }
-
     // Only serverRuntimeConfig needs the default
     // publicRuntimeConfig gets it's default in client/index.js
     const {serverRuntimeConfig = {}, publicRuntimeConfig, assetPrefix, generateEtags} = this.nextConfig
@@ -118,6 +113,17 @@ export default class Server {
   }
 
   async prepare () {
+    if (this.dev && process.stdout.isTTY) {
+      const checkForUpdate = require('update-check')
+      const update = await checkForUpdate(pkg, {
+        distTag: pkg.version.includes('canary') ? 'canary' : 'latest'
+      })
+      if (update) {
+        // bgRed from chalk
+        console.log(`\u001B[41mUPDATE AVAILABLE\u001B[49m The latest version of \`next\` is ${update.latest}`)
+      }
+    }
+
     await this.defineRoutes()
     if (this.hotReloader) {
       await this.hotReloader.start()
diff --git a/yarn.lock b/yarn.lock
index 92b93fcd97635..14383eb8f1955 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -740,14 +740,6 @@
   dependencies:
     chokidar "^1.7.0"
 
-"@zeit/check-updates@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@zeit/check-updates/-/check-updates-1.1.1.tgz#1bee858fd3f9b8633b0fc23dff53cb17343331c0"
-  dependencies:
-    chalk "2.3.2"
-    ms "2.1.1"
-    update-notifier "2.3.0"
-
 "@zeit/next-css@0.0.7":
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/@zeit/next-css/-/next-css-0.0.7.tgz#8eb0c3829d757854921488e4e1e1a5c086f3fad8"
@@ -860,12 +852,6 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  dependencies:
-    string-width "^2.0.0"
-
 ansi-escapes@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
@@ -1397,18 +1383,6 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
-boxen@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
-  dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
-    term-size "^1.2.0"
-    widest-line "^2.0.0"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1617,7 +1591,7 @@ camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
@@ -1638,10 +1612,6 @@ caniuse-lite@^1.0.30000821:
   version "1.0.30000821"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000821.tgz#0f3223f1e048ed96451c56ca6cf197058c42cb93"
 
-capture-stack-trace@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
-
 case-sensitive-paths-webpack-plugin@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.1.tgz#3d29ced8c1f124bf6f53846fb3f5894731fdc909"
@@ -1661,14 +1631,6 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@2.3.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -1679,6 +1641,14 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -1785,10 +1755,6 @@ clean-stack@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
 
-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-
 cli-cursor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
@@ -1957,17 +1923,6 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-configstore@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
-  dependencies:
-    dot-prop "^4.1.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
-
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -2090,12 +2045,6 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-error-class@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
@@ -2173,10 +2122,6 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-
 css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -2510,16 +2455,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-dot-prop@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  dependencies:
-    is-obj "^1.0.0"
-
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-
 duplexify@^3.4.2, duplexify@^3.5.3:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
@@ -3445,12 +3380,6 @@ glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  dependencies:
-    ini "^1.3.4"
-
 global@^4.3.0:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
@@ -3487,22 +3416,6 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-got@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
-
 graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -3789,10 +3702,6 @@ ignore@^3.0.9, ignore@^3.3.3, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3830,7 +3739,7 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.4, ini@~1.3.0:
+ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -4015,13 +3924,6 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  dependencies:
-    global-dirs "^0.1.0"
-    is-path-inside "^1.0.0"
-
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
@@ -4036,10 +3938,6 @@ is-my-json-valid@^2.12.4:
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
-is-npm@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4056,7 +3954,7 @@ is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
-is-obj@^1.0.0, is-obj@^1.0.1:
+is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
@@ -4108,10 +4006,6 @@ is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -4126,11 +4020,7 @@ is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
-is-retry-allowed@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-
-is-stream@1.1.0, is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@1.1.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
@@ -4647,12 +4537,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
-latest-version@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
-  dependencies:
-    package-json "^4.0.0"
-
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -4898,10 +4782,6 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
   dependencies:
     js-tokens "^3.0.0"
 
-lowercase-keys@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-
 lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
@@ -5178,10 +5058,6 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -5572,15 +5448,6 @@ p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
-package-json@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
-  dependencies:
-    got "^6.7.1"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
-
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -6054,7 +5921,7 @@ prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
-prepend-http@^1.0.0, prepend-http@^1.0.1:
+prepend-http@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
@@ -6114,7 +5981,7 @@ prop-types@15.6.0:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-prop-types@^15.6.0:
+prop-types@^15.6.0, prop-types@^15.6.1:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
@@ -6264,14 +6131,14 @@ react-dom@16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react-hot-loader@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.0.0.tgz#3452fa9bc0d0ba9dfc5b0ccfa25101ca8dbd2de2"
+react-hot-loader@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.0.1.tgz#48284350ae5d7ba07dac872bd5bbc6e477352593"
   dependencies:
     fast-levenshtein "^2.0.6"
     global "^4.3.0"
     hoist-non-react-statics "^2.5.0"
-    prop-types "^15.6.0"
+    prop-types "^15.6.1"
     shallowequal "^1.0.2"
 
 react@16.2.0:
@@ -6415,14 +6282,14 @@ regexpu-core@^4.1.3:
     unicode-match-property-ecmascript "^1.0.3"
     unicode-match-property-value-ecmascript "^1.0.1"
 
-registry-auth-token@^3.0.1:
+registry-auth-token@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
 
-registry-url@^3.0.3:
+registry-url@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
   dependencies:
@@ -6710,13 +6577,7 @@ schema-utils@^0.4.0, schema-utils@^0.4.2:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-semver-diff@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-  dependencies:
-    semver "^5.0.3"
-
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -7308,12 +7169,6 @@ taskr@1.1.0:
     mri "^1.1.0"
     tinydate "^1.0.0"
 
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  dependencies:
-    execa "^0.7.0"
-
 test-exclude@^4.1.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
@@ -7347,10 +7202,6 @@ time-stamp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
 
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-
 timers-browserify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
@@ -7574,12 +7425,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  dependencies:
-    crypto-random-string "^1.0.0"
-
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -7591,27 +7436,16 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-
 upath@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
 
-update-notifier@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
+update-check@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/update-check/-/update-check-1.3.2.tgz#460f9e9ab24820367f3edbeb4d4142d9936ff171"
   dependencies:
-    boxen "^1.2.1"
-    chalk "^2.0.1"
-    configstore "^3.0.0"
-    import-lazy "^2.1.0"
-    is-installed-globally "^0.1.0"
-    is-npm "^1.0.0"
-    latest-version "^3.0.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^3.0.0"
+    registry-auth-token "3.3.2"
+    registry-url "3.1.0"
 
 uri-js@^3.0.2:
   version "3.0.2"
@@ -7623,12 +7457,6 @@ urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  dependencies:
-    prepend-http "^1.0.1"
-
 url@0.11.0, url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -7839,12 +7667,6 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
-widest-line@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
-  dependencies:
-    string-width "^2.1.1"
-
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
@@ -7886,7 +7708,7 @@ write-file-atomic@^1.1.4:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.1.0:
+write-file-atomic@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
   dependencies:
@@ -7911,10 +7733,6 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-
 xml-name-validator@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"

From bc03c59f5744dd08a90fefe81807133e7ccfd667 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sun, 22 Apr 2018 16:11:17 -0700
Subject: [PATCH 56/73] Upgrade react hot loader (#4171)

* Upgrade react hot loader

* Upgrade to 4.1.1
---
 package.json |   2 +-
 yarn.lock    | 503 ++++++++++++++++++++++++---------------------------
 2 files changed, 237 insertions(+), 268 deletions(-)

diff --git a/package.json b/package.json
index 6049040bf5e31..732d00f2c8b48 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "path-to-regexp": "2.1.0",
     "prop-types": "15.6.0",
     "prop-types-exact": "1.1.1",
-    "react-hot-loader": "4.0.1",
+    "react-hot-loader": "4.1.1",
     "recursive-copy": "2.0.6",
     "resolve": "1.5.0",
     "send": "0.16.1",
diff --git a/yarn.lock b/yarn.lock
index 14383eb8f1955..a7793fcc91367 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,11 +8,11 @@
   dependencies:
     "@babel/highlight" "7.0.0-beta.42"
 
-"@babel/code-frame@7.0.0-beta.43", "@babel/code-frame@^7.0.0-beta.40":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.43.tgz#57281887da181b4f9a3e72151f54f3237bf011eb"
+"@babel/code-frame@7.0.0-beta.44", "@babel/code-frame@^7.0.0-beta.40":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
   dependencies:
-    "@babel/highlight" "7.0.0-beta.43"
+    "@babel/highlight" "7.0.0-beta.44"
 
 "@babel/core@7.0.0-beta.42":
   version "7.0.0-beta.42"
@@ -35,16 +35,16 @@
     source-map "^0.5.0"
 
 "@babel/core@^7.0.0-beta.42":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.43.tgz#2e5d50b338b1484f4de7a92047e65b88f3fd2eed"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.43"
-    "@babel/generator" "7.0.0-beta.43"
-    "@babel/helpers" "7.0.0-beta.43"
-    "@babel/template" "7.0.0-beta.43"
-    "@babel/traverse" "7.0.0-beta.43"
-    "@babel/types" "7.0.0-beta.43"
-    babylon "7.0.0-beta.43"
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.44.tgz#90bb9e897427e7ebec2a1b857f458ff74ca28057"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helpers" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     convert-source-map "^1.1.0"
     debug "^3.1.0"
     json5 "^0.5.0"
@@ -64,11 +64,11 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/generator@7.0.0-beta.43":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.43.tgz#9f32baf9fe6a4a79872d1825bb7541ed992573ca"
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
   dependencies:
-    "@babel/types" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.44"
     jsesc "^2.5.1"
     lodash "^4.2.0"
     source-map "^0.5.0"
@@ -125,13 +125,13 @@
     "@babel/template" "7.0.0-beta.42"
     "@babel/types" "7.0.0-beta.42"
 
-"@babel/helper-function-name@7.0.0-beta.43":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.43.tgz#c1f521f0782a0e544fdfae2d88b6a2895a38a498"
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.43"
-    "@babel/template" "7.0.0-beta.43"
-    "@babel/types" "7.0.0-beta.43"
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
 
 "@babel/helper-get-function-arity@7.0.0-beta.42":
   version "7.0.0-beta.42"
@@ -139,11 +139,11 @@
   dependencies:
     "@babel/types" "7.0.0-beta.42"
 
-"@babel/helper-get-function-arity@7.0.0-beta.43":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.43.tgz#c00072b6d290ce037dc9037fe99037c7686a56e3"
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
   dependencies:
-    "@babel/types" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.44"
 
 "@babel/helper-hoist-variables@7.0.0-beta.42":
   version "7.0.0-beta.42"
@@ -222,11 +222,11 @@
   dependencies:
     "@babel/types" "7.0.0-beta.42"
 
-"@babel/helper-split-export-declaration@7.0.0-beta.43":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.43.tgz#1e95b16ce597df81ce1face60f5ea89a4631a7bf"
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
   dependencies:
-    "@babel/types" "7.0.0-beta.43"
+    "@babel/types" "7.0.0-beta.44"
 
 "@babel/helper-wrap-function@7.0.0-beta.42":
   version "7.0.0-beta.42"
@@ -245,13 +245,13 @@
     "@babel/traverse" "7.0.0-beta.42"
     "@babel/types" "7.0.0-beta.42"
 
-"@babel/helpers@7.0.0-beta.43":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.43.tgz#a45078bdd135012229c3bb209c86ef1f953ba041"
+"@babel/helpers@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.44.tgz#b1cc87fdc3b77351c0a4860bcd9d4ef457919bfd"
   dependencies:
-    "@babel/template" "7.0.0-beta.43"
-    "@babel/traverse" "7.0.0-beta.43"
-    "@babel/types" "7.0.0-beta.43"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
 
 "@babel/highlight@7.0.0-beta.42":
   version "7.0.0-beta.42"
@@ -261,9 +261,9 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/highlight@7.0.0-beta.43":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.43.tgz#7bd0415ca160495a22b3a234f0841b4a9ab0de26"
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
@@ -657,13 +657,13 @@
     babylon "7.0.0-beta.42"
     lodash "^4.2.0"
 
-"@babel/template@7.0.0-beta.43":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.43.tgz#0d34fa1da16835b23dd136b942c753ad97540c24"
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.43"
-    "@babel/types" "7.0.0-beta.43"
-    babylon "7.0.0-beta.43"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
 "@babel/traverse@7.0.0-beta.42":
@@ -681,16 +681,16 @@
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/traverse@7.0.0-beta.43", "@babel/traverse@^7.0.0-beta.40":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.43.tgz#dad8700f1e51ed960de22c5060bf1c3e8c8fc494"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.43"
-    "@babel/generator" "7.0.0-beta.43"
-    "@babel/helper-function-name" "7.0.0-beta.43"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.43"
-    "@babel/types" "7.0.0-beta.43"
-    babylon "7.0.0-beta.43"
+"@babel/traverse@7.0.0-beta.44", "@babel/traverse@^7.0.0-beta.40":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     debug "^3.1.0"
     globals "^11.1.0"
     invariant "^2.2.0"
@@ -704,9 +704,9 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@babel/types@7.0.0-beta.43", "@babel/types@^7.0.0-beta.40":
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.43.tgz#9d82c2d773b6baec0474ddb774eafd7fb4511f8b"
+"@babel/types@7.0.0-beta.44", "@babel/types@^7.0.0-beta.40":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.2.0"
@@ -811,13 +811,6 @@ ajv-keywords@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
 
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
 ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -1101,8 +1094,8 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
 aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -1142,7 +1135,7 @@ babel-core@^6.0.0, babel-core@^6.26.0:
 
 babel-eslint@8.2.2:
   version "8.2.2"
-  resolved "http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.40"
     "@babel/traverse" "^7.0.0-beta.40"
@@ -1192,7 +1185,7 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-istanbul@4.1.5, babel-plugin-istanbul@^4.0.0:
+babel-plugin-istanbul@4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
   dependencies:
@@ -1200,6 +1193,15 @@ babel-plugin-istanbul@4.1.5, babel-plugin-istanbul@^4.0.0:
     istanbul-lib-instrument "^1.7.5"
     test-exclude "^4.1.1"
 
+babel-plugin-istanbul@^4.0.0:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.10.1"
+    test-exclude "^4.2.1"
+
 babel-plugin-jest-hoist@^21.2.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz#2cef637259bd4b628a6cace039de5fcd14dbb006"
@@ -1287,9 +1289,9 @@ babylon@7.0.0-beta.42:
   version "7.0.0-beta.42"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.42.tgz#67cfabcd4f3ec82999d29031ccdea89d0ba99657"
 
-babylon@7.0.0-beta.43, babylon@^7.0.0-beta.40:
-  version "7.0.0-beta.43"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.43.tgz#15128e7403d41b0e56cca2f110024cc1d8ada8cd"
+babylon@7.0.0-beta.44, babylon@^7.0.0-beta.40:
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
 babylon@^6.18.0:
   version "6.18.0"
@@ -1304,8 +1306,8 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
 base64-js@^1.0.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
 
 base@^0.11.1:
   version "0.11.2"
@@ -1347,12 +1349,6 @@ bl@^1.0.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
 bluebird@^3.5.0, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -1399,16 +1395,14 @@ braces@^1.8.2:
     repeat-element "^1.1.2"
 
 braces@^2.3.0, braces@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
-    define-property "^1.0.0"
     extend-shallow "^2.0.1"
     fill-range "^4.0.0"
     isobject "^3.0.1"
-    kind-of "^6.0.2"
     repeat-element "^1.1.2"
     snapdragon "^0.8.1"
     snapdragon-node "^2.0.1"
@@ -1426,8 +1420,8 @@ browser-resolve@^1.11.2:
     resolve "1.1.7"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1437,16 +1431,16 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
     safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
     evp_bytestokey "^1.0.0"
 
 browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1605,12 +1599,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000821"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000821.tgz#3fcdc67c446a94a9cdd848248a4e3e54b2da7419"
+  version "1.0.30000830"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000830.tgz#6e45255b345649fd15ff59072da1e12bb3de2f13"
 
 caniuse-lite@^1.0.30000821:
-  version "1.0.30000821"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000821.tgz#0f3223f1e048ed96451c56ca6cf197058c42cb93"
+  version "1.0.30000830"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328"
 
 case-sensitive-paths-webpack-plugin@2.1.1:
   version "2.1.1"
@@ -1642,8 +1636,8 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     supports-color "^2.0.0"
 
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52"
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -1985,8 +1979,8 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
 core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.3:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0"
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -2039,24 +2033,25 @@ crc@^3.4.4:
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
 
 create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.1.tgz#44223dfed533193ba5ba54e0df5709b89acf1f82"
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
-    ripemd160 "^2.0.0"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2252,7 +2247,7 @@ debug-log@^1.0.0, debug-log@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -2392,8 +2387,8 @@ diff@^3.2.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
 diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2475,8 +2470,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.41:
-  version "1.3.41"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.41.tgz#7e33643e00cd85edfd17e04194f6d00e73737235"
+  version "1.3.42"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -3251,6 +3246,12 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -3265,28 +3266,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0, fsevents@^1.1.1, fsevents@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.0.tgz#e11a5ff285471e4cc43ab9cd09bb7986c565dcdc"
   dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
+    nan "^2.9.2"
+    node-pre-gyp "^0.9.0"
 
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
@@ -3434,10 +3418,6 @@ handlebars@^4.0.3:
   optionalDependencies:
     uglify-js "^2.6"
 
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3451,13 +3431,6 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
@@ -3524,12 +3497,6 @@ has@^1.0.1:
   dependencies:
     function-bind "^1.0.2"
 
-hash-base@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
-  dependencies:
-    inherits "^2.0.1"
-
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
@@ -3544,7 +3511,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
-hawk@3.1.3, hawk@~3.1.3:
+hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
@@ -3672,10 +3639,16 @@ husky@0.14.3:
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+  version "0.4.21"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
+  dependencies:
+    safer-buffer "^2.1.0"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -3698,6 +3671,12 @@ ignore-loader@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ignore-loader/-/ignore-loader-0.1.2.tgz#d81f240376d0ba4f0d778972c3ad25874117a463"
 
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.0.9, ignore@^3.3.3, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@@ -3731,7 +3710,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -4965,8 +4944,8 @@ min-document@^2.19.0:
     dom-walk "^0.1.0"
 
 minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
@@ -4990,6 +4969,19 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1, minipass@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
+  dependencies:
+    safe-buffer "^5.1.1"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -5029,15 +5021,15 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
 moment@^2.11.2:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -5062,7 +5054,7 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0:
+nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -5087,13 +5079,21 @@ natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
+needle@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.0.tgz#f14efc69cee1024b72c8b21c7bdf94a731dc12fa"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
 neo-async@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
 
 next-tick@1:
   version "1.0.0"
@@ -5156,21 +5156,20 @@ node-notifier@^5.0.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+node-pre-gyp@^0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
   dependencies:
     detect-libc "^1.0.2"
-    hawk "3.1.3"
     mkdirp "^0.5.1"
+    needle "^2.2.0"
     nopt "^4.0.1"
+    npm-packlist "^1.1.6"
     npmlog "^4.0.2"
     rc "^1.1.7"
-    request "2.81.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
+    tar "^4"
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -5217,6 +5216,17 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-path@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
@@ -5350,7 +5360,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -5461,8 +5471,8 @@ parallel-transform@^1.1.0:
     readable-stream "^2.1.5"
 
 parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -5561,8 +5571,8 @@ path-type@^2.0.0:
     pify "^2.0.0"
 
 pbkdf2@^3.0.3:
-  version "3.0.14"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -5574,10 +5584,6 @@ pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -5724,8 +5730,8 @@ postcss-load-plugins@^2.3.0:
     object-assign "^4.1.0"
 
 postcss-loader@^2.0.10:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.3.tgz#eb210da734e475a244f76ccd61f9860f5bb3ee09"
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.4.tgz#f44a6390e03c84108b2b2063182d1a1011b2ce76"
   dependencies:
     loader-utils "^1.1.0"
     postcss "^6.0.0"
@@ -6005,8 +6011,8 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
 public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -6057,10 +6063,6 @@ qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
@@ -6131,16 +6133,21 @@ react-dom@16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react-hot-loader@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.0.1.tgz#48284350ae5d7ba07dac872bd5bbc6e477352593"
+react-hot-loader@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.1.1.tgz#693499a6414b6dc6880287e254322a9d3155e944"
   dependencies:
     fast-levenshtein "^2.0.6"
     global "^4.3.0"
     hoist-non-react-statics "^2.5.0"
     prop-types "^15.6.1"
+    react-lifecycles-compat "^2.0.0"
     shallowequal "^1.0.2"
 
+react-lifecycles-compat@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-2.0.2.tgz#00a23160eec17a43b94dd74f95d44a1a2c3c5ec1"
+
 react@16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
@@ -6180,16 +6187,16 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~2.0.0"
     safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
+    string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
 readdirp@^2.0.0:
@@ -6358,33 +6365,6 @@ request@2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
 request@^2.79.0, request@^2.81.0:
   version "2.85.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
@@ -6458,8 +6438,8 @@ resolve@1.5.0:
     path-parse "^1.0.5"
 
 resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
@@ -6491,17 +6471,17 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@2.6.2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2.6.2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
   dependencies:
-    hash-base "^2.0.0"
+    hash-base "^3.0.0"
     inherits "^2.0.1"
 
 run-async@^2.2.0:
@@ -6531,8 +6511,8 @@ rx-lite@*, rx-lite@^4.0.8:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
 rxjs@^5.0.0-beta.11:
-  version "5.5.8"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.8.tgz#b2b0809a57614ad6254c03d7446dea0d83ca3791"
+  version "5.5.10"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
   dependencies:
     symbol-observable "1.0.1"
 
@@ -6546,6 +6526,10 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
+safer-buffer@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
 sane@^2.0.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.0.tgz#6359cd676f5efd9988b264d8ce3b827dd6b27bec"
@@ -6560,7 +6544,7 @@ sane@^2.0.0:
   optionalDependencies:
     fsevents "^1.1.1"
 
-sax@^1.2.1, sax@~1.2.1:
+sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -6618,8 +6602,8 @@ send@0.16.1:
     statuses "~1.3.1"
 
 serialize-javascript@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
 
 serve-static@1.12.6:
   version "1.12.6"
@@ -6979,18 +6963,12 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0:
+string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringify-object@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
@@ -7081,8 +7059,8 @@ supports-color@^4.2.1:
     has-flag "^2.0.0"
 
 supports-color@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
     has-flag "^3.0.0"
 
@@ -7121,19 +7099,6 @@ tapable@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
 
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
 tar-stream@^1.5.0:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
@@ -7143,13 +7108,17 @@ tar-stream@^1.5.0:
     readable-stream "^2.0.0"
     xtend "^4.0.0"
 
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+tar@^4:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
   dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.2.4"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.1"
+    yallist "^3.0.2"
 
 taskkill@^2.0.0:
   version "2.0.0"
@@ -7169,7 +7138,7 @@ taskr@1.1.0:
     mri "^1.1.0"
     tinydate "^1.0.0"
 
-test-exclude@^4.1.1:
+test-exclude@^4.1.1, test-exclude@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
   dependencies:
@@ -7203,8 +7172,8 @@ time-stamp@^2.0.0:
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
 
 timers-browserify@^2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
   dependencies:
     setimmediate "^1.0.4"
 
@@ -7356,10 +7325,6 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
 underscore.string@3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db"
@@ -7508,8 +7473,8 @@ vary@~1.1.1:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
 vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
 
 verror@1.10.0:
   version "1.10.0"
@@ -7753,6 +7718,10 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"

From f5fa8a160d1120f139b42af3cf1efc97af30cb78 Mon Sep 17 00:00:00 2001
From: Leo Lamprecht <mindrun@icloud.com>
Date: Sun, 22 Apr 2018 16:39:05 -0700
Subject: [PATCH 57/73] Replaced NPM token (#4193)

* 6.0.0-canary.5

* Replaced NPM token

* Fixed version
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2e441f97a7bd1..2d2a822b0a66a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@
     email: "leo@zeit.co",
     tag: "canary",
     api_key: {
-      secure: "mvLXMXn1z1ri29wAy5/CCrDuO7ZC3gxckcnY5W00cbL8aFuK5buvpizKr3dz1pYX7vC55I+nZMtVa2vn4oOlTae07dd0BYGmmpiwq692XD4P+PHVs8D5MlbiT62vIJl/ezv/TcyoAbfIVPfUfLXA7H6a04Kodyzj3LffannOYpZNTPRNSdNAtkVtHPCuHksVpZoj6WhmC52MBEWkh0TCV3OdbeQAs6z3m6j81XcTduhXdraO4UmyXi/ML+eAgEBSejH70/7O/RSGludBOtIWMuxSrEey4wB4F4/xpN7k4LjPQRS+EtUBg9DSb3vB5y/hGwbDqwx7gGfN/yP/ssc9j3G8syTevv3fxH4ver9kg5tvltTJ8/gOzV7nF2sK1+Nb8legL4fLwHvgThf4sB9dAgNc7R8dYNgYwivkLUrrAy9WJsu7OsXLhg3NpEb9PcbKH7yFwrAzQjRPguVxg7bC02g41v0c2i1UXTb0D0/1KW5Mdg7HYZEw4uUXRhJCLWZbOcBCWdmiB+hwKSaq+aO49C5aX2UAyIsUPmG0OgqY91H/Y09KP3O6jN4j7ADrIIrdMwcyx15UJDZMwADCHHesnzeelDah7w3H6q+/heOA4nzbWhZaYQEDK4/aouRDINdXMmCmt9NNYjUA50BAI2dPpqetjaqq3gaPSAXsMvzNvRs="
+      secure: "rtfolrLprf1or4HkorLic8eVGOvJ6CHla8PNVS0JPVfXIwnqfn9c3OzkKJEcjD+rXLJlmbYfww8mz47cNtjREJVCax6Lc8PEXivhF9rfVCd/zrIslnhxIV6lDSehbm/ZlSItNyGVove+HpgD9G1ky9VGbGoSk0vYHRWriwwfwzfljXgnlJOFzdeJZpbLNEOqbMnjd9/TaaT2CCvInFydp78mx//dG34Qo5Hm6Le6lijEw/Ys6PL0LSJdZ+uP9HUz0of4Pu76IlD+SDPiMdpghidfMbD6s4UJoyeMN4JzX6R8xRHo0Q10yzM1KgbmFvJqXrGZuiVvTv9GviZUIPqowUonqIp6rdAgjLt7B4ng8YoPKCP6xOkjjaGgd6yaNuzbdqiZLRrPYFN6jwD9p4dMirCb3pccEWuDYwkTzJidwH58Isz7B8J2cinMAJbg3DVNlwS5tki9Soydk+n/0d+2Z4euzw+EZ1qd2aFhaLCkDZoLih8AIK6XrvjQTwMJEoRyg6tjhOeXbPNqPpH/k0QvheCeRmwIqXO2Pj8FHY4dgPGgU8PL6wdNJ0WQ+etpWYkuCAGA1SXHcNY2VFhkFTkuC+jFxJWWOfpMlBPdGOYTW31f3OAmp2lMJT2vQkPDqq91RRVorw7Lwf943RSLgULzl4fDuhe9/ORtvHjisqHp+RY="
     },
     skip_cleanup: true,
     on: {

From 59ff251bca176e58ae223a12888b77d21c0dd9aa Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Sun, 22 Apr 2018 16:39:34 -0700
Subject: [PATCH 58/73] 6.0.0-canary.5

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

diff --git a/package.json b/package.json
index 732d00f2c8b48..b312b5554eb49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.0-canary.4",
+  "version": "6.0.0-canary.5",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From 23716d448757254fc6c9c4451ea189b17e0ac17e Mon Sep 17 00:00:00 2001
From: ninesalt <youssefswailem@gmail.com>
Date: Mon, 23 Apr 2018 20:17:27 +0200
Subject: [PATCH 59/73] Fix grammatical errors in readme.md (#4199)

---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index e3ca7f2ef12bf..d2518372bcc06 100644
--- a/readme.md
+++ b/readme.md
@@ -525,7 +525,7 @@ The second `as` parameter for `push` and `replace` is an optional _decoration_ o
 _Note: in order to programmatically change the route without triggering navigation and component-fetching, use `props.url.push` and `props.url.replace` within a component_
 
 ##### With URL object
-You can use an URL object the same way you use it in a `<Link>` component to `push` and `replace` an url.
+You can use an URL object the same way you use it in a `<Link>` component to `push` and `replace` an URL.
 
 ```jsx
 import Router from 'next/router'
@@ -542,7 +542,7 @@ export default () =>
   </div>
 ```
 
-This uses of the same exact parameters as in the `<Link>` component.
+This uses the same exact parameters as in the `<Link>` component.
 
 ##### Router Events
 

From 0f2c8f5eb1af62963a057b4c53aac52f5096dc16 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Mon, 23 Apr 2018 13:27:53 -0700
Subject: [PATCH 60/73] =?UTF-8?q?Exclude=20=5Fapp.js=20since=20it=E2=80=99?=
 =?UTF-8?q?s=20not=20a=20normal=20page=20(#4201)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/export.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/export.js b/server/export.js
index 89967165face1..a781abf018402 100644
--- a/server/export.js
+++ b/server/export.js
@@ -29,7 +29,8 @@ export default async function (dir, options, configuration) {
   const defaultPathMap = {}
 
   for (const page of pages) {
-    if (page === '/_document') {
+    // _document and _app are not real pages.
+    if (page === '/_document' || page === '/_app') {
       continue
     }
     defaultPathMap[page] = { page }

From f48b67d535e97df5c71463674a7bd4874c79e9e8 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Mon, 23 Apr 2018 13:28:36 -0700
Subject: [PATCH 61/73] 6.0.0-canary.6

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

diff --git a/package.json b/package.json
index b312b5554eb49..b29806a727f6c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.0-canary.5",
+  "version": "6.0.0-canary.6",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From 65c0014ad174e5dcf3b991cfacd9c91edb3972d4 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Mon, 23 Apr 2018 14:22:36 -0700
Subject: [PATCH 62/73] Add componentDidCatch example

---
 examples/.babelrc                              |  4 ++--
 examples/with-componentdidcatch/package.json   | 15 +++++++++++++++
 examples/with-componentdidcatch/pages/_app.js  |  9 +++++++++
 examples/with-componentdidcatch/pages/index.js |  4 ++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 examples/with-componentdidcatch/package.json
 create mode 100644 examples/with-componentdidcatch/pages/_app.js
 create mode 100644 examples/with-componentdidcatch/pages/index.js

diff --git a/examples/.babelrc b/examples/.babelrc
index 6714336e3e0d3..2b5be340ae6ac 100644
--- a/examples/.babelrc
+++ b/examples/.babelrc
@@ -1,3 +1,3 @@
 {
-  "babelrc": false
-}
\ No newline at end of file
+  "presets": ["../babel"]
+}
diff --git a/examples/with-componentdidcatch/package.json b/examples/with-componentdidcatch/package.json
new file mode 100644
index 0000000000000..a2f3b1c60c10a
--- /dev/null
+++ b/examples/with-componentdidcatch/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "hello-world",
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "6.0.0-canary.6",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0"
+  },
+  "license": "ISC"
+}
diff --git a/examples/with-componentdidcatch/pages/_app.js b/examples/with-componentdidcatch/pages/_app.js
new file mode 100644
index 0000000000000..a2af363306114
--- /dev/null
+++ b/examples/with-componentdidcatch/pages/_app.js
@@ -0,0 +1,9 @@
+import App from 'next/app'
+
+export default class MyApp extends App {
+  componentDidCatch (error, errorInfo) {
+    console.log('CUSTOM ERROR HANDLING', error)
+    // This is needed to render errors correctly in development / production
+    super.componentDidCatch(error, errorInfo)
+  }
+}
diff --git a/examples/with-componentdidcatch/pages/index.js b/examples/with-componentdidcatch/pages/index.js
new file mode 100644
index 0000000000000..e9fd47868f943
--- /dev/null
+++ b/examples/with-componentdidcatch/pages/index.js
@@ -0,0 +1,4 @@
+export default () => {
+  // Render time error
+  throw new Error('Test')
+}

From 326c84a730b28a477dd16ae735a514b267b3cade Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Mon, 23 Apr 2018 15:07:48 -0700
Subject: [PATCH 63/73] Add readme for componentDidCatch example

---
 examples/with-componentdidcatch/package.json |  2 +-
 examples/with-componentdidcatch/readme.md    | 44 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 examples/with-componentdidcatch/readme.md

diff --git a/examples/with-componentdidcatch/package.json b/examples/with-componentdidcatch/package.json
index a2f3b1c60c10a..d06f82981b1d4 100644
--- a/examples/with-componentdidcatch/package.json
+++ b/examples/with-componentdidcatch/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hello-world",
+  "name": "with-componentdidcatch",
   "version": "1.0.0",
   "scripts": {
     "dev": "next",
diff --git a/examples/with-componentdidcatch/readme.md b/examples/with-componentdidcatch/readme.md
new file mode 100644
index 0000000000000..5ec8b9b8f74b1
--- /dev/null
+++ b/examples/with-componentdidcatch/readme.md
@@ -0,0 +1,44 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-componentdidcatch)
+
+# With `componentDidCatch` 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-componentdidcatch with-componentdidcatch-app
+# or
+yarn create next-app --example with-componentdidcatch with-componentdidcatch-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-componentdidcatch
+cd with-componentdidcatch
+```
+
+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 catch errors caught by `componentDidCatch` in React's client side.

From e6b5567b20126b12c6b5b640357ff91bfb04e3df Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Mon, 23 Apr 2018 15:16:22 -0700
Subject: [PATCH 64/73] Update url for componentDidCatch

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index d2518372bcc06..7ad578e82f328 100644
--- a/readme.md
+++ b/readme.md
@@ -954,7 +954,7 @@ export default () => <HelloBundle title="Dynamic Bundle" />
 <p><details>
   <summary><b>Examples</b></summary>
   <ul><li><a href="./examples/layout-component">Using `_app.js` for layout</a></li></ul>
-  <ul><li><a href="./examples/componentdidcatch">Using `_app.js` to override `componentDidCatch`</a></li></ul>
+  <ul><li><a href="./examples/with-componentdidcatch">Using `_app.js` to override `componentDidCatch`</a></li></ul>
 </details></p>
 
 Next.js uses the `App` component to initialize pages. You can override it and control the page initialization. Which allows you to do amazing things like:

From 0daf9beedc96baa5f3801994d339888e3f54cbc8 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Tue, 24 Apr 2018 12:30:24 -0700
Subject: [PATCH 65/73] Add _app layout example

---
 examples/with-app-layout/package.json   | 15 +++++++++
 examples/with-app-layout/pages/_app.js  | 22 +++++++++++++
 examples/with-app-layout/pages/index.js |  3 ++
 examples/with-app-layout/readme.md      | 44 +++++++++++++++++++++++++
 readme.md                               |  2 +-
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 examples/with-app-layout/package.json
 create mode 100644 examples/with-app-layout/pages/_app.js
 create mode 100644 examples/with-app-layout/pages/index.js
 create mode 100644 examples/with-app-layout/readme.md

diff --git a/examples/with-app-layout/package.json b/examples/with-app-layout/package.json
new file mode 100644
index 0000000000000..65fd5e93a42e5
--- /dev/null
+++ b/examples/with-app-layout/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "with-app-layout",
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "next",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "next": "6.0.0-canary.6",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0"
+  },
+  "license": "ISC"
+}
diff --git a/examples/with-app-layout/pages/_app.js b/examples/with-app-layout/pages/_app.js
new file mode 100644
index 0000000000000..68dbb5afd3278
--- /dev/null
+++ b/examples/with-app-layout/pages/_app.js
@@ -0,0 +1,22 @@
+import React from 'react'
+import App, {Container} from 'next/app'
+
+class Layout extends React.Component {
+  render () {
+    const {children} = this.props
+    return <div className='layout'>
+      {children}
+    </div>
+  }
+}
+
+export default class MyApp extends App {
+  render () {
+    const {Component, pageProps} = this.props
+    return <Container>
+      <Layout>
+        <Component {...pageProps} />
+      </Layout>
+    </Container>
+  }
+}
diff --git a/examples/with-app-layout/pages/index.js b/examples/with-app-layout/pages/index.js
new file mode 100644
index 0000000000000..6dad26ab7533e
--- /dev/null
+++ b/examples/with-app-layout/pages/index.js
@@ -0,0 +1,3 @@
+export default () => {
+  return <div>test</div>
+}
diff --git a/examples/with-app-layout/readme.md b/examples/with-app-layout/readme.md
new file mode 100644
index 0000000000000..f595a01fd3482
--- /dev/null
+++ b/examples/with-app-layout/readme.md
@@ -0,0 +1,44 @@
+[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/zeit/next.js/tree/master/examples/with-app-layout)
+
+# With `App` layout 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-app-layout with-app-layout-app
+# or
+yarn create next-app --example with-app-layout with-app-layout-app
+```
+
+### Download manually
+
+Download the example [or clone the repo](https://github.com/zeit/next.js):
+
+```bash
+curl https://codeload.github.com/zeit/next.js/tar.gz/canary | tar -xz --strip=2 next.js-canary/examples/with-app-layout
+cd with-app-layout
+```
+
+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
+
+Shows how to use _app.js to implement a global layout for all pages.
diff --git a/readme.md b/readme.md
index 7ad578e82f328..daed326f72dbc 100644
--- a/readme.md
+++ b/readme.md
@@ -953,7 +953,7 @@ export default () => <HelloBundle title="Dynamic Bundle" />
 
 <p><details>
   <summary><b>Examples</b></summary>
-  <ul><li><a href="./examples/layout-component">Using `_app.js` for layout</a></li></ul>
+  <ul><li><a href="./examples/with-app-layout">Using `_app.js` for layout</a></li></ul>
   <ul><li><a href="./examples/with-componentdidcatch">Using `_app.js` to override `componentDidCatch`</a></li></ul>
 </details></p>
 

From fe24333edc40f19c2225ddfc55f7076df979fb44 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Tue, 24 Apr 2018 15:25:45 -0700
Subject: [PATCH 66/73] Only show deprecation message in development (#4206)

---
 lib/app.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/app.js b/lib/app.js
index c4f722aef7afe..dd00614b97e94 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -86,7 +86,11 @@ export class Container extends Component {
   }
 }
 
-const warnUrl = execOnce(() => warn(`Warning: the 'url' property is deprecated. https://err.sh/next.js/url-deprecated`))
+const warnUrl = execOnce(() => {
+  if (process.env.NODE_ENV !== 'PRODUCTION') {
+    warn(`Warning: the 'url' property is deprecated. https://err.sh/next.js/url-deprecated`)
+  }
+})
 
 export function createUrl (router) {
   return {

From 30b0e36c7134ea4eb711c95f61cc773354348f09 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Wed, 25 Apr 2018 09:23:39 -0700
Subject: [PATCH 67/73] =?UTF-8?q?Don=E2=80=99t=20use=20caps=20for=20node?=
 =?UTF-8?q?=5Fenv=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/app.js b/lib/app.js
index dd00614b97e94..ebee26d13970b 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -87,7 +87,7 @@ export class Container extends Component {
 }
 
 const warnUrl = execOnce(() => {
-  if (process.env.NODE_ENV !== 'PRODUCTION') {
+  if (process.env.NODE_ENV !== 'production') {
     warn(`Warning: the 'url' property is deprecated. https://err.sh/next.js/url-deprecated`)
   }
 })

From 2457df5d06de51501ad9a78de9f6e9d85aacdffb Mon Sep 17 00:00:00 2001
From: Tony Kovanen <rase-@users.noreply.github.com>
Date: Fri, 27 Apr 2018 00:05:04 +0700
Subject: [PATCH 68/73] examples/with-reasonml: use bs-next for Next.Link
 (#4214)

Fixes #4028
---
 examples/with-reasonml/bsconfig.json        |  2 +-
 examples/with-reasonml/components/Header.re | 10 +++++++---
 examples/with-reasonml/package.json         |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/with-reasonml/bsconfig.json b/examples/with-reasonml/bsconfig.json
index 13dd3ae1eb89c..30030a72ba2cd 100644
--- a/examples/with-reasonml/bsconfig.json
+++ b/examples/with-reasonml/bsconfig.json
@@ -1,7 +1,7 @@
 {
   "name": "with-reasonml",
   "sources": ["components", "pages"],
-  "bs-dependencies": ["reason-react"],
+  "bs-dependencies": ["reason-react", "bs-next"],
   "reason": { "react-jsx": 2 },
   "package-specs": ["commonjs"],
   "bsc-flags": [
diff --git a/examples/with-reasonml/components/Header.re b/examples/with-reasonml/components/Header.re
index 737a07ea6f7df..7d02472fe5661 100644
--- a/examples/with-reasonml/components/Header.re
+++ b/examples/with-reasonml/components/Header.re
@@ -6,7 +6,11 @@ let make = (_children) => {
   ...component,
   render: (_self) =>
     <div>
-      <a href="/" style=styles> (ReasonReact.stringToElement("Home")) </a>
-      <a href="/about" style=styles> (ReasonReact.stringToElement("About")) </a>
+      <Next.Link href="/">
+        <a style=styles> (ReasonReact.stringToElement("Home")) </a>
+      </Next.Link>
+      <Next.Link href="/about">
+        <a style=styles> (ReasonReact.stringToElement("About")) </a>
+      </Next.Link>
     </div>
-};
\ No newline at end of file
+};
diff --git a/examples/with-reasonml/package.json b/examples/with-reasonml/package.json
index 7d45ce2923ccf..91a7052fc50c6 100644
--- a/examples/with-reasonml/package.json
+++ b/examples/with-reasonml/package.json
@@ -12,7 +12,8 @@
     "next": "latest",
     "react": "^16.1.1",
     "react-dom": "^16.1.1",
-    "reason-react": "^0.3.0"
+    "reason-react": "^0.3.0",
+    "bs-next": "^2.0.0"
   },
   "devDependencies": {
     "bs-platform": "^2.1.0",

From 737f6cfce0cd89c2ee487b9b2e48f03624dc630b Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Thu, 26 Apr 2018 11:26:42 -0700
Subject: [PATCH 69/73] Set babelrc true (#4215)

---
 server/build/webpack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/build/webpack.js b/server/build/webpack.js
index d5c0971cc57fb..f8343ce42eb36 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -48,7 +48,7 @@ function babelConfig (dir, {isServer, dev}) {
       console.log(`> Using external babel configuration`)
       console.log(`> Location: "${externalBabelConfig.babelrc}"`)
     }
-    // By default babel-loader will look for babelrc, so no need to set it to true
+    mainBabelOptions.babelrc = true
   } else {
     mainBabelOptions.babelrc = false
   }

From 4d9eb200d9a413bc55c56a806820b3f7e06d4bc4 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <timneutkens@me.com>
Date: Thu, 26 Apr 2018 11:27:11 -0700
Subject: [PATCH 70/73] 6.0.0-canary.7

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

diff --git a/package.json b/package.json
index b29806a727f6c..9ba18206eeb47 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "6.0.0-canary.6",
+  "version": "6.0.0-canary.7",
   "description": "Minimalistic framework for server-rendered React applications",
   "main": "./dist/server/next.js",
   "license": "MIT",

From f378448b79937431a3ee3399d49e7f7b8a96159c Mon Sep 17 00:00:00 2001
From: Tony Kovanen <rase-@users.noreply.github.com>
Date: Fri, 27 Apr 2018 10:35:30 +0700
Subject: [PATCH 71/73] with-reasonml: use default exports (#4217)

---
 examples/with-reasonml/package.json                 | 6 +++---
 examples/with-reasonml/pages/about.js               | 4 ----
 examples/with-reasonml/pages/{About.re => about.re} | 2 +-
 examples/with-reasonml/pages/index.js               | 3 ---
 examples/with-reasonml/pages/{Index.re => index.re} | 2 +-
 5 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 examples/with-reasonml/pages/about.js
 rename examples/with-reasonml/pages/{About.re => about.re} (75%)
 delete mode 100644 examples/with-reasonml/pages/index.js
 rename examples/with-reasonml/pages/{Index.re => index.re} (74%)

diff --git a/examples/with-reasonml/package.json b/examples/with-reasonml/package.json
index 91a7052fc50c6..d28cf3612cb2c 100644
--- a/examples/with-reasonml/package.json
+++ b/examples/with-reasonml/package.json
@@ -2,9 +2,9 @@
   "name": "with-reasonml",
   "version": "1.0.0",
   "scripts": {
-    "dev": "concurrently \"bsb -clean-world -make-world -w\" \"next -w\"",
-    "build": "bsb -clean-world -make-world && next build",
-    "start": "bsb -clean-world -make-world && next start -w"
+    "dev": "bsb -clean-world -make-world && next dev lib/js",
+    "build": "bsb -clean-world -make-world && next build lib/js",
+    "start": "next start lib/js"
   },
   "license": "ISC",
   "dependencies": {
diff --git a/examples/with-reasonml/pages/about.js b/examples/with-reasonml/pages/about.js
deleted file mode 100644
index a9997ae5926d5..0000000000000
--- a/examples/with-reasonml/pages/about.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { jsComponent as About } from './About.re'
-import React from 'react'
-
-export default () => <About />
diff --git a/examples/with-reasonml/pages/About.re b/examples/with-reasonml/pages/about.re
similarity index 75%
rename from examples/with-reasonml/pages/About.re
rename to examples/with-reasonml/pages/about.re
index ad39b954dae00..f10456564766e 100644
--- a/examples/with-reasonml/pages/About.re
+++ b/examples/with-reasonml/pages/about.re
@@ -10,4 +10,4 @@ let make = (_children) => {
     </div>
 };
 
-let jsComponent = ReasonReact.wrapReasonForJs(~component, (_jsProps) => make([||]));
\ No newline at end of file
+let default = ReasonReact.wrapReasonForJs(~component, (_jsProps) => make([||]));
diff --git a/examples/with-reasonml/pages/index.js b/examples/with-reasonml/pages/index.js
deleted file mode 100644
index 24ea82817f6de..0000000000000
--- a/examples/with-reasonml/pages/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { jsComponent as Index } from './Index.re'
-
-export default () => <Index />
diff --git a/examples/with-reasonml/pages/Index.re b/examples/with-reasonml/pages/index.re
similarity index 74%
rename from examples/with-reasonml/pages/Index.re
rename to examples/with-reasonml/pages/index.re
index a62bc34d61faf..b6966cd469472 100644
--- a/examples/with-reasonml/pages/Index.re
+++ b/examples/with-reasonml/pages/index.re
@@ -10,4 +10,4 @@ let make = (_children) => {
     </div>
 };
 
-let jsComponent = ReasonReact.wrapReasonForJs(~component, (_jsProps) => make([||]));
\ No newline at end of file
+let default = ReasonReact.wrapReasonForJs(~component, (_jsProps) => make([||]));

From 61582433396ca41c4a411b511d90e528d80f8998 Mon Sep 17 00:00:00 2001
From: Tony Kovanen <rase-@users.noreply.github.com>
Date: Fri, 27 Apr 2018 22:24:46 +0700
Subject: [PATCH 72/73] with-reasonml: better setup (#4218)

With this setup we're compiling the .re/.ml files directly to source
directories with a .bs.js extension, and enabling next.js to pick up
that extension for pages.
---
 examples/with-reasonml/.gitignore     | 1 +
 examples/with-reasonml/bsconfig.json  | 6 +++++-
 examples/with-reasonml/next.config.js | 3 +++
 examples/with-reasonml/package.json   | 6 +++---
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 examples/with-reasonml/next.config.js

diff --git a/examples/with-reasonml/.gitignore b/examples/with-reasonml/.gitignore
index 9d8f0bbe5193b..019f854e11a76 100644
--- a/examples/with-reasonml/.gitignore
+++ b/examples/with-reasonml/.gitignore
@@ -1,3 +1,4 @@
 bs
 .merlin
 lib/
+*.bs.js
diff --git a/examples/with-reasonml/bsconfig.json b/examples/with-reasonml/bsconfig.json
index 30030a72ba2cd..66af768638c1e 100644
--- a/examples/with-reasonml/bsconfig.json
+++ b/examples/with-reasonml/bsconfig.json
@@ -3,7 +3,11 @@
   "sources": ["components", "pages"],
   "bs-dependencies": ["reason-react", "bs-next"],
   "reason": { "react-jsx": 2 },
-  "package-specs": ["commonjs"],
+  "package-specs": {
+    "module": "commonjs",
+    "in-source": true
+  },
+  "suffix": ".bs.js",
   "bsc-flags": [
     "-bs-super-errors"
   ],
diff --git a/examples/with-reasonml/next.config.js b/examples/with-reasonml/next.config.js
new file mode 100644
index 0000000000000..36556760d4afd
--- /dev/null
+++ b/examples/with-reasonml/next.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  pageExtensions: ['jsx', 'js', 'bs.js']
+}
diff --git a/examples/with-reasonml/package.json b/examples/with-reasonml/package.json
index d28cf3612cb2c..4d5b35a99316d 100644
--- a/examples/with-reasonml/package.json
+++ b/examples/with-reasonml/package.json
@@ -2,9 +2,9 @@
   "name": "with-reasonml",
   "version": "1.0.0",
   "scripts": {
-    "dev": "bsb -clean-world -make-world && next dev lib/js",
-    "build": "bsb -clean-world -make-world && next build lib/js",
-    "start": "next start lib/js"
+    "dev": "concurrently \"bsb -clean-world -make-world -w\" \"next dev\"",
+    "build": "bsb -clean-world -make-world && next build",
+    "start": "next start"
   },
   "license": "ISC",
   "dependencies": {

From 9578e9f9d8faa0096dcab0e4adbe809e4c1ef9e1 Mon Sep 17 00:00:00 2001
From: Raven <raven.wills@gmail.com>
Date: Sun, 29 Apr 2018 12:55:19 -0500
Subject: [PATCH 73/73] Update link to new learning page (#4223)

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index daed326f72dbc..521be4a1fb5e0 100644
--- a/readme.md
+++ b/readme.md
@@ -8,7 +8,7 @@
 
 Next.js is a minimalistic framework for server-rendered React applications.
 
-**Visit [learnnextjs.com](https://learnnextjs.com) to get started with Next.js.**
+**Visit [nextjs.org/learn](https://nextjs.org/learn) to get started with Next.js.**
 
 ---