From 811729d14396090d968ceabc9b020e84968f34f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 21 May 2017 21:15:18 +0200
Subject: [PATCH 001/236] Add pi0 as maintainer

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

diff --git a/package.json b/package.json
index 01fc26057c..0fa88c46b0 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,15 @@
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "contributors": [
     {
-      "name": "Sebastien Chopin"
+      "name": "Sebastien Chopin (@Atinux)"
     },
     {
-      "name": "Alexandre Chopin"
+      "name": "Alexandre Chopin (@alexchopin)"
+    }
+  ],
+  "maintainers": [
+    {
+      "name": "Pooya Parsa (@pi0)"
     }
   ],
   "main": "./index.js",

From 6d969b0e37cc8a827bd9a032b0ee19cfaf57ac1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 21 May 2017 21:15:54 +0200
Subject: [PATCH 002/236] Set as contributors instead

---
 package.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0fa88c46b0..4536d6ff81 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,7 @@
     },
     {
       "name": "Alexandre Chopin (@alexchopin)"
-    }
-  ],
-  "maintainers": [
+    },
     {
       "name": "Pooya Parsa (@pi0)"
     }

From f50d5673d9814c68e6da0f0dd72ec64c4d05e4cf Mon Sep 17 00:00:00 2001
From: James Lee <uptownhr@gmail.com>
Date: Mon, 5 Jun 2017 14:41:56 -0700
Subject: [PATCH 003/236] removed build.then()

alpha3 no longer returns a promise on the nuxt constructor.
---
 README.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 40ed8ee8bc..7c655d5ebc 100644
--- a/README.md
+++ b/README.md
@@ -170,13 +170,8 @@ const Nuxt = require('nuxt')
 // Launch nuxt build with given options
 let config = require('./nuxt.config.js')
 let nuxt = new Nuxt(config)
-nuxt.build()
-.then(() => {
-  // You can use nuxt.render(req, res) or nuxt.renderRoute(route, context)
-})
-.catch((e) => {
-  // An error happened during the build
-})
+
+// You can use nuxt.render(req, res) or nuxt.renderRoute(route, context)
 ```
 
 Learn more: https://nuxtjs.org/api/nuxt

From c25aa4bc45f726c1c0270690f47f2d79c6232ccd Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <atinux@gmail.com>
Date: Tue, 6 Jun 2017 14:51:30 +0200
Subject: [PATCH 004/236] Modules: unshit plugins to be executed first

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

diff --git a/lib/module.js b/lib/module.js
index 630db411e2..eed166f5fa 100755
--- a/lib/module.js
+++ b/lib/module.js
@@ -63,7 +63,7 @@ class Module {
   addPlugin (template) {
     const {dst} = this.addTemplate(template)
     // Add to nuxt plugins
-    this.options.plugins.push({
+    this.options.plugins.unshift({
       src: path.join(this.nuxt.buildDir, dst),
       ssr: template.ssr
     })

From 5e5b58c4610c5224130ecdc3fe5452363af27b6b Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <atinux@gmail.com>
Date: Tue, 6 Jun 2017 14:51:49 +0200
Subject: [PATCH 005/236] Add redirect in plugins context

---
 lib/app/index.js  |  3 ++-
 lib/app/server.js | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index a812d16426..0b556cdf82 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -111,15 +111,16 @@ async function createApp (ssrContext) {
     ...App
   }
 
+  const next = ssrContext ? ssrContext.next : (location) => app.router.push(location)
   const ctx = getContext({
     isServer: !!ssrContext,
     isClient: !ssrContext,
     route: router.currentRoute,
+    next,
     <%= (store ? 'store,' : '') %>
     req: ssrContext ? ssrContext.req : undefined,
     res: ssrContext ? ssrContext.res : undefined,
   }, app)
-  delete ctx.redirect
   delete ctx.error
 
   // Inject external plugins
diff --git a/lib/app/server.js b/lib/app/server.js
index 5187b73298..326fa3dfd6 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -17,15 +17,6 @@ const isDev = <%= isDev %>
 // Since data fetching is async, this function is expected to
 // return a Promise that resolves to the app instance.
 export default async (context) => {
-  const { app, router<%= (store ? ', store' : '') %> } = await createApp(context)
-  const _app = new Vue(app)
-  const _noopApp = new Vue({ render: (h) => h('div') })
-  // Add store to the context
-  <%= (store ? 'context.store = store' : '') %>
-  // Add route to the context
-  context.route = router.currentRoute
-  // Nuxt object
-  context.nuxt = { layout: 'default', data: [], error: null<%= (store ? ', state: null' : '') %>, serverRendered: true }
   // create context.next for simulate next() of beforeEach() when wanted to redirect
   context.redirected = false
   context.next = function (opts) {
@@ -45,6 +36,15 @@ export default async (context) => {
     })
     context.res.end()
   }
+  const { app, router<%= (store ? ', store' : '') %> } = await createApp(context)
+  const _app = new Vue(app)
+  const _noopApp = new Vue({ render: (h) => h('div') })
+  // Add store to the context
+  <%= (store ? 'context.store = store' : '') %>
+  // Add route to the context
+  context.route = router.currentRoute
+  // Nuxt object
+  context.nuxt = { layout: 'default', data: [], error: null<%= (store ? ', state: null' : '') %>, serverRendered: true }
   // Add meta infos
   context.meta = _app.$meta()
   // Error function

From 7a0e8739ed4033042f33cd6ec6ee49c6edc44ea3 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <atinux@gmail.com>
Date: Tue, 6 Jun 2017 14:57:23 +0200
Subject: [PATCH 006/236] Upgrade dependencies

---
 package.json |    6 +-
 yarn.lock    | 2172 +++++++++++++++++++++++++-------------------------
 2 files changed, 1105 insertions(+), 1073 deletions(-)

diff --git a/package.json b/package.json
index f78ff073d6..ea933353e4 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "debug": "^2.6.8",
     "etag": "^1.8.0",
     "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.11.1",
+    "file-loader": "^0.11.2",
     "fresh": "^0.5.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "fs-extra": "^3.0.1",
@@ -117,13 +117,13 @@
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-html": "^2.0.3",
     "eslint-plugin-import": "^2.3.0",
-    "eslint-plugin-node": "^4.2.2",
+    "eslint-plugin-node": "^5.0.0",
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
     "finalhandler": "^1.0.3",
     "jsdom": "^11.0.0",
     "json-loader": "^0.5.4",
-    "nyc": "^10.3.2",
+    "nyc": "^11.0.2",
     "request": "^2.81.0",
     "request-promise-native": "^1.0.4",
     "std-mocks": "^1.0.1"
diff --git a/yarn.lock b/yarn.lock
index d77c849ad0..48780ca123 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -38,68 +38,68 @@
     esutils "^2.0.2"
 
 "@types/node@^6.0.46":
-  version "6.0.73"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.73.tgz#85dc4bb6f125377c75ddd2519a1eeb63f0a4ed70"
+  version "6.0.77"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.77.tgz#3e4d569a427f17085e1ee4ecd3c31befb56af7b5"
 
 abab@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
 abbrev@1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
 accepts@~1.3.3:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
   dependencies:
     mime-types "~2.1.11"
     negotiator "0.6.1"
 
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
   dependencies:
     acorn "^4.0.3"
 
 acorn-globals@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
   dependencies:
     acorn "^4.0.4"
 
 acorn-jsx@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
   dependencies:
     acorn "^3.0.4"
 
 acorn@^3.0.4:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
 acorn@^4.0.3, acorn@^4.0.4:
   version "4.0.13"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
 acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
   version "5.0.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
 
 ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
 ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
@@ -107,133 +107,133 @@ align-text@^0.1.1, align-text@^0.1.3:
 
 alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
 
 amdefine@>=0.0.4:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
   dependencies:
     string-width "^2.0.0"
 
 ansi-escapes@^1.1.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
 ansi-html@0.0.7, ansi-html@^0.0.7:
   version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
 ansi-styles@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
 ansi-styles@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.0.0.tgz#5404e93a544c4fec7f048262977bebfe3155e0c1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-styles/-/ansi-styles-3.0.0.tgz#5404e93a544c4fec7f048262977bebfe3155e0c1"
   dependencies:
     color-convert "^1.0.0"
 
 ansi-styles@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
 anymatch@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
   dependencies:
     arrify "^1.0.0"
     micromatch "^2.1.5"
 
 append-transform@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
   dependencies:
     default-require-extensions "^1.0.0"
 
 aproba@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
+  version "1.1.2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
 
 archy@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 are-we-there-yet@~1.1.2:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
 argparse@^1.0.7:
   version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
   dependencies:
     sprintf-js "~1.0.2"
 
 argv@0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
 
 arr-diff@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-exclude@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/arr-exclude/-/arr-exclude-1.0.0.tgz#dfc7c2e552a270723ccda04cf3128c8cbfe5c631"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/arr-exclude/-/arr-exclude-1.0.0.tgz#dfc7c2e552a270723ccda04cf3128c8cbfe5c631"
 
 arr-flatten@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
 
 array-differ@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
 
 array-equal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
 
 array-find-index@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
 
 array-flatten@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
 
 array-union@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1, array-uniq@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
 array-unique@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
 asn1.js@^4.0.0:
   version "4.9.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -241,47 +241,47 @@ asn1.js@^4.0.0:
 
 asn1@~0.2.3:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
 assert-plus@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
 assert@^1.1.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
     util "0.10.3"
 
 async-each@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
 async@^1.4.0:
   version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
 async@^2.1.2:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
   dependencies:
     lodash "^4.14.0"
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
 auto-bind@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-1.1.0.tgz#93b864dc7ee01a326281775d5c75ca0a751e5961"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/auto-bind/-/auto-bind-1.1.0.tgz#93b864dc7ee01a326281775d5c75ca0a751e5961"
 
 autoprefixer@^6.3.1:
   version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
   dependencies:
     browserslist "^1.7.6"
     caniuse-db "^1.0.30000634"
@@ -292,7 +292,7 @@ autoprefixer@^6.3.1:
 
 autoprefixer@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d"
   dependencies:
     browserslist "^2.1.3"
     caniuse-lite "^1.0.30000670"
@@ -303,7 +303,7 @@ autoprefixer@^7.1.1:
 
 ava-init@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.2.0.tgz#9304c8b4c357d66e3dfdae1fbff47b1199d5c55d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ava-init/-/ava-init-0.2.0.tgz#9304c8b4c357d66e3dfdae1fbff47b1199d5c55d"
   dependencies:
     arr-exclude "^1.0.0"
     execa "^0.5.0"
@@ -313,7 +313,7 @@ ava-init@^0.2.0:
 
 ava@^0.19.1:
   version "0.19.1"
-  resolved "https://registry.yarnpkg.com/ava/-/ava-0.19.1.tgz#43dd82435ad19b3980ffca2488f05daab940b273"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ava/-/ava-0.19.1.tgz#43dd82435ad19b3980ffca2488f05daab940b273"
   dependencies:
     "@ava/babel-preset-stage-4" "^1.0.0"
     "@ava/babel-preset-transform-test-files" "^3.0.0"
@@ -396,15 +396,15 @@ ava@^0.19.1:
 
 aws-sign2@~0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
 
 aws4@^1.2.1:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
 babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
   version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
   dependencies:
     chalk "^1.1.0"
     esutils "^2.0.2"
@@ -412,7 +412,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
 
 babel-core@^6.17.0, babel-core@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-generator "^6.24.1"
@@ -436,7 +436,7 @@ babel-core@^6.17.0, babel-core@^6.24.1:
 
 babel-eslint@^7.2.3:
   version "7.2.3"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-traverse "^6.23.1"
@@ -445,7 +445,7 @@ babel-eslint@^7.2.3:
 
 babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
@@ -458,7 +458,7 @@ babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.24.1:
 
 babel-helper-bindify-decorators@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
   dependencies:
     babel-runtime "^6.22.0"
     babel-traverse "^6.24.1"
@@ -466,7 +466,7 @@ babel-helper-bindify-decorators@^6.24.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -474,7 +474,7 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -483,7 +483,7 @@ babel-helper-call-delegate@^6.24.1:
 
 babel-helper-define-map@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
   dependencies:
     babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
@@ -492,7 +492,7 @@ babel-helper-define-map@^6.24.1:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -500,7 +500,7 @@ babel-helper-explode-assignable-expression@^6.24.1:
 
 babel-helper-explode-class@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
   dependencies:
     babel-helper-bindify-decorators "^6.24.1"
     babel-runtime "^6.22.0"
@@ -509,7 +509,7 @@ babel-helper-explode-class@^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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -519,28 +519,28 @@ babel-helper-function-name@^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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
 babel-helper-regex@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -548,7 +548,7 @@ babel-helper-regex@^6.24.1:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
   dependencies:
     babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
@@ -558,7 +558,7 @@ babel-helper-remap-async-to-generator@^6.24.1:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
   dependencies:
     babel-helper-optimise-call-expression "^6.24.1"
     babel-messages "^6.23.0"
@@ -569,18 +569,18 @@ babel-helper-replace-supers@^6.24.1:
 
 babel-helper-vue-jsx-merge-props@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
 
 babel-helpers@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
 babel-loader@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
   dependencies:
     find-cache-dir "^0.1.1"
     loader-utils "^1.0.2"
@@ -588,23 +588,23 @@ babel-loader@^7.0.0:
 
 babel-messages@^6.23.0:
   version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-array-includes@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz#cf5452e81c7b803fb7959f1045ac88e2ec28ff76"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz#cf5452e81c7b803fb7959f1045ac88e2ec28ff76"
 
 babel-plugin-check-es2015-constants@^6.22.0, babel-plugin-check-es2015-constants@^6.8.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-espower@^2.3.2:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz#5516b8fcdb26c9f0e1d8160749f6e4c65e71271e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz#5516b8fcdb26c9f0e1d8160749f6e4c65e71271e"
   dependencies:
     babel-generator "^6.1.0"
     babylon "^6.1.0"
@@ -616,43 +616,43 @@ babel-plugin-espower@^2.3.2:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
 
 babel-plugin-syntax-async-generators@^6.5.0:
   version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
 
 babel-plugin-syntax-decorators@^6.13.0:
   version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
 
 babel-plugin-syntax-object-rest-spread@^6.8.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
 
 babel-plugin-syntax-trailing-function-commas@^6.20.0, 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
 
 babel-plugin-transform-async-generator-functions@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
   dependencies:
     babel-helper-remap-async-to-generator "^6.24.1"
     babel-plugin-syntax-async-generators "^6.5.0"
@@ -660,7 +660,7 @@ babel-plugin-transform-async-generator-functions@^6.24.1:
 
 babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1:
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -668,7 +668,7 @@ babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -677,7 +677,7 @@ babel-plugin-transform-class-properties@^6.24.1:
 
 babel-plugin-transform-decorators@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
   dependencies:
     babel-helper-explode-class "^6.24.1"
     babel-plugin-syntax-decorators "^6.13.0"
@@ -687,19 +687,19 @@ babel-plugin-transform-decorators@^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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
@@ -709,7 +709,7 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es20
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -723,33 +723,33 @@ babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-cla
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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.19.0, 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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, babel-plugin-transform-es2015-function-name@^6.9.0:
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -757,13 +757,13 @@ babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es20
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -771,7 +771,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
 
 babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
   dependencies:
     babel-plugin-transform-strict-mode "^6.24.1"
     babel-runtime "^6.22.0"
@@ -780,7 +780,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-e
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -788,7 +788,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-e
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -796,14 +796,14 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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.21.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -814,20 +814,20 @@ babel-plugin-transform-es2015-parameters@^6.21.0, babel-plugin-transform-es2015-
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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, babel-plugin-transform-es2015-spread@^6.8.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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, babel-plugin-transform-es2015-sticky-regex@^6.8.0:
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -835,19 +835,19 @@ babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es201
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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.11.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -855,7 +855,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.11.0, babel-plugin-transform-es20
 
 babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1, babel-plugin-transform-exponentiation-operator@^6.8.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -863,39 +863,39 @@ babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-e
 
 babel-plugin-transform-object-rest-spread@^6.22.0, babel-plugin-transform-object-rest-spread@^6.23.0:
   version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
   dependencies:
     regenerator-transform "0.9.11"
 
 babel-plugin-transform-runtime@^6.15.0, 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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-plugin-transform-vue-jsx@^3.1.2:
   version "3.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.4.3.tgz#de57d8dd7d619333c981867728f3e6fdf68982ff"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.4.3.tgz#de57d8dd7d619333c981867728f3e6fdf68982ff"
   dependencies:
     esutils "^2.0.2"
 
 babel-polyfill@6.23.0:
   version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
   dependencies:
     babel-runtime "^6.22.0"
     core-js "^2.4.0"
@@ -903,7 +903,7 @@ babel-polyfill@6.23.0:
 
 babel-preset-env@^1.2.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -938,7 +938,7 @@ babel-preset-env@^1.2.1:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
@@ -967,7 +967,7 @@ babel-preset-es2015@^6.24.1:
 
 babel-preset-stage-2@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-plugin-transform-class-properties "^6.24.1"
@@ -976,7 +976,7 @@ babel-preset-stage-2@^6.24.1:
 
 babel-preset-stage-3@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
   dependencies:
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
     babel-plugin-transform-async-generator-functions "^6.24.1"
@@ -986,7 +986,7 @@ babel-preset-stage-3@^6.24.1:
 
 babel-preset-vue-app@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-vue-app/-/babel-preset-vue-app-1.2.0.tgz#5ddfb7920020123a2482b12c6b36bdef9e3fb0ad"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-vue-app/-/babel-preset-vue-app-1.2.0.tgz#5ddfb7920020123a2482b12c6b36bdef9e3fb0ad"
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-plugin-transform-object-rest-spread "^6.23.0"
@@ -997,7 +997,7 @@ babel-preset-vue-app@^1.2.0:
 
 babel-preset-vue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-0.1.0.tgz#adb84ceab3873bd72606fdd3f7047640f032301f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-vue/-/babel-preset-vue-0.1.0.tgz#adb84ceab3873bd72606fdd3f7047640f032301f"
   dependencies:
     babel-helper-vue-jsx-merge-props "^2.0.2"
     babel-plugin-syntax-jsx "^6.18.0"
@@ -1005,7 +1005,7 @@ babel-preset-vue@^0.1.0:
 
 babel-register@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
   dependencies:
     babel-core "^6.24.1"
     babel-runtime "^6.22.0"
@@ -1017,14 +1017,14 @@ babel-register@^6.24.1:
 
 babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
   version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
 babel-template@^6.16.0, babel-template@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
   dependencies:
     babel-runtime "^6.22.0"
     babel-traverse "^6.24.1"
@@ -1034,7 +1034,7 @@ babel-template@^6.16.0, babel-template@^6.24.1:
 
 babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-messages "^6.23.0"
@@ -1048,7 +1048,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
 
 babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
   dependencies:
     babel-runtime "^6.22.0"
     esutils "^2.0.2"
@@ -1056,62 +1056,62 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
     to-fast-properties "^1.0.1"
 
 babylon@^6.1.0, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0:
-  version "6.17.1"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.1.tgz#17f14fddf361b695981fe679385e4f1c01ebd86f"
+  version "6.17.2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/babylon/-/babylon-6.17.2.tgz#201d25ef5f892c41bae49488b08db0dd476e9f5c"
 
 balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
 base64-js@^1.0.2:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
   dependencies:
     tweetnacl "^0.14.3"
 
 big.js@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
 
 binary-extensions@^1.0.0:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
 
 block-stream@*:
   version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
   dependencies:
     inherits "~2.0.0"
 
 bluebird@^2.10.2:
   version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
 bluebird@^3.0.0, bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.4.7:
   version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.6"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
 
 boolbase@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
 boom@2.x.x:
   version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
   dependencies:
     hoek "2.x.x"
 
 boxen@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.1.0.tgz#b1b69dd522305e807a99deee777dbd6e5167b102"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/boxen/-/boxen-1.1.0.tgz#b1b69dd522305e807a99deee777dbd6e5167b102"
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1123,14 +1123,14 @@ boxen@^1.0.0:
 
 brace-expansion@^1.1.7:
   version "1.1.7"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
   dependencies:
     balanced-match "^0.4.1"
     concat-map "0.0.1"
 
 braces@^1.8.2:
   version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1138,11 +1138,11 @@ braces@^1.8.2:
 
 brorand@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
   dependencies:
     buffer-xor "^1.0.2"
     cipher-base "^1.0.0"
@@ -1152,7 +1152,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 
 browserify-cipher@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1160,7 +1160,7 @@ browserify-cipher@^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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1168,14 +1168,14 @@ browserify-des@^1.0.0:
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
   version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1187,39 +1187,35 @@ browserify-sign@^4.0.0:
 
 browserify-zlib@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
   dependencies:
     pako "~0.2.0"
 
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
 browserslist@^2.1.2, browserslist@^2.1.3:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053"
   dependencies:
     caniuse-lite "^1.0.30000670"
     electron-to-chromium "^1.3.11"
 
 buf-compare@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
-
-buffer-shims@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
 
 buffer-xor@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
 
 buffer@^4.3.0:
   version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1227,19 +1223,19 @@ buffer@^4.3.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
 bytes@2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
 
 caching-transform@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
   dependencies:
     md5-hex "^1.2.0"
     mkdirp "^0.5.1"
@@ -1247,7 +1243,7 @@ caching-transform@^1.0.0:
 
 call-matcher@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-matcher/-/call-matcher-1.0.1.tgz#5134d077984f712a54dad3cbf62de28dce416ca8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/call-matcher/-/call-matcher-1.0.1.tgz#5134d077984f712a54dad3cbf62de28dce416ca8"
   dependencies:
     core-js "^2.0.0"
     deep-equal "^1.0.0"
@@ -1256,51 +1252,51 @@ call-matcher@^1.0.0:
 
 call-signature@0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/call-signature/-/call-signature-0.0.2.tgz#a84abc825a55ef4cb2b028bd74e205a65b9a4996"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/call-signature/-/call-signature-0.0.2.tgz#a84abc825a55ef4cb2b028bd74e205a65b9a4996"
 
 caller-path@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
   dependencies:
     callsites "^0.2.0"
 
 callsites@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
 
 camel-case@3.0.x:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
   dependencies:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
 camelcase@^1.0.2:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
 camelcase@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
 camelcase@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-camelcase@^4.0.0:
+camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
 caniuse-api@^1.5.2:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
   dependencies:
     browserslist "^1.3.6"
     caniuse-db "^1.0.30000529"
@@ -1308,35 +1304,35 @@ 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.30000676"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000676.tgz#82ea578237637c8ff34a28acaade373b624c4ea8"
+  version "1.0.30000679"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/caniuse-db/-/caniuse-db-1.0.30000679.tgz#dd7be12f16577e5d6ae6db880c6d619e77dca365"
 
 caniuse-lite@^1.0.30000670:
-  version "1.0.30000676"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000676.tgz#1e962123f48073f0c51c4ea0651dd64d25786498"
+  version "1.0.30000679"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/caniuse-lite/-/caniuse-lite-1.0.30000679.tgz#0fb5bb3658d4d4448f8f86a1c48df15664aa05ef"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
 
 caseless@~0.11.0:
   version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
 
 caseless@~0.12.0:
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
 center-align@^0.1.1:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
   dependencies:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1346,7 +1342,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
 
 chalk@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
   dependencies:
     ansi-styles "~1.0.0"
     has-color "~0.1.0"
@@ -1354,7 +1350,7 @@ chalk@^0.4.0:
 
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -1369,72 +1365,72 @@ chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
 
 ci-info@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
   dependencies:
     inherits "^2.0.1"
 
 circular-json@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
 
 clap@^1.0.9:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
   dependencies:
     chalk "^1.1.3"
 
 clean-css@4.1.x:
   version "4.1.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.3.tgz#07cfe8980edb20d455ddc23aadcf1e04c6e509ce"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/clean-css/-/clean-css-4.1.3.tgz#07cfe8980edb20d455ddc23aadcf1e04c6e509ce"
   dependencies:
     source-map "0.5.x"
 
 clean-stack@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
 
 clean-yaml-object@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
 
 cli-boxes@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
 cli-cursor@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-spinners@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.0.0.tgz#ef987ed3d48391ac3dab9180b406a742180d6e6a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-spinners/-/cli-spinners-1.0.0.tgz#ef987ed3d48391ac3dab9180b406a742180d6e6a"
 
 cli-truncate@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.0.0.tgz#21eb91f47b3f6560f004db77a769b4668d9c5518"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-truncate/-/cli-truncate-1.0.0.tgz#21eb91f47b3f6560f004db77a769b4668d9c5518"
   dependencies:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
 
 cliui@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
   dependencies:
     center-align "^0.1.1"
     right-align "^0.1.1"
@@ -1442,7 +1438,7 @@ cliui@^2.1.0:
 
 cliui@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -1450,37 +1446,37 @@ cliui@^3.2.0:
 
 clone@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
 co-with-promise@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"
   dependencies:
     pinkie-promise "^1.0.0"
 
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 coa@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.2.tgz#2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/coa/-/coa-1.0.2.tgz#2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec"
   dependencies:
     q "^1.1.2"
 
 code-excerpt@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/code-excerpt/-/code-excerpt-2.1.0.tgz#5dcc081e88f4a7e3b554e9e35d7ef232d47f8147"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/code-excerpt/-/code-excerpt-2.1.0.tgz#5dcc081e88f4a7e3b554e9e35d7ef232d47f8147"
   dependencies:
     convert-to-spaces "^1.0.1"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
 codecov@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/codecov/-/codecov-2.2.0.tgz#2d06817ceb8891eca6368836d4fb6bf6cc04ffd1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/codecov/-/codecov-2.2.0.tgz#2d06817ceb8891eca6368836d4fb6bf6cc04ffd1"
   dependencies:
     argv "0.0.2"
     request "2.79.0"
@@ -1488,23 +1484,23 @@ codecov@^2.2.0:
 
 color-convert@^1.0.0, color-convert@^1.3.0:
   version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
     color-name "^1.1.1"
 
 color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
 
 color-string@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
   dependencies:
     color-name "^1.0.0"
 
 color@^0.11.0:
   version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
   dependencies:
     clone "^1.0.2"
     color-convert "^1.3.0"
@@ -1512,7 +1508,7 @@ color@^0.11.0:
 
 colormin@^1.0.5:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
   dependencies:
     color "^0.11.0"
     css-color-names "0.0.4"
@@ -1520,37 +1516,37 @@ colormin@^1.0.5:
 
 colors@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
   version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
     graceful-readlink ">= 1.0.0"
 
 common-path-prefix@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-1.0.0.tgz#cd52f6f0712e0baab97d6f9732874f22f47752c0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/common-path-prefix/-/common-path-prefix-1.0.0.tgz#cd52f6f0712e0baab97d6f9732874f22f47752c0"
 
 commondir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
 compressible@~2.0.8:
   version "2.0.10"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
   dependencies:
     mime-db ">= 1.27.0 < 2"
 
 compression@^1.6.2:
   version "1.6.2"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
   dependencies:
     accepts "~1.3.3"
     bytes "2.3.0"
@@ -1561,11 +1557,11 @@ compression@^1.6.2:
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 concat-stream@^1.5.2:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
     inherits "^2.0.3"
     readable-stream "^2.2.2"
@@ -1573,14 +1569,14 @@ concat-stream@^1.5.2:
 
 config-chain@~1.1.5:
   version "1.1.11"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
   dependencies:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
 configstore@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.0.tgz#45df907073e26dfa1cf4b2d52f5b60545eaa11d1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/configstore/-/configstore-3.1.0.tgz#45df907073e26dfa1cf4b2d52f5b60545eaa11d1"
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -1591,7 +1587,7 @@ configstore@^3.0.0:
 
 connect@^3.6.2:
   version "3.6.2"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.2.tgz#694e8d20681bfe490282c8ab886be98f09f42fe7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/connect/-/connect-3.6.2.tgz#694e8d20681bfe490282c8ab886be98f09f42fe7"
   dependencies:
     debug "2.6.7"
     finalhandler "1.0.3"
@@ -1600,59 +1596,59 @@ connect@^3.6.2:
 
 console-browserify@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
 consolidate@^0.14.0:
   version "0.14.5"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
   dependencies:
     bluebird "^3.1.1"
 
 constants-browserify@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
 
 content-type-parser@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
 
 content-type@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
 convert-source-map@^1.1.0, convert-source-map@^1.2.0, convert-source-map@^1.3.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
 convert-to-spaces@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz#7e3e48bbe6d997b1417ddca2868204b4d3d85715"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz#7e3e48bbe6d997b1417ddca2868204b4d3d85715"
 
 cookie-signature@1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
 
 cookie@0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
 copy-webpack-plugin@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz#9728e383b94316050d0c7463958f2b85c0aa8200"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz#9728e383b94316050d0c7463958f2b85c0aa8200"
   dependencies:
     bluebird "^2.10.2"
     fs-extra "^0.26.4"
@@ -1665,22 +1661,22 @@ copy-webpack-plugin@^4.0.1:
 
 core-assert@^0.2.0:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f"
   dependencies:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
 core-js@^2.0.0, core-js@^2.4.0:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
 core-util-is@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
 cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
   version "2.1.3"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.3.tgz#952771eb0dddc1cb3fa2f6fbe51a522e93b3ee0a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cosmiconfig/-/cosmiconfig-2.1.3.tgz#952771eb0dddc1cb3fa2f6fbe51a522e93b3ee0a"
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.4.3"
@@ -1692,20 +1688,20 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
 
 create-ecdh@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
   dependencies:
     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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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.1, create-hash@^1.1.2:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -1714,7 +1710,7 @@ create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -1725,27 +1721,27 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 
 cross-spawn-async@^2.1.1:
   version "2.2.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
   dependencies:
     lru-cache "^4.0.0"
     which "^1.2.8"
 
 cross-spawn@^4, cross-spawn@^4.0.0:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
 cryptiles@2.x.x:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
   dependencies:
     boom "2.x.x"
 
 crypto-browserify@^3.11.0:
   version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -1760,15 +1756,15 @@ crypto-browserify@^3.11.0:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
 css-loader@^0.28.4:
   version "0.28.4"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -1787,7 +1783,7 @@ css-loader@^0.28.4:
 
 css-select@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -1796,7 +1792,7 @@ css-select@^1.1.0:
 
 css-selector-tokenizer@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -1804,15 +1800,15 @@ css-selector-tokenizer@^0.7.0:
 
 css-what@2.1:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
 
 cssesc@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
 
 "cssnano@>=2.6.1 <4":
   version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
   dependencies:
     autoprefixer "^6.3.1"
     decamelize "^1.1.2"
@@ -1849,113 +1845,113 @@ cssesc@^0.1.0:
 
 csso@~2.3.1:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
   dependencies:
     clap "^1.0.9"
     source-map "^0.5.3"
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
 "cssstyle@>= 0.2.37 < 0.3.0":
   version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
   dependencies:
     cssom "0.3.x"
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
   dependencies:
     array-find-index "^1.0.1"
 
 d@1:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
   dependencies:
     es5-ext "^0.10.9"
 
 dashdash@^1.12.0:
   version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
   dependencies:
     assert-plus "^1.0.0"
 
 date-now@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
 date-time@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
 
 de-indent@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
 debug-log@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
 debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
     ms "0.7.1"
 
 debug@2.6.7:
   version "2.6.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
   dependencies:
     ms "2.0.0"
 
 debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
   version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
 deep-equal@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
 deep-extend@^0.4.0, deep-extend@~0.4.0:
   version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
 deep-is@~0.1.3:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
 deepmerge@^1.3.2:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
   dependencies:
     strip-bom "^2.0.0"
 
 define-properties@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
   dependencies:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
 defined@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
 del@^2.0.2:
   version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -1967,48 +1963,48 @@ del@^2.0.2:
 
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
 delegates@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
 depd@1.1.0, depd@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
 des.js@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
 destroy@~1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
 detect-indent@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
   dependencies:
     repeating "^2.0.0"
 
 detect-indent@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
 
 diff-match-patch@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
 
 diff@^3.0.0, diff@^3.0.1:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
 diffie-hellman@^5.0.0:
   version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2016,98 +2012,98 @@ diffie-hellman@^5.0.0:
 
 doctrine@1.5.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
 doctrine@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
 dom-converter@~0.1:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
   dependencies:
     utila "~0.3"
 
 dom-serializer@0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
 domain-browser@^1.1.1:
   version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
 domelementtype@~1.1.1:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
 domhandler@2.1:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
   dependencies:
     domelementtype "1"
 
 domhandler@^2.3.0:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
   dependencies:
     domelementtype "1"
 
 domutils@1.1:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
 domutils@^1.5.1:
   version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
 dot-prop@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
 duplexer@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
 ecc-jsbn@~0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
   dependencies:
     jsbn "~0.1.0"
 
 editorconfig@^0.13.2:
   version "0.13.2"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
   dependencies:
     bluebird "^3.0.5"
     commander "^2.9.0"
@@ -2116,19 +2112,19 @@ editorconfig@^0.13.2:
 
 ee-first@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 ejs@^2.3.4, ejs@^2.5.6:
   version "2.5.6"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11:
   version "1.3.13"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc"
 
 elliptic@^6.0.0:
   version "6.4.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2140,28 +2136,28 @@ elliptic@^6.0.0:
 
 emojis-list@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
 empower-core@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/empower-core/-/empower-core-0.6.1.tgz#6c187f502fcef7554d57933396aac655483772b1"
+  version "0.6.2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/empower-core/-/empower-core-0.6.2.tgz#5adef566088e31fba80ba0a36df47d7094169144"
   dependencies:
     call-signature "0.0.2"
     core-js "^2.0.0"
 
 encodeurl@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
 
 encoding@^0.1.11:
   version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
   dependencies:
     iconv-lite "~0.4.13"
 
 enhanced-resolve@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -2170,44 +2166,44 @@ enhanced-resolve@^3.0.0:
 
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
 equal-length@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
 
 errno@^0.1.3:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
   dependencies:
     prr "~0.0.0"
 
 error-ex@^1.2.0:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
 error-stack-parser@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a"
   dependencies:
     stackframe "^1.0.3"
 
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.21"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.21.tgz#19a725f9e51d0300bbc1e8e821109fd9daf55925"
+  version "0.10.23"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
 
 es6-error@^4.0.1, es6-error@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
 es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -2215,7 +2211,7 @@ es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
 
 es6-map@^0.1.3:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -2226,7 +2222,7 @@ es6-map@^0.1.3:
 
 es6-set@~0.1.5:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -2236,14 +2232,14 @@ es6-set@~0.1.5:
 
 es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
 
 es6-weak-map@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -2252,15 +2248,15 @@ es6-weak-map@^2.0.1:
 
 escape-html@~1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
 escodegen@^1.6.1:
   version "1.8.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -2271,7 +2267,7 @@ escodegen@^1.6.1:
 
 escope@^3.6.0:
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
   dependencies:
     es6-map "^0.1.3"
     es6-weak-map "^2.0.1"
@@ -2280,11 +2276,11 @@ escope@^3.6.0:
 
 eslint-config-standard@^10.2.1:
   version "10.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
 
 eslint-import-resolver-node@^0.2.0:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
   dependencies:
     debug "^2.2.0"
     object-assign "^4.0.1"
@@ -2292,20 +2288,20 @@ eslint-import-resolver-node@^0.2.0:
 
 eslint-module-utils@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
   dependencies:
     debug "2.2.0"
     pkg-dir "^1.0.0"
 
 eslint-plugin-html@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz#7c89883ab0c85fa5d28b666a14a4e906aa90b897"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz#7c89883ab0c85fa5d28b666a14a4e906aa90b897"
   dependencies:
     htmlparser2 "^3.8.2"
 
 eslint-plugin-import@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.3.0.tgz#37c801e0ada0e296cbdf20c3f393acb5b52af36b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-import/-/eslint-plugin-import-2.3.0.tgz#37c801e0ada0e296cbdf20c3f393acb5b52af36b"
   dependencies:
     builtin-modules "^1.1.1"
     contains-path "^0.1.0"
@@ -2318,27 +2314,26 @@ eslint-plugin-import@^2.3.0:
     minimatch "^3.0.3"
     read-pkg-up "^2.0.0"
 
-eslint-plugin-node@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-4.2.2.tgz#82959ca9aed79fcbd28bb1b188d05cac04fb3363"
+eslint-plugin-node@^5.0.0:
+  version "5.0.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-node/-/eslint-plugin-node-5.0.0.tgz#948b1fb82e3f0a744e86fad19aa4f49537d246cc"
   dependencies:
-    ignore "^3.0.11"
-    minimatch "^3.0.2"
-    object-assign "^4.0.1"
-    resolve "^1.1.7"
+    ignore "^3.3.3"
+    minimatch "^3.0.4"
+    resolve "^1.3.3"
     semver "5.3.0"
 
 eslint-plugin-promise@^3.5.0:
   version "3.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
 
 eslint@^3.19.0:
   version "3.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -2378,7 +2373,7 @@ eslint@^3.19.0:
 
 espower-location-detector@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/espower-location-detector/-/espower-location-detector-1.0.0.tgz#a17b7ecc59d30e179e2bef73fb4137704cb331b5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/espower-location-detector/-/espower-location-detector-1.0.0.tgz#a17b7ecc59d30e179e2bef73fb4137704cb331b5"
   dependencies:
     is-url "^1.2.1"
     path-is-absolute "^1.0.0"
@@ -2387,78 +2382,78 @@ espower-location-detector@^1.0.0:
 
 espree@^3.4.0:
   version "3.4.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
   dependencies:
     acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
 esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
 esprima@^3.1.1:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
 espurify@^1.6.0:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/espurify/-/espurify-1.7.0.tgz#1c5cf6cbccc32e6f639380bd4f991fab9ba9d226"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/espurify/-/espurify-1.7.0.tgz#1c5cf6cbccc32e6f639380bd4f991fab9ba9d226"
   dependencies:
     core-js "^2.0.0"
 
 esquery@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
   dependencies:
     estraverse "~4.1.0"
     object-assign "^4.0.1"
 
 estraverse@^1.9.1:
   version "1.9.3"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
 estraverse@^4.0.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
 estraverse@~4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
 
 esutils@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
 etag@^1.8.0, etag@~1.8.0:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"
 
 event-emitter@~0.3.5:
   version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
 
 events@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
 evp_bytestokey@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
   dependencies:
     create-hash "^1.1.1"
 
 execa@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"
   dependencies:
     cross-spawn-async "^2.1.1"
     is-stream "^1.1.0"
@@ -2469,7 +2464,7 @@ execa@^0.4.0:
 
 execa@^0.5.0:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
   dependencies:
     cross-spawn "^4.0.0"
     get-stream "^2.2.0"
@@ -2481,23 +2476,23 @@ execa@^0.5.0:
 
 exit-hook@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
 
 expand-brackets@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-range@^1.8.1:
   version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
   dependencies:
     fill-range "^2.1.0"
 
 express@^4.15.2:
   version "4.15.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662"
   dependencies:
     accepts "~1.3.3"
     array-flatten "1.1.1"
@@ -2530,11 +2525,11 @@ express@^4.15.2:
 
 extend@~3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
 external-editor@^2.0.1:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
   dependencies:
     iconv-lite "^0.4.17"
     jschardet "^1.4.2"
@@ -2542,13 +2537,13 @@ external-editor@^2.0.1:
 
 extglob@^0.3.1:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
 extract-text-webpack-plugin@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
   dependencies:
     ajv "^4.11.2"
     async "^2.1.2"
@@ -2557,53 +2552,53 @@ extract-text-webpack-plugin@^2.1.0:
 
 extsprintf@1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
 fastparse@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
 figures@^1.3.5:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.1.tgz#6b328ee1234a729e4e47d36375dd6d35c0e1db84"
+file-loader@^0.11.2:
+  version "0.11.2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
   dependencies:
     loader-utils "^1.0.2"
 
 filename-regex@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 filesize@^3.5.9:
   version "3.5.10"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/filesize/-/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
 
 fill-range@^2.1.0:
   version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -2613,7 +2608,7 @@ fill-range@^2.1.0:
 
 finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
   dependencies:
     debug "2.6.7"
     encodeurl "~1.0.1"
@@ -2625,28 +2620,28 @@ finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
 
 find-cache-dir@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
   dependencies:
     commondir "^1.0.1"
     mkdirp "^0.5.1"
     pkg-dir "^1.0.0"
 
-find-up@^1.0.0, find-up@^1.1.2:
+find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0:
+find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   dependencies:
     locate-path "^2.0.0"
 
 flat-cache@^1.2.1:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
   dependencies:
     circular-json "^0.3.1"
     del "^2.0.2"
@@ -2655,40 +2650,40 @@ flat-cache@^1.2.1:
 
 flatten@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
 fn-name@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
 
 for-in@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
 for-own@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
   dependencies:
     for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
 
-foreground-child@^1.3.3, foreground-child@^1.5.3:
+foreground-child@^1.5.3, foreground-child@^1.5.6:
   version "1.5.6"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
   dependencies:
     cross-spawn "^4"
     signal-exit "^3.0.0"
 
 forever-agent@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
 form-data@~2.1.1:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -2696,15 +2691,15 @@ form-data@~2.1.1:
 
 forwarded@~0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
 fresh@0.5.0, fresh@^0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
 friendly-errors-webpack-plugin@^1.6.1:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70"
   dependencies:
     chalk "^1.1.3"
     error-stack-parser "^2.0.0"
@@ -2712,7 +2707,7 @@ friendly-errors-webpack-plugin@^1.6.1:
 
 fs-extra@^0.26.4:
   version "0.26.7"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
@@ -2722,7 +2717,7 @@ fs-extra@^0.26.4:
 
 fs-extra@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^3.0.0"
@@ -2730,18 +2725,18 @@ fs-extra@^3.0.1:
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
   dependencies:
     nan "^2.3.0"
     node-pre-gyp "^0.6.29"
 
 fstream-ignore@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
   dependencies:
     fstream "^1.0.0"
     inherits "2"
@@ -2749,7 +2744,7 @@ fstream-ignore@^1.0.5:
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -2758,11 +2753,11 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
 
 function-bind@^1.0.2, function-bind@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
 gauge@~2.7.3:
   version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -2775,59 +2770,59 @@ gauge@~2.7.3:
 
 generate-function@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
 
 generate-object-property@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
   dependencies:
     is-property "^1.0.0"
 
 get-caller-file@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
 get-port@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e"
 
 get-stdin@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
 get-stream@^2.2.0:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
   dependencies:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
 get-stream@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
 getpass@^0.1.1:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
   dependencies:
     assert-plus "^1.0.0"
 
 glob-base@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
 
 glob-parent@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
   dependencies:
     is-glob "^2.0.0"
 
 glob@^6.0.4:
   version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -2837,7 +2832,7 @@ glob@^6.0.4:
 
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
   version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -2848,11 +2843,11 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
 
 globals@^9.0.0, globals@^9.14.0:
   version "9.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
 
 globby@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -2863,7 +2858,7 @@ globby@^5.0.0:
 
 globby@^6.0.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -2873,7 +2868,7 @@ globby@^6.0.0:
 
 got@^6.7.1:
   version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
   dependencies:
     create-error-class "^3.0.0"
     duplexer3 "^0.1.4"
@@ -2889,21 +2884,21 @@ got@^6.7.1:
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
 gzip-size@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
   dependencies:
     duplexer "^0.1.1"
 
 handlebars@^4.0.3:
   version "4.0.10"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
     async "^1.4.0"
     optimist "^0.6.1"
@@ -2913,11 +2908,11 @@ handlebars@^4.0.3:
 
 har-schema@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
 
 har-validator@~2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
   dependencies:
     chalk "^1.1.1"
     commander "^2.9.0"
@@ -2926,62 +2921,62 @@ har-validator@~2.0.6:
 
 har-validator@~4.2.1:
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
   dependencies:
     ajv "^4.9.1"
     har-schema "^1.0.5"
 
 has-ansi@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   dependencies:
     ansi-regex "^2.0.0"
 
 has-color@~0.1.0:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
 
 has-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
 has-flag@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
 has-unicode@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
 has-yarn@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7"
 
 has@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
   dependencies:
     inherits "^2.0.1"
 
 hash-sum@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
   dependencies:
     inherits "^2.0.1"
 
 hawk@~3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -2990,11 +2985,11 @@ hawk@~3.1.3:
 
 he@1.1.x, he@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -3002,36 +2997,36 @@ hmac-drbg@^1.0.0:
 
 hoek@2.x.x:
   version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
 
 html-encoding-sniffer@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
   dependencies:
     whatwg-encoding "^1.0.1"
 
 html-entities@^1.2.0:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
 html-minifier@^3.2.3, html-minifier@^3.5.2:
   version "3.5.2"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7"
   dependencies:
     camel-case "3.0.x"
     clean-css "4.1.x"
@@ -3044,7 +3039,7 @@ html-minifier@^3.2.3, html-minifier@^3.5.2:
 
 html-webpack-plugin@^2.28.0:
   version "2.28.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
   dependencies:
     bluebird "^3.4.7"
     html-minifier "^3.2.3"
@@ -3055,7 +3050,7 @@ html-webpack-plugin@^2.28.0:
 
 htmlparser2@^3.8.2:
   version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
   dependencies:
     domelementtype "^1.3.0"
     domhandler "^2.3.0"
@@ -3066,7 +3061,7 @@ htmlparser2@^3.8.2:
 
 htmlparser2@~3.3.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
   dependencies:
     domelementtype "1"
     domhandler "2.1"
@@ -3075,7 +3070,7 @@ htmlparser2@~3.3.0:
 
 http-errors@~1.6.1:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257"
   dependencies:
     depd "1.1.0"
     inherits "2.0.3"
@@ -3084,7 +3079,7 @@ http-errors@~1.6.1:
 
 http-signature@~1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -3092,11 +3087,11 @@ http-signature@~1.1.0:
 
 https-browserify@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
 hullabaloo-config-manager@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hullabaloo-config-manager/-/hullabaloo-config-manager-1.0.1.tgz#c72be7ba249a67c99b6ba3eb1f55837fa01acd8f"
+  version "1.1.1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz#1d9117813129ad035fd9e8477eaf066911269fe3"
   dependencies:
     dot-prop "^4.1.0"
     es6-error "^4.0.2"
@@ -3109,83 +3104,84 @@ hullabaloo-config-manager@^1.0.0:
     lodash.merge "^4.6.0"
     md5-hex "^2.0.0"
     package-hash "^2.0.0"
-    pkg-dir "^1.0.0"
-    resolve-from "^2.0.0"
+    pkg-dir "^2.0.0"
+    resolve-from "^3.0.0"
+    safe-buffer "^5.0.1"
 
 iconv-lite@0.4.13:
   version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
 iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.17"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
 
 icss-utils@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
   dependencies:
     postcss "^6.0.1"
 
 ieee754@^1.1.4:
   version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
 ignore-by-default@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
-ignore@^3.0.11, ignore@^3.2.0:
+ignore@^3.2.0, ignore@^3.3.3:
   version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
 indent-string@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0, indent-string@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.1.0.tgz#08ff4334603388399b329e6b9538dc7a3cf5de7d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/indent-string/-/indent-string-3.1.0.tgz#08ff4334603388399b329e6b9538dc7a3cf5de7d"
 
 indexes-of@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
 
 indexof@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     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:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
 inherits@2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
 inquirer@3.0.6:
   version "3.0.6"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
   dependencies:
     ansi-escapes "^1.1.0"
     chalk "^1.0.0"
@@ -3203,7 +3199,7 @@ inquirer@3.0.6:
 
 inquirer@^0.12.0:
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
   dependencies:
     ansi-escapes "^1.1.0"
     ansi-regex "^2.0.0"
@@ -3221,121 +3217,121 @@ inquirer@^0.12.0:
 
 interpret@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
 invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
 ipaddr.js@1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
 
 irregular-plurals@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
 is-binary-path@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   dependencies:
     builtin-modules "^1.0.0"
 
 is-ci@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies:
     ci-info "^1.0.0"
 
 is-directory@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
 
 is-dotfile@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+  version "1.0.3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
   dependencies:
     is-primitive "^2.0.0"
 
 is-error@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-error/-/is-error-2.2.1.tgz#684a96d84076577c98f4cdb40c6d26a5123bf19c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-error/-/is-error-2.2.1.tgz#684a96d84076577c98f4cdb40c6d26a5123bf19c"
 
 is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
 is-extglob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
 is-extglob@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
 is-finite@^1.0.0, is-finite@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
 is-generator-fn@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
   dependencies:
     is-extglob "^2.1.0"
 
 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
   version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -3344,131 +3340,131 @@ is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
 
 is-npm@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
 
 is-number@^2.0.2, is-number@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
     kind-of "^3.0.2"
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
 is-observable@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
   dependencies:
     symbol-observable "^0.2.2"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
   dependencies:
     path-is-inside "^1.0.1"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
 
 is-primitive@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
 is-promise@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
 is-property@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
 is-resolvable@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
   dependencies:
     tryit "^1.0.1"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
 
 is-stream@^1.0.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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
 is-svg@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
   dependencies:
     html-comment-regex "^1.1.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
 is-url@^1.2.1:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
 
 is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
 isarray@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
   dependencies:
     isarray "1.0.0"
 
 isstream@~0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-lib-coverage@^1.1.0, istanbul-lib-coverage@^1.1.1:
+istanbul-lib-coverage@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
 
-istanbul-lib-hook@^1.0.6:
+istanbul-lib-hook@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc"
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.7.1:
+istanbul-lib-instrument@^1.7.2:
   version "1.7.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz#6014b03d3470fb77638d5802508c255c06312e56"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz#6014b03d3470fb77638d5802508c255c06312e56"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -3478,18 +3474,18 @@ istanbul-lib-instrument@^1.7.1:
     istanbul-lib-coverage "^1.1.1"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.1.0:
+istanbul-lib-report@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#f0e55f56655ffa34222080b7a0cd4760e1405fc9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#f0e55f56655ffa34222080b7a0cd4760e1405fc9"
   dependencies:
     istanbul-lib-coverage "^1.1.1"
     mkdirp "^0.5.1"
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.2.0:
+istanbul-lib-source-maps@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c"
   dependencies:
     debug "^2.6.3"
     istanbul-lib-coverage "^1.1.1"
@@ -3497,15 +3493,15 @@ istanbul-lib-source-maps@^1.2.0:
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-reports@^1.1.0:
+istanbul-reports@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e"
   dependencies:
     handlebars "^4.0.3"
 
 jest-diff@19.0.0, jest-diff@^19.0.0:
   version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
   dependencies:
     chalk "^1.1.3"
     diff "^3.0.0"
@@ -3514,29 +3510,29 @@ jest-diff@19.0.0, jest-diff@^19.0.0:
 
 jest-file-exists@^19.0.0:
   version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8"
 
 jest-matcher-utils@^19.0.0:
   version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d"
   dependencies:
     chalk "^1.1.3"
     pretty-format "^19.0.0"
 
 jest-message-util@^19.0.0:
   version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-19.0.0.tgz#721796b89c0e4d761606f9ba8cb828a3b6246416"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-message-util/-/jest-message-util-19.0.0.tgz#721796b89c0e4d761606f9ba8cb828a3b6246416"
   dependencies:
     chalk "^1.1.1"
     micromatch "^2.3.11"
 
 jest-mock@^19.0.0:
   version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-19.0.0.tgz#67038641e9607ab2ce08ec4a8cb83aabbc899d01"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-mock/-/jest-mock-19.0.0.tgz#67038641e9607ab2ce08ec4a8cb83aabbc899d01"
 
 jest-snapshot@19.0.2:
   version "19.0.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b"
   dependencies:
     chalk "^1.1.3"
     jest-diff "^19.0.0"
@@ -3548,7 +3544,7 @@ jest-snapshot@19.0.2:
 
 jest-util@^19.0.2:
   version "19.0.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41"
   dependencies:
     chalk "^1.1.1"
     graceful-fs "^4.1.6"
@@ -3561,7 +3557,7 @@ jest-util@^19.0.2:
 
 jest-validate@^19.0.2:
   version "19.0.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c"
   dependencies:
     chalk "^1.1.1"
     jest-matcher-utils "^19.0.0"
@@ -3570,17 +3566,17 @@ jest-validate@^19.0.2:
 
 jodid25519@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
   dependencies:
     jsbn "~0.1.0"
 
 js-base64@^2.1.9:
   version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
 js-beautify@^1.6.3:
   version "1.6.14"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
   dependencies:
     config-chain "~1.1.5"
     editorconfig "^0.13.2"
@@ -3589,33 +3585,33 @@ js-beautify@^1.6.3:
 
 js-tokens@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
 js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.8.2:
   version "3.8.4"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
   dependencies:
     argparse "^1.0.7"
     esprima "^3.1.1"
 
 js-yaml@~3.7.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
 jsbn@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jschardet@^1.4.2:
   version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
 
 jsdom@^11.0.0:
   version "11.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
   dependencies:
     abab "^1.0.3"
     acorn "^4.0.4"
@@ -3641,57 +3637,57 @@ jsdom@^11.0.0:
 
 jsesc@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
 json-loader@^0.5.4:
   version "0.5.4"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
 
 json-schema@0.2.3:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
 
 json-stable-stringify@^1.0.0, 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
     jsonify "~0.0.0"
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
 jsonfile@^2.1.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonfile@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonify@~0.0.0:
   version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
 jsonpointer@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.0.2"
@@ -3700,56 +3696,56 @@ jsprim@^1.2.2:
 
 kind-of@^3.0.2:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
     is-buffer "^1.1.5"
 
 klaw@^1.0.0:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
   optionalDependencies:
     graceful-fs "^4.1.9"
 
 last-line-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/last-line-stream/-/last-line-stream-1.0.0.tgz#d1b64d69f86ff24af2d04883a2ceee14520a5600"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/last-line-stream/-/last-line-stream-1.0.0.tgz#d1b64d69f86ff24af2d04883a2ceee14520a5600"
   dependencies:
     through2 "^2.0.0"
 
 latest-version@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
 lazy-req@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-2.0.0.tgz#c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lazy-req/-/lazy-req-2.0.0.tgz#c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"
 
 lcid@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
   dependencies:
     invert-kv "^1.0.0"
 
 leven@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3759,7 +3755,7 @@ load-json-file@^1.0.0:
 
 load-json-file@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3768,11 +3764,11 @@ load-json-file@^2.0.0:
 
 loader-runner@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
 loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
   version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -3781,7 +3777,7 @@ loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
 
 loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -3789,176 +3785,182 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
 
 locate-path@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
 lodash.clonedeepwith@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz#6ee30573a03a1a60d670a62ef33c10cf1afdbdd4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz#6ee30573a03a1a60d670a62ef33c10cf1afdbdd4"
 
 lodash.cond@^4.3.0:
   version "4.5.2"
-  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
 
 lodash.debounce@^4.0.3:
   version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
 lodash.difference@^4.3.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
 
 lodash.flatten@^4.2.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
 
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
 
 lodash.isequal@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
 
 lodash.memoize@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
 lodash.merge@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
 lodash.template@^4.4.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
 
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
 lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
 longest@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
 loose-envify@^1.0.0:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
     js-tokens "^3.0.0"
 
 loud-rejection@^1.0.0, loud-rejection@^1.2.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
 lower-case@^1.1.1:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
 lowercase-keys@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
 lru-cache@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
   dependencies:
     pseudomap "^1.0.1"
 
 lru-cache@^4.0.0, lru-cache@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
   dependencies:
     pseudomap "^1.0.1"
     yallist "^2.0.0"
 
 macaddress@^0.2.8:
   version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
 make-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
   dependencies:
     pify "^2.3.0"
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
 matcher@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/matcher/-/matcher-0.1.2.tgz#ef20cbde64c24c50cc61af5b83ee0b1b8ff00101"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/matcher/-/matcher-0.1.2.tgz#ef20cbde64c24c50cc61af5b83ee0b1b8ff00101"
   dependencies:
     escape-string-regexp "^1.0.4"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
 md5-hex@^1.2.0, md5-hex@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
   dependencies:
     md5-o-matic "^0.1.1"
 
 md5-hex@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
   dependencies:
     md5-o-matic "^0.1.1"
 
 md5-o-matic@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
 
 media-typer@0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
 
 memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
 meow@^3.7.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -3973,21 +3975,21 @@ meow@^3.7.0:
 
 merge-descriptors@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
 merge-source-map@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.3.tgz#da1415f2722a5119db07b14c4f973410863a2abf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/merge-source-map/-/merge-source-map-1.0.3.tgz#da1415f2722a5119db07b14c4f973410863a2abf"
   dependencies:
     source-map "^0.5.3"
 
 methods@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
 micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -4005,76 +4007,76 @@ micromatch@^2.1.5, micromatch@^2.3.11:
 
 miller-rabin@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
 "mime-db@>= 1.27.0 < 2":
   version "1.28.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.28.0.tgz#fedd349be06d2865b7fc57d837c6de4f17d7ac3c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mime-db/-/mime-db-1.28.0.tgz#fedd349be06d2865b7fc57d837c6de4f17d7ac3c"
 
 mime-db@~1.27.0:
   version "1.27.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
 
 mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   version "2.1.15"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
   dependencies:
     mime-db "~1.27.0"
 
 mime@1.3.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
 mime@1.3.x, mime@^1.3.4:
   version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
 mimic-fn@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
 minimalistic-assert@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
 minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
 "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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
 ms@0.7.1, ms@^0.7.1:
   version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
 multimatch@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
   dependencies:
     array-differ "^1.0.0"
     array-union "^1.0.1"
@@ -4083,52 +4085,52 @@ multimatch@^2.1.0:
 
 mute-stream@0.0.5:
   version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
 nan@^2.3.0:
   version "2.6.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
 ncname@1.0.x:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
   dependencies:
     xml-char-classes "^1.0.0"
 
 negotiator@0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
 no-case@^2.2.0:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
   dependencies:
     lower-case "^1.1.1"
 
 node-dir@^0.1.10:
   version "0.1.17"
-  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
   dependencies:
     minimatch "^3.0.2"
 
 node-fetch@1.6.3:
   version "1.6.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
 node-libs-browser@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.1.4"
@@ -4155,8 +4157,8 @@ node-libs-browser@^2.0.0:
     vm-browserify "0.0.4"
 
 node-pre-gyp@^0.6.29:
-  version "0.6.34"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
+  version "0.6.36"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
   dependencies:
     mkdirp "^0.5.1"
     nopt "^4.0.1"
@@ -4170,20 +4172,20 @@ node-pre-gyp@^0.6.29:
 
 nopt@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
 nopt@~3.0.1:
   version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
     abbrev "1"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -4192,17 +4194,17 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 
 normalize-path@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
 normalize-url@^1.4.0:
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
   dependencies:
     object-assign "^4.0.1"
     prepend-http "^1.0.0"
@@ -4211,19 +4213,19 @@ normalize-url@^1.4.0:
 
 npm-run-path@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
   dependencies:
     path-key "^1.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   dependencies:
     path-key "^2.0.0"
 
 npmlog@^4.0.2:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -4232,25 +4234,25 @@ npmlog@^4.0.2:
 
 nth-check@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
   dependencies:
     boolbase "~1.0.0"
 
 num2fraction@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 "nwmatcher@>= 1.3.9 < 2.0.0":
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf"
 
-nyc@^10.3.2:
-  version "10.3.2"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-10.3.2.tgz#f27f4d91f2a9db36c24f574ff5c6efff0233de46"
+nyc@^11.0.2:
+  version "11.0.2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/nyc/-/nyc-11.0.2.tgz#9e592a697186028253b668516c38f079c39c08f3"
   dependencies:
     archy "^1.0.0"
     arrify "^1.0.1"
@@ -4259,15 +4261,15 @@ nyc@^10.3.2:
     debug-log "^1.0.1"
     default-require-extensions "^1.0.0"
     find-cache-dir "^0.1.1"
-    find-up "^1.1.2"
+    find-up "^2.1.0"
     foreground-child "^1.5.3"
     glob "^7.0.6"
-    istanbul-lib-coverage "^1.1.0"
-    istanbul-lib-hook "^1.0.6"
-    istanbul-lib-instrument "^1.7.1"
-    istanbul-lib-report "^1.1.0"
-    istanbul-lib-source-maps "^1.2.0"
-    istanbul-reports "^1.1.0"
+    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-hook "^1.0.7"
+    istanbul-lib-instrument "^1.7.2"
+    istanbul-lib-report "^1.1.1"
+    istanbul-lib-source-maps "^1.2.1"
+    istanbul-reports "^1.1.1"
     md5-hex "^1.2.0"
     merge-source-map "^1.0.2"
     micromatch "^2.3.11"
@@ -4275,26 +4277,26 @@ nyc@^10.3.2:
     resolve-from "^2.0.0"
     rimraf "^2.5.4"
     signal-exit "^3.0.1"
-    spawn-wrap "1.2.4"
-    test-exclude "^4.1.0"
-    yargs "^7.1.0"
+    spawn-wrap "^1.3.6"
+    test-exclude "^4.1.1"
+    yargs "^8.0.1"
     yargs-parser "^5.0.0"
 
 oauth-sign@~0.8.1:
   version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
 object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
 object.assign@^4.0.1:
   version "4.0.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.0"
@@ -4302,21 +4304,21 @@ object.assign@^4.0.1:
 
 object.omit@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
 observable-to-promise@^0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/observable-to-promise/-/observable-to-promise-0.5.0.tgz#c828f0f0dc47e9f86af8a4977c5d55076ce7a91f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/observable-to-promise/-/observable-to-promise-0.5.0.tgz#c828f0f0dc47e9f86af8a4977c5d55076ce7a91f"
   dependencies:
     is-observable "^0.2.0"
     symbol-observable "^1.0.4"
 
 offline-plugin@^4.8.1:
   version "4.8.1"
-  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.8.1.tgz#1d73457081185777179c29d9d416f71077a0197a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/offline-plugin/-/offline-plugin-4.8.1.tgz#1d73457081185777179c29d9d416f71077a0197a"
   dependencies:
     deep-extend "^0.4.0"
     ejs "^2.3.4"
@@ -4326,33 +4328,33 @@ offline-plugin@^4.8.1:
 
 on-finished@~2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
 once@^1.3.0, once@^1.3.3:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
     wrappy "1"
 
 onetime@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
   dependencies:
     mimic-fn "^1.0.0"
 
 opencollective@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
   dependencies:
     babel-polyfill "6.23.0"
     chalk "1.1.3"
@@ -4363,31 +4365,31 @@ opencollective@^1.0.3:
 
 opener@^1.4.3:
   version "1.4.3"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
 
 opn@4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
   dependencies:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
 optimist@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
 option-chain@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/option-chain/-/option-chain-0.1.1.tgz#e9b811e006f1c0f54802f28295bfc8970f8dcfbd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/option-chain/-/option-chain-0.1.1.tgz#e9b811e006f1c0f54802f28295bfc8970f8dcfbd"
   dependencies:
     object-assign "^4.0.1"
 
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -4398,52 +4400,60 @@ optionator@^0.8.1, optionator@^0.8.2:
 
 os-browserify@^0.2.0:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
 
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
   dependencies:
     lcid "^1.0.0"
 
+os-locale@^2.0.0:
+  version "2.0.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/os-locale/-/os-locale-2.0.0.tgz#15918ded510522b81ee7ae5a309d54f639fc39a4"
+  dependencies:
+    execa "^0.5.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
 osenv@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
 p-limit@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
 
 p-locate@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   dependencies:
     p-limit "^1.1.0"
 
 package-hash@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
   dependencies:
     md5-hex "^1.3.0"
 
 package-hash@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-2.0.0.tgz#78ae326c89e05a4d813b68601977af05c00d2a0d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/package-hash/-/package-hash-2.0.0.tgz#78ae326c89e05a4d813b68601977af05c00d2a0d"
   dependencies:
     graceful-fs "^4.1.11"
     lodash.flattendeep "^4.4.0"
@@ -4452,7 +4462,7 @@ package-hash@^2.0.0:
 
 package-json@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
   dependencies:
     got "^6.7.1"
     registry-auth-token "^3.0.1"
@@ -4461,17 +4471,17 @@ package-json@^4.0.0:
 
 pako@~0.2.0:
   version "0.2.9"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
 
 param-case@2.1.x:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   dependencies:
     no-case "^2.2.0"
 
 parse-asn1@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -4481,7 +4491,7 @@ parse-asn1@^5.0.0:
 
 parse-glob@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -4490,69 +4500,69 @@ parse-glob@^3.0.4:
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
   dependencies:
     error-ex "^1.2.0"
 
 parse-ms@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-0.1.2.tgz#dd3fa25ed6c2efc7bdde12ad9b46c163aa29224e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-ms/-/parse-ms-0.1.2.tgz#dd3fa25ed6c2efc7bdde12ad9b46c163aa29224e"
 
 parse-ms@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
 
 parse5@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
   dependencies:
     "@types/node" "^6.0.46"
 
 parseurl@~1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
 
 path-browserify@0.0.0:
   version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
 path-is-inside@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
 path-key@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
 
 path-key@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
 path-parse@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -4560,13 +4570,13 @@ path-type@^1.0.0:
 
 path-type@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
   dependencies:
     pify "^2.0.0"
 
 pbkdf2@^3.0.3:
   version "3.0.12"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -4576,74 +4586,80 @@ pbkdf2@^3.0.3:
 
 performance-now@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
 pify@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
 pinkie-promise@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
   dependencies:
     pinkie "^1.0.0"
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-1.0.0.tgz#5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie/-/pinkie-1.0.0.tgz#5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
 pkg-conf@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279"
   dependencies:
     find-up "^2.0.0"
     load-json-file "^2.0.0"
 
 pkg-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
   dependencies:
     find-up "^1.0.0"
 
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
 plur@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
 
 plur@^2.0.0:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
   dependencies:
     irregular-plurals "^1.0.0"
 
 pluralize@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
 
 pn@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pn/-/pn-1.0.0.tgz#1cf5a30b0d806cd18f88fc41a6b5d4ad615b3ba9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pn/-/pn-1.0.0.tgz#1cf5a30b0d806cd18f88fc41a6b5d4ad615b3ba9"
 
 post-compile-webpack-plugin@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/post-compile-webpack-plugin/-/post-compile-webpack-plugin-0.1.1.tgz#1b1a0eea890ce748556ca49e066a48c900e0b370"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/post-compile-webpack-plugin/-/post-compile-webpack-plugin-0.1.1.tgz#1b1a0eea890ce748556ca49e066a48c900e0b370"
 
 postcss-calc@^5.2.0:
   version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
   dependencies:
     postcss "^5.0.2"
     postcss-message-helpers "^2.0.0"
@@ -4651,7 +4667,7 @@ postcss-calc@^5.2.0:
 
 postcss-colormin@^2.1.8:
   version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
   dependencies:
     colormin "^1.0.5"
     postcss "^5.0.13"
@@ -4659,52 +4675,52 @@ postcss-colormin@^2.1.8:
 
 postcss-convert-values@^2.3.4:
   version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
   dependencies:
     postcss "^5.0.11"
     postcss-value-parser "^3.1.2"
 
 postcss-discard-comments@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-duplicates@^2.0.1:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
   dependencies:
     postcss "^5.0.4"
 
 postcss-discard-empty@^2.0.1:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-overridden@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
   dependencies:
     postcss "^5.0.16"
 
 postcss-discard-unused@^2.2.1:
   version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
   dependencies:
     postcss "^5.0.14"
     uniqs "^2.0.0"
 
 postcss-filter-plugins@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
   dependencies:
     postcss "^5.0.4"
     uniqid "^4.0.0"
 
 postcss-load-config@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
@@ -4713,21 +4729,21 @@ postcss-load-config@^1.1.0:
 
 postcss-load-options@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
 
 postcss-load-plugins@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
   dependencies:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
 
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
   dependencies:
     has "^1.0.1"
     postcss "^5.0.10"
@@ -4735,13 +4751,13 @@ postcss-merge-idents@^2.1.5:
 
 postcss-merge-longhand@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
   dependencies:
     postcss "^5.0.4"
 
 postcss-merge-rules@^2.0.3:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
   dependencies:
     browserslist "^1.5.2"
     caniuse-api "^1.5.2"
@@ -4751,11 +4767,11 @@ postcss-merge-rules@^2.0.3:
 
 postcss-message-helpers@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
 
 postcss-minify-font-values@^1.0.2:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
   dependencies:
     object-assign "^4.0.1"
     postcss "^5.0.4"
@@ -4763,14 +4779,14 @@ postcss-minify-font-values@^1.0.2:
 
 postcss-minify-gradients@^1.0.1:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
   dependencies:
     postcss "^5.0.12"
     postcss-value-parser "^3.3.0"
 
 postcss-minify-params@^1.0.4:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.2"
@@ -4779,7 +4795,7 @@ postcss-minify-params@^1.0.4:
 
 postcss-minify-selectors@^2.0.4:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
   dependencies:
     alphanum-sort "^1.0.2"
     has "^1.0.1"
@@ -4788,40 +4804,40 @@ postcss-minify-selectors@^2.0.4:
 
 postcss-modules-extract-imports@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
   dependencies:
     postcss "^6.0.1"
 
 postcss-modules-local-by-default@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
 postcss-modules-scope@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
 postcss-modules-values@^1.1.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
   dependencies:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
 
 postcss-normalize-charset@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
   dependencies:
     postcss "^5.0.5"
 
 postcss-normalize-url@^3.0.7:
   version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
   dependencies:
     is-absolute-url "^2.0.0"
     normalize-url "^1.4.0"
@@ -4830,27 +4846,27 @@ postcss-normalize-url@^3.0.7:
 
 postcss-ordered-values@^2.1.0:
   version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.1"
 
 postcss-reduce-idents@^2.2.2:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.2"
 
 postcss-reduce-initial@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
   dependencies:
     postcss "^5.0.4"
 
 postcss-reduce-transforms@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
   dependencies:
     has "^1.0.1"
     postcss "^5.0.8"
@@ -4858,7 +4874,7 @@ postcss-reduce-transforms@^1.0.3:
 
 postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
   version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
   dependencies:
     flatten "^1.0.2"
     indexes-of "^1.0.1"
@@ -4866,7 +4882,7 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
 
 postcss-svgo@^2.1.1:
   version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
   dependencies:
     is-svg "^2.0.0"
     postcss "^5.0.14"
@@ -4875,7 +4891,7 @@ postcss-svgo@^2.1.1:
 
 postcss-unique-selectors@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.4"
@@ -4883,11 +4899,11 @@ postcss-unique-selectors@^2.0.2:
 
 postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
 postcss-zindex@^2.0.1:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
   dependencies:
     has "^1.0.1"
     postcss "^5.0.4"
@@ -4895,7 +4911,7 @@ postcss-zindex@^2.0.1:
 
 postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
@@ -4904,7 +4920,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
 
 postcss@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
   dependencies:
     chalk "^1.1.3"
     source-map "^0.5.6"
@@ -4912,44 +4928,44 @@ postcss@^6.0.1:
 
 preload-webpack-plugin@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/preload-webpack-plugin/-/preload-webpack-plugin-1.2.2.tgz#d1b6f0eab3c2d0bb4c249d409cf6b7a8b0a415dd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/preload-webpack-plugin/-/preload-webpack-plugin-1.2.2.tgz#d1b6f0eab3c2d0bb4c249d409cf6b7a8b0a415dd"
   dependencies:
     object-assign "^4.1.1"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
 prepend-http@^1.0.0, prepend-http@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
 preserve@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 pretty-error@^2.0.2:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.0.tgz#87f4e9d706a24c87d6cbee9fabec001fcf8c75d8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-error/-/pretty-error-2.1.0.tgz#87f4e9d706a24c87d6cbee9fabec001fcf8c75d8"
   dependencies:
     renderkid "^2.0.1"
     utila "~0.4"
 
 pretty-format@^19.0.0:
   version "19.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84"
   dependencies:
     ansi-styles "^3.0.0"
 
 pretty-ms@^0.2.1:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-0.2.2.tgz#da879a682ff33a37011046f13d627f67c73b84f6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-ms/-/pretty-ms-0.2.2.tgz#da879a682ff33a37011046f13d627f67c73b84f6"
   dependencies:
     parse-ms "^0.1.0"
 
 pretty-ms@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-2.1.0.tgz#4257c256df3fb0b451d6affaab021884126981dc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-ms/-/pretty-ms-2.1.0.tgz#4257c256df3fb0b451d6affaab021884126981dc"
   dependencies:
     is-finite "^1.0.1"
     parse-ms "^1.0.0"
@@ -4957,19 +4973,19 @@ pretty-ms@^2.0.0:
 
 private@^0.1.6:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
 process@^0.11.0:
   version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
 progress-bar-webpack-plugin@^1.9.3:
   version "1.9.3"
-  resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz#81fb8bd8e38da6edaf9a20beed79bd978dd63c2a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz#81fb8bd8e38da6edaf9a20beed79bd978dd63c2a"
   dependencies:
     chalk "^1.1.1"
     object.assign "^4.0.1"
@@ -4977,30 +4993,30 @@ progress-bar-webpack-plugin@^1.9.3:
 
 progress@^1.1.8:
   version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
 
 proto-list@~1.2.1:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
 
 proxy-addr@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
   dependencies:
     forwarded "~0.1.0"
     ipaddr.js "1.3.0"
 
 prr@~0.0.0:
   version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
 pseudomap@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -5010,57 +5026,59 @@ public-encrypt@^4.0.0:
 
 punycode@1.3.2:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 q@^1.1.2:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
 qs@6.4.0, qs@~6.4.0:
   version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 qs@~6.3.0:
   version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
 query-string@^4.1.0:
   version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
   dependencies:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
 querystring-es3@^0.2.0:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
 querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
 randomatic@^1.1.3:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
   dependencies:
     is-number "^2.0.2"
     kind-of "^3.0.2"
 
 randombytes@^2.0.0, randombytes@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
+  version "2.0.4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/randombytes/-/randombytes-2.0.4.tgz#9551df208422c8f80eb58e2326dd0b840ff22efd"
+  dependencies:
+    safe-buffer "^5.0.1"
 
 range-parser@^1.0.3, range-parser@~1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -5069,21 +5087,21 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
 read-pkg-up@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -5091,7 +5109,7 @@ read-pkg@^1.0.0:
 
 read-pkg@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -5099,7 +5117,7 @@ read-pkg@^2.0.0:
 
 readable-stream@1.0:
   version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -5107,20 +5125,20 @@ readable-stream@1.0:
     string_decoder "~0.10.x"
 
 readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
+  version "2.2.10"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/readable-stream/-/readable-stream-2.2.10.tgz#effe72bb7c884c0dd335e2379d526196d9d011ee"
   dependencies:
-    buffer-shims "~1.0.0"
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
+    safe-buffer "^5.0.1"
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
 readdirp@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -5129,7 +5147,7 @@ readdirp@^2.0.0:
 
 readline2@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -5137,20 +5155,20 @@ readline2@^1.0.1:
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
 reduce-css-calc@^1.2.6:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
   dependencies:
     balanced-match "^0.4.2"
     math-expression-evaluator "^1.2.14"
@@ -5158,21 +5176,21 @@ reduce-css-calc@^1.2.6:
 
 reduce-function-call@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
   dependencies:
     balanced-match "^0.4.2"
 
 regenerate@^1.2.1:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
 regenerator-runtime@^0.10.0:
   version "0.10.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
 regenerator-transform@0.9.11:
   version "0.9.11"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
   dependencies:
     babel-runtime "^6.18.0"
     babel-types "^6.19.0"
@@ -5180,14 +5198,14 @@ regenerator-transform@0.9.11:
 
 regex-cache@^0.4.2:
   version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
   dependencies:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
 
 regexpu-core@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -5195,7 +5213,7 @@ regexpu-core@^1.0.0:
 
 regexpu-core@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -5203,44 +5221,44 @@ regexpu-core@^2.0.0:
 
 registry-auth-token@^3.0.1:
   version "3.3.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
 
 registry-url@^3.0.3:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
   dependencies:
     rc "^1.0.1"
 
 regjsgen@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
 
 regjsparser@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
   dependencies:
     jsesc "~0.5.0"
 
 relateurl@0.2.x:
   version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
 release-zalgo@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
   dependencies:
     es6-error "^4.0.1"
 
 remove-trailing-separator@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
 
 renderkid@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
   dependencies:
     css-select "^1.1.0"
     dom-converter "~0.1"
@@ -5250,27 +5268,27 @@ renderkid@^2.0.1:
 
 repeat-element@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
 repeat-string@^1.5.2:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
 repeating@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
   dependencies:
     is-finite "^1.0.0"
 
 request-promise-core@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
   dependencies:
     lodash "^4.13.1"
 
 request-promise-native@^1.0.3, request-promise-native@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.4.tgz#86988ec8eee408e45579fce83bfd05b3adf9a155"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/request-promise-native/-/request-promise-native-1.0.4.tgz#86988ec8eee408e45579fce83bfd05b3adf9a155"
   dependencies:
     request-promise-core "1.1.1"
     stealthy-require "^1.1.0"
@@ -5278,7 +5296,7 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.4:
 
 request@2.79.0:
   version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -5303,7 +5321,7 @@ request@2.79.0:
 
 request@^2.79.0, request@^2.81.0:
   version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -5330,127 +5348,135 @@ request@^2.79.0, request@^2.81.0:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
 require-from-string@^1.1.0:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
 require-precompiled@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
 
 require-uncached@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
   dependencies:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
 resolve-cwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-1.0.0.tgz#4eaeea41ed040d1702457df64a42b2b07d246f9f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-cwd/-/resolve-cwd-1.0.0.tgz#4eaeea41ed040d1702457df64a42b2b07d246f9f"
   dependencies:
     resolve-from "^2.0.0"
 
 resolve-from@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
 resolve-from@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3:
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
+resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.3:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
   dependencies:
     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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
 right-align@^0.1.1:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
   dependencies:
     align-text "^0.1.1"
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
   dependencies:
     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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
   dependencies:
     once "^1.3.0"
 
 run-async@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
   dependencies:
     is-promise "^2.1.0"
 
 rx-lite@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
 rx@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1, safe-buffer@~5.0.1:
+safe-buffer@^5.0.1:
+  version "5.1.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
+
+safe-buffer@~5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
 sax@^1.2.1, sax@~1.2.1:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
 script-ext-html-webpack-plugin@^1.8.1:
   version "1.8.1"
-  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195"
   dependencies:
     debug "^2.6.3"
 
 semver-diff@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
   dependencies:
     semver "^5.0.3"
 
 "semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
 send@0.15.3:
   version "0.15.3"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.15.3.tgz#5013f9f99023df50d1bd9892c19e3defd1d53309"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/send/-/send-0.15.3.tgz#5013f9f99023df50d1bd9892c19e3defd1d53309"
   dependencies:
     debug "2.6.7"
     depd "~1.1.0"
@@ -5468,11 +5494,11 @@ send@0.15.3:
 
 serialize-javascript@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
 
 serve-static@1.12.3, serve-static@^1.12.3:
   version "1.12.3"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
   dependencies:
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
@@ -5481,29 +5507,29 @@ serve-static@1.12.3, serve-static@^1.12.3:
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
 setimmediate@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
 setprototypeof@1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.8"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
   dependencies:
     inherits "^2.0.1"
 
 shelljs@^0.7.5:
   version "0.7.7"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -5511,102 +5537,98 @@ shelljs@^0.7.5:
 
 sigmund@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
-signal-exit@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-2.1.2.tgz#375879b1f92ebc3b334480d038dc546a6d558564"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
 
 signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
 slash@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
 slice-ansi@0.0.4:
   version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
 slide@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
 sntp@1.x.x:
   version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
   dependencies:
     hoek "2.x.x"
 
 sort-keys@^1.0.0, sort-keys@^1.1.1, sort-keys@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-list-map@^0.1.7, source-list-map@~0.1.7:
   version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
 source-list-map@^1.1.1:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
 
 source-map-support@^0.4.0, source-map-support@^0.4.2:
   version "0.4.15"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
     source-map "^0.5.6"
 
 source-map@0.5.6, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
 source-map@^0.4.4:
   version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@~0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
   dependencies:
     amdefine ">=0.0.4"
 
-spawn-wrap@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.2.4.tgz#920eb211a769c093eebfbd5b0e7a5d2e68ab2e40"
+spawn-wrap@^1.3.6:
+  version "1.3.6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/spawn-wrap/-/spawn-wrap-1.3.6.tgz#ccec4a949d8ce7e2b1a35cf4671d683d2e76a1d1"
   dependencies:
-    foreground-child "^1.3.3"
+    foreground-child "^1.5.6"
     mkdirp "^0.5.0"
     os-homedir "^1.0.1"
     rimraf "^2.3.3"
-    signal-exit "^2.0.0"
+    signal-exit "^3.0.2"
     which "^1.2.4"
 
 spdx-correct@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
   dependencies:
     spdx-license-ids "^1.0.2"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
   version "1.13.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -5621,36 +5643,36 @@ sshpk@^1.7.0:
 
 stack-utils@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
 stackframe@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.3.tgz#fe64ab20b170e4ce49044b126c119dfa0e5dc7cc"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/stackframe/-/stackframe-1.0.3.tgz#fe64ab20b170e4ce49044b126c119dfa0e5dc7cc"
 
 "statuses@>= 1.3.1 < 2", statuses@~1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
 std-mocks@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/std-mocks/-/std-mocks-1.0.1.tgz#d3388876d7beeba3c70fbd8e2bcaf46eb07d79fe"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/std-mocks/-/std-mocks-1.0.1.tgz#d3388876d7beeba3c70fbd8e2bcaf46eb07d79fe"
   dependencies:
     lodash "^4.11.1"
 
 stealthy-require@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
 stream-browserify@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
 stream-http@^2.3.1:
   version "2.7.1"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.1.tgz#546a51741ad5a6b07e9e31b0b10441a917df528a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/stream-http/-/stream-http-2.7.1.tgz#546a51741ad5a6b07e9e31b0b10441a917df528a"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -5660,17 +5682,17 @@ stream-http@^2.3.1:
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
 string-length@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
   dependencies:
     strip-ansi "^3.0.0"
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -5678,78 +5700,78 @@ string-width@^1.0.1, string-width@^1.0.2:
 
 string-width@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
 string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
 string_decoder@~1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.1.tgz#62e200f039955a6810d8df0a33ffc0f013662d98"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/string_decoder/-/string_decoder-1.0.1.tgz#62e200f039955a6810d8df0a33ffc0f013662d98"
   dependencies:
     safe-buffer "^5.0.1"
 
 stringstream@~0.0.4:
   version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
 
 strip-bom-buf@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
   dependencies:
     is-utf8 "^0.2.1"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
 strip-eof@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
 strip-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
   dependencies:
     get-stdin "^4.0.1"
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
 supports-color@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
 supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
 svgo@^0.7.0:
   version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
   dependencies:
     coa "~1.0.1"
     colors "~1.1.2"
@@ -5761,19 +5783,19 @@ svgo@^0.7.0:
 
 symbol-observable@^0.2.2:
   version "0.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
 symbol-observable@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
 symbol-tree@^3.2.1:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
   dependencies:
     ajv "^4.7.0"
     ajv-keywords "^1.0.0"
@@ -5784,11 +5806,11 @@ table@^3.7.8:
 
 tapable@^0.2.5, tapable@~0.2.5:
   version "0.2.6"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
 
 tar-pack@^3.4.0:
   version "3.4.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
   dependencies:
     debug "^2.2.0"
     fstream "^1.0.10"
@@ -5801,7 +5823,7 @@ tar-pack@^3.4.0:
 
 tar@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
@@ -5809,13 +5831,13 @@ tar@^2.2.1:
 
 term-size@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
   dependencies:
     execa "^0.4.0"
 
-test-exclude@^4.1.0:
+test-exclude@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -5825,22 +5847,22 @@ test-exclude@^4.1.0:
 
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
 through2@^2.0.0:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
 through@^2.3.6:
   version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
 time-require@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
   dependencies:
     chalk "^0.4.0"
     date-time "^0.1.1"
@@ -5849,99 +5871,99 @@ time-require@^0.1.2:
 
 timed-out@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
 
 timers-browserify@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
   dependencies:
     setimmediate "^1.0.4"
 
 tmp@^0.0.31:
   version "0.0.31"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
   dependencies:
     os-tmpdir "~1.0.1"
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
 to-fast-properties@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
 toposort@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
 
 tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
     punycode "^1.4.1"
 
 tr46@~0.0.3:
   version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
 trim-newlines@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
 trim-right@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
 tryit@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
 
 tty-browserify@0.0.0:
   version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   dependencies:
     safe-buffer "^5.0.1"
 
 tunnel-agent@~0.4.1:
   version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
 type-check@~0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
   dependencies:
     prelude-ls "~1.1.2"
 
 type-is@~1.6.15:
   version "1.6.15"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 uglify-js@3.0.x:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.13.tgz#1871d736aa1e550c728d7e5a6556579e70925d68"
+  version "3.0.15"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
   dependencies:
     commander "~2.9.0"
     source-map "~0.5.1"
 
 uglify-js@^2.6, uglify-js@^2.8.27:
-  version "2.8.27"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.27.tgz#47787f912b0f242e5b984343be8e35e95f694c9c"
+  version "2.8.28"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -5950,43 +5972,43 @@ uglify-js@^2.6, uglify-js@^2.8.27:
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
 uid-number@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
 uid2@0.0.3:
   version "0.0.3"
-  resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
 
 ultron@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
 
 uniq@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
 
 uniqid@^4.0.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
   dependencies:
     macaddress "^0.2.8"
 
 uniqs@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
 unique-string@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
   dependencies:
     crypto-random-string "^1.0.0"
 
 unique-temp-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385"
   dependencies:
     mkdirp "^0.5.1"
     os-tmpdir "^1.0.1"
@@ -5994,19 +6016,19 @@ unique-temp-dir@^1.0.0:
 
 universalify@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
 
 unpipe@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
 unzip-response@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 update-notifier@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
   dependencies:
     boxen "^1.0.0"
     chalk "^1.0.0"
@@ -6019,98 +6041,98 @@ update-notifier@^2.1.0:
 
 upper-case@^1.1.1:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
 url-loader@^0.5.8:
   version "0.5.8"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
   dependencies:
     loader-utils "^1.0.2"
     mime "1.3.x"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
   dependencies:
     prepend-http "^1.0.1"
 
 url@^0.11.0:
   version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
 
 urlgrey@0.4.4:
   version "0.4.4"
-  resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
 
 user-home@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
   dependencies:
     os-homedir "^1.0.0"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
 util@0.10.3, util@^0.10.3:
   version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
     inherits "2.0.1"
 
 utila@~0.3:
   version "0.3.3"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
 
 utila@~0.4:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
 
 utils-merge@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
 uuid@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
   dependencies:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
 vary@~1.1.0, vary@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
 
 vendors@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
 
 verror@1.3.6:
   version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
   dependencies:
     extsprintf "1.0.2"
 
 vm-browserify@0.0.4:
   version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
     indexof "0.0.1"
 
 vue-hot-reload-api@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
 
 vue-loader@^12.2.1:
   version "12.2.1"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-12.2.1.tgz#53f27c0973d386768f5a75156f4129b5efc6ba55"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-loader/-/vue-loader-12.2.1.tgz#53f27c0973d386768f5a75156f4129b5efc6ba55"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -6128,7 +6150,7 @@ vue-loader@^12.2.1:
 
 vue-meta@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-1.0.4.tgz#17608970aa02f6346829845eb8a05b2d5bf485c3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-meta/-/vue-meta-1.0.4.tgz#17608970aa02f6346829845eb8a05b2d5bf485c3"
   dependencies:
     deepmerge "^1.3.2"
     lodash.isplainobject "^4.0.6"
@@ -6136,11 +6158,11 @@ vue-meta@^1.0.4:
 
 vue-router@^2.5.3:
   version "2.5.3"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.5.3.tgz#073783f564b6aece6c8a59c63e298dc2aabfb51b"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-router/-/vue-router-2.5.3.tgz#073783f564b6aece6c8a59c63e298dc2aabfb51b"
 
 vue-server-renderer@~2.3.3:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.3.tgz#1f450f8a4541b9dd3b084d6470939f82781c3e0a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-server-renderer/-/vue-server-renderer-2.3.3.tgz#1f450f8a4541b9dd3b084d6470939f82781c3e0a"
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -6153,39 +6175,39 @@ vue-server-renderer@~2.3.3:
 
 vue-ssr-html-stream@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vue-ssr-html-stream/-/vue-ssr-html-stream-2.2.0.tgz#56d78b96c9c172b43749a324c156e888aca96d92"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-ssr-html-stream/-/vue-ssr-html-stream-2.2.0.tgz#56d78b96c9c172b43749a324c156e888aca96d92"
   dependencies:
     serialize-javascript "^1.3.0"
 
 vue-style-loader@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
   dependencies:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
 vue-template-compiler@~2.3.3:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz#b5bab9ec57309c906b82a78c81a02179dbc2f470"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz#b5bab9ec57309c906b82a78c81a02179dbc2f470"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
 
 vue-template-es2015-compiler@^1.2.2:
   version "1.5.2"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
 
 vue@~2.3.3:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.3.tgz#d1eaa8fde5240735a4563e74f2c7fead9cbb064c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vue/-/vue-2.3.3.tgz#d1eaa8fde5240735a4563e74f2c7fead9cbb064c"
 
 vuex@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.3.1.tgz#cde8e997c1f9957719bc7dea154f9aa691d981a6"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/vuex/-/vuex-2.3.1.tgz#cde8e997c1f9957719bc7dea154f9aa691d981a6"
 
 watchpack@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
   dependencies:
     async "^2.1.2"
     chokidar "^1.4.3"
@@ -6193,15 +6215,15 @@ watchpack@^1.3.1:
 
 webidl-conversions@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
 
 webidl-conversions@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
 
 webpack-bundle-analyzer@^2.8.2:
   version "2.8.2"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8"
   dependencies:
     acorn "^5.0.3"
     chalk "^1.1.3"
@@ -6217,7 +6239,7 @@ webpack-bundle-analyzer@^2.8.2:
 
 webpack-dev-middleware@^1.10.2:
   version "1.10.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
   dependencies:
     memory-fs "~0.4.1"
     mime "^1.3.4"
@@ -6226,7 +6248,7 @@ webpack-dev-middleware@^1.10.2:
 
 webpack-hot-middleware@^2.18.0:
   version "2.18.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
@@ -6235,25 +6257,25 @@ webpack-hot-middleware@^2.18.0:
 
 webpack-node-externals@^1.6.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
 
 webpack-sources@^0.1.0:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.5.3"
 
 webpack-sources@^0.2.3:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
   dependencies:
     source-list-map "^1.1.1"
     source-map "~0.5.3"
 
 webpack@^2.6.1:
   version "2.6.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -6279,69 +6301,73 @@ webpack@^2.6.1:
 
 whatwg-encoding@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
   dependencies:
     iconv-lite "0.4.13"
 
 whatwg-url@^4.3.0:
   version "4.8.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
 whet.extend@~0.9.9:
   version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
 which-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
 which@^1.2.4, which@^1.2.8, which@^1.2.9:
   version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
   dependencies:
     string-width "^1.0.2"
 
 widest-line@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
   dependencies:
     string-width "^1.0.1"
 
 window-size@0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
 wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
 wordwrap@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
 write-file-atomic@^1.1.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -6349,7 +6375,7 @@ write-file-atomic@^1.1.4:
 
 write-file-atomic@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37"
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -6357,7 +6383,7 @@ write-file-atomic@^2.0.0:
 
 write-json-file@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
   dependencies:
     detect-indent "^5.0.0"
     graceful-fs "^4.1.2"
@@ -6368,63 +6394,69 @@ write-json-file@^2.0.0:
 
 write-pkg@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-2.1.0.tgz#353aa44c39c48c21440f5c08ce6abd46141c9c08"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/write-pkg/-/write-pkg-2.1.0.tgz#353aa44c39c48c21440f5c08ce6abd46141c9c08"
   dependencies:
     sort-keys "^1.1.2"
     write-json-file "^2.0.0"
 
 write@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
   dependencies:
     mkdirp "^0.5.1"
 
 ws@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80"
   dependencies:
     safe-buffer "~5.0.1"
     ultron "~1.1.0"
 
 xdg-basedir@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
 xml-char-classes@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
 
 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"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
 y18n@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
 yallist@^2.0.0:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
 yargs-parser@^4.2.0:
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
   dependencies:
     camelcase "^3.0.0"
 
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs@^6.0.0:
   version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -6440,27 +6472,27 @@ yargs@^6.0.0:
     y18n "^3.2.1"
     yargs-parser "^4.2.0"
 
-yargs@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+yargs@^8.0.1:
+  version "8.0.1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs/-/yargs-8.0.1.tgz#420ef75e840c1457a80adcca9bc6fa3849de51aa"
   dependencies:
-    camelcase "^3.0.0"
+    camelcase "^4.1.0"
     cliui "^3.2.0"
     decamelize "^1.1.1"
     get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
     y18n "^3.2.1"
-    yargs-parser "^5.0.0"
+    yargs-parser "^7.0.0"
 
 yargs@~3.10.0:
   version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
   dependencies:
     camelcase "^1.0.2"
     cliui "^2.1.0"

From d15a50f539e74a510353d06e9a247e5cec77850e Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <atinux@gmail.com>
Date: Tue, 6 Jun 2017 14:57:48 +0200
Subject: [PATCH 007/236] bump to alpha 4

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

diff --git a/package.json b/package.json
index ea933353e4..1c540b6ce2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "contributors": [
     {

From e4e5096ee2095886be85bb264e7f34e5557527b0 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <atinux@gmail.com>
Date: Tue, 6 Jun 2017 14:59:16 +0200
Subject: [PATCH 008/236] update yarn.loock

---
 yarn.lock | 2010 ++++++++++++++++++++++++++---------------------------
 1 file changed, 1005 insertions(+), 1005 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 48780ca123..a639c1bbe3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -43,63 +43,63 @@
 
 abab@^1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
 abbrev@1:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
 accepts@~1.3.3:
   version "1.3.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
   dependencies:
     mime-types "~2.1.11"
     negotiator "0.6.1"
 
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
   dependencies:
     acorn "^4.0.3"
 
 acorn-globals@^3.1.0:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
   dependencies:
     acorn "^4.0.4"
 
 acorn-jsx@^3.0.0:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
   dependencies:
     acorn "^3.0.4"
 
 acorn@^3.0.4:
   version "3.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
 acorn@^4.0.3, acorn@^4.0.4:
   version "4.0.13"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
 acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
   version "5.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
 
 ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
 ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
@@ -107,133 +107,133 @@ align-text@^0.1.1, align-text@^0.1.3:
 
 alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
 
 amdefine@>=0.0.4:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
 ansi-align@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
   dependencies:
     string-width "^2.0.0"
 
 ansi-escapes@^1.1.0:
   version "1.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
 ansi-html@0.0.7, ansi-html@^0.0.7:
   version "0.0.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
 ansi-styles@^2.2.1:
   version "2.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
 ansi-styles@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-styles/-/ansi-styles-3.0.0.tgz#5404e93a544c4fec7f048262977bebfe3155e0c1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.0.0.tgz#5404e93a544c4fec7f048262977bebfe3155e0c1"
   dependencies:
     color-convert "^1.0.0"
 
 ansi-styles@~1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
 anymatch@^1.3.0:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
   dependencies:
     arrify "^1.0.0"
     micromatch "^2.1.5"
 
 append-transform@^0.4.0:
   version "0.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
   dependencies:
     default-require-extensions "^1.0.0"
 
 aproba@^1.0.3:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
 
 archy@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 are-we-there-yet@~1.1.2:
   version "1.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
 argparse@^1.0.7:
   version "1.0.9"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
   dependencies:
     sprintf-js "~1.0.2"
 
 argv@0.0.2:
   version "0.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
+  resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
 
 arr-diff@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-exclude@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/arr-exclude/-/arr-exclude-1.0.0.tgz#dfc7c2e552a270723ccda04cf3128c8cbfe5c631"
+  resolved "https://registry.yarnpkg.com/arr-exclude/-/arr-exclude-1.0.0.tgz#dfc7c2e552a270723ccda04cf3128c8cbfe5c631"
 
 arr-flatten@^1.0.1:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
 
 array-differ@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
 
 array-equal@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
 
 array-find-index@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
 
 array-flatten@1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
 
 array-union@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1, array-uniq@^1.0.2:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
 array-unique@^0.2.1:
   version "0.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
 asn1.js@^4.0.0:
   version "4.9.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -241,47 +241,47 @@ asn1.js@^4.0.0:
 
 asn1@~0.2.3:
   version "0.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
 assert-plus@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
 assert@^1.1.1:
   version "1.4.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
     util "0.10.3"
 
 async-each@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
 async@^1.4.0:
   version "1.5.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
 async@^2.1.2:
   version "2.4.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
   dependencies:
     lodash "^4.14.0"
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
 auto-bind@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/auto-bind/-/auto-bind-1.1.0.tgz#93b864dc7ee01a326281775d5c75ca0a751e5961"
+  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-1.1.0.tgz#93b864dc7ee01a326281775d5c75ca0a751e5961"
 
 autoprefixer@^6.3.1:
   version "6.7.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
   dependencies:
     browserslist "^1.7.6"
     caniuse-db "^1.0.30000634"
@@ -292,7 +292,7 @@ autoprefixer@^6.3.1:
 
 autoprefixer@^7.1.1:
   version "7.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d"
   dependencies:
     browserslist "^2.1.3"
     caniuse-lite "^1.0.30000670"
@@ -303,7 +303,7 @@ autoprefixer@^7.1.1:
 
 ava-init@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ava-init/-/ava-init-0.2.0.tgz#9304c8b4c357d66e3dfdae1fbff47b1199d5c55d"
+  resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.2.0.tgz#9304c8b4c357d66e3dfdae1fbff47b1199d5c55d"
   dependencies:
     arr-exclude "^1.0.0"
     execa "^0.5.0"
@@ -313,7 +313,7 @@ ava-init@^0.2.0:
 
 ava@^0.19.1:
   version "0.19.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ava/-/ava-0.19.1.tgz#43dd82435ad19b3980ffca2488f05daab940b273"
+  resolved "https://registry.yarnpkg.com/ava/-/ava-0.19.1.tgz#43dd82435ad19b3980ffca2488f05daab940b273"
   dependencies:
     "@ava/babel-preset-stage-4" "^1.0.0"
     "@ava/babel-preset-transform-test-files" "^3.0.0"
@@ -396,15 +396,15 @@ ava@^0.19.1:
 
 aws-sign2@~0.6.0:
   version "0.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
 
 aws4@^1.2.1:
   version "1.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
 babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
   version "6.22.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
   dependencies:
     chalk "^1.1.0"
     esutils "^2.0.2"
@@ -412,7 +412,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
 
 babel-core@^6.17.0, babel-core@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-generator "^6.24.1"
@@ -436,7 +436,7 @@ babel-core@^6.17.0, babel-core@^6.24.1:
 
 babel-eslint@^7.2.3:
   version "7.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-traverse "^6.23.1"
@@ -445,7 +445,7 @@ babel-eslint@^7.2.3:
 
 babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
@@ -458,7 +458,7 @@ babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.24.1:
 
 babel-helper-bindify-decorators@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
+  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
   dependencies:
     babel-runtime "^6.22.0"
     babel-traverse "^6.24.1"
@@ -466,7 +466,7 @@ babel-helper-bindify-decorators@^6.24.1:
 
 babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  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"
@@ -474,7 +474,7 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
 
 babel-helper-call-delegate@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  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"
@@ -483,7 +483,7 @@ babel-helper-call-delegate@^6.24.1:
 
 babel-helper-define-map@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
   dependencies:
     babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
@@ -492,7 +492,7 @@ babel-helper-define-map@^6.24.1:
 
 babel-helper-explode-assignable-expression@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  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"
@@ -500,7 +500,7 @@ babel-helper-explode-assignable-expression@^6.24.1:
 
 babel-helper-explode-class@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
   dependencies:
     babel-helper-bindify-decorators "^6.24.1"
     babel-runtime "^6.22.0"
@@ -509,7 +509,7 @@ babel-helper-explode-class@^6.24.1:
 
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  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"
@@ -519,28 +519,28 @@ babel-helper-function-name@^6.24.1:
 
 babel-helper-get-function-arity@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  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://repository.neo9.pro/content/groups/global-npm/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  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"
 
 babel-helper-optimise-call-expression@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
 babel-helper-regex@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -548,7 +548,7 @@ babel-helper-regex@^6.24.1:
 
 babel-helper-remap-async-to-generator@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
   dependencies:
     babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
@@ -558,7 +558,7 @@ babel-helper-remap-async-to-generator@^6.24.1:
 
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
   dependencies:
     babel-helper-optimise-call-expression "^6.24.1"
     babel-messages "^6.23.0"
@@ -569,18 +569,18 @@ babel-helper-replace-supers@^6.24.1:
 
 babel-helper-vue-jsx-merge-props@^2.0.2:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
+  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
 
 babel-helpers@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
 babel-loader@^7.0.0:
   version "7.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
   dependencies:
     find-cache-dir "^0.1.1"
     loader-utils "^1.0.2"
@@ -588,23 +588,23 @@ babel-loader@^7.0.0:
 
 babel-messages@^6.23.0:
   version "6.23.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-array-includes@^2.0.3:
   version "2.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz#cf5452e81c7b803fb7959f1045ac88e2ec28ff76"
+  resolved "https://registry.yarnpkg.com/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz#cf5452e81c7b803fb7959f1045ac88e2ec28ff76"
 
 babel-plugin-check-es2015-constants@^6.22.0, babel-plugin-check-es2015-constants@^6.8.0:
   version "6.22.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  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-espower@^2.3.2:
   version "2.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz#5516b8fcdb26c9f0e1d8160749f6e4c65e71271e"
+  resolved "https://registry.yarnpkg.com/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz#5516b8fcdb26c9f0e1d8160749f6e4c65e71271e"
   dependencies:
     babel-generator "^6.1.0"
     babylon "^6.1.0"
@@ -616,43 +616,43 @@ babel-plugin-espower@^2.3.2:
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
 
 babel-plugin-syntax-async-generators@^6.5.0:
   version "6.13.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
 
 babel-plugin-syntax-class-properties@^6.8.0:
   version "6.13.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
 
 babel-plugin-syntax-decorators@^6.13.0:
   version "6.13.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
 
 babel-plugin-syntax-dynamic-import@^6.18.0:
   version "6.18.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  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://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
 
 babel-plugin-syntax-jsx@^6.18.0:
   version "6.18.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+  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.8.0:
   version "6.13.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  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.20.0, babel-plugin-syntax-trailing-function-commas@^6.22.0:
   version "6.22.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  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-generator-functions@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
   dependencies:
     babel-helper-remap-async-to-generator "^6.24.1"
     babel-plugin-syntax-async-generators "^6.5.0"
@@ -660,7 +660,7 @@ babel-plugin-transform-async-generator-functions@^6.24.1:
 
 babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  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"
@@ -668,7 +668,7 @@ babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-
 
 babel-plugin-transform-class-properties@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  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"
@@ -677,7 +677,7 @@ babel-plugin-transform-class-properties@^6.24.1:
 
 babel-plugin-transform-decorators@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
   dependencies:
     babel-helper-explode-class "^6.24.1"
     babel-plugin-syntax-decorators "^6.13.0"
@@ -687,19 +687,19 @@ babel-plugin-transform-decorators@^6.24.1:
 
 babel-plugin-transform-es2015-arrow-functions@^6.22.0:
   version "6.22.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  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://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  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.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
@@ -709,7 +709,7 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es20
 
 babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  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"
@@ -723,33 +723,33 @@ babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-cla
 
 babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  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.19.0, babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  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://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  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://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  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, babel-plugin-transform-es2015-function-name@^6.9.0:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  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"
@@ -757,13 +757,13 @@ babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es20
 
 babel-plugin-transform-es2015-literals@^6.22.0:
   version "6.22.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  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://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  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"
@@ -771,7 +771,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
 
 babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
   dependencies:
     babel-plugin-transform-strict-mode "^6.24.1"
     babel-runtime "^6.22.0"
@@ -780,7 +780,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-e
 
 babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  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"
@@ -788,7 +788,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-e
 
 babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015-modules-umd@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  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"
@@ -796,14 +796,14 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015
 
 babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  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.21.0, babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  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"
@@ -814,20 +814,20 @@ babel-plugin-transform-es2015-parameters@^6.21.0, babel-plugin-transform-es2015-
 
 babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  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, babel-plugin-transform-es2015-spread@^6.8.0:
   version "6.22.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  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, babel-plugin-transform-es2015-sticky-regex@^6.8.0:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  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"
@@ -835,19 +835,19 @@ babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es201
 
 babel-plugin-transform-es2015-template-literals@^6.22.0:
   version "6.22.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  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://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  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.11.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://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  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"
@@ -855,7 +855,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.11.0, babel-plugin-transform-es20
 
 babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1, babel-plugin-transform-exponentiation-operator@^6.8.0:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  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"
@@ -863,39 +863,39 @@ babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-e
 
 babel-plugin-transform-object-rest-spread@^6.22.0, babel-plugin-transform-object-rest-spread@^6.23.0:
   version "6.23.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
   dependencies:
     regenerator-transform "0.9.11"
 
 babel-plugin-transform-runtime@^6.15.0, babel-plugin-transform-runtime@^6.23.0:
   version "6.23.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  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://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  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-plugin-transform-vue-jsx@^3.1.2:
   version "3.4.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.4.3.tgz#de57d8dd7d619333c981867728f3e6fdf68982ff"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.4.3.tgz#de57d8dd7d619333c981867728f3e6fdf68982ff"
   dependencies:
     esutils "^2.0.2"
 
 babel-polyfill@6.23.0:
   version "6.23.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
   dependencies:
     babel-runtime "^6.22.0"
     core-js "^2.4.0"
@@ -903,7 +903,7 @@ babel-polyfill@6.23.0:
 
 babel-preset-env@^1.2.1:
   version "1.5.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -938,7 +938,7 @@ babel-preset-env@^1.2.1:
 
 babel-preset-es2015@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
+  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"
@@ -967,7 +967,7 @@ babel-preset-es2015@^6.24.1:
 
 babel-preset-stage-2@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-plugin-transform-class-properties "^6.24.1"
@@ -976,7 +976,7 @@ babel-preset-stage-2@^6.24.1:
 
 babel-preset-stage-3@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
   dependencies:
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
     babel-plugin-transform-async-generator-functions "^6.24.1"
@@ -986,7 +986,7 @@ babel-preset-stage-3@^6.24.1:
 
 babel-preset-vue-app@^1.2.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-vue-app/-/babel-preset-vue-app-1.2.0.tgz#5ddfb7920020123a2482b12c6b36bdef9e3fb0ad"
+  resolved "https://registry.yarnpkg.com/babel-preset-vue-app/-/babel-preset-vue-app-1.2.0.tgz#5ddfb7920020123a2482b12c6b36bdef9e3fb0ad"
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-plugin-transform-object-rest-spread "^6.23.0"
@@ -997,7 +997,7 @@ babel-preset-vue-app@^1.2.0:
 
 babel-preset-vue@^0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-preset-vue/-/babel-preset-vue-0.1.0.tgz#adb84ceab3873bd72606fdd3f7047640f032301f"
+  resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-0.1.0.tgz#adb84ceab3873bd72606fdd3f7047640f032301f"
   dependencies:
     babel-helper-vue-jsx-merge-props "^2.0.2"
     babel-plugin-syntax-jsx "^6.18.0"
@@ -1005,7 +1005,7 @@ babel-preset-vue@^0.1.0:
 
 babel-register@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
   dependencies:
     babel-core "^6.24.1"
     babel-runtime "^6.22.0"
@@ -1017,14 +1017,14 @@ babel-register@^6.24.1:
 
 babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
   version "6.23.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
 babel-template@^6.16.0, babel-template@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
   dependencies:
     babel-runtime "^6.22.0"
     babel-traverse "^6.24.1"
@@ -1034,7 +1034,7 @@ babel-template@^6.16.0, babel-template@^6.24.1:
 
 babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-messages "^6.23.0"
@@ -1048,7 +1048,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
 
 babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1:
   version "6.24.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
   dependencies:
     babel-runtime "^6.22.0"
     esutils "^2.0.2"
@@ -1057,61 +1057,61 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
 
 babylon@^6.1.0, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0:
   version "6.17.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/babylon/-/babylon-6.17.2.tgz#201d25ef5f892c41bae49488b08db0dd476e9f5c"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.2.tgz#201d25ef5f892c41bae49488b08db0dd476e9f5c"
 
 balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
 base64-js@^1.0.2:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
   dependencies:
     tweetnacl "^0.14.3"
 
 big.js@^3.1.3:
   version "3.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
 
 binary-extensions@^1.0.0:
   version "1.8.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
 
 block-stream@*:
   version "0.0.9"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
   dependencies:
     inherits "~2.0.0"
 
 bluebird@^2.10.2:
   version "2.11.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
 bluebird@^3.0.0, bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.4.7:
   version "3.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
 
 boolbase@~1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
 boom@2.x.x:
   version "2.10.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
   dependencies:
     hoek "2.x.x"
 
 boxen@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/boxen/-/boxen-1.1.0.tgz#b1b69dd522305e807a99deee777dbd6e5167b102"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.1.0.tgz#b1b69dd522305e807a99deee777dbd6e5167b102"
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1123,14 +1123,14 @@ boxen@^1.0.0:
 
 brace-expansion@^1.1.7:
   version "1.1.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
   dependencies:
     balanced-match "^0.4.1"
     concat-map "0.0.1"
 
 braces@^1.8.2:
   version "1.8.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1138,11 +1138,11 @@ braces@^1.8.2:
 
 brorand@^1.0.1:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
   dependencies:
     buffer-xor "^1.0.2"
     cipher-base "^1.0.0"
@@ -1152,7 +1152,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 
 browserify-cipher@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1160,7 +1160,7 @@ browserify-cipher@^1.0.0:
 
 browserify-des@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1168,14 +1168,14 @@ browserify-des@^1.0.0:
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
   version "4.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1187,35 +1187,35 @@ browserify-sign@^4.0.0:
 
 browserify-zlib@^0.1.4:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
   dependencies:
     pako "~0.2.0"
 
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
 browserslist@^2.1.2, browserslist@^2.1.3:
   version "2.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053"
   dependencies:
     caniuse-lite "^1.0.30000670"
     electron-to-chromium "^1.3.11"
 
 buf-compare@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
+  resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
 
 buffer-xor@^1.0.2:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
 
 buffer@^4.3.0:
   version "4.9.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1223,19 +1223,19 @@ buffer@^4.3.0:
 
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
 bytes@2.3.0:
   version "2.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
 
 caching-transform@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
+  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
   dependencies:
     md5-hex "^1.2.0"
     mkdirp "^0.5.1"
@@ -1243,7 +1243,7 @@ caching-transform@^1.0.0:
 
 call-matcher@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/call-matcher/-/call-matcher-1.0.1.tgz#5134d077984f712a54dad3cbf62de28dce416ca8"
+  resolved "https://registry.yarnpkg.com/call-matcher/-/call-matcher-1.0.1.tgz#5134d077984f712a54dad3cbf62de28dce416ca8"
   dependencies:
     core-js "^2.0.0"
     deep-equal "^1.0.0"
@@ -1252,51 +1252,51 @@ call-matcher@^1.0.0:
 
 call-signature@0.0.2:
   version "0.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/call-signature/-/call-signature-0.0.2.tgz#a84abc825a55ef4cb2b028bd74e205a65b9a4996"
+  resolved "https://registry.yarnpkg.com/call-signature/-/call-signature-0.0.2.tgz#a84abc825a55ef4cb2b028bd74e205a65b9a4996"
 
 caller-path@^0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
   dependencies:
     callsites "^0.2.0"
 
 callsites@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
 
 camel-case@3.0.x:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
   dependencies:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
 camelcase@^1.0.2:
   version "1.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
 camelcase@^2.0.0:
   version "2.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
 camelcase@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
 caniuse-api@^1.5.2:
   version "1.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
   dependencies:
     browserslist "^1.3.6"
     caniuse-db "^1.0.30000529"
@@ -1305,34 +1305,34 @@ caniuse-api@^1.5.2:
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000679"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/caniuse-db/-/caniuse-db-1.0.30000679.tgz#dd7be12f16577e5d6ae6db880c6d619e77dca365"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000679.tgz#dd7be12f16577e5d6ae6db880c6d619e77dca365"
 
 caniuse-lite@^1.0.30000670:
   version "1.0.30000679"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/caniuse-lite/-/caniuse-lite-1.0.30000679.tgz#0fb5bb3658d4d4448f8f86a1c48df15664aa05ef"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000679.tgz#0fb5bb3658d4d4448f8f86a1c48df15664aa05ef"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
 
 caseless@~0.11.0:
   version "0.11.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
 
 caseless@~0.12.0:
   version "0.12.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
 center-align@^0.1.1:
   version "0.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
   dependencies:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1342,7 +1342,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
 
 chalk@^0.4.0:
   version "0.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
   dependencies:
     ansi-styles "~1.0.0"
     has-color "~0.1.0"
@@ -1350,7 +1350,7 @@ chalk@^0.4.0:
 
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -1365,72 +1365,72 @@ chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
 
 ci-info@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
   dependencies:
     inherits "^2.0.1"
 
 circular-json@^0.3.1:
   version "0.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
 
 clap@^1.0.9:
   version "1.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
   dependencies:
     chalk "^1.1.3"
 
 clean-css@4.1.x:
   version "4.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/clean-css/-/clean-css-4.1.3.tgz#07cfe8980edb20d455ddc23aadcf1e04c6e509ce"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.3.tgz#07cfe8980edb20d455ddc23aadcf1e04c6e509ce"
   dependencies:
     source-map "0.5.x"
 
 clean-stack@^1.1.1:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
 
 clean-yaml-object@^0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
+  resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
 
 cli-boxes@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
 cli-cursor@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  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://repository.neo9.pro/content/groups/global-npm/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-spinners@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-spinners/-/cli-spinners-1.0.0.tgz#ef987ed3d48391ac3dab9180b406a742180d6e6a"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.0.0.tgz#ef987ed3d48391ac3dab9180b406a742180d6e6a"
 
 cli-truncate@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-truncate/-/cli-truncate-1.0.0.tgz#21eb91f47b3f6560f004db77a769b4668d9c5518"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.0.0.tgz#21eb91f47b3f6560f004db77a769b4668d9c5518"
   dependencies:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
 
 cliui@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
   dependencies:
     center-align "^0.1.1"
     right-align "^0.1.1"
@@ -1438,7 +1438,7 @@ cliui@^2.1.0:
 
 cliui@^3.2.0:
   version "3.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -1446,37 +1446,37 @@ cliui@^3.2.0:
 
 clone@^1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
 co-with-promise@^4.6.0:
   version "4.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"
+  resolved "https://registry.yarnpkg.com/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"
   dependencies:
     pinkie-promise "^1.0.0"
 
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 coa@~1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/coa/-/coa-1.0.2.tgz#2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.2.tgz#2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec"
   dependencies:
     q "^1.1.2"
 
 code-excerpt@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/code-excerpt/-/code-excerpt-2.1.0.tgz#5dcc081e88f4a7e3b554e9e35d7ef232d47f8147"
+  resolved "https://registry.yarnpkg.com/code-excerpt/-/code-excerpt-2.1.0.tgz#5dcc081e88f4a7e3b554e9e35d7ef232d47f8147"
   dependencies:
     convert-to-spaces "^1.0.1"
 
 code-point-at@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
 codecov@^2.2.0:
   version "2.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/codecov/-/codecov-2.2.0.tgz#2d06817ceb8891eca6368836d4fb6bf6cc04ffd1"
+  resolved "https://registry.yarnpkg.com/codecov/-/codecov-2.2.0.tgz#2d06817ceb8891eca6368836d4fb6bf6cc04ffd1"
   dependencies:
     argv "0.0.2"
     request "2.79.0"
@@ -1484,23 +1484,23 @@ codecov@^2.2.0:
 
 color-convert@^1.0.0, color-convert@^1.3.0:
   version "1.9.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
     color-name "^1.1.1"
 
 color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
 
 color-string@^0.3.0:
   version "0.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
   dependencies:
     color-name "^1.0.0"
 
 color@^0.11.0:
   version "0.11.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
   dependencies:
     clone "^1.0.2"
     color-convert "^1.3.0"
@@ -1508,7 +1508,7 @@ color@^0.11.0:
 
 colormin@^1.0.5:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
   dependencies:
     color "^0.11.0"
     css-color-names "0.0.4"
@@ -1516,37 +1516,37 @@ colormin@^1.0.5:
 
 colors@~1.1.2:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
   version "2.9.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
     graceful-readlink ">= 1.0.0"
 
 common-path-prefix@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/common-path-prefix/-/common-path-prefix-1.0.0.tgz#cd52f6f0712e0baab97d6f9732874f22f47752c0"
+  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-1.0.0.tgz#cd52f6f0712e0baab97d6f9732874f22f47752c0"
 
 commondir@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
 compressible@~2.0.8:
   version "2.0.10"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
   dependencies:
     mime-db ">= 1.27.0 < 2"
 
 compression@^1.6.2:
   version "1.6.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
   dependencies:
     accepts "~1.3.3"
     bytes "2.3.0"
@@ -1557,11 +1557,11 @@ compression@^1.6.2:
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 concat-stream@^1.5.2:
   version "1.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
     inherits "^2.0.3"
     readable-stream "^2.2.2"
@@ -1569,14 +1569,14 @@ concat-stream@^1.5.2:
 
 config-chain@~1.1.5:
   version "1.1.11"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
   dependencies:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
 configstore@^3.0.0:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/configstore/-/configstore-3.1.0.tgz#45df907073e26dfa1cf4b2d52f5b60545eaa11d1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.0.tgz#45df907073e26dfa1cf4b2d52f5b60545eaa11d1"
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -1587,7 +1587,7 @@ configstore@^3.0.0:
 
 connect@^3.6.2:
   version "3.6.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/connect/-/connect-3.6.2.tgz#694e8d20681bfe490282c8ab886be98f09f42fe7"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.2.tgz#694e8d20681bfe490282c8ab886be98f09f42fe7"
   dependencies:
     debug "2.6.7"
     finalhandler "1.0.3"
@@ -1596,59 +1596,59 @@ connect@^3.6.2:
 
 console-browserify@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
 consolidate@^0.14.0:
   version "0.14.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
   dependencies:
     bluebird "^3.1.1"
 
 constants-browserify@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  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://repository.neo9.pro/content/groups/global-npm/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  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://repository.neo9.pro/content/groups/global-npm/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
 
 content-type-parser@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
 
 content-type@~1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
 convert-source-map@^1.1.0, convert-source-map@^1.2.0, convert-source-map@^1.3.0:
   version "1.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
 convert-to-spaces@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz#7e3e48bbe6d997b1417ddca2868204b4d3d85715"
+  resolved "https://registry.yarnpkg.com/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz#7e3e48bbe6d997b1417ddca2868204b4d3d85715"
 
 cookie-signature@1.0.6:
   version "1.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
 
 cookie@0.3.1:
   version "0.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
 copy-webpack-plugin@^4.0.1:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz#9728e383b94316050d0c7463958f2b85c0aa8200"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz#9728e383b94316050d0c7463958f2b85c0aa8200"
   dependencies:
     bluebird "^2.10.2"
     fs-extra "^0.26.4"
@@ -1661,22 +1661,22 @@ copy-webpack-plugin@^4.0.1:
 
 core-assert@^0.2.0:
   version "0.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f"
+  resolved "https://registry.yarnpkg.com/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f"
   dependencies:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
 core-js@^2.0.0, core-js@^2.4.0:
   version "2.4.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
 core-util-is@~1.0.0:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
 cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
   version "2.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cosmiconfig/-/cosmiconfig-2.1.3.tgz#952771eb0dddc1cb3fa2f6fbe51a522e93b3ee0a"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.3.tgz#952771eb0dddc1cb3fa2f6fbe51a522e93b3ee0a"
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.4.3"
@@ -1688,20 +1688,20 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
 
 create-ecdh@^4.0.0:
   version "4.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
 create-error-class@^3.0.0:
   version "3.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  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.1, create-hash@^1.1.2:
   version "1.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -1710,7 +1710,7 @@ create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2:
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -1721,27 +1721,27 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 
 cross-spawn-async@^2.1.1:
   version "2.2.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
+  resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
   dependencies:
     lru-cache "^4.0.0"
     which "^1.2.8"
 
 cross-spawn@^4, cross-spawn@^4.0.0:
   version "4.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
 cryptiles@2.x.x:
   version "2.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
   dependencies:
     boom "2.x.x"
 
 crypto-browserify@^3.11.0:
   version "3.11.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -1756,15 +1756,15 @@ crypto-browserify@^3.11.0:
 
 crypto-random-string@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+  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://repository.neo9.pro/content/groups/global-npm/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
 css-loader@^0.28.4:
   version "0.28.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -1783,7 +1783,7 @@ css-loader@^0.28.4:
 
 css-select@^1.1.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -1792,7 +1792,7 @@ css-select@^1.1.0:
 
 css-selector-tokenizer@^0.7.0:
   version "0.7.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -1800,15 +1800,15 @@ css-selector-tokenizer@^0.7.0:
 
 css-what@2.1:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
 
 cssesc@^0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
 
 "cssnano@>=2.6.1 <4":
   version "3.10.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
   dependencies:
     autoprefixer "^6.3.1"
     decamelize "^1.1.2"
@@ -1845,113 +1845,113 @@ cssesc@^0.1.0:
 
 csso@~2.3.1:
   version "2.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
   dependencies:
     clap "^1.0.9"
     source-map "^0.5.3"
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
 "cssstyle@>= 0.2.37 < 0.3.0":
   version "0.2.37"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
   dependencies:
     cssom "0.3.x"
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
   dependencies:
     array-find-index "^1.0.1"
 
 d@1:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
   dependencies:
     es5-ext "^0.10.9"
 
 dashdash@^1.12.0:
   version "1.14.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
   dependencies:
     assert-plus "^1.0.0"
 
 date-now@^0.1.4:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
 date-time@^0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
+  resolved "https://registry.yarnpkg.com/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
 
 de-indent@^1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
 debug-log@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
+  resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
 debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
     ms "0.7.1"
 
 debug@2.6.7:
   version "2.6.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
   dependencies:
     ms "2.0.0"
 
 debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
   version "2.6.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
 deep-equal@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
 deep-extend@^0.4.0, deep-extend@~0.4.0:
   version "0.4.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
 deep-is@~0.1.3:
   version "0.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
 deepmerge@^1.3.2:
   version "1.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
   dependencies:
     strip-bom "^2.0.0"
 
 define-properties@^1.1.2:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
   dependencies:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
 defined@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
 del@^2.0.2:
   version "2.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -1963,48 +1963,48 @@ del@^2.0.2:
 
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
 delegates@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
 depd@1.1.0, depd@~1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
 des.js@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
 destroy@~1.0.4:
   version "1.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
 detect-indent@^4.0.0:
   version "4.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
   dependencies:
     repeating "^2.0.0"
 
 detect-indent@^5.0.0:
   version "5.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
 
 diff-match-patch@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
+  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
 
 diff@^3.0.0, diff@^3.0.1:
   version "3.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
 diffie-hellman@^5.0.0:
   version "5.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2012,98 +2012,98 @@ diffie-hellman@^5.0.0:
 
 doctrine@1.5.0:
   version "1.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  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:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
 dom-converter@~0.1:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
   dependencies:
     utila "~0.3"
 
 dom-serializer@0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
 domain-browser@^1.1.1:
   version "1.1.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
 domelementtype@~1.1.1:
   version "1.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
 domhandler@2.1:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
   dependencies:
     domelementtype "1"
 
 domhandler@^2.3.0:
   version "2.4.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
   dependencies:
     domelementtype "1"
 
 domutils@1.1:
   version "1.1.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
 domutils@^1.5.1:
   version "1.6.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
 dot-prop@^4.1.0:
   version "4.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
   dependencies:
     is-obj "^1.0.0"
 
 duplexer3@^0.1.4:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
 duplexer@^0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
 ecc-jsbn@~0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
   dependencies:
     jsbn "~0.1.0"
 
 editorconfig@^0.13.2:
   version "0.13.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
   dependencies:
     bluebird "^3.0.5"
     commander "^2.9.0"
@@ -2112,19 +2112,19 @@ editorconfig@^0.13.2:
 
 ee-first@1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 ejs@^2.3.4, ejs@^2.5.6:
   version "2.5.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11:
   version "1.3.13"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc"
 
 elliptic@^6.0.0:
   version "6.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2136,28 +2136,28 @@ elliptic@^6.0.0:
 
 emojis-list@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
 empower-core@^0.6.1:
   version "0.6.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/empower-core/-/empower-core-0.6.2.tgz#5adef566088e31fba80ba0a36df47d7094169144"
+  resolved "https://registry.yarnpkg.com/empower-core/-/empower-core-0.6.2.tgz#5adef566088e31fba80ba0a36df47d7094169144"
   dependencies:
     call-signature "0.0.2"
     core-js "^2.0.0"
 
 encodeurl@~1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
 
 encoding@^0.1.11:
   version "0.1.12"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
   dependencies:
     iconv-lite "~0.4.13"
 
 enhanced-resolve@^3.0.0:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -2166,44 +2166,44 @@ enhanced-resolve@^3.0.0:
 
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
 equal-length@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
+  resolved "https://registry.yarnpkg.com/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
 
 errno@^0.1.3:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
   dependencies:
     prr "~0.0.0"
 
 error-ex@^1.2.0:
   version "1.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
 error-stack-parser@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a"
   dependencies:
     stackframe "^1.0.3"
 
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
   version "0.10.23"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
 
 es6-error@^4.0.1, es6-error@^4.0.2:
   version "4.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
 es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -2211,7 +2211,7 @@ es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
 
 es6-map@^0.1.3:
   version "0.1.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -2222,7 +2222,7 @@ es6-map@^0.1.3:
 
 es6-set@~0.1.5:
   version "0.1.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -2232,14 +2232,14 @@ es6-set@~0.1.5:
 
 es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
   version "3.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
 
 es6-weak-map@^2.0.1:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -2248,15 +2248,15 @@ es6-weak-map@^2.0.1:
 
 escape-html@~1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
 escodegen@^1.6.1:
   version "1.8.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -2267,7 +2267,7 @@ escodegen@^1.6.1:
 
 escope@^3.6.0:
   version "3.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
   dependencies:
     es6-map "^0.1.3"
     es6-weak-map "^2.0.1"
@@ -2276,11 +2276,11 @@ escope@^3.6.0:
 
 eslint-config-standard@^10.2.1:
   version "10.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
 
 eslint-import-resolver-node@^0.2.0:
   version "0.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
   dependencies:
     debug "^2.2.0"
     object-assign "^4.0.1"
@@ -2288,20 +2288,20 @@ eslint-import-resolver-node@^0.2.0:
 
 eslint-module-utils@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
   dependencies:
     debug "2.2.0"
     pkg-dir "^1.0.0"
 
 eslint-plugin-html@^2.0.3:
   version "2.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz#7c89883ab0c85fa5d28b666a14a4e906aa90b897"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz#7c89883ab0c85fa5d28b666a14a4e906aa90b897"
   dependencies:
     htmlparser2 "^3.8.2"
 
 eslint-plugin-import@^2.3.0:
   version "2.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-import/-/eslint-plugin-import-2.3.0.tgz#37c801e0ada0e296cbdf20c3f393acb5b52af36b"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.3.0.tgz#37c801e0ada0e296cbdf20c3f393acb5b52af36b"
   dependencies:
     builtin-modules "^1.1.1"
     contains-path "^0.1.0"
@@ -2316,7 +2316,7 @@ eslint-plugin-import@^2.3.0:
 
 eslint-plugin-node@^5.0.0:
   version "5.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-node/-/eslint-plugin-node-5.0.0.tgz#948b1fb82e3f0a744e86fad19aa4f49537d246cc"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.0.0.tgz#948b1fb82e3f0a744e86fad19aa4f49537d246cc"
   dependencies:
     ignore "^3.3.3"
     minimatch "^3.0.4"
@@ -2325,15 +2325,15 @@ eslint-plugin-node@^5.0.0:
 
 eslint-plugin-promise@^3.5.0:
   version "3.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
 
 eslint-plugin-standard@^3.0.1:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
 
 eslint@^3.19.0:
   version "3.19.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -2373,7 +2373,7 @@ eslint@^3.19.0:
 
 espower-location-detector@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/espower-location-detector/-/espower-location-detector-1.0.0.tgz#a17b7ecc59d30e179e2bef73fb4137704cb331b5"
+  resolved "https://registry.yarnpkg.com/espower-location-detector/-/espower-location-detector-1.0.0.tgz#a17b7ecc59d30e179e2bef73fb4137704cb331b5"
   dependencies:
     is-url "^1.2.1"
     path-is-absolute "^1.0.0"
@@ -2382,78 +2382,78 @@ espower-location-detector@^1.0.0:
 
 espree@^3.4.0:
   version "3.4.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
   dependencies:
     acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
 esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
 esprima@^3.1.1:
   version "3.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
 espurify@^1.6.0:
   version "1.7.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/espurify/-/espurify-1.7.0.tgz#1c5cf6cbccc32e6f639380bd4f991fab9ba9d226"
+  resolved "https://registry.yarnpkg.com/espurify/-/espurify-1.7.0.tgz#1c5cf6cbccc32e6f639380bd4f991fab9ba9d226"
   dependencies:
     core-js "^2.0.0"
 
 esquery@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
   version "4.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
   dependencies:
     estraverse "~4.1.0"
     object-assign "^4.0.1"
 
 estraverse@^1.9.1:
   version "1.9.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
 estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
 estraverse@~4.1.0:
   version "4.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
 
 esutils@^2.0.2:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
 etag@^1.8.0, etag@~1.8.0:
   version "1.8.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"
 
 event-emitter@~0.3.5:
   version "0.3.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
   dependencies:
     d "1"
     es5-ext "~0.10.14"
 
 events@^1.0.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
 evp_bytestokey@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
   dependencies:
     create-hash "^1.1.1"
 
 execa@^0.4.0:
   version "0.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"
   dependencies:
     cross-spawn-async "^2.1.1"
     is-stream "^1.1.0"
@@ -2464,7 +2464,7 @@ execa@^0.4.0:
 
 execa@^0.5.0:
   version "0.5.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
   dependencies:
     cross-spawn "^4.0.0"
     get-stream "^2.2.0"
@@ -2476,23 +2476,23 @@ execa@^0.5.0:
 
 exit-hook@^1.0.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
 
 expand-brackets@^0.1.4:
   version "0.1.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-range@^1.8.1:
   version "1.8.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
   dependencies:
     fill-range "^2.1.0"
 
 express@^4.15.2:
   version "4.15.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662"
   dependencies:
     accepts "~1.3.3"
     array-flatten "1.1.1"
@@ -2525,11 +2525,11 @@ express@^4.15.2:
 
 extend@~3.0.0:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
 external-editor@^2.0.1:
   version "2.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
   dependencies:
     iconv-lite "^0.4.17"
     jschardet "^1.4.2"
@@ -2537,13 +2537,13 @@ external-editor@^2.0.1:
 
 extglob@^0.3.1:
   version "0.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
 extract-text-webpack-plugin@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
   dependencies:
     ajv "^4.11.2"
     async "^2.1.2"
@@ -2552,53 +2552,53 @@ extract-text-webpack-plugin@^2.1.0:
 
 extsprintf@1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
 fastparse@^1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
 figures@^1.3.5:
   version "1.7.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  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://repository.neo9.pro/content/groups/global-npm/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  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://repository.neo9.pro/content/groups/global-npm/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
 file-loader@^0.11.2:
   version "0.11.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
   dependencies:
     loader-utils "^1.0.2"
 
 filename-regex@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 filesize@^3.5.9:
   version "3.5.10"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/filesize/-/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
 
 fill-range@^2.1.0:
   version "2.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -2608,7 +2608,7 @@ fill-range@^2.1.0:
 
 finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
   dependencies:
     debug "2.6.7"
     encodeurl "~1.0.1"
@@ -2620,7 +2620,7 @@ finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
 
 find-cache-dir@^0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
   dependencies:
     commondir "^1.0.1"
     mkdirp "^0.5.1"
@@ -2628,20 +2628,20 @@ find-cache-dir@^0.1.1:
 
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   dependencies:
     locate-path "^2.0.0"
 
 flat-cache@^1.2.1:
   version "1.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
   dependencies:
     circular-json "^0.3.1"
     del "^2.0.2"
@@ -2650,40 +2650,40 @@ flat-cache@^1.2.1:
 
 flatten@^1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
 fn-name@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
+  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
 
 for-in@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
 for-own@^0.1.4:
   version "0.1.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
   dependencies:
     for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
 
 foreground-child@^1.5.3, foreground-child@^1.5.6:
   version "1.5.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
   dependencies:
     cross-spawn "^4"
     signal-exit "^3.0.0"
 
 forever-agent@~0.6.1:
   version "0.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
 form-data@~2.1.1:
   version "2.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -2691,15 +2691,15 @@ form-data@~2.1.1:
 
 forwarded@~0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
 fresh@0.5.0, fresh@^0.5.0:
   version "0.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
 friendly-errors-webpack-plugin@^1.6.1:
   version "1.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70"
+  resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70"
   dependencies:
     chalk "^1.1.3"
     error-stack-parser "^2.0.0"
@@ -2707,7 +2707,7 @@ friendly-errors-webpack-plugin@^1.6.1:
 
 fs-extra@^0.26.4:
   version "0.26.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
@@ -2717,7 +2717,7 @@ fs-extra@^0.26.4:
 
 fs-extra@^3.0.1:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^3.0.0"
@@ -2725,18 +2725,18 @@ fs-extra@^3.0.1:
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
   dependencies:
     nan "^2.3.0"
     node-pre-gyp "^0.6.29"
 
 fstream-ignore@^1.0.5:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
   dependencies:
     fstream "^1.0.0"
     inherits "2"
@@ -2744,7 +2744,7 @@ fstream-ignore@^1.0.5:
 
 fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
   version "1.0.11"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -2753,11 +2753,11 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
 
 function-bind@^1.0.2, function-bind@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
 gauge@~2.7.3:
   version "2.7.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -2770,59 +2770,59 @@ gauge@~2.7.3:
 
 generate-function@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
 
 generate-object-property@^1.1.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
   dependencies:
     is-property "^1.0.0"
 
 get-caller-file@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
 get-port@^3.0.0:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e"
 
 get-stdin@^4.0.1:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
 get-stream@^2.2.0:
   version "2.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
   dependencies:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
 get-stream@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
 getpass@^0.1.1:
   version "0.1.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
   dependencies:
     assert-plus "^1.0.0"
 
 glob-base@^0.3.0:
   version "0.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
 
 glob-parent@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
   dependencies:
     is-glob "^2.0.0"
 
 glob@^6.0.4:
   version "6.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -2832,7 +2832,7 @@ glob@^6.0.4:
 
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
   version "7.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -2843,11 +2843,11 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
 
 globals@^9.0.0, globals@^9.14.0:
   version "9.17.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
 
 globby@^5.0.0:
   version "5.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -2858,7 +2858,7 @@ globby@^5.0.0:
 
 globby@^6.0.0:
   version "6.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -2868,7 +2868,7 @@ globby@^6.0.0:
 
 got@^6.7.1:
   version "6.7.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
   dependencies:
     create-error-class "^3.0.0"
     duplexer3 "^0.1.4"
@@ -2884,21 +2884,21 @@ got@^6.7.1:
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
 gzip-size@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
   dependencies:
     duplexer "^0.1.1"
 
 handlebars@^4.0.3:
   version "4.0.10"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
     async "^1.4.0"
     optimist "^0.6.1"
@@ -2908,11 +2908,11 @@ handlebars@^4.0.3:
 
 har-schema@^1.0.5:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
 
 har-validator@~2.0.6:
   version "2.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
   dependencies:
     chalk "^1.1.1"
     commander "^2.9.0"
@@ -2921,62 +2921,62 @@ har-validator@~2.0.6:
 
 har-validator@~4.2.1:
   version "4.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
   dependencies:
     ajv "^4.9.1"
     har-schema "^1.0.5"
 
 has-ansi@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   dependencies:
     ansi-regex "^2.0.0"
 
 has-color@~0.1.0:
   version "0.1.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
 
 has-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
 has-flag@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
 has-unicode@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
 has-yarn@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7"
 
 has@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
     function-bind "^1.0.2"
 
 hash-base@^2.0.0:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
   dependencies:
     inherits "^2.0.1"
 
 hash-sum@^1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
+  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
   dependencies:
     inherits "^2.0.1"
 
 hawk@~3.1.3:
   version "3.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -2985,11 +2985,11 @@ hawk@~3.1.3:
 
 he@1.1.x, he@^1.1.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -2997,36 +2997,36 @@ hmac-drbg@^1.0.0:
 
 hoek@2.x.x:
   version "2.16.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
   version "2.4.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
 
 html-encoding-sniffer@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
   dependencies:
     whatwg-encoding "^1.0.1"
 
 html-entities@^1.2.0:
   version "1.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
 html-minifier@^3.2.3, html-minifier@^3.5.2:
   version "3.5.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7"
   dependencies:
     camel-case "3.0.x"
     clean-css "4.1.x"
@@ -3039,7 +3039,7 @@ html-minifier@^3.2.3, html-minifier@^3.5.2:
 
 html-webpack-plugin@^2.28.0:
   version "2.28.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
   dependencies:
     bluebird "^3.4.7"
     html-minifier "^3.2.3"
@@ -3050,7 +3050,7 @@ html-webpack-plugin@^2.28.0:
 
 htmlparser2@^3.8.2:
   version "3.9.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
   dependencies:
     domelementtype "^1.3.0"
     domhandler "^2.3.0"
@@ -3061,7 +3061,7 @@ htmlparser2@^3.8.2:
 
 htmlparser2@~3.3.0:
   version "3.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
   dependencies:
     domelementtype "1"
     domhandler "2.1"
@@ -3070,7 +3070,7 @@ htmlparser2@~3.3.0:
 
 http-errors@~1.6.1:
   version "1.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257"
   dependencies:
     depd "1.1.0"
     inherits "2.0.3"
@@ -3079,7 +3079,7 @@ http-errors@~1.6.1:
 
 http-signature@~1.1.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -3087,11 +3087,11 @@ http-signature@~1.1.0:
 
 https-browserify@0.0.1:
   version "0.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
 hullabaloo-config-manager@^1.0.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz#1d9117813129ad035fd9e8477eaf066911269fe3"
+  resolved "https://registry.yarnpkg.com/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz#1d9117813129ad035fd9e8477eaf066911269fe3"
   dependencies:
     dot-prop "^4.1.0"
     es6-error "^4.0.2"
@@ -3110,78 +3110,78 @@ hullabaloo-config-manager@^1.0.0:
 
 iconv-lite@0.4.13:
   version "0.4.13"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
 iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.17"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
 
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
 
 icss-utils@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
   dependencies:
     postcss "^6.0.1"
 
 ieee754@^1.1.4:
   version "1.1.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
 ignore-by-default@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
+  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
 ignore@^3.2.0, ignore@^3.3.3:
   version "3.3.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
 indent-string@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0, indent-string@^3.1.0:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/indent-string/-/indent-string-3.1.0.tgz#08ff4334603388399b329e6b9538dc7a3cf5de7d"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.1.0.tgz#08ff4334603388399b329e6b9538dc7a3cf5de7d"
 
 indexes-of@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
 
 indexof@0.0.1:
   version "0.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     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:
   version "2.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
 inherits@2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
 inquirer@3.0.6:
   version "3.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
   dependencies:
     ansi-escapes "^1.1.0"
     chalk "^1.0.0"
@@ -3199,7 +3199,7 @@ inquirer@3.0.6:
 
 inquirer@^0.12.0:
   version "0.12.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
   dependencies:
     ansi-escapes "^1.1.0"
     ansi-regex "^2.0.0"
@@ -3217,121 +3217,121 @@ inquirer@^0.12.0:
 
 interpret@^1.0.0:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
 invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
 ipaddr.js@1.3.0:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
 
 irregular-plurals@^1.0.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
+  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
 is-binary-path@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   dependencies:
     builtin-modules "^1.0.0"
 
 is-ci@^1.0.7:
   version "1.0.10"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies:
     ci-info "^1.0.0"
 
 is-directory@^0.3.1:
   version "0.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
 
 is-dotfile@^1.0.0:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
   dependencies:
     is-primitive "^2.0.0"
 
 is-error@^2.2.0:
   version "2.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-error/-/is-error-2.2.1.tgz#684a96d84076577c98f4cdb40c6d26a5123bf19c"
+  resolved "https://registry.yarnpkg.com/is-error/-/is-error-2.2.1.tgz#684a96d84076577c98f4cdb40c6d26a5123bf19c"
 
 is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
 is-extglob@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
 is-extglob@^2.1.0:
   version "2.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
 is-finite@^1.0.0, is-finite@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
 is-generator-fn@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
   dependencies:
     is-extglob "^2.1.0"
 
 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
   version "2.16.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -3340,131 +3340,131 @@ is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
 
 is-npm@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
 
 is-number@^2.0.2, is-number@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
     kind-of "^3.0.2"
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
 is-observable@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
   dependencies:
     symbol-observable "^0.2.2"
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  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://repository.neo9.pro/content/groups/global-npm/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
 
 is-primitive@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
 is-promise@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
 is-property@^1.0.0:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  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://repository.neo9.pro/content/groups/global-npm/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
 is-resolvable@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
   dependencies:
     tryit "^1.0.1"
 
 is-retry-allowed@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
 
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
 is-svg@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
   dependencies:
     html-comment-regex "^1.1.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
 is-url@^1.2.1:
   version "1.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
+  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
 
 is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
 isarray@0.0.1:
   version "0.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
   dependencies:
     isarray "1.0.0"
 
 isstream@~0.1.2:
   version "0.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
 istanbul-lib-coverage@^1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
 
 istanbul-lib-hook@^1.0.7:
   version "1.0.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc"
   dependencies:
     append-transform "^0.4.0"
 
 istanbul-lib-instrument@^1.7.2:
   version "1.7.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz#6014b03d3470fb77638d5802508c255c06312e56"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz#6014b03d3470fb77638d5802508c255c06312e56"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -3476,7 +3476,7 @@ istanbul-lib-instrument@^1.7.2:
 
 istanbul-lib-report@^1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#f0e55f56655ffa34222080b7a0cd4760e1405fc9"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#f0e55f56655ffa34222080b7a0cd4760e1405fc9"
   dependencies:
     istanbul-lib-coverage "^1.1.1"
     mkdirp "^0.5.1"
@@ -3485,7 +3485,7 @@ istanbul-lib-report@^1.1.1:
 
 istanbul-lib-source-maps@^1.2.1:
   version "1.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c"
   dependencies:
     debug "^2.6.3"
     istanbul-lib-coverage "^1.1.1"
@@ -3495,13 +3495,13 @@ istanbul-lib-source-maps@^1.2.1:
 
 istanbul-reports@^1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e"
   dependencies:
     handlebars "^4.0.3"
 
 jest-diff@19.0.0, jest-diff@^19.0.0:
   version "19.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
   dependencies:
     chalk "^1.1.3"
     diff "^3.0.0"
@@ -3510,29 +3510,29 @@ jest-diff@19.0.0, jest-diff@^19.0.0:
 
 jest-file-exists@^19.0.0:
   version "19.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8"
+  resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8"
 
 jest-matcher-utils@^19.0.0:
   version "19.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d"
   dependencies:
     chalk "^1.1.3"
     pretty-format "^19.0.0"
 
 jest-message-util@^19.0.0:
   version "19.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-message-util/-/jest-message-util-19.0.0.tgz#721796b89c0e4d761606f9ba8cb828a3b6246416"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-19.0.0.tgz#721796b89c0e4d761606f9ba8cb828a3b6246416"
   dependencies:
     chalk "^1.1.1"
     micromatch "^2.3.11"
 
 jest-mock@^19.0.0:
   version "19.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-mock/-/jest-mock-19.0.0.tgz#67038641e9607ab2ce08ec4a8cb83aabbc899d01"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-19.0.0.tgz#67038641e9607ab2ce08ec4a8cb83aabbc899d01"
 
 jest-snapshot@19.0.2:
   version "19.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b"
   dependencies:
     chalk "^1.1.3"
     jest-diff "^19.0.0"
@@ -3544,7 +3544,7 @@ jest-snapshot@19.0.2:
 
 jest-util@^19.0.2:
   version "19.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41"
   dependencies:
     chalk "^1.1.1"
     graceful-fs "^4.1.6"
@@ -3557,7 +3557,7 @@ jest-util@^19.0.2:
 
 jest-validate@^19.0.2:
   version "19.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c"
   dependencies:
     chalk "^1.1.1"
     jest-matcher-utils "^19.0.0"
@@ -3566,17 +3566,17 @@ jest-validate@^19.0.2:
 
 jodid25519@^1.0.0:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
+  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
   dependencies:
     jsbn "~0.1.0"
 
 js-base64@^2.1.9:
   version "2.1.9"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
 js-beautify@^1.6.3:
   version "1.6.14"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
   dependencies:
     config-chain "~1.1.5"
     editorconfig "^0.13.2"
@@ -3585,33 +3585,33 @@ js-beautify@^1.6.3:
 
 js-tokens@^3.0.0:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
 js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.8.2:
   version "3.8.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
   dependencies:
     argparse "^1.0.7"
     esprima "^3.1.1"
 
 js-yaml@~3.7.0:
   version "3.7.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
 jsbn@~0.1.0:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jschardet@^1.4.2:
   version "1.4.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
 
 jsdom@^11.0.0:
   version "11.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
   dependencies:
     abab "^1.0.3"
     acorn "^4.0.4"
@@ -3637,57 +3637,57 @@ jsdom@^11.0.0:
 
 jsesc@^1.3.0:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
 json-loader@^0.5.4:
   version "0.5.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
 
 json-schema@0.2.3:
   version "0.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  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:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
     jsonify "~0.0.0"
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
 jsonfile@^2.1.0:
   version "2.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonfile@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonify@~0.0.0:
   version "0.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
 jsonpointer@^4.0.0:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
   version "1.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.0.2"
@@ -3696,56 +3696,56 @@ jsprim@^1.2.2:
 
 kind-of@^3.0.2:
   version "3.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
     is-buffer "^1.1.5"
 
 klaw@^1.0.0:
   version "1.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
   optionalDependencies:
     graceful-fs "^4.1.9"
 
 last-line-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/last-line-stream/-/last-line-stream-1.0.0.tgz#d1b64d69f86ff24af2d04883a2ceee14520a5600"
+  resolved "https://registry.yarnpkg.com/last-line-stream/-/last-line-stream-1.0.0.tgz#d1b64d69f86ff24af2d04883a2ceee14520a5600"
   dependencies:
     through2 "^2.0.0"
 
 latest-version@^3.0.0:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
+  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://repository.neo9.pro/content/groups/global-npm/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
 lazy-req@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lazy-req/-/lazy-req-2.0.0.tgz#c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"
+  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-2.0.0.tgz#c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"
 
 lcid@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
   dependencies:
     invert-kv "^1.0.0"
 
 leven@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3755,7 +3755,7 @@ load-json-file@^1.0.0:
 
 load-json-file@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3764,11 +3764,11 @@ load-json-file@^2.0.0:
 
 loader-runner@^2.3.0:
   version "2.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
 loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
   version "0.2.17"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -3777,7 +3777,7 @@ loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
 
 loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -3785,182 +3785,182 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
 
 locate-path@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
 lodash.clonedeepwith@^4.5.0:
   version "4.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz#6ee30573a03a1a60d670a62ef33c10cf1afdbdd4"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz#6ee30573a03a1a60d670a62ef33c10cf1afdbdd4"
 
 lodash.cond@^4.3.0:
   version "4.5.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
+  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
 
 lodash.debounce@^4.0.3:
   version "4.0.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
 lodash.difference@^4.3.0:
   version "4.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
 
 lodash.flatten@^4.2.0:
   version "4.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
 
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
 
 lodash.isequal@^4.5.0:
   version "4.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
 
 lodash.memoize@^4.1.2:
   version "4.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
 lodash.merge@^4.6.0:
   version "4.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
 lodash.template@^4.4.0:
   version "4.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
 
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
 lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
 longest@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
 loose-envify@^1.0.0:
   version "1.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
     js-tokens "^3.0.0"
 
 loud-rejection@^1.0.0, loud-rejection@^1.2.0:
   version "1.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
 lower-case@^1.1.1:
   version "1.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
 lowercase-keys@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
 lru-cache@^3.2.0:
   version "3.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
   dependencies:
     pseudomap "^1.0.1"
 
 lru-cache@^4.0.0, lru-cache@^4.0.1:
   version "4.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
   dependencies:
     pseudomap "^1.0.1"
     yallist "^2.0.0"
 
 macaddress@^0.2.8:
   version "0.2.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
 make-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
   dependencies:
     pify "^2.3.0"
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
 matcher@^0.1.1:
   version "0.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/matcher/-/matcher-0.1.2.tgz#ef20cbde64c24c50cc61af5b83ee0b1b8ff00101"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-0.1.2.tgz#ef20cbde64c24c50cc61af5b83ee0b1b8ff00101"
   dependencies:
     escape-string-regexp "^1.0.4"
 
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
 md5-hex@^1.2.0, md5-hex@^1.3.0:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
   dependencies:
     md5-o-matic "^0.1.1"
 
 md5-hex@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
   dependencies:
     md5-o-matic "^0.1.1"
 
 md5-o-matic@^0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
+  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
 
 media-typer@0.3.0:
   version "0.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
 mem@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
   dependencies:
     mimic-fn "^1.0.0"
 
 memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
 meow@^3.7.0:
   version "3.7.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -3975,21 +3975,21 @@ meow@^3.7.0:
 
 merge-descriptors@1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
 merge-source-map@^1.0.2:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/merge-source-map/-/merge-source-map-1.0.3.tgz#da1415f2722a5119db07b14c4f973410863a2abf"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.3.tgz#da1415f2722a5119db07b14c4f973410863a2abf"
   dependencies:
     source-map "^0.5.3"
 
 methods@~1.1.2:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
 micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -4007,76 +4007,76 @@ micromatch@^2.1.5, micromatch@^2.3.11:
 
 miller-rabin@^4.0.0:
   version "4.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
 "mime-db@>= 1.27.0 < 2":
   version "1.28.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mime-db/-/mime-db-1.28.0.tgz#fedd349be06d2865b7fc57d837c6de4f17d7ac3c"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.28.0.tgz#fedd349be06d2865b7fc57d837c6de4f17d7ac3c"
 
 mime-db@~1.27.0:
   version "1.27.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
 
 mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   version "2.1.15"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
   dependencies:
     mime-db "~1.27.0"
 
 mime@1.3.4:
   version "1.3.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
 mime@1.3.x, mime@^1.3.4:
   version "1.3.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
 mimic-fn@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
 minimalistic-assert@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
 minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
 "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://repository.neo9.pro/content/groups/global-npm/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
 ms@0.7.1, ms@^0.7.1:
   version "0.7.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
 multimatch@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
   dependencies:
     array-differ "^1.0.0"
     array-union "^1.0.1"
@@ -4085,52 +4085,52 @@ multimatch@^2.1.0:
 
 mute-stream@0.0.5:
   version "0.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+  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://repository.neo9.pro/content/groups/global-npm/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
 nan@^2.3.0:
   version "2.6.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
 ncname@1.0.x:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
+  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
   dependencies:
     xml-char-classes "^1.0.0"
 
 negotiator@0.6.1:
   version "0.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
 no-case@^2.2.0:
   version "2.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
   dependencies:
     lower-case "^1.1.1"
 
 node-dir@^0.1.10:
   version "0.1.17"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
+  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
   dependencies:
     minimatch "^3.0.2"
 
 node-fetch@1.6.3:
   version "1.6.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
 node-libs-browser@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.1.4"
@@ -4158,7 +4158,7 @@ node-libs-browser@^2.0.0:
 
 node-pre-gyp@^0.6.29:
   version "0.6.36"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
   dependencies:
     mkdirp "^0.5.1"
     nopt "^4.0.1"
@@ -4172,20 +4172,20 @@ node-pre-gyp@^0.6.29:
 
 nopt@^4.0.1:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
 nopt@~3.0.1:
   version "3.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
     abbrev "1"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.3.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -4194,17 +4194,17 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 
 normalize-path@^2.0.1:
   version "2.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
 normalize-url@^1.4.0:
   version "1.9.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
   dependencies:
     object-assign "^4.0.1"
     prepend-http "^1.0.0"
@@ -4213,19 +4213,19 @@ normalize-url@^1.4.0:
 
 npm-run-path@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
   dependencies:
     path-key "^1.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   dependencies:
     path-key "^2.0.0"
 
 npmlog@^4.0.2:
   version "4.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -4234,25 +4234,25 @@ npmlog@^4.0.2:
 
 nth-check@~1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
   dependencies:
     boolbase "~1.0.0"
 
 num2fraction@^1.2.2:
   version "1.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  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.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf"
 
 nyc@^11.0.2:
   version "11.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/nyc/-/nyc-11.0.2.tgz#9e592a697186028253b668516c38f079c39c08f3"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.0.2.tgz#9e592a697186028253b668516c38f079c39c08f3"
   dependencies:
     archy "^1.0.0"
     arrify "^1.0.1"
@@ -4284,19 +4284,19 @@ nyc@^11.0.2:
 
 oauth-sign@~0.8.1:
   version "0.8.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
 object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
 object.assign@^4.0.1:
   version "4.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.0"
@@ -4304,21 +4304,21 @@ object.assign@^4.0.1:
 
 object.omit@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
 observable-to-promise@^0.5.0:
   version "0.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/observable-to-promise/-/observable-to-promise-0.5.0.tgz#c828f0f0dc47e9f86af8a4977c5d55076ce7a91f"
+  resolved "https://registry.yarnpkg.com/observable-to-promise/-/observable-to-promise-0.5.0.tgz#c828f0f0dc47e9f86af8a4977c5d55076ce7a91f"
   dependencies:
     is-observable "^0.2.0"
     symbol-observable "^1.0.4"
 
 offline-plugin@^4.8.1:
   version "4.8.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/offline-plugin/-/offline-plugin-4.8.1.tgz#1d73457081185777179c29d9d416f71077a0197a"
+  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.8.1.tgz#1d73457081185777179c29d9d416f71077a0197a"
   dependencies:
     deep-extend "^0.4.0"
     ejs "^2.3.4"
@@ -4328,33 +4328,33 @@ offline-plugin@^4.8.1:
 
 on-finished@~2.3.0:
   version "2.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
 once@^1.3.0, once@^1.3.3:
   version "1.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
     wrappy "1"
 
 onetime@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
 onetime@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
   dependencies:
     mimic-fn "^1.0.0"
 
 opencollective@^1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
+  resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
   dependencies:
     babel-polyfill "6.23.0"
     chalk "1.1.3"
@@ -4365,31 +4365,31 @@ opencollective@^1.0.3:
 
 opener@^1.4.3:
   version "1.4.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
 
 opn@4.0.2:
   version "4.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
   dependencies:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
 optimist@^0.6.1:
   version "0.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
 option-chain@^0.1.0:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/option-chain/-/option-chain-0.1.1.tgz#e9b811e006f1c0f54802f28295bfc8970f8dcfbd"
+  resolved "https://registry.yarnpkg.com/option-chain/-/option-chain-0.1.1.tgz#e9b811e006f1c0f54802f28295bfc8970f8dcfbd"
   dependencies:
     object-assign "^4.0.1"
 
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -4400,21 +4400,21 @@ optionator@^0.8.1, optionator@^0.8.2:
 
 os-browserify@^0.2.0:
   version "0.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
 
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/os-locale/-/os-locale-2.0.0.tgz#15918ded510522b81ee7ae5a309d54f639fc39a4"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.0.0.tgz#15918ded510522b81ee7ae5a309d54f639fc39a4"
   dependencies:
     execa "^0.5.0"
     lcid "^1.0.0"
@@ -4422,38 +4422,38 @@ os-locale@^2.0.0:
 
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
 osenv@^0.1.4:
   version "0.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
 p-limit@^1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
 
 p-locate@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   dependencies:
     p-limit "^1.1.0"
 
 package-hash@^1.2.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
+  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
   dependencies:
     md5-hex "^1.3.0"
 
 package-hash@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/package-hash/-/package-hash-2.0.0.tgz#78ae326c89e05a4d813b68601977af05c00d2a0d"
+  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-2.0.0.tgz#78ae326c89e05a4d813b68601977af05c00d2a0d"
   dependencies:
     graceful-fs "^4.1.11"
     lodash.flattendeep "^4.4.0"
@@ -4462,7 +4462,7 @@ package-hash@^2.0.0:
 
 package-json@^4.0.0:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  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"
@@ -4471,17 +4471,17 @@ package-json@^4.0.0:
 
 pako@~0.2.0:
   version "0.2.9"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
 
 param-case@2.1.x:
   version "2.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   dependencies:
     no-case "^2.2.0"
 
 parse-asn1@^5.0.0:
   version "5.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -4491,7 +4491,7 @@ parse-asn1@^5.0.0:
 
 parse-glob@^3.0.4:
   version "3.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -4500,69 +4500,69 @@ parse-glob@^3.0.4:
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
   dependencies:
     error-ex "^1.2.0"
 
 parse-ms@^0.1.0:
   version "0.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-ms/-/parse-ms-0.1.2.tgz#dd3fa25ed6c2efc7bdde12ad9b46c163aa29224e"
+  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-0.1.2.tgz#dd3fa25ed6c2efc7bdde12ad9b46c163aa29224e"
 
 parse-ms@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
+  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
 
 parse5@^3.0.2:
   version "3.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
   dependencies:
     "@types/node" "^6.0.46"
 
 parseurl@~1.3.1:
   version "1.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
 
 path-browserify@0.0.0:
   version "0.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
 path-is-inside@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
 path-key@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
 
 path-key@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
 path-parse@^1.0.5:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -4570,13 +4570,13 @@ path-type@^1.0.0:
 
 path-type@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
   dependencies:
     pify "^2.0.0"
 
 pbkdf2@^3.0.3:
   version "3.0.12"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -4586,80 +4586,80 @@ pbkdf2@^3.0.3:
 
 performance-now@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
 pify@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
 pinkie-promise@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
   dependencies:
     pinkie "^1.0.0"
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie/-/pinkie-1.0.0.tgz#5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-1.0.0.tgz#5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
 pkg-conf@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279"
+  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279"
   dependencies:
     find-up "^2.0.0"
     load-json-file "^2.0.0"
 
 pkg-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
   dependencies:
     find-up "^1.0.0"
 
 pkg-dir@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
   dependencies:
     find-up "^2.1.0"
 
 plur@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
+  resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
 
 plur@^2.0.0:
   version "2.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
+  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
   dependencies:
     irregular-plurals "^1.0.0"
 
 pluralize@^1.2.1:
   version "1.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
 
 pn@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pn/-/pn-1.0.0.tgz#1cf5a30b0d806cd18f88fc41a6b5d4ad615b3ba9"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.0.0.tgz#1cf5a30b0d806cd18f88fc41a6b5d4ad615b3ba9"
 
 post-compile-webpack-plugin@^0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/post-compile-webpack-plugin/-/post-compile-webpack-plugin-0.1.1.tgz#1b1a0eea890ce748556ca49e066a48c900e0b370"
+  resolved "https://registry.yarnpkg.com/post-compile-webpack-plugin/-/post-compile-webpack-plugin-0.1.1.tgz#1b1a0eea890ce748556ca49e066a48c900e0b370"
 
 postcss-calc@^5.2.0:
   version "5.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
   dependencies:
     postcss "^5.0.2"
     postcss-message-helpers "^2.0.0"
@@ -4667,7 +4667,7 @@ postcss-calc@^5.2.0:
 
 postcss-colormin@^2.1.8:
   version "2.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
   dependencies:
     colormin "^1.0.5"
     postcss "^5.0.13"
@@ -4675,52 +4675,52 @@ postcss-colormin@^2.1.8:
 
 postcss-convert-values@^2.3.4:
   version "2.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
   dependencies:
     postcss "^5.0.11"
     postcss-value-parser "^3.1.2"
 
 postcss-discard-comments@^2.0.4:
   version "2.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-duplicates@^2.0.1:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
   dependencies:
     postcss "^5.0.4"
 
 postcss-discard-empty@^2.0.1:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-overridden@^0.1.1:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
   dependencies:
     postcss "^5.0.16"
 
 postcss-discard-unused@^2.2.1:
   version "2.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
   dependencies:
     postcss "^5.0.14"
     uniqs "^2.0.0"
 
 postcss-filter-plugins@^2.0.0:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
   dependencies:
     postcss "^5.0.4"
     uniqid "^4.0.0"
 
 postcss-load-config@^1.1.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
@@ -4729,21 +4729,21 @@ postcss-load-config@^1.1.0:
 
 postcss-load-options@^1.2.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
 
 postcss-load-plugins@^2.3.0:
   version "2.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
   dependencies:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
 
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
   dependencies:
     has "^1.0.1"
     postcss "^5.0.10"
@@ -4751,13 +4751,13 @@ postcss-merge-idents@^2.1.5:
 
 postcss-merge-longhand@^2.0.1:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
   dependencies:
     postcss "^5.0.4"
 
 postcss-merge-rules@^2.0.3:
   version "2.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
   dependencies:
     browserslist "^1.5.2"
     caniuse-api "^1.5.2"
@@ -4767,11 +4767,11 @@ postcss-merge-rules@^2.0.3:
 
 postcss-message-helpers@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
 
 postcss-minify-font-values@^1.0.2:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
   dependencies:
     object-assign "^4.0.1"
     postcss "^5.0.4"
@@ -4779,14 +4779,14 @@ postcss-minify-font-values@^1.0.2:
 
 postcss-minify-gradients@^1.0.1:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
   dependencies:
     postcss "^5.0.12"
     postcss-value-parser "^3.3.0"
 
 postcss-minify-params@^1.0.4:
   version "1.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.2"
@@ -4795,7 +4795,7 @@ postcss-minify-params@^1.0.4:
 
 postcss-minify-selectors@^2.0.4:
   version "2.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
   dependencies:
     alphanum-sort "^1.0.2"
     has "^1.0.1"
@@ -4804,40 +4804,40 @@ postcss-minify-selectors@^2.0.4:
 
 postcss-modules-extract-imports@^1.0.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
   dependencies:
     postcss "^6.0.1"
 
 postcss-modules-local-by-default@^1.0.1:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
 postcss-modules-scope@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
 postcss-modules-values@^1.1.0:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
   dependencies:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
 
 postcss-normalize-charset@^1.1.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
   dependencies:
     postcss "^5.0.5"
 
 postcss-normalize-url@^3.0.7:
   version "3.0.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
   dependencies:
     is-absolute-url "^2.0.0"
     normalize-url "^1.4.0"
@@ -4846,27 +4846,27 @@ postcss-normalize-url@^3.0.7:
 
 postcss-ordered-values@^2.1.0:
   version "2.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.1"
 
 postcss-reduce-idents@^2.2.2:
   version "2.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.2"
 
 postcss-reduce-initial@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
   dependencies:
     postcss "^5.0.4"
 
 postcss-reduce-transforms@^1.0.3:
   version "1.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
   dependencies:
     has "^1.0.1"
     postcss "^5.0.8"
@@ -4874,7 +4874,7 @@ postcss-reduce-transforms@^1.0.3:
 
 postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
   version "2.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
   dependencies:
     flatten "^1.0.2"
     indexes-of "^1.0.1"
@@ -4882,7 +4882,7 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
 
 postcss-svgo@^2.1.1:
   version "2.1.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
   dependencies:
     is-svg "^2.0.0"
     postcss "^5.0.14"
@@ -4891,7 +4891,7 @@ postcss-svgo@^2.1.1:
 
 postcss-unique-selectors@^2.0.2:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.4"
@@ -4899,11 +4899,11 @@ postcss-unique-selectors@^2.0.2:
 
 postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
 postcss-zindex@^2.0.1:
   version "2.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
   dependencies:
     has "^1.0.1"
     postcss "^5.0.4"
@@ -4911,7 +4911,7 @@ postcss-zindex@^2.0.1:
 
 postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.17"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
@@ -4920,7 +4920,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
 
 postcss@^6.0.1:
   version "6.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
   dependencies:
     chalk "^1.1.3"
     source-map "^0.5.6"
@@ -4928,44 +4928,44 @@ postcss@^6.0.1:
 
 preload-webpack-plugin@^1.2.2:
   version "1.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/preload-webpack-plugin/-/preload-webpack-plugin-1.2.2.tgz#d1b6f0eab3c2d0bb4c249d409cf6b7a8b0a415dd"
+  resolved "https://registry.yarnpkg.com/preload-webpack-plugin/-/preload-webpack-plugin-1.2.2.tgz#d1b6f0eab3c2d0bb4c249d409cf6b7a8b0a415dd"
   dependencies:
     object-assign "^4.1.1"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
 prepend-http@^1.0.0, prepend-http@^1.0.1:
   version "1.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
 preserve@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 pretty-error@^2.0.2:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-error/-/pretty-error-2.1.0.tgz#87f4e9d706a24c87d6cbee9fabec001fcf8c75d8"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.0.tgz#87f4e9d706a24c87d6cbee9fabec001fcf8c75d8"
   dependencies:
     renderkid "^2.0.1"
     utila "~0.4"
 
 pretty-format@^19.0.0:
   version "19.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84"
   dependencies:
     ansi-styles "^3.0.0"
 
 pretty-ms@^0.2.1:
   version "0.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-ms/-/pretty-ms-0.2.2.tgz#da879a682ff33a37011046f13d627f67c73b84f6"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-0.2.2.tgz#da879a682ff33a37011046f13d627f67c73b84f6"
   dependencies:
     parse-ms "^0.1.0"
 
 pretty-ms@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pretty-ms/-/pretty-ms-2.1.0.tgz#4257c256df3fb0b451d6affaab021884126981dc"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-2.1.0.tgz#4257c256df3fb0b451d6affaab021884126981dc"
   dependencies:
     is-finite "^1.0.1"
     parse-ms "^1.0.0"
@@ -4973,19 +4973,19 @@ pretty-ms@^2.0.0:
 
 private@^0.1.6:
   version "0.1.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
 process@^0.11.0:
   version "0.11.10"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
 progress-bar-webpack-plugin@^1.9.3:
   version "1.9.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz#81fb8bd8e38da6edaf9a20beed79bd978dd63c2a"
+  resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz#81fb8bd8e38da6edaf9a20beed79bd978dd63c2a"
   dependencies:
     chalk "^1.1.1"
     object.assign "^4.0.1"
@@ -4993,30 +4993,30 @@ progress-bar-webpack-plugin@^1.9.3:
 
 progress@^1.1.8:
   version "1.1.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
 
 proto-list@~1.2.1:
   version "1.2.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
 
 proxy-addr@~1.1.4:
   version "1.1.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
   dependencies:
     forwarded "~0.1.0"
     ipaddr.js "1.3.0"
 
 prr@~0.0.0:
   version "0.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
 pseudomap@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
 public-encrypt@^4.0.0:
   version "4.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -5026,59 +5026,59 @@ public-encrypt@^4.0.0:
 
 punycode@1.3.2:
   version "1.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 q@^1.1.2:
   version "1.5.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
 qs@6.4.0, qs@~6.4.0:
   version "6.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 qs@~6.3.0:
   version "6.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
 query-string@^4.1.0:
   version "4.3.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
   dependencies:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
 querystring-es3@^0.2.0:
   version "0.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
 querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
 randomatic@^1.1.3:
   version "1.1.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
   dependencies:
     is-number "^2.0.2"
     kind-of "^3.0.2"
 
 randombytes@^2.0.0, randombytes@^2.0.1:
   version "2.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/randombytes/-/randombytes-2.0.4.tgz#9551df208422c8f80eb58e2326dd0b840ff22efd"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.4.tgz#9551df208422c8f80eb58e2326dd0b840ff22efd"
   dependencies:
     safe-buffer "^5.0.1"
 
 range-parser@^1.0.3, range-parser@~1.2.0:
   version "1.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
   version "1.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -5087,21 +5087,21 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
 read-pkg-up@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -5109,7 +5109,7 @@ read-pkg@^1.0.0:
 
 read-pkg@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -5117,7 +5117,7 @@ read-pkg@^2.0.0:
 
 readable-stream@1.0:
   version "1.0.34"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -5126,7 +5126,7 @@ readable-stream@1.0:
 
 readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
   version "2.2.10"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/readable-stream/-/readable-stream-2.2.10.tgz#effe72bb7c884c0dd335e2379d526196d9d011ee"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.10.tgz#effe72bb7c884c0dd335e2379d526196d9d011ee"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -5138,7 +5138,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
 
 readdirp@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -5147,7 +5147,7 @@ readdirp@^2.0.0:
 
 readline2@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  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"
@@ -5155,20 +5155,20 @@ readline2@^1.0.1:
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
 reduce-css-calc@^1.2.6:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
   dependencies:
     balanced-match "^0.4.2"
     math-expression-evaluator "^1.2.14"
@@ -5176,21 +5176,21 @@ reduce-css-calc@^1.2.6:
 
 reduce-function-call@^1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
   dependencies:
     balanced-match "^0.4.2"
 
 regenerate@^1.2.1:
   version "1.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
 regenerator-runtime@^0.10.0:
   version "0.10.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
 regenerator-transform@0.9.11:
   version "0.9.11"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
   dependencies:
     babel-runtime "^6.18.0"
     babel-types "^6.19.0"
@@ -5198,14 +5198,14 @@ regenerator-transform@0.9.11:
 
 regex-cache@^0.4.2:
   version "0.4.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
   dependencies:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
 
 regexpu-core@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -5213,7 +5213,7 @@ regexpu-core@^1.0.0:
 
 regexpu-core@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -5221,44 +5221,44 @@ regexpu-core@^2.0.0:
 
 registry-auth-token@^3.0.1:
   version "3.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
 
 registry-url@^3.0.3:
   version "3.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
   dependencies:
     rc "^1.0.1"
 
 regjsgen@^0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
 
 regjsparser@^0.1.4:
   version "0.1.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
   dependencies:
     jsesc "~0.5.0"
 
 relateurl@0.2.x:
   version "0.2.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
 release-zalgo@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
+  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
   dependencies:
     es6-error "^4.0.1"
 
 remove-trailing-separator@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
 
 renderkid@^2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
   dependencies:
     css-select "^1.1.0"
     dom-converter "~0.1"
@@ -5268,27 +5268,27 @@ renderkid@^2.0.1:
 
 repeat-element@^1.1.2:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
 repeat-string@^1.5.2:
   version "1.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
 repeating@^2.0.0:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
   dependencies:
     is-finite "^1.0.0"
 
 request-promise-core@1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
   dependencies:
     lodash "^4.13.1"
 
 request-promise-native@^1.0.3, request-promise-native@^1.0.4:
   version "1.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/request-promise-native/-/request-promise-native-1.0.4.tgz#86988ec8eee408e45579fce83bfd05b3adf9a155"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.4.tgz#86988ec8eee408e45579fce83bfd05b3adf9a155"
   dependencies:
     request-promise-core "1.1.1"
     stealthy-require "^1.1.0"
@@ -5296,7 +5296,7 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.4:
 
 request@2.79.0:
   version "2.79.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -5321,7 +5321,7 @@ request@2.79.0:
 
 request@^2.79.0, request@^2.81.0:
   version "2.81.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -5348,135 +5348,135 @@ request@^2.79.0, request@^2.81.0:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
 require-from-string@^1.1.0:
   version "1.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
 
 require-main-filename@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
 require-precompiled@^0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
+  resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
 
 require-uncached@^1.0.2:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
   dependencies:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
 resolve-cwd@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-cwd/-/resolve-cwd-1.0.0.tgz#4eaeea41ed040d1702457df64a42b2b07d246f9f"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-1.0.0.tgz#4eaeea41ed040d1702457df64a42b2b07d246f9f"
   dependencies:
     resolve-from "^2.0.0"
 
 resolve-from@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
 resolve-from@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
 resolve-from@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
 resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.3:
   version "1.3.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   dependencies:
     path-parse "^1.0.5"
 
 restore-cursor@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
   dependencies:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
 right-align@^0.1.1:
   version "0.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
   dependencies:
     align-text "^0.1.1"
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
     glob "^7.0.5"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
   dependencies:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
 run-async@^0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
   dependencies:
     once "^1.3.0"
 
 run-async@^2.2.0:
   version "2.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
   dependencies:
     is-promise "^2.1.0"
 
 rx-lite@^3.1.2:
   version "3.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
 rx@^4.1.0:
   version "4.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
 safe-buffer@^5.0.1:
   version "5.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
 
 safe-buffer@~5.0.1:
   version "5.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
 sax@^1.2.1, sax@~1.2.1:
   version "1.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
 script-ext-html-webpack-plugin@^1.8.1:
   version "1.8.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195"
+  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195"
   dependencies:
     debug "^2.6.3"
 
 semver-diff@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  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.3.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
   version "5.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
 send@0.15.3:
   version "0.15.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/send/-/send-0.15.3.tgz#5013f9f99023df50d1bd9892c19e3defd1d53309"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.15.3.tgz#5013f9f99023df50d1bd9892c19e3defd1d53309"
   dependencies:
     debug "2.6.7"
     depd "~1.1.0"
@@ -5494,11 +5494,11 @@ send@0.15.3:
 
 serialize-javascript@^1.3.0:
   version "1.3.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
 
 serve-static@1.12.3, serve-static@^1.12.3:
   version "1.12.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
   dependencies:
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
@@ -5507,29 +5507,29 @@ serve-static@1.12.3, serve-static@^1.12.3:
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
 set-immediate-shim@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
 setimmediate@^1.0.4:
   version "1.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
 setprototypeof@1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  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.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
   dependencies:
     inherits "^2.0.1"
 
 shelljs@^0.7.5:
   version "0.7.7"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -5537,69 +5537,69 @@ shelljs@^0.7.5:
 
 sigmund@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
 
 signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
   version "3.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
 slash@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
 slice-ansi@0.0.4:
   version "0.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
 slide@^1.1.5:
   version "1.1.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
 sntp@1.x.x:
   version "1.0.9"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
   dependencies:
     hoek "2.x.x"
 
 sort-keys@^1.0.0, sort-keys@^1.1.1, sort-keys@^1.1.2:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-list-map@^0.1.7, source-list-map@~0.1.7:
   version "0.1.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
 source-list-map@^1.1.1:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
 
 source-map-support@^0.4.0, source-map-support@^0.4.2:
   version "0.4.15"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
     source-map "^0.5.6"
 
 source-map@0.5.6, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
 source-map@^0.4.4:
   version "0.4.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@~0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
   dependencies:
     amdefine ">=0.0.4"
 
 spawn-wrap@^1.3.6:
   version "1.3.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/spawn-wrap/-/spawn-wrap-1.3.6.tgz#ccec4a949d8ce7e2b1a35cf4671d683d2e76a1d1"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.6.tgz#ccec4a949d8ce7e2b1a35cf4671d683d2e76a1d1"
   dependencies:
     foreground-child "^1.5.6"
     mkdirp "^0.5.0"
@@ -5610,25 +5610,25 @@ spawn-wrap@^1.3.6:
 
 spdx-correct@~1.0.0:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
   dependencies:
     spdx-license-ids "^1.0.2"
 
 spdx-expression-parse@~1.0.0:
   version "1.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
 
 spdx-license-ids@^1.0.2:
   version "1.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
   version "1.13.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -5643,36 +5643,36 @@ sshpk@^1.7.0:
 
 stack-utils@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
 stackframe@^1.0.3:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/stackframe/-/stackframe-1.0.3.tgz#fe64ab20b170e4ce49044b126c119dfa0e5dc7cc"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.3.tgz#fe64ab20b170e4ce49044b126c119dfa0e5dc7cc"
 
 "statuses@>= 1.3.1 < 2", statuses@~1.3.1:
   version "1.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
 std-mocks@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/std-mocks/-/std-mocks-1.0.1.tgz#d3388876d7beeba3c70fbd8e2bcaf46eb07d79fe"
+  resolved "https://registry.yarnpkg.com/std-mocks/-/std-mocks-1.0.1.tgz#d3388876d7beeba3c70fbd8e2bcaf46eb07d79fe"
   dependencies:
     lodash "^4.11.1"
 
 stealthy-require@^1.1.0:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
 stream-browserify@^2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
 stream-http@^2.3.1:
   version "2.7.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/stream-http/-/stream-http-2.7.1.tgz#546a51741ad5a6b07e9e31b0b10441a917df528a"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.1.tgz#546a51741ad5a6b07e9e31b0b10441a917df528a"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -5682,17 +5682,17 @@ stream-http@^2.3.1:
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
 string-length@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
   dependencies:
     strip-ansi "^3.0.0"
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -5700,78 +5700,78 @@ string-width@^1.0.1, string-width@^1.0.2:
 
 string-width@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
 string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
 string_decoder@~1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/string_decoder/-/string_decoder-1.0.1.tgz#62e200f039955a6810d8df0a33ffc0f013662d98"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.1.tgz#62e200f039955a6810d8df0a33ffc0f013662d98"
   dependencies:
     safe-buffer "^5.0.1"
 
 stringstream@~0.0.4:
   version "0.0.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@~0.1.0:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
 
 strip-bom-buf@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
+  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
   dependencies:
     is-utf8 "^0.2.1"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
 strip-eof@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
 strip-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
   dependencies:
     get-stdin "^4.0.1"
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
 supports-color@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
 supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
 svgo@^0.7.0:
   version "0.7.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
   dependencies:
     coa "~1.0.1"
     colors "~1.1.2"
@@ -5783,19 +5783,19 @@ svgo@^0.7.0:
 
 symbol-observable@^0.2.2:
   version "0.2.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
 symbol-observable@^1.0.4:
   version "1.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
 symbol-tree@^3.2.1:
   version "3.2.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
 table@^3.7.8:
   version "3.8.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
   dependencies:
     ajv "^4.7.0"
     ajv-keywords "^1.0.0"
@@ -5806,11 +5806,11 @@ table@^3.7.8:
 
 tapable@^0.2.5, tapable@~0.2.5:
   version "0.2.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
 
 tar-pack@^3.4.0:
   version "3.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
   dependencies:
     debug "^2.2.0"
     fstream "^1.0.10"
@@ -5823,7 +5823,7 @@ tar-pack@^3.4.0:
 
 tar@^2.2.1:
   version "2.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
@@ -5831,13 +5831,13 @@ tar@^2.2.1:
 
 term-size@^0.1.0:
   version "0.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
   dependencies:
     execa "^0.4.0"
 
 test-exclude@^4.1.1:
   version "4.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -5847,22 +5847,22 @@ test-exclude@^4.1.1:
 
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
 through2@^2.0.0:
   version "2.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
 through@^2.3.6:
   version "2.3.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
 time-require@^0.1.2:
   version "0.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
+  resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
   dependencies:
     chalk "^0.4.0"
     date-time "^0.1.1"
@@ -5871,99 +5871,99 @@ time-require@^0.1.2:
 
 timed-out@^4.0.0:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
 
 timers-browserify@^2.0.2:
   version "2.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
   dependencies:
     setimmediate "^1.0.4"
 
 tmp@^0.0.31:
   version "0.0.31"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
   dependencies:
     os-tmpdir "~1.0.1"
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
 to-fast-properties@^1.0.1:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
 toposort@^1.0.0:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
 
 tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
   version "2.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
     punycode "^1.4.1"
 
 tr46@~0.0.3:
   version "0.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
 trim-newlines@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
 trim-right@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
 tryit@^1.0.1:
   version "1.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
+  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
 
 tty-browserify@0.0.0:
   version "0.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   dependencies:
     safe-buffer "^5.0.1"
 
 tunnel-agent@~0.4.1:
   version "0.4.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
 type-check@~0.3.2:
   version "0.3.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
   dependencies:
     prelude-ls "~1.1.2"
 
 type-is@~1.6.15:
   version "1.6.15"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 uglify-js@3.0.x:
   version "3.0.15"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
   dependencies:
     commander "~2.9.0"
     source-map "~0.5.1"
 
 uglify-js@^2.6, uglify-js@^2.8.27:
   version "2.8.28"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -5972,43 +5972,43 @@ uglify-js@^2.6, uglify-js@^2.8.27:
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
 uid-number@^0.0.6:
   version "0.0.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
 uid2@0.0.3:
   version "0.0.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
+  resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
 
 ultron@~1.1.0:
   version "1.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
 
 uniq@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
 
 uniqid@^4.0.0:
   version "4.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
   dependencies:
     macaddress "^0.2.8"
 
 uniqs@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
 unique-string@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
   dependencies:
     crypto-random-string "^1.0.0"
 
 unique-temp-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385"
+  resolved "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385"
   dependencies:
     mkdirp "^0.5.1"
     os-tmpdir "^1.0.1"
@@ -6016,19 +6016,19 @@ unique-temp-dir@^1.0.0:
 
 universalify@^0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
 
 unpipe@~1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
 unzip-response@^2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 update-notifier@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
   dependencies:
     boxen "^1.0.0"
     chalk "^1.0.0"
@@ -6041,98 +6041,98 @@ update-notifier@^2.1.0:
 
 upper-case@^1.1.1:
   version "1.1.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
 url-loader@^0.5.8:
   version "0.5.8"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
   dependencies:
     loader-utils "^1.0.2"
     mime "1.3.x"
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  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:
   version "0.11.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
 
 urlgrey@0.4.4:
   version "0.4.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
+  resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
 
 user-home@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
   dependencies:
     os-homedir "^1.0.0"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
 util@0.10.3, util@^0.10.3:
   version "0.10.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
     inherits "2.0.1"
 
 utila@~0.3:
   version "0.3.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
 
 utila@~0.4:
   version "0.4.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
 
 utils-merge@1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
 uuid@^3.0.0:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
   dependencies:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
 vary@~1.1.0, vary@~1.1.1:
   version "1.1.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
 
 vendors@^1.0.0:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
 
 verror@1.3.6:
   version "1.3.6"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
   dependencies:
     extsprintf "1.0.2"
 
 vm-browserify@0.0.4:
   version "0.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
     indexof "0.0.1"
 
 vue-hot-reload-api@^2.1.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
+  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
 
 vue-loader@^12.2.1:
   version "12.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-loader/-/vue-loader-12.2.1.tgz#53f27c0973d386768f5a75156f4129b5efc6ba55"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-12.2.1.tgz#53f27c0973d386768f5a75156f4129b5efc6ba55"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -6150,7 +6150,7 @@ vue-loader@^12.2.1:
 
 vue-meta@^1.0.4:
   version "1.0.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-meta/-/vue-meta-1.0.4.tgz#17608970aa02f6346829845eb8a05b2d5bf485c3"
+  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-1.0.4.tgz#17608970aa02f6346829845eb8a05b2d5bf485c3"
   dependencies:
     deepmerge "^1.3.2"
     lodash.isplainobject "^4.0.6"
@@ -6158,11 +6158,11 @@ vue-meta@^1.0.4:
 
 vue-router@^2.5.3:
   version "2.5.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-router/-/vue-router-2.5.3.tgz#073783f564b6aece6c8a59c63e298dc2aabfb51b"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.5.3.tgz#073783f564b6aece6c8a59c63e298dc2aabfb51b"
 
 vue-server-renderer@~2.3.3:
   version "2.3.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-server-renderer/-/vue-server-renderer-2.3.3.tgz#1f450f8a4541b9dd3b084d6470939f82781c3e0a"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.3.tgz#1f450f8a4541b9dd3b084d6470939f82781c3e0a"
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -6175,39 +6175,39 @@ vue-server-renderer@~2.3.3:
 
 vue-ssr-html-stream@^2.2.0:
   version "2.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-ssr-html-stream/-/vue-ssr-html-stream-2.2.0.tgz#56d78b96c9c172b43749a324c156e888aca96d92"
+  resolved "https://registry.yarnpkg.com/vue-ssr-html-stream/-/vue-ssr-html-stream-2.2.0.tgz#56d78b96c9c172b43749a324c156e888aca96d92"
   dependencies:
     serialize-javascript "^1.3.0"
 
 vue-style-loader@^3.0.0:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
+  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
   dependencies:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
 vue-template-compiler@~2.3.3:
   version "2.3.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz#b5bab9ec57309c906b82a78c81a02179dbc2f470"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz#b5bab9ec57309c906b82a78c81a02179dbc2f470"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
 
 vue-template-es2015-compiler@^1.2.2:
   version "1.5.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
+  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
 
 vue@~2.3.3:
   version "2.3.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vue/-/vue-2.3.3.tgz#d1eaa8fde5240735a4563e74f2c7fead9cbb064c"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.3.tgz#d1eaa8fde5240735a4563e74f2c7fead9cbb064c"
 
 vuex@^2.3.1:
   version "2.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/vuex/-/vuex-2.3.1.tgz#cde8e997c1f9957719bc7dea154f9aa691d981a6"
+  resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.3.1.tgz#cde8e997c1f9957719bc7dea154f9aa691d981a6"
 
 watchpack@^1.3.1:
   version "1.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
   dependencies:
     async "^2.1.2"
     chokidar "^1.4.3"
@@ -6215,15 +6215,15 @@ watchpack@^1.3.1:
 
 webidl-conversions@^3.0.0:
   version "3.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
 
 webidl-conversions@^4.0.0:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
 
 webpack-bundle-analyzer@^2.8.2:
   version "2.8.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8"
   dependencies:
     acorn "^5.0.3"
     chalk "^1.1.3"
@@ -6239,7 +6239,7 @@ webpack-bundle-analyzer@^2.8.2:
 
 webpack-dev-middleware@^1.10.2:
   version "1.10.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
   dependencies:
     memory-fs "~0.4.1"
     mime "^1.3.4"
@@ -6248,7 +6248,7 @@ webpack-dev-middleware@^1.10.2:
 
 webpack-hot-middleware@^2.18.0:
   version "2.18.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
@@ -6257,25 +6257,25 @@ webpack-hot-middleware@^2.18.0:
 
 webpack-node-externals@^1.6.0:
   version "1.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
+  resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
 
 webpack-sources@^0.1.0:
   version "0.1.5"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.5.3"
 
 webpack-sources@^0.2.3:
   version "0.2.3"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
   dependencies:
     source-list-map "^1.1.1"
     source-map "~0.5.3"
 
 webpack@^2.6.1:
   version "2.6.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -6301,73 +6301,73 @@ webpack@^2.6.1:
 
 whatwg-encoding@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
   dependencies:
     iconv-lite "0.4.13"
 
 whatwg-url@^4.3.0:
   version "4.8.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
 whet.extend@~0.9.9:
   version "0.9.9"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
 which-module@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
 which-module@^2.0.0:
   version "2.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
 which@^1.2.4, which@^1.2.8, which@^1.2.9:
   version "1.2.14"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
   dependencies:
     string-width "^1.0.2"
 
 widest-line@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
   dependencies:
     string-width "^1.0.1"
 
 window-size@0.1.0:
   version "0.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
 wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
 wordwrap@~1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
 write-file-atomic@^1.1.4:
   version "1.3.4"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -6375,7 +6375,7 @@ write-file-atomic@^1.1.4:
 
 write-file-atomic@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37"
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -6383,7 +6383,7 @@ write-file-atomic@^2.0.0:
 
 write-json-file@^2.0.0:
   version "2.2.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
   dependencies:
     detect-indent "^5.0.0"
     graceful-fs "^4.1.2"
@@ -6394,69 +6394,69 @@ write-json-file@^2.0.0:
 
 write-pkg@^2.0.0:
   version "2.1.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/write-pkg/-/write-pkg-2.1.0.tgz#353aa44c39c48c21440f5c08ce6abd46141c9c08"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-2.1.0.tgz#353aa44c39c48c21440f5c08ce6abd46141c9c08"
   dependencies:
     sort-keys "^1.1.2"
     write-json-file "^2.0.0"
 
 write@^0.2.1:
   version "0.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
   dependencies:
     mkdirp "^0.5.1"
 
 ws@^2.3.1:
   version "2.3.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80"
   dependencies:
     safe-buffer "~5.0.1"
     ultron "~1.1.0"
 
 xdg-basedir@^3.0.0:
   version "3.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
 xml-char-classes@^1.0.0:
   version "1.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
+  resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
 
 xml-name-validator@^2.0.1:
   version "2.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
 y18n@^3.2.1:
   version "3.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
 yallist@^2.0.0:
   version "2.1.2"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
 yargs-parser@^4.2.0:
   version "4.2.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
   dependencies:
     camelcase "^4.1.0"
 
 yargs@^6.0.0:
   version "6.6.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -6474,7 +6474,7 @@ yargs@^6.0.0:
 
 yargs@^8.0.1:
   version "8.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs/-/yargs-8.0.1.tgz#420ef75e840c1457a80adcca9bc6fa3849de51aa"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.1.tgz#420ef75e840c1457a80adcca9bc6fa3849de51aa"
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -6492,7 +6492,7 @@ yargs@^8.0.1:
 
 yargs@~3.10.0:
   version "3.10.0"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
   dependencies:
     camelcase "^1.0.2"
     cliui "^2.1.0"

From 092d9cd0abef88eea4e26836c05eeee4f2f50c8c Mon Sep 17 00:00:00 2001
From: Dmitri Efimenko <ezheg89@gmail.com>
Date: Wed, 7 Jun 2017 19:05:02 +0300
Subject: [PATCH 009/236] Fix server build.extend context

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

diff --git a/lib/webpack/server.config.js b/lib/webpack/server.config.js
index b58b80dcfe..e1ba11ccc5 100644
--- a/lib/webpack/server.config.js
+++ b/lib/webpack/server.config.js
@@ -63,7 +63,7 @@ export default function () {
 
   // Extend config
   if (typeof this.options.build.extend === 'function') {
-    this.options.build.extend(config, {
+    this.options.build.extend.call(this, config, {
       dev: this.dev,
       isServer: true
     })

From 92951853fc001a32779d2edcb3fb0a2435d5f220 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Fri, 9 Jun 2017 13:44:07 +0200
Subject: [PATCH 010/236] Add error in plugins context

---
 lib/app/index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index 0b556cdf82..4972dea315 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -103,8 +103,9 @@ async function createApp (ssrContext) {
         if (typeof err === 'string') {
           err = { statusCode: 500, message: err }
         }
-        this.$options._nuxt.dateErr = Date.now()
-        this.$options._nuxt.err = err;
+        const _nuxt = this._nuxt || this.$options._nuxt
+        _nuxt.dateErr = Date.now()
+        _nuxt.err = err
         return err
       }
     },
@@ -117,11 +118,11 @@ async function createApp (ssrContext) {
     isClient: !ssrContext,
     route: router.currentRoute,
     next,
+    error: app._nuxt.error.bind(app),
     <%= (store ? 'store,' : '') %>
     req: ssrContext ? ssrContext.req : undefined,
     res: ssrContext ? ssrContext.res : undefined,
   }, app)
-  delete ctx.error
 
   // Inject external plugins
   <% plugins.forEach(function (plugin) {

From affcb9d58ea091b99060e08c8e7aa7ba1e57d61e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sat, 10 Jun 2017 23:10:14 +0430
Subject: [PATCH 011/236] fix: show localhost instead of 0.0.0.0 in Open URL

fixes potential problems after merging #865
---
 lib/build.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/build.js b/lib/build.js
index 968feee155..8de61eb9d8 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -427,8 +427,9 @@ function getWebpackServerConfig () {
 
 function createWebpackMiddleware () {
   const clientConfig = getWebpackClientConfig.call(this)
-  const host = process.env.HOST || process.env.npm_package_config_nuxt_host || '127.0.0.1'
+  const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
   const port = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
+
   // setup on the fly compilation + hot-reload
   clientConfig.entry.app = _.flatten(['webpack-hot-middleware/client?reload=true', clientConfig.entry.app])
   clientConfig.plugins.push(
@@ -436,7 +437,10 @@ function createWebpackMiddleware () {
     new webpack.NoEmitOnErrorsPlugin(),
     new PostCompilePlugin(stats => {
       if (!stats.hasErrors() && !stats.hasWarnings()) {
-        console.log(`> Open http://${host}:${port}\n`) // eslint-disable-line no-console
+        // We don't use os.host() here because browsers have special behaviour with localhost
+        // For example chrome allows Geolocation api only to https or localhost origins
+        let _host = host==='0.0.0.0' ? 'localhost' : host
+        console.log(`> Open http://${_host}:${port}\n`) // eslint-disable-line no-console
       }
     })
   )

From c08801cf53209c22e1526bf1aee70c4e7abd993a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sat, 10 Jun 2017 23:12:13 +0430
Subject: [PATCH 012/236] eslint

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

diff --git a/lib/build.js b/lib/build.js
index 8de61eb9d8..36b2cf5286 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -439,7 +439,7 @@ function createWebpackMiddleware () {
       if (!stats.hasErrors() && !stats.hasWarnings()) {
         // We don't use os.host() here because browsers have special behaviour with localhost
         // For example chrome allows Geolocation api only to https or localhost origins
-        let _host = host==='0.0.0.0' ? 'localhost' : host
+        let _host = host === '0.0.0.0' ? 'localhost' : host
         console.log(`> Open http://${_host}:${port}\n`) // eslint-disable-line no-console
       }
     })

From 52377645733981de56cfcb07db67d05834fdc09b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 11 Jun 2017 18:03:47 +0430
Subject: [PATCH 013/236] add tapable dependency

---
 package.json | 1 +
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1c540b6ce2..472d26ff40 100644
--- a/package.json
+++ b/package.json
@@ -89,6 +89,7 @@
     "script-ext-html-webpack-plugin": "^1.8.1",
     "serialize-javascript": "^1.3.0",
     "serve-static": "^1.12.3",
+    "tapable": "^0.2.6",
     "url-loader": "^0.5.8",
     "vue": "~2.3.3",
     "vue-loader": "^12.2.1",
diff --git a/yarn.lock b/yarn.lock
index a639c1bbe3..47332ff848 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5804,7 +5804,7 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-tapable@^0.2.5, tapable@~0.2.5:
+tapable@^0.2.5, tapable@^0.2.6, tapable@~0.2.5:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
 

From c9313572bdf4ccce4fe845645f7e97aa90607d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 15:48:20 +0200
Subject: [PATCH 014/236] Refactor nuxt commands using minimist

---
 bin/nuxt-build    |  84 +++----
 bin/nuxt-dev      |  58 +++--
 bin/nuxt-generate |  47 +++-
 bin/nuxt-start    |  55 ++++-
 package.json      |   1 +
 yarn.lock         | 573 ++++++++++++++++++++++++----------------------
 6 files changed, 479 insertions(+), 339 deletions(-)

diff --git a/bin/nuxt-build b/bin/nuxt-build
index 1af998d2be..53b125765e 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -4,60 +4,66 @@
 process.env.DEBUG = 'nuxt:*'
 
 var fs = require('fs')
+var parseArgs = require('minimist')
 var without = require('lodash').without
 var Nuxt = require('../')
 var resolve = require('path').resolve
 
-// --analyze option
-var analyzeBuild = false
-if (process.argv.indexOf('--analyze') !== -1 || process.argv.indexOf('-a') !== -1) {
-  analyzeBuild = true
-  process.argv = without(process.argv, '--analyze', '-a')
+const argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    c: 'config-file',
+    a: 'analyze'
+  },
+  boolean: ['h', 'a'],
+  string: ['c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
+
+if (argv.help) {
+  console.log(`
+    Description
+      Compiles the application for production deployment
+    Usage
+      $ nuxt build <dir>
+    Options
+      --analyze, -a       Launch webpack-bundle-analyzer to optimize your bundles.
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
 }
 
-var nuxtConfigFileName = 'nuxt.config.js'
-
-// --config-file option
-var indexOfConfig = false
-if (process.argv.indexOf('--config-file') !== -1) {
-  indexOfConfig = process.argv.indexOf('--config-file')
-} else if (process.argv.indexOf('-c') !== -1) {
-  indexOfConfig = process.argv.indexOf('-c')
-}
-
-if (indexOfConfig !== false) {
-  nuxtConfigFileName = process.argv.slice(indexOfConfig)[1]
-  process.argv = without(process.argv, '--config-file', '-c', nuxtConfigFileName)
-}
-
-// Root directory parameter
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFilePath = resolve(rootDir, nuxtConfigFileName)
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
-if (fs.existsSync(nuxtConfigFilePath)) {
-  options = require(nuxtConfigFilePath)
-} else {
-  console.log(`Could not locate ${nuxtConfigFilePath}`) // eslint-disable-line no-console
+if (fs.existsSync(nuxtConfigFile)) {
+  options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
-
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
-options.dev = false // Create production build when calling `nuxt build`
-
+// Create production build when calling `nuxt build`
+options.dev = false
+// Analyze option
 options.build = options.build || {}
-if (analyzeBuild) {
-  options.build.analyze = analyzeBuild
+if (argv.analyze) {
+  options.build.analyze = true
 }
 
 console.log('[nuxt] Building...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
 nuxt.build()
-  .then(() => {
-    console.log('[nuxt] Building done') // eslint-disable-line no-console
-  })
-  .catch((err) => {
-    console.error(err) // eslint-disable-line no-console
-    process.exit(1)
-  })
+.then(() => {
+  console.log('[nuxt] Building done') // eslint-disable-line no-console
+})
+.catch((err) => {
+  console.error(err) // eslint-disable-line no-console
+  process.exit(1)
+})
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 4b1f733ce6..84efb2e442 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -7,41 +7,66 @@ var _ = require('lodash')
 var debug = require('debug')('nuxt:build')
 debug.color = 2 // force green color
 var fs = require('fs')
+var parseArgs = require('minimist')
 var Nuxt = require('../')
 var chokidar = require('chokidar')
 var resolve = require('path').resolve
 var without = require('lodash').without
 
-var nuxtConfigFileName = 'nuxt.config.js'
+var argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    H: 'hostname',
+    p: 'port',
+    c: 'config-file'
+  },
+  boolean: ['h'],
+  string: ['H', 'c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
 
-// --config-file option
-var indexOfConfig = false
-if (process.argv.indexOf('--config-file') !== -1) {
-  indexOfConfig = process.argv.indexOf('--config-file')
-} else if (process.argv.indexOf('-c') !== -1) {
-  indexOfConfig = process.argv.indexOf('-c')
+if (argv.hostname === '') {
+  console.error(`> Provided hostname argument has no value`)
+  process.exit(1)
 }
 
-if (indexOfConfig !== false) {
-  nuxtConfigFileName = process.argv.slice(indexOfConfig)[1]
-  process.argv = without(process.argv, '--config-file', '-c', nuxtConfigFileName)
+if (argv.help) {
+  console.log(`
+    Description
+      Starts the application in development mode (hot-code reloading, error
+      reporting, etc)
+    Usage
+      $ nuxt dev <dir> -p <port number> -H <hostname>
+    Options
+      --port, -p          A port number on which to start the application
+      --hostname, -H      Hostname on which to start the application
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
 }
 
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFile = resolve(rootDir, nuxtConfigFileName)
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
   options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
-options.dev = true // Add hot reloading and watching changes
+// Force development mode: add hot reloading and watching changes
+options.dev = true
 
 var nuxt = module.exports = new Nuxt(options)
-var port = process.env.PORT || process.env.npm_package_config_nuxt_port
-var host = process.env.HOST || process.env.npm_package_config_nuxt_host
+var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
+var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
 var server = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
 
 listenOnConfigChanges(nuxt, server)
@@ -74,7 +99,6 @@ function listenOnConfigChanges(nuxt, server) {
         process.exit(1)
       })
   }, 200)
-  var nuxtConfigFile = resolve(rootDir, nuxtConfigFileName)
-  chokidar.watch(nuxtConfigFile, Object.assign({}, nuxt.options.watchers.chokidar, {ignoreInitial: true}))
+  chokidar.watch(nuxtConfigFile, Object.assign({}, nuxt.options.watchers.chokidar, { ignoreInitial: true }))
     .on('all', build)
 }
diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index c187810fa1..771612bf38 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -4,15 +4,44 @@
 process.env.DEBUG = 'nuxt:*'
 
 var fs = require('fs')
+var parseArgs = require('minimist')
 var Nuxt = require('../')
 var resolve = require('path').resolve
 
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFile = resolve(rootDir, 'nuxt.config.js')
+var argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    c: 'config-file'
+  },
+  boolean: ['h'],
+  string: ['c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
+
+if (argv.help) {
+  console.log(`
+    Description
+      Generate a static web application (server-rendered)
+    Usage
+      $ nuxt generate <dir>
+    Options
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
+}
+
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
   options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
@@ -22,10 +51,10 @@ options.dev = false // Force production mode (no webpack middleware called)
 console.log('[nuxt] Generating...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
 nuxt.generate()
-  .then(() => {
-    console.log('[nuxt] Generate done') // eslint-disable-line no-console
-  })
-  .catch((err) => {
-    console.error(err) // eslint-disable-line no-console
-    process.exit(1)
-  })
+.then(() => {
+  console.log('[nuxt] Generate done') // eslint-disable-line no-console
+})
+.catch((err) => {
+  console.error(err) // eslint-disable-line no-console
+  process.exit(1)
+})
diff --git a/bin/nuxt-start b/bin/nuxt-start
index 8af26fbaf4..970c87d7fd 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -1,22 +1,69 @@
 #!/usr/bin/env node
 
 var fs = require('fs')
+var parseArgs = require('minimist')
 var Nuxt = require('../')
 var resolve = require('path').resolve
+var join = require('path').join
 
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFile = resolve(rootDir, 'nuxt.config.js')
+var argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    H: 'hostname',
+    p: 'port',
+    c: 'config-file'
+  },
+  boolean: ['h'],
+  string: ['H', 'c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
+
+if (argv.hostname === '') {
+  console.error(`> Provided hostname argument has no value`)
+  process.exit(1)
+}
+
+if (argv.help) {
+  console.log(`
+    Description
+      Starts the application in production mode.
+      The application should be compiled with \`nuxt build\` first.
+    Usage
+      $ nuxt start <dir> -p <port number> -H <hostname>
+    Options
+      --port, -p          A port number on which to start the application
+      --hostname, -H      Hostname on which to start the application
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
+}
+
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
   options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
 options.dev = false // Force production mode (no webpack middleware called)
 
+var buildDir = join(options.rootDir, (options.buildDir || '.nuxt'), 'dist', 'server-bundle.json')
+// Check if project is built for production
+if (!fs.existsSync(buildDir)) {
+  console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
+  process.exit(1)
+}
+
 var nuxt = module.exports = new Nuxt(options)
-var port = process.env.PORT || process.env.npm_package_config_nuxt_port
-var host = process.env.HOST || process.env.npm_package_config_nuxt_host
+var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
+var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
 var server = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
diff --git a/package.json b/package.json
index 1c540b6ce2..037bf496ee 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "html-webpack-plugin": "^2.28.0",
     "lodash": "^4.17.4",
     "memory-fs": "^0.4.1",
+    "minimist": "^1.2.0",
     "offline-plugin": "^4.8.1",
     "opencollective": "^1.0.3",
     "pify": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index a639c1bbe3..756239aa08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,14 +1,12 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 "@ava/babel-plugin-throws-helper@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
 
 "@ava/babel-preset-stage-4@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.0.0.tgz#a613b5e152f529305422546b072d47facfb26291"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.1.0.tgz#ae60be881a0babf7d35f52aba770d1f6194f76bd"
   dependencies:
     babel-plugin-check-es2015-constants "^6.8.0"
     babel-plugin-syntax-trailing-function-commas "^6.20.0"
@@ -38,8 +36,8 @@
     esutils "^2.0.2"
 
 "@types/node@^6.0.46":
-  version "6.0.77"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.77.tgz#3e4d569a427f17085e1ee4ecd3c31befb56af7b5"
+  version "6.0.78"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
 
 abab@^1.0.3:
   version "1.0.3"
@@ -90,13 +88,20 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.7.0, 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:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -123,7 +128,7 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-html@0.0.7, ansi-html@^0.0.7:
+ansi-html@^0.0.7, ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
@@ -243,14 +248,14 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
+assert-plus@^1.0.0, assert-plus@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -411,19 +416,19 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     js-tokens "^3.0.0"
 
 babel-core@^6.17.0, babel-core@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
     babel-code-frame "^6.22.0"
-    babel-generator "^6.24.1"
+    babel-generator "^6.25.0"
     babel-helpers "^6.24.1"
     babel-messages "^6.23.0"
     babel-register "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
+    babel-template "^6.25.0"
+    babel-traverse "^6.25.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     convert-source-map "^1.1.0"
     debug "^2.1.1"
     json5 "^0.5.0"
@@ -443,13 +448,13 @@ babel-eslint@^7.2.3:
     babel-types "^6.23.0"
     babylon "^6.17.0"
 
-babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.25.0.tgz#33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    babel-types "^6.25.0"
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
     lodash "^4.2.0"
@@ -902,8 +907,8 @@ babel-polyfill@6.23.0:
     regenerator-runtime "^0.10.0"
 
 babel-preset-env@^1.2.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b"
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -1022,42 +1027,42 @@ babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
+    babel-traverse "^6.25.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     lodash "^4.2.0"
 
-babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    babylon "^6.15.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     debug "^2.2.0"
     globals "^9.0.0"
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
   dependencies:
     babel-runtime "^6.22.0"
     esutils "^2.0.2"
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.1.0, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0:
-  version "6.17.2"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.2.tgz#201d25ef5f892c41bae49488b08db0dd476e9f5c"
+babylon@^6.1.0, babylon@^6.13.0, babylon@^6.17.0, babylon@^6.17.2:
+  version "6.17.3"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.3.tgz#1327d709950b558f204e5352587fd0290f8d8e48"
 
 balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
@@ -1304,12 +1309,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.30000679"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000679.tgz#dd7be12f16577e5d6ae6db880c6d619e77dca365"
+  version "1.0.30000683"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000683.tgz#58b57ed1e0bb9da54eaf1462985147bbe16679fa"
 
 caniuse-lite@^1.0.30000670:
-  version "1.0.30000679"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000679.tgz#0fb5bb3658d4d4448f8f86a1c48df15664aa05ef"
+  version "1.0.30000683"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000683.tgz#a7573707cf2acc9217ca6484d1dfbc9f13898364"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1330,7 +1335,15 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
+chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1340,14 +1353,6 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1459,8 +1464,8 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 coa@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.2.tgz#2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.3.tgz#1b54a5e1dcf77c990455d4deea98c564416dc893"
   dependencies:
     q "^1.1.2"
 
@@ -1524,7 +1529,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
+commander@^2.9.0, commander@~2.9.0, commander@2.9.x:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -1850,7 +1855,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+"cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -1894,7 +1899,13 @@ 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.2.0, debug@~2.2.0:
+debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
+debug@~2.2.0, debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -1906,12 +1917,6 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
 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"
@@ -1969,7 +1974,7 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@1.1.0, depd@~1.1.0:
+depd@~1.1.0, depd@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
@@ -2010,16 +2015,16 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+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"
@@ -2041,7 +2046,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@^1.3.0, domelementtype@1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2049,16 +2054,23 @@ domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  dependencies:
+    domelementtype "1"
+
 domhandler@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
   dependencies:
     domelementtype "1"
 
-domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
   dependencies:
+    dom-serializer "0"
     domelementtype "1"
 
 domutils@1.1:
@@ -2074,27 +2086,20 @@ domutils@1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
   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"
-
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2119,8 +2124,8 @@ ejs@^2.3.4, ejs@^2.5.6:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11:
-  version "1.3.13"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc"
+  version "1.3.14"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2201,7 +2206,7 @@ es6-error@^4.0.1, es6-error@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
-es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@2:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
@@ -2230,7 +2235,7 @@ es6-set@~0.1.5:
     es6-symbol "3.1.1"
     event-emitter "~0.3.5"
 
-es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1, es6-symbol@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -2542,13 +2547,13 @@ extglob@^0.3.1:
     is-extglob "^1.0.0"
 
 extract-text-webpack-plugin@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
   dependencies:
-    ajv "^4.11.2"
     async "^2.1.2"
     loader-utils "^1.0.2"
-    webpack-sources "^0.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
 
 extsprintf@1.0.2:
   version "1.0.2"
@@ -2606,7 +2611,7 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
+finalhandler@^1.0.3, finalhandler@~1.0.3, finalhandler@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
   dependencies:
@@ -2693,7 +2698,7 @@ forwarded@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
-fresh@0.5.0, fresh@^0.5.0:
+fresh@^0.5.0, fresh@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
@@ -2842,8 +2847,8 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
     path-is-absolute "^1.0.0"
 
 globals@^9.0.0, globals@^9.14.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
 globby@^5.0.0:
   version "5.0.0"
@@ -2983,7 +2988,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@1.1.x, he@^1.1.0:
+he@^1.1.0, he@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
@@ -3108,14 +3113,14 @@ hullabaloo-config-manager@^1.0.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
 iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.17"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
 
+iconv-lite@0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+
 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"
@@ -3138,6 +3143,10 @@ ignore@^3.2.0, ignore@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
+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"
@@ -3167,7 +3176,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.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3179,24 +3188,6 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    chalk "^1.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.1"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx "^4.1.0"
-    string-width "^2.0.0"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 inquirer@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
@@ -3215,6 +3206,24 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    chalk "^1.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.1"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx "^4.1.0"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -3342,12 +3351,18 @@ 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.0.2, is-number@^2.1.0:
+is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -3430,14 +3445,14 @@ is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3499,7 +3514,7 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
-jest-diff@19.0.0, jest-diff@^19.0.0:
+jest-diff@^19.0.0, jest-diff@19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
   dependencies:
@@ -3564,12 +3579,6 @@ jest-validate@^19.0.2:
     leven "^2.0.0"
     pretty-format "^19.0.0"
 
-jodid25519@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
-  dependencies:
-    jsbn "~0.1.0"
-
 js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
@@ -3700,6 +3709,12 @@ kind-of@^3.0.2:
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -3722,10 +3737,6 @@ lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
-lazy-req@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-2.0.0.tgz#c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"
-
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -3766,7 +3777,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
+loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@0.2.x:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -3895,11 +3906,11 @@ lru-cache@^3.2.0:
     pseudomap "^1.0.1"
 
 lru-cache@^4.0.0, lru-cache@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
-    pseudomap "^1.0.1"
-    yallist "^2.0.0"
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
 macaddress@^0.2.8:
   version "0.2.8"
@@ -4026,14 +4037,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.27.0"
 
+mime@^1.3.4, mime@1.3.x:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.3.x, mime@^1.3.4:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
-
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -4046,27 +4057,35 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, "minimatch@2 || 3":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8, minimist@~0.0.1:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist, minimist@^1.1.3, minimist@^1.2.0, minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", 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"
 
-ms@0.7.1, ms@^0.7.1:
+ms@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
+ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
@@ -5010,7 +5029,7 @@ prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
-pseudomap@^1.0.1:
+pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
@@ -5024,26 +5043,26 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
 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@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
 q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
-qs@6.4.0, qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
+qs@~6.4.0, qs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -5055,22 +5074,22 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@0.2.0, querystring@^0.2.0:
+querystring@^0.2.0, querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
 randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
   dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.4.tgz#9551df208422c8f80eb58e2326dd0b840ff22efd"
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
   dependencies:
-    safe-buffer "^5.0.1"
+    safe-buffer "^5.1.0"
 
 range-parser@^1.0.3, range-parser@~1.2.0:
   version "1.2.0"
@@ -5115,6 +5134,18 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
+  version "2.2.11"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.0.1"
+    string_decoder "~1.0.0"
+    util-deprecate "~1.0.1"
+
 readable-stream@1.0:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -5124,18 +5155,6 @@ readable-stream@1.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
-  version "2.2.10"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.10.tgz#effe72bb7c884c0dd335e2379d526196d9d011ee"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "^5.0.1"
-    string_decoder "~1.0.0"
-    util-deprecate "~1.0.1"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -5253,8 +5272,8 @@ release-zalgo@^1.0.0:
     es6-error "^4.0.1"
 
 remove-trailing-separator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511"
 
 renderkid@^2.0.1:
   version "2.0.1"
@@ -5294,31 +5313,6 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.4:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.0"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    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"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 request@^2.79.0, request@^2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -5346,6 +5340,31 @@ request@^2.79.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    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"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5413,7 +5432,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
+rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@2:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
@@ -5446,7 +5465,7 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
 
@@ -5458,6 +5477,12 @@ sax@^1.2.1, sax@~1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  dependencies:
+    ajv "^5.0.0"
+
 script-ext-html-webpack-plugin@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195"
@@ -5470,7 +5495,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, "semver@2 || 3 || 4 || 5", semver@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5496,7 +5521,7 @@ serialize-javascript@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
 
-serve-static@1.12.3, serve-static@^1.12.3:
+serve-static@^1.12.3, serve-static@1.12.3:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
   dependencies:
@@ -5528,8 +5553,8 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
 
 shelljs@^0.7.5:
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  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"
@@ -5567,7 +5592,7 @@ sort-keys@^1.0.0, sort-keys@^1.1.1, sort-keys@^1.1.2:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^0.1.7, source-list-map@~0.1.7:
+source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
@@ -5575,22 +5600,26 @@ source-list-map@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
 
+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-support@^0.4.0, source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
     source-map "^0.5.6"
 
-source-map@0.5.6, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
 source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.6, source-map@0.5.x:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -5627,8 +5656,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.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -5637,7 +5666,6 @@ sshpk@^1.7.0:
   optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
     ecc-jsbn "~0.1.1"
-    jodid25519 "^1.0.0"
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
@@ -5684,6 +5712,16 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
+  dependencies:
+    safe-buffer "~5.0.1"
+
 string-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -5705,16 +5743,6 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.1.tgz#62e200f039955a6810d8df0a33ffc0f013662d98"
-  dependencies:
-    safe-buffer "^5.0.1"
-
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -5849,6 +5877,10 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -5856,10 +5888,6 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -5897,7 +5925,7 @@ toposort@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
 
-tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
+tough-cookie@^2.3.2, tough-cookie@>=2.3.0, tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
@@ -5954,13 +5982,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@3.0.x:
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
-  dependencies:
-    commander "~2.9.0"
-    source-map "~0.5.1"
-
 uglify-js@^2.6, uglify-js@^2.8.27:
   version "2.8.28"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
@@ -5970,6 +5991,13 @@ uglify-js@^2.6, uglify-js@^2.8.27:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@3.0.x:
+  version "3.0.15"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
+  dependencies:
+    commander "~2.9.0"
+    source-map "~0.5.1"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -6027,15 +6055,15 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 update-notifier@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.2.0.tgz#1b5837cf90c0736d88627732b661c138f86de72f"
   dependencies:
     boxen "^1.0.0"
     chalk "^1.0.0"
     configstore "^3.0.0"
+    import-lazy "^2.1.0"
     is-npm "^1.0.0"
     latest-version "^3.0.0"
-    lazy-req "^2.0.0"
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
@@ -6077,7 +6105,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@^0.10.3, util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6161,8 +6189,8 @@ vue-router@^2.5.3:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.5.3.tgz#073783f564b6aece6c8a59c63e298dc2aabfb51b"
 
 vue-server-renderer@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.3.tgz#1f450f8a4541b9dd3b084d6470939f82781c3e0a"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.4.tgz#ce1361eb32bfb84573b9c9b83f2810de8fa606c7"
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -6187,8 +6215,8 @@ vue-style-loader@^3.0.0:
     loader-utils "^1.0.2"
 
 vue-template-compiler@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz#b5bab9ec57309c906b82a78c81a02179dbc2f470"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.4.tgz#5a88ac2c5e4d5d6218e6aa80e7e221fb7e67894c"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -6198,8 +6226,8 @@ vue-template-es2015-compiler@^1.2.2:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
 
 vue@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.3.tgz#d1eaa8fde5240735a4563e74f2c7fead9cbb064c"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.4.tgz#5ec3b87a191da8090bbef56b7cfabd4158038171"
 
 vuex@^2.3.1:
   version "2.3.1"
@@ -6259,13 +6287,6 @@ webpack-node-externals@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
 
-webpack-sources@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.5.3"
-
 webpack-sources@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
@@ -6273,6 +6294,13 @@ webpack-sources@^0.2.3:
     source-list-map "^1.1.1"
     source-map "~0.5.3"
 
+webpack-sources@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.5.3"
+
 webpack@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
@@ -6346,14 +6374,18 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2, wordwrap@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6432,7 +6464,7 @@ y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
-yallist@^2.0.0:
+yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
@@ -6498,3 +6530,4 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+

From 84e5eabd994c1cac6cc85d109963fb1d1a3923f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 15:49:01 +0200
Subject: [PATCH 015/236] Display localhost instead of 0.0.0.0

---
 lib/server.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index 63766e4563..9e3366fa73 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -46,12 +46,13 @@ class Server {
   }
 
   listen (port, host) {
-    host = host || '127.0.0.1'
+    host = host || 'localhost'
     port = port || 3000
     this.nuxt.ready()
     .then(() => {
       this.server.listen(port, host, () => {
-        console.log('Ready on http://%s:%s', host, port) // eslint-disable-line no-console
+        let _host = host === '0.0.0.0' ? 'localhost' : host
+        console.log('Ready on http://%s:%s', _host, port) // eslint-disable-line no-console
       })
     })
     return this

From 2926b08344eeff8e012fab11cf50df12ca2998ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 15:49:19 +0200
Subject: [PATCH 016/236] No need to check on render anymore

---
 lib/render.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/render.js b/lib/render.js
index 238c31a528..e9dfeebf41 100644
--- a/lib/render.js
+++ b/lib/render.js
@@ -14,11 +14,6 @@ setAnsiColors(ansiHTML)
 export async function render (req, res) {
   // Wait for nuxt.js to be ready
   await this.ready()
-  // Check if project is built for production
-  if (!this.renderer && !this.dev) {
-    console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
-    process.exit(1)
-  }
   /* istanbul ignore if */
   if (!this.renderer || !this.appTemplate) {
     return new Promise((resolve) => {

From 8fe9380df90a337b6eb566722cf09421e3dff37b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 11 Jun 2017 18:47:36 +0430
Subject: [PATCH 017/236] refactor into components

---
 lib/build.js                           | 569 -----------------------
 lib/builder.js                         | 601 +++++++++++++++++++++++++
 lib/defaults.js                        |  95 ++++
 lib/generate.js                        | 244 +++++-----
 lib/{module.js => module-container.js} |  18 +-
 lib/nuxt.js                            | 201 ++++-----
 lib/render.js                          | 196 --------
 lib/renderer.js                        | 210 +++++++++
 lib/server.js                          |  26 +-
 lib/utils.js                           |   2 +-
 lib/webpack/base.config.js             |  40 +-
 lib/webpack/client.config.js           |  20 +-
 lib/webpack/helpers.js                 |   2 +-
 lib/webpack/server.config.js           |  16 +-
 lib/webpack/vue-loader.config.js       |   4 +-
 15 files changed, 1170 insertions(+), 1074 deletions(-)
 delete mode 100644 lib/build.js
 create mode 100644 lib/builder.js
 create mode 100755 lib/defaults.js
 rename lib/{module.js => module-container.js} (94%)
 delete mode 100644 lib/render.js
 create mode 100644 lib/renderer.js

diff --git a/lib/build.js b/lib/build.js
deleted file mode 100644
index 36b2cf5286..0000000000
--- a/lib/build.js
+++ /dev/null
@@ -1,569 +0,0 @@
-'use strict'
-
-import _ from 'lodash'
-import chokidar from 'chokidar'
-import fs from 'fs-extra'
-import hash from 'hash-sum'
-import pify from 'pify'
-import webpack from 'webpack'
-import PostCompilePlugin from 'post-compile-webpack-plugin'
-import serialize from 'serialize-javascript'
-import { createBundleRenderer } from 'vue-server-renderer'
-import { join, resolve, basename, dirname } from 'path'
-import { isUrl, r, wp } from './utils'
-import clientWebpackConfig from './webpack/client.config.js'
-import serverWebpackConfig from './webpack/server.config.js'
-const debug = require('debug')('nuxt:build')
-const remove = pify(fs.remove)
-const readFile = pify(fs.readFile)
-const utimes = pify(fs.utimes)
-const writeFile = pify(fs.writeFile)
-const mkdirp = pify(fs.mkdirp)
-const glob = pify(require('glob'))
-
-let webpackStats = 'none'
-debug.color = 2 // force green color
-
-const defaults = {
-  analyze: false,
-  extractCSS: false,
-  publicPath: '/_nuxt/',
-  filenames: {
-    css: 'common.[chunkhash].css',
-    manifest: 'manifest.[hash].js',
-    vendor: 'vendor.bundle.[chunkhash].js',
-    app: 'nuxt.bundle.[chunkhash].js'
-  },
-  vendor: [],
-  loaders: [],
-  plugins: [],
-  babel: {},
-  postcss: [],
-  templates: [],
-  watch: []
-}
-const defaultsLoaders = [
-  {
-    test: /\.(png|jpe?g|gif|svg)$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1KO
-      name: 'img/[name].[hash:7].[ext]'
-    }
-  },
-  {
-    test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1 KO
-      name: 'fonts/[name].[hash:7].[ext]'
-    }
-  }
-]
-const defaultsPostcss = [
-  require('autoprefixer')({
-    browsers: ['last 3 versions']
-  })
-]
-
-export function options () {
-  // Defaults build options
-  let extraDefaults = {}
-  if (this.options.build && !Array.isArray(this.options.build.loaders)) extraDefaults.loaders = defaultsLoaders
-  if (this.options.build && !Array.isArray(this.options.build.postcss)) extraDefaults.postcss = defaultsPostcss
-  this.options.build = _.defaultsDeep(this.options.build, defaults, extraDefaults)
-  /* istanbul ignore if */
-  if (this.dev && isUrl(this.options.build.publicPath)) {
-    this.options.build.publicPath = defaults.publicPath
-  }
-}
-
-export function production () {
-  // Production, create server-renderer
-  webpackStats = {
-    chunks: false,
-    children: false,
-    modules: false,
-    colors: true
-  }
-  const serverConfig = getWebpackServerConfig.call(this)
-  const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
-  const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
-  if (fs.existsSync(bundlePath) && fs.existsSync(manifestPath)) {
-    const bundle = fs.readFileSync(bundlePath, 'utf8')
-    const manifest = fs.readFileSync(manifestPath, 'utf8')
-    createRenderer.call(this, JSON.parse(bundle), JSON.parse(manifest))
-    addAppTemplate.call(this)
-  }
-}
-
-export async function build () {
-  // Avoid calling this method multiple times
-  if (this._buildDone) {
-    return this
-  }
-  // If building
-  if (this._building) {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(this.build())
-      }, 300)
-    })
-  }
-  this._building = true
-  // Wait for Nuxt.js to be ready
-  await this.ready()
-  // Check if pages dir exists and warn if not
-  this._nuxtPages = typeof this.createRoutes !== 'function'
-  if (this._nuxtPages) {
-    if (!fs.existsSync(join(this.srcDir, 'pages'))) {
-      if (fs.existsSync(join(this.srcDir, '..', 'pages'))) {
-        console.error('> No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?') // eslint-disable-line no-console
-      } else {
-        console.error('> Couldn\'t find a `pages` directory. Please create one under the project root') // eslint-disable-line no-console
-      }
-      process.exit(1)
-    }
-  }
-  debug(`App root: ${this.srcDir}`)
-  debug(`Generating ${this.buildDir} files...`)
-  // Create .nuxt/, .nuxt/components and .nuxt/dist folders
-  await remove(r(this.buildDir))
-  await mkdirp(r(this.buildDir, 'components'))
-  if (!this.dev) {
-    await mkdirp(r(this.buildDir, 'dist'))
-  }
-  // Generate routes and interpret the template files
-  await generateRoutesAndFiles.call(this)
-  // Generate .nuxt/dist/ files
-  await buildFiles.call(this)
-  // Flag to set that building is done
-  this._buildDone = true
-  return this
-}
-
-async function buildFiles () {
-  if (this.dev) {
-    debug('Adding webpack middleware...')
-    createWebpackMiddleware.call(this)
-    webpackWatchAndUpdate.call(this)
-    watchFiles.call(this)
-  } else {
-    debug('Building files...')
-    await webpackRunClient.call(this)
-    await webpackRunServer.call(this)
-    addAppTemplate.call(this)
-  }
-}
-
-function addAppTemplate () {
-  let templatePath = resolve(this.buildDir, 'dist', 'index.html')
-  if (fs.existsSync(templatePath)) {
-    this.appTemplate = _.template(fs.readFileSync(templatePath, 'utf8'), {
-      interpolate: /{{([\s\S]+?)}}/g
-    })
-  }
-}
-
-async function generateRoutesAndFiles () {
-  debug('Generating files...')
-  // -- Templates --
-  let templatesFiles = [
-    'App.vue',
-    'client.js',
-    'index.js',
-    'middleware.js',
-    'router.js',
-    'server.js',
-    'utils.js',
-    'components/nuxt-error.vue',
-    'components/nuxt-loading.vue',
-    'components/nuxt-child.js',
-    'components/nuxt-link.js',
-    'components/nuxt.vue'
-  ]
-  const templateVars = {
-    options: this.options,
-    uniqBy: _.uniqBy,
-    isDev: this.dev,
-    router: {
-      mode: this.options.router.mode,
-      base: this.options.router.base,
-      middleware: this.options.router.middleware,
-      linkActiveClass: this.options.router.linkActiveClass,
-      linkExactActiveClass: this.options.router.linkExactActiveClass,
-      scrollBehavior: this.options.router.scrollBehavior
-    },
-    env: this.options.env,
-    head: this.options.head,
-    middleware: fs.existsSync(join(this.srcDir, 'middleware')),
-    store: this.options.store || fs.existsSync(join(this.srcDir, 'store')),
-    css: this.options.css,
-    plugins: this.options.plugins.map((p, i) => {
-      if (typeof p === 'string') p = { src: p }
-      p.src = r(this.srcDir, p.src)
-      return { src: p.src, ssr: (p.ssr !== false), name: `plugin${i}` }
-    }),
-    appPath: './App.vue',
-    layouts: Object.assign({}, this.options.layouts),
-    loading: (typeof this.options.loading === 'string' ? r(this.srcDir, this.options.loading) : this.options.loading),
-    transition: this.options.transition,
-    components: {
-      ErrorPage: this.options.ErrorPage ? r(this.options.ErrorPage) : null
-    }
-  }
-
-  // -- Layouts --
-  if (fs.existsSync(resolve(this.srcDir, 'layouts'))) {
-    const layoutsFiles = await glob('layouts/*.vue', {cwd: this.srcDir})
-    layoutsFiles.forEach((file) => {
-      let name = file.split('/').slice(-1)[0].replace('.vue', '')
-      if (name === 'error') return
-      templateVars.layouts[name] = r(this.srcDir, file)
-    })
-    if (layoutsFiles.includes('layouts/error.vue')) {
-      templateVars.components.ErrorPage = r(this.srcDir, 'layouts/error.vue')
-    }
-  }
-  // If no default layout, create its folder and add the default folder
-  if (!templateVars.layouts.default) {
-    await mkdirp(r(this.buildDir, 'layouts'))
-    templatesFiles.push('layouts/default.vue')
-    templateVars.layouts.default = r(__dirname, 'app', 'layouts', 'default.vue')
-  }
-
-  // -- Routes --
-  debug('Generating routes...')
-  // If user defined a custom method to create routes
-  if (this._nuxtPages) {
-    // Use nuxt.js createRoutes bases on pages/
-    const files = await glob('pages/**/*.vue', {cwd: this.srcDir})
-    templateVars.router.routes = createRoutes(files, this.srcDir)
-  } else {
-    templateVars.router.routes = this.createRoutes(this.srcDir)
-  }
-  // router.extendRoutes method
-  if (typeof this.options.router.extendRoutes === 'function') {
-    // let the user extend the routes
-    this.options.router.extendRoutes.call(this, templateVars.router.routes || [], r)
-  }
-  // Routes for generate command
-  this.routes = flatRoutes(templateVars.router.routes || [])
-
-  // -- Store --
-  // Add store if needed
-  if (this.options.store) {
-    templatesFiles.push('store.js')
-  }
-
-  // Resolve template files
-  const customTemplateFiles = this.options.build.templates.map(t => t.dst || basename(t.src || t))
-  templatesFiles = templatesFiles.map(file => {
-    // Skip if custom file was already provided in build.templates[]
-    if (customTemplateFiles.indexOf(file) !== -1) {
-      return
-    }
-    // Allow override templates using a file with same name in ${srcDir}/app
-    const customPath = r(this.srcDir, 'app', file)
-    const customFileExists = fs.existsSync(customPath)
-    return {
-      src: customFileExists ? customPath : r(__dirname, 'app', file),
-      dst: file,
-      custom: customFileExists
-    }
-  }).filter(i => !!i)
-
-  // -- Custom templates --
-  // Add custom template files
-  templatesFiles = templatesFiles.concat(this.options.build.templates.map(t => {
-    return Object.assign({
-      src: r(this.dir, t.src || t),
-      dst: t.dst || basename(t.src || t),
-      custom: true
-    }, t)
-  }))
-
-  // Interpret and move template files to .nuxt/
-  return Promise.all(templatesFiles.map(async ({ src, dst, options, custom }) => {
-    // Add template to watchers
-    this.options.build.watch.push(src)
-    // Render template to dst
-    const fileContent = await readFile(src, 'utf8')
-    const template = _.template(fileContent, {
-      imports: {
-        serialize,
-        hash,
-        r,
-        wp
-      }
-    })
-    const content = template(Object.assign({}, templateVars, {
-      options: options || {},
-      custom,
-      src,
-      dst
-    }))
-    const path = r(this.buildDir, dst)
-    // Ensure parent dir exits
-    await mkdirp(dirname(path))
-    // Write file
-    await writeFile(path, content, 'utf8')
-    // Fix webpack loop (https://github.com/webpack/watchpack/issues/25#issuecomment-287789288)
-    const dateFS = Date.now() / 1000 - 30
-    return utimes(path, dateFS, dateFS)
-  }))
-}
-
-function createRoutes (files, srcDir) {
-  let routes = []
-  files.forEach((file) => {
-    let keys = file.replace(/^pages/, '').replace(/\.vue$/, '').replace(/\/{2,}/g, '/').split('/').slice(1)
-    let route = { name: '', path: '', component: r(srcDir, file) }
-    let parent = routes
-    keys.forEach((key, i) => {
-      route.name = route.name ? route.name + '-' + key.replace('_', '') : key.replace('_', '')
-      route.name += (key === '_') ? 'all' : ''
-      let child = _.find(parent, { name: route.name })
-      if (child) {
-        if (!child.children) {
-          child.children = []
-        }
-        parent = child.children
-        route.path = ''
-      } else {
-        if (key === 'index' && (i + 1) === keys.length) {
-          route.path += (i > 0 ? '' : '/')
-        } else {
-          route.path += '/' + (key === '_' ? '*' : key.replace('_', ':'))
-          if (key !== '_' && key.indexOf('_') !== -1) {
-            route.path += '?'
-          }
-        }
-      }
-    })
-    // Order Routes path
-    parent.push(route)
-    parent.sort((a, b) => {
-      if (!a.path.length || a.path === '/') { return -1 }
-      if (!b.path.length || b.path === '/') { return 1 }
-      var res = 0
-      var _a = a.path.split('/')
-      var _b = b.path.split('/')
-      for (var i = 0; i < _a.length; i++) {
-        if (res !== 0) { break }
-        var y = (_a[i].indexOf('*') > -1) ? 2 : (_a[i].indexOf(':') > -1 ? 1 : 0)
-        var z = (_b[i].indexOf('*') > -1) ? 2 : (_b[i].indexOf(':') > -1 ? 1 : 0)
-        res = y - z
-        if (i === _b.length - 1 && res === 0) {
-          res = 1
-        }
-      }
-      return res === 0 ? -1 : res
-    })
-  })
-  return cleanChildrenRoutes(routes)
-}
-
-function cleanChildrenRoutes (routes, isChild = false) {
-  let start = -1
-  let routesIndex = []
-  routes.forEach((route) => {
-    if (/-index$/.test(route.name) || route.name === 'index') {
-      // Save indexOf 'index' key in name
-      let res = route.name.split('-')
-      let s = res.indexOf('index')
-      start = (start === -1 || s < start) ? s : start
-      routesIndex.push(res)
-    }
-  })
-  routes.forEach((route) => {
-    route.path = (isChild) ? route.path.replace('/', '') : route.path
-    if (route.path.indexOf('?') > -1) {
-      let names = route.name.split('-')
-      let paths = route.path.split('/')
-      if (!isChild) { paths.shift() } // clean first / for parents
-      routesIndex.forEach((r) => {
-        let i = r.indexOf('index') - start //  children names
-        if (i < paths.length) {
-          for (var a = 0; a <= i; a++) {
-            if (a === i) { paths[a] = paths[a].replace('?', '') }
-            if (a < i && names[a] !== r[a]) { break }
-          }
-        }
-      })
-      route.path = (isChild ? '' : '/') + paths.join('/')
-    }
-    route.name = route.name.replace(/-index$/, '')
-    if (route.children) {
-      if (route.children.find((child) => child.path === '')) {
-        delete route.name
-      }
-      route.children = cleanChildrenRoutes(route.children, true)
-    }
-  })
-  return routes
-}
-
-function flatRoutes (router, path = '', routes = []) {
-  router.forEach((r) => {
-    if (!r.path.includes(':') && !r.path.includes('*')) {
-      if (r.children) {
-        flatRoutes(r.children, path + r.path + '/', routes)
-      } else {
-        routes.push((r.path === '' && path[path.length - 1] === '/' ? path.slice(0, -1) : path) + r.path)
-      }
-    }
-  })
-  return routes
-}
-
-function getWebpackClientConfig () {
-  return clientWebpackConfig.call(this)
-}
-
-function getWebpackServerConfig () {
-  return serverWebpackConfig.call(this)
-}
-
-function createWebpackMiddleware () {
-  const clientConfig = getWebpackClientConfig.call(this)
-  const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
-  const port = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
-
-  // setup on the fly compilation + hot-reload
-  clientConfig.entry.app = _.flatten(['webpack-hot-middleware/client?reload=true', clientConfig.entry.app])
-  clientConfig.plugins.push(
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoEmitOnErrorsPlugin(),
-    new PostCompilePlugin(stats => {
-      if (!stats.hasErrors() && !stats.hasWarnings()) {
-        // We don't use os.host() here because browsers have special behaviour with localhost
-        // For example chrome allows Geolocation api only to https or localhost origins
-        let _host = host === '0.0.0.0' ? 'localhost' : host
-        console.log(`> Open http://${_host}:${port}\n`) // eslint-disable-line no-console
-      }
-    })
-  )
-  const clientCompiler = webpack(clientConfig)
-  this.clientCompiler = clientCompiler
-  // Add the middleware to the instance context
-  this.webpackDevMiddleware = pify(require('webpack-dev-middleware')(clientCompiler, {
-    publicPath: clientConfig.output.publicPath,
-    stats: webpackStats,
-    quiet: true,
-    noInfo: true,
-    watchOptions: this.options.watchers.webpack
-  }))
-  this.webpackHotMiddleware = pify(require('webpack-hot-middleware')(clientCompiler, {
-    log: () => {}
-  }))
-  clientCompiler.plugin('done', () => {
-    const fs = this.webpackDevMiddleware.fileSystem
-    const filePath = join(clientConfig.output.path, 'index.html')
-    if (fs.existsSync(filePath)) {
-      const template = fs.readFileSync(filePath, 'utf-8')
-      this.appTemplate = _.template(template, {
-        interpolate: /{{([\s\S]+?)}}/g
-      })
-    }
-    this.watchHandler()
-  })
-}
-
-function webpackWatchAndUpdate () {
-  const MFS = require('memory-fs') // <- dependencies of webpack
-  const serverFS = new MFS()
-  const clientFS = this.clientCompiler.outputFileSystem
-  const serverConfig = getWebpackServerConfig.call(this)
-  const serverCompiler = webpack(serverConfig)
-  const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
-  const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
-  serverCompiler.outputFileSystem = serverFS
-  const watchHandler = (err) => {
-    if (err) throw err
-    const bundleExists = serverFS.existsSync(bundlePath)
-    const manifestExists = clientFS.existsSync(manifestPath)
-    if (bundleExists && manifestExists) {
-      const bundle = serverFS.readFileSync(bundlePath, 'utf8')
-      const manifest = clientFS.readFileSync(manifestPath, 'utf8')
-      createRenderer.call(this, JSON.parse(bundle), JSON.parse(manifest))
-    }
-  }
-  this.watchHandler = watchHandler
-  this.webpackServerWatcher = serverCompiler.watch(this.options.watchers.webpack, watchHandler)
-}
-
-function webpackRunClient () {
-  return new Promise((resolve, reject) => {
-    const clientConfig = getWebpackClientConfig.call(this)
-    const clientCompiler = webpack(clientConfig)
-    clientCompiler.run((err, stats) => {
-      if (err) return reject(err)
-      console.log('[nuxt:build:client]\n', stats.toString(webpackStats)) // eslint-disable-line no-console
-      if (stats.hasErrors()) return reject(new Error('Webpack build exited with errors'))
-      resolve()
-    })
-  })
-}
-
-function webpackRunServer () {
-  return new Promise((resolve, reject) => {
-    const serverConfig = getWebpackServerConfig.call(this)
-    const serverCompiler = webpack(serverConfig)
-    serverCompiler.run((err, stats) => {
-      if (err) return reject(err)
-      console.log('[nuxt:build:server]\n', stats.toString(webpackStats)) // eslint-disable-line no-console
-      if (stats.hasErrors()) return reject(new Error('Webpack build exited with errors'))
-      const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
-      const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
-      readFile(bundlePath, 'utf8')
-      .then(bundle => {
-        readFile(manifestPath, 'utf8')
-        .then(manifest => {
-          createRenderer.call(this, JSON.parse(bundle), JSON.parse(manifest))
-          resolve()
-        })
-      })
-    })
-  })
-}
-
-function createRenderer (bundle, manifest) {
-  // Create bundle renderer to give a fresh context for every request
-  this.renderer = createBundleRenderer(bundle, Object.assign({
-    clientManifest: manifest,
-    runInNewContext: false,
-    basedir: this.dir
-  }, this.options.build.ssr))
-  this.renderToString = pify(this.renderer.renderToString)
-  this.renderToStream = this.renderer.renderToStream
-}
-
-function watchFiles () {
-  const patterns = [
-    r(this.srcDir, 'layouts'),
-    r(this.srcDir, 'store'),
-    r(this.srcDir, 'middleware'),
-    r(this.srcDir, 'layouts/*.vue'),
-    r(this.srcDir, 'layouts/**/*.vue')
-  ]
-  if (this._nuxtPages) {
-    patterns.push(r(this.srcDir, 'pages'))
-    patterns.push(r(this.srcDir, 'pages/*.vue'))
-    patterns.push(r(this.srcDir, 'pages/**/*.vue'))
-  }
-  const options = Object.assign({}, this.options.watchers.chokidar, {
-    ignoreInitial: true
-  })
-  /* istanbul ignore next */
-  const refreshFiles = _.debounce(async () => {
-    await generateRoutesAndFiles.call(this)
-  }, 200)
-  // Watch for internals
-  this.filesWatcher = chokidar.watch(patterns, options)
-  .on('add', refreshFiles)
-  .on('unlink', refreshFiles)
-  // Watch for custom provided files
-  this.customFilesWatcher = chokidar.watch(_.uniq(this.options.build.watch), options)
-  .on('change', refreshFiles)
-}
diff --git a/lib/builder.js b/lib/builder.js
new file mode 100644
index 0000000000..a920ccf32c
--- /dev/null
+++ b/lib/builder.js
@@ -0,0 +1,601 @@
+import _ from 'lodash'
+import chokidar from 'chokidar'
+import fs from 'fs-extra'
+import hash from 'hash-sum'
+import pify from 'pify'
+import webpack from 'webpack'
+import PostCompilePlugin from 'post-compile-webpack-plugin'
+import serialize from 'serialize-javascript'
+import { createBundleRenderer } from 'vue-server-renderer'
+import { join, resolve, basename, dirname } from 'path'
+import { isUrl, r, wp } from './utils'
+import clientWebpackConfig from './webpack/client.config.js'
+import serverWebpackConfig from './webpack/server.config.js'
+import defaults from './defaults'
+import Tapable from 'tapable'
+
+const debug = require('debug')('nuxt:build')
+debug.color = 2 // Force green color
+
+const remove = pify(fs.remove)
+const readFile = pify(fs.readFile)
+const utimes = pify(fs.utimes)
+const writeFile = pify(fs.writeFile)
+const mkdirp = pify(fs.mkdirp)
+const glob = pify(require('glob'))
+
+export default class Builder extends Tapable {
+  constructor (nuxt) {
+    super()
+    this.nuxt = nuxt
+    this.options = nuxt.options
+
+    // Add extra loaders only if they are not already provided
+    let extraDefaults = {}
+    if (this.options.build && !Array.isArray(this.options.build.loaders)) {
+      extraDefaults.loaders = defaultsLoaders
+    }
+    if (this.options.build && !Array.isArray(this.options.build.postcss)) {
+      extraDefaults.postcss = defaultsPostcss
+    }
+    this.options.build = _.defaultsDeep(this.options.build, extraDefaults)
+    /* istanbul ignore if */
+    if (this.options.dev && isUrl(this.options.build.publicPath)) {
+      this.options.build.publicPath = defaults.publicPath.publicPath
+    }
+
+    // Stats
+    this.webpackStats = {
+      chunks: false,
+      children: false,
+      modules: false,
+      colors: true
+    }
+
+    this._buildStatus = STATUS.INITIAL
+  }
+
+  ready () {
+    if (this.options.dev) {
+      // Don't await for builder in dev (faster startup)
+      this.build().catch(err => {
+        console.error(err)
+        process.exit(1)
+      })
+      return Promise.resolve(this)
+    } else {
+      return this.production()
+    }
+  }
+
+  async build () {
+    // Avoid calling this method multiple times
+    if (this._buildStatus === STATUS.BUILD_DONE) {
+      return this
+    }
+    // If building
+    if (this._buildStatus === STATUS.BUILDING) {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(this.build())
+        }, 300)
+      })
+    }
+    this._buildStatus = STATUS.BUILDING
+    // Check if pages dir exists and warn if not
+    this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
+
+    if (this._nuxtPages) {
+      if (!fs.existsSync(join(this.options.srcDir, 'pages'))) {
+        if (fs.existsSync(join(this.options.srcDir, '..', 'pages'))) {
+          console.error('> No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?') // eslint-disable-line no-console
+        } else {
+          console.error('> Couldn\'t find a `pages` directory. Please create one under the project root') // eslint-disable-line no-console
+        }
+        process.exit(1)
+      }
+    }
+    debug(`App root: ${this.options.srcDir}`)
+    debug(`Generating ${this.options.buildDir} files...`)
+
+    // Create .nuxt/, .nuxt/components and .nuxt/dist folders
+    await remove(r(this.options.buildDir))
+    await mkdirp(r(this.options.buildDir, 'components'))
+    if (!this.options.dev) {
+      await mkdirp(r(this.options.buildDir, 'dist'))
+    }
+    // Generate routes and interpret the template files
+    await this.generateRoutesAndFiles()
+    // Generate .nuxt/dist/ files
+    await this.buildFiles()
+    // Flag to set that building is done
+    this._buildStatus = STATUS.BUILD_DONE
+    return this
+  }
+
+  production () {
+    // Production, create server-renderer
+    const serverConfig = this.getWebpackServerConfig()
+    const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
+    const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
+    if (fs.existsSync(bundlePath) && fs.existsSync(manifestPath)) {
+      const bundle = fs.readFileSync(bundlePath, 'utf8')
+      const manifest = fs.readFileSync(manifestPath, 'utf8')
+      this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
+      this.addAppTemplate()
+    }
+    return this
+  }
+
+  addAppTemplate () {
+    let templatePath = resolve(this.options.buildDir, 'dist', 'index.html')
+    if (fs.existsSync(templatePath)) {
+      this.appTemplate = _.template(fs.readFileSync(templatePath, 'utf8'), {
+        interpolate: /{{([\s\S]+?)}}/g
+      })
+    }
+  }
+
+  async generateRoutesAndFiles () {
+    debug('Generating files...')
+    // -- Templates --
+    let templatesFiles = [
+      'App.vue',
+      'client.js',
+      'index.js',
+      'middleware.js',
+      'router.js',
+      'server.js',
+      'utils.js',
+      'components/nuxt-error.vue',
+      'components/nuxt-loading.vue',
+      'components/nuxt-child.js',
+      'components/nuxt-link.js',
+      'components/nuxt.vue'
+    ]
+    const templateVars = {
+      options: this.options,
+      uniqBy: _.uniqBy,
+      isDev: this.options.dev,
+      router: {
+        mode: this.options.router.mode,
+        base: this.options.router.base,
+        middleware: this.options.router.middleware,
+        linkActiveClass: this.options.router.linkActiveClass,
+        linkExactActiveClass: this.options.router.linkExactActiveClass,
+        scrollBehavior: this.options.router.scrollBehavior
+      },
+      env: this.options.env,
+      head: this.options.head,
+      middleware: fs.existsSync(join(this.options.srcDir, 'middleware')),
+      store: this.options.store || fs.existsSync(join(this.options.srcDir, 'store')),
+      css: this.options.css,
+      plugins: this.options.plugins.map((p, i) => {
+        if (typeof p === 'string') p = { src: p }
+        p.src = r(this.options.srcDir, p.src)
+        return { src: p.src, ssr: (p.ssr !== false), name: `plugin${i}` }
+      }),
+      appPath: './App.vue',
+      layouts: Object.assign({}, this.options.layouts),
+      loading: (typeof this.options.loading === 'string' ? r(this.options.srcDir, this.options.loading) : this.options.loading),
+      transition: this.options.transition,
+      components: {
+        ErrorPage: this.options.ErrorPage ? r(this.options.ErrorPage) : null
+      }
+    }
+
+    // -- Layouts --
+    if (fs.existsSync(resolve(this.options.srcDir, 'layouts'))) {
+      const layoutsFiles = await glob('layouts/*.vue', { cwd: this.options.srcDir })
+      layoutsFiles.forEach((file) => {
+        let name = file.split('/').slice(-1)[0].replace('.vue', '')
+        if (name === 'error') return
+        templateVars.layouts[name] = r(this.options.srcDir, file)
+      })
+      if (layoutsFiles.includes('layouts/error.vue')) {
+        templateVars.components.ErrorPage = r(this.options.srcDir, 'layouts/error.vue')
+      }
+    }
+    // If no default layout, create its folder and add the default folder
+    if (!templateVars.layouts.default) {
+      await mkdirp(r(this.options.buildDir, 'layouts'))
+      templatesFiles.push('layouts/default.vue')
+      templateVars.layouts.default = r(__dirname, 'app', 'layouts', 'default.vue')
+    }
+
+    // -- Routes --
+    debug('Generating routes...')
+    // If user defined a custom method to create routes
+    if (this._nuxtPages) {
+      // Use nuxt.js createRoutes bases on pages/
+      const files = await glob('pages/**/*.vue', { cwd: this.options.srcDir })
+      templateVars.router.routes = this.createRoutes(files, this.options.srcDir)
+    } else {
+      templateVars.router.routes = this.options.build.createRoutes(this.options.srcDir)
+    }
+    // router.extendRoutes method
+    if (typeof this.options.router.extendRoutes === 'function') {
+      // let the user extend the routes
+      this.options.router.extendRoutes(this, templateVars.router.routes || [], r)
+    }
+    // Routes for generate command
+    this.routes = this.flatRoutes(templateVars.router.routes || [])
+
+    // -- Store --
+    // Add store if needed
+    if (this.options.store) {
+      templatesFiles.push('store.js')
+    }
+
+    // Resolve template files
+    const customTemplateFiles = this.options.build.templates.map(t => t.dst || basename(t.src || t))
+
+    templatesFiles = templatesFiles.map(file => {
+      // Skip if custom file was already provided in build.templates[]
+      if (customTemplateFiles.indexOf(file) !== -1) {
+        return
+      }
+      // Allow override templates using a file with same name in ${srcDir}/app
+      const customPath = r(this.options.srcDir, 'app', file)
+      const customFileExists = fs.existsSync(customPath)
+
+      return {
+        src: customFileExists ? customPath : r(__dirname, 'app', file),
+        dst: file,
+        custom: customFileExists
+      }
+    }).filter(i => !!i)
+
+    // -- Custom templates --
+    // Add custom template files
+    templatesFiles = templatesFiles.concat(this.options.build.templates.map(t => {
+      return Object.assign({
+        src: r(this.options.srcDir, t.src || t),
+        dst: t.dst || basename(t.src || t),
+        custom: true
+      }, t)
+    }))
+
+    // Interpret and move template files to .nuxt/
+    return Promise.all(templatesFiles.map(async ({ src, dst, options, custom }) => {
+      // Add template to watchers
+      this.options.build.watch.push(src)
+      // Render template to dst
+      const fileContent = await readFile(src, 'utf8')
+      const template = _.template(fileContent, {
+        imports: {
+          serialize,
+          hash,
+          r,
+          wp
+        }
+      })
+      const content = template(Object.assign({}, templateVars, {
+        options: options || {},
+        custom,
+        src,
+        dst
+      }))
+      const path = r(this.options.buildDir, dst)
+      // Ensure parent dir exits
+      await mkdirp(dirname(path))
+      // Write file
+      await writeFile(path, content, 'utf8')
+      // Fix webpack loop (https://github.com/webpack/watchpack/issues/25#issuecomment-287789288)
+      const dateFS = Date.now() / 1000 - 30
+      return utimes(path, dateFS, dateFS)
+    }))
+  }
+
+  async buildFiles () {
+    if (this.options.dev) {
+      debug('Adding webpack middleware...')
+      this.createWebpackMiddleware()
+      this.webpackWatchAndUpdate()
+      this.watchFiles()
+    } else {
+      debug('Building files...')
+      await this.webpackRunClient()
+      await this.webpackRunServer()
+      this.addAppTemplate()
+    }
+  }
+
+  createRoutes (files, srcDir) {
+    let routes = []
+    files.forEach((file) => {
+      let keys = file.replace(/^pages/, '').replace(/\.vue$/, '').replace(/\/{2,}/g, '/').split('/').slice(1)
+      let route = { name: '', path: '', component: r(srcDir, file) }
+      let parent = routes
+      keys.forEach((key, i) => {
+        route.name = route.name ? route.name + '-' + key.replace('_', '') : key.replace('_', '')
+        route.name += (key === '_') ? 'all' : ''
+        let child = _.find(parent, { name: route.name })
+        if (child) {
+          if (!child.children) {
+            child.children = []
+          }
+          parent = child.children
+          route.path = ''
+        } else {
+          if (key === 'index' && (i + 1) === keys.length) {
+            route.path += (i > 0 ? '' : '/')
+          } else {
+            route.path += '/' + (key === '_' ? '*' : key.replace('_', ':'))
+            if (key !== '_' && key.indexOf('_') !== -1) {
+              route.path += '?'
+            }
+          }
+        }
+      })
+      // Order Routes path
+      parent.push(route)
+      parent.sort((a, b) => {
+        if (!a.path.length || a.path === '/') {
+          return -1
+        }
+        if (!b.path.length || b.path === '/') {
+          return 1
+        }
+        let res = 0
+        let _a = a.path.split('/')
+        let _b = b.path.split('/')
+        for (let i = 0; i < _a.length; i++) {
+          if (res !== 0) {
+            break
+          }
+          let y = (_a[i].indexOf('*') > -1) ? 2 : (_a[i].indexOf(':') > -1 ? 1 : 0)
+          let z = (_b[i].indexOf('*') > -1) ? 2 : (_b[i].indexOf(':') > -1 ? 1 : 0)
+          res = y - z
+          if (i === _b.length - 1 && res === 0) {
+            res = 1
+          }
+        }
+        return res === 0 ? -1 : res
+      })
+    })
+    return this.cleanChildrenRoutes(routes)
+  }
+
+  cleanChildrenRoutes (routes, isChild = false) {
+    let start = -1
+    let routesIndex = []
+    routes.forEach((route) => {
+      if (/-index$/.test(route.name) || route.name === 'index') {
+        // Save indexOf 'index' key in name
+        let res = route.name.split('-')
+        let s = res.indexOf('index')
+        start = (start === -1 || s < start) ? s : start
+        routesIndex.push(res)
+      }
+    })
+    routes.forEach((route) => {
+      route.path = (isChild) ? route.path.replace('/', '') : route.path
+      if (route.path.indexOf('?') > -1) {
+        let names = route.name.split('-')
+        let paths = route.path.split('/')
+        if (!isChild) {
+          paths.shift()
+        } // clean first / for parents
+        routesIndex.forEach((r) => {
+          let i = r.indexOf('index') - start //  children names
+          if (i < paths.length) {
+            for (let a = 0; a <= i; a++) {
+              if (a === i) {
+                paths[a] = paths[a].replace('?', '')
+              }
+              if (a < i && names[a] !== r[a]) {
+                break
+              }
+            }
+          }
+        })
+        route.path = (isChild ? '' : '/') + paths.join('/')
+      }
+      route.name = route.name.replace(/-index$/, '')
+      if (route.children) {
+        if (route.children.find((child) => child.path === '')) {
+          delete route.name
+        }
+        route.children = this.cleanChildrenRoutes(route.children, true)
+      }
+    })
+    return routes
+  }
+
+  flatRoutes (router, path = '', routes = []) {
+    router.forEach((r) => {
+      if (!r.path.includes(':') && !r.path.includes('*')) {
+        if (r.children) {
+          flatRoutes(r.children, path + r.path + '/', routes)
+        } else {
+          routes.push((r.path === '' && path[path.length - 1] === '/' ? path.slice(0, -1) : path) + r.path)
+        }
+      }
+    })
+    return routes
+  }
+
+  getWebpackClientConfig () {
+    return clientWebpackConfig.call(this)
+  }
+
+  getWebpackServerConfig () {
+    return serverWebpackConfig.call(this)
+  }
+
+  createWebpackMiddleware () {
+    const clientConfig = this.getWebpackClientConfig()
+    const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
+    const port = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
+
+    // setup on the fly compilation + hot-reload
+    clientConfig.entry.app = _.flatten(['webpack-hot-middleware/client?reload=true', clientConfig.entry.app])
+    clientConfig.plugins.push(
+      new webpack.HotModuleReplacementPlugin(),
+      new webpack.NoEmitOnErrorsPlugin(),
+      new PostCompilePlugin(stats => {
+        if (!stats.hasErrors() && !stats.hasWarnings()) {
+          // We don't use os.host() here because browsers have special behaviour with localhost
+          // For example chrome allows Geolocation api only to https or localhost origins
+          let _host = host === '0.0.0.0' ? 'localhost' : host
+          console.log(`> Open http://${_host}:${port}\n`) // eslint-disable-line no-console
+        }
+      })
+    )
+    const clientCompiler = webpack(clientConfig)
+    this.clientCompiler = clientCompiler
+    // Add the middleware to the instance context
+    this.webpackDevMiddleware = pify(require('webpack-dev-middleware')(clientCompiler, {
+      publicPath: clientConfig.output.publicPath,
+      stats: this.webpackStats,
+      quiet: true,
+      noInfo: true,
+      watchOptions: this.options.watchers.webpack
+    }))
+    this.webpackHotMiddleware = pify(require('webpack-hot-middleware')(clientCompiler, {
+      log: () => {
+      }
+    }))
+    clientCompiler.plugin('done', () => {
+      const fs = this.webpackDevMiddleware.fileSystem
+      const filePath = join(clientConfig.output.path, 'index.html')
+      if (fs.existsSync(filePath)) {
+        const template = fs.readFileSync(filePath, 'utf-8')
+        this.appTemplate = _.template(template, {
+          interpolate: /{{([\s\S]+?)}}/g
+        })
+      }
+      this.watchHandler()
+    })
+  }
+
+  webpackWatchAndUpdate () {
+    const MFS = require('memory-fs') // <- dependencies of webpack
+    const serverFS = new MFS()
+    const clientFS = this.clientCompiler.outputFileSystem
+    const serverConfig = this.getWebpackServerConfig()
+    const serverCompiler = webpack(serverConfig)
+    const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
+    const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
+    serverCompiler.outputFileSystem = serverFS
+    const watchHandler = (err) => {
+      if (err) throw err
+      const bundleExists = serverFS.existsSync(bundlePath)
+      const manifestExists = clientFS.existsSync(manifestPath)
+      if (bundleExists && manifestExists) {
+        const bundle = serverFS.readFileSync(bundlePath, 'utf8')
+        const manifest = clientFS.readFileSync(manifestPath, 'utf8')
+        this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
+      }
+    }
+    this.watchHandler = watchHandler
+    this.webpackServerWatcher = serverCompiler.watch(this.options.watchers.webpack, watchHandler)
+  }
+
+  webpackRunClient () {
+    return new Promise((resolve, reject) => {
+      const clientConfig = this.getWebpackClientConfig()
+      const clientCompiler = webpack(clientConfig)
+      clientCompiler.run((err, stats) => {
+        if (err) return reject(err)
+        console.log('[nuxt:build:client]\n', stats.toString(this.webpackStats)) // eslint-disable-line no-console
+        if (stats.hasErrors()) {
+          return reject(new Error('Webpack build exited with errors'))
+        }
+        resolve()
+      })
+    })
+  }
+
+  webpackRunServer () {
+    return new Promise((resolve, reject) => {
+      const serverConfig = this.getWebpackServerConfig()
+      const serverCompiler = webpack(serverConfig)
+      serverCompiler.run((err, stats) => {
+        if (err) return reject(err)
+        console.log('[nuxt:build:server]\n', stats.toString(this.webpackStats)) // eslint-disable-line no-console
+        if (stats.hasErrors()) return reject(new Error('Webpack build exited with errors'))
+        const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
+        const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
+        readFile(bundlePath, 'utf8')
+          .then(bundle => {
+            readFile(manifestPath, 'utf8')
+              .then(manifest => {
+                this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
+                resolve()
+              })
+          })
+      })
+    })
+  }
+
+  createRenderer (bundle, manifest) {
+    // Create bundle renderer to give a fresh context for every request
+    this.renderer = createBundleRenderer(bundle, Object.assign({
+      clientManifest: manifest,
+      runInNewContext: false,
+      basedir: this.options.rootDir
+    }, this.options.build.ssr))
+    this.renderToString = pify(this.renderer.renderToString)
+    this.renderToStream = this.renderer.renderToStream
+  }
+
+  watchFiles () {
+    const patterns = [
+      r(this.options.srcDir, 'layouts'),
+      r(this.options.srcDir, 'store'),
+      r(this.options.srcDir, 'middleware'),
+      r(this.options.srcDir, 'layouts/*.vue'),
+      r(this.options.srcDir, 'layouts/**/*.vue')
+    ]
+    if (this._nuxtPages) {
+      patterns.push(r(this.options.srcDir, 'pages'))
+      patterns.push(r(this.options.srcDir, 'pages/*.vue'))
+      patterns.push(r(this.options.srcDir, 'pages/**/*.vue'))
+    }
+    const options = Object.assign({}, this.options.watchers.chokidar, {
+      ignoreInitial: true
+    })
+    /* istanbul ignore next */
+    const refreshFiles = _.debounce(this.generateRoutesAndFiles, 200)
+    // Watch for internals
+    this.filesWatcher = chokidar.watch(patterns, options)
+      .on('add', refreshFiles)
+      .on('unlink', refreshFiles)
+    // Watch for custom provided files
+    this.customFilesWatcher = chokidar.watch(_.uniq(this.options.build.watch), options)
+      .on('change', refreshFiles)
+  }
+}
+
+const defaultsLoaders = [
+  {
+    test: /\.(png|jpe?g|gif|svg)$/,
+    loader: 'url-loader',
+    query: {
+      limit: 1000, // 1KO
+      name: 'img/[name].[hash:7].[ext]'
+    }
+  },
+  {
+    test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+    loader: 'url-loader',
+    query: {
+      limit: 1000, // 1 KO
+      name: 'fonts/[name].[hash:7].[ext]'
+    }
+  }
+]
+
+const defaultsPostcss = [
+  require('autoprefixer')({
+    browsers: ['last 3 versions']
+  })
+]
+
+const STATUS = {
+  INITIAL: 1,
+  BUILD_DONE: 2,
+  BUILDING: 3
+}
diff --git a/lib/defaults.js b/lib/defaults.js
new file mode 100755
index 0000000000..d8d20df8a7
--- /dev/null
+++ b/lib/defaults.js
@@ -0,0 +1,95 @@
+export default {
+  dev: (process.env.NODE_ENV !== 'production'),
+  buildDir: '.nuxt',
+  build: {
+    analyze: false,
+    extractCSS: false,
+    publicPath: '/_nuxt/',
+    filenames: {
+      css: 'common.[chunkhash].css',
+      manifest: 'manifest.[hash].js',
+      vendor: 'vendor.bundle.[chunkhash].js',
+      app: 'nuxt.bundle.[chunkhash].js'
+    },
+    vendor: [],
+    loaders: [],
+    plugins: [],
+    babel: {},
+    postcss: [],
+    templates: [],
+    watch: []
+  },
+  generate: {
+    dir: 'dist',
+    routes: [],
+    interval: 0,
+    minify: {
+      collapseBooleanAttributes: true,
+      collapseWhitespace: true,
+      decodeEntities: true,
+      minifyCSS: true,
+      minifyJS: true,
+      processConditionalComments: true,
+      removeAttributeQuotes: false,
+      removeComments: false,
+      removeEmptyAttributes: true,
+      removeOptionalTags: true,
+      removeRedundantAttributes: true,
+      removeScriptTypeAttributes: false,
+      removeStyleLinkTypeAttributes: false,
+      removeTagWhitespace: false,
+      sortAttributes: true,
+      sortClassName: true,
+      trimCustomFragments: true,
+      useShortDoctype: true
+    }
+  },
+  env: {},
+  head: {
+    meta: [],
+    link: [],
+    style: [],
+    script: []
+  },
+  plugins: [],
+  css: [],
+  modules: [],
+  layouts: {},
+  serverMiddleware: [],
+  ErrorPage: null,
+  loading: {
+    color: 'black',
+    failedColor: 'red',
+    height: '2px',
+    duration: 5000
+  },
+  transition: {
+    name: 'page',
+    mode: 'out-in'
+  },
+  router: {
+    mode: 'history',
+    base: '/',
+    middleware: [],
+    linkActiveClass: 'nuxt-link-active',
+    linkExactActiveClass: 'nuxt-link-exact-active',
+    extendRoutes: null,
+    scrollBehavior: null
+  },
+  render: {
+    http2: {
+      push: false
+    },
+    static: {},
+    gzip: {
+      threshold: 0
+    },
+    etag: {
+      weak: true // Faster for responses > 5KB
+    }
+  },
+  watchers: {
+    webpack: {},
+    chokidar: {}
+  }
+}
diff --git a/lib/generate.js b/lib/generate.js
index 7525cb843d..ccc017cd56 100644
--- a/lib/generate.js
+++ b/lib/generate.js
@@ -1,11 +1,11 @@
-'use strict'
-
 import fs from 'fs-extra'
 import pify from 'pify'
 import _ from 'lodash'
 import { resolve, join, dirname, sep } from 'path'
 import { isUrl, promisifyRoute, waitFor } from './utils'
 import { minify } from 'html-minifier'
+import Tapable from 'tapable'
+
 const debug = require('debug')('nuxt:generate')
 const copy = pify(fs.copy)
 const remove = pify(fs.remove)
@@ -38,124 +38,136 @@ const defaults = {
   }
 }
 
-export default async function () {
-  const s = Date.now()
-  let errors = []
-  /*
-  ** Wait for modules to be initialized
-  */
-  await this.ready()
-  /*
-  ** Set variables
-  */
-  this.options.generate = _.defaultsDeep(this.options.generate, defaults)
-  var srcStaticPath = resolve(this.srcDir, 'static')
-  var srcBuiltPath = resolve(this.buildDir, 'dist')
-  var distPath = resolve(this.dir, this.options.generate.dir)
-  var distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
-  /*
-  ** Launch build process
-  */
-  await this.build()
-  /*
-  ** Clean destination folder
-  */
-  try {
-    await remove(distPath)
-    debug('Destination folder cleaned')
-  } catch (e) {}
-  /*
-  ** Copy static and built files
-  */
-  if (fs.existsSync(srcStaticPath)) {
-    await copy(srcStaticPath, distPath)
+export default class Generator extends Tapable {
+  constructor (nuxt) {
+    super()
+    this.nuxt = nuxt
+    this.options = nuxt.options
   }
-  await copy(srcBuiltPath, distNuxtPath)
-  debug('Static & build files copied')
-  if (this.options.router.mode !== 'hash') {
-    // Resolve config.generate.routes promises before generating the routes
+
+  async generate () {
+    const s = Date.now()
+    let errors = []
+    /*
+    ** Wait for modules to be initialized
+    */
+    await this.ready()
+    /*
+    ** Set variables
+    */
+    this.options.generate = _.defaultsDeep(this.options.generate, defaults)
+    let srcStaticPath = resolve(this.options.srcDir, 'static')
+    let srcBuiltPath = resolve(this.buildDir, 'dist')
+    let distPath = resolve(this.options.rootDir, this.options.generate.dir)
+    let distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
+    /*
+    ** Launch build process
+    */
+    await this.build()
+    /*
+    ** Clean destination folder
+    */
     try {
-      var generateRoutes = await promisifyRoute(this.options.generate.routes || [])
+      await remove(distPath)
+      debug('Destination folder cleaned')
     } catch (e) {
-      console.error('Could not resolve routes') // eslint-disable-line no-console
-      console.error(e) // eslint-disable-line no-console
-      process.exit(1)
-      throw e // eslint-disable-line no-unreachable
+    }
+    /*
+    ** Copy static and built files
+    */
+    if (fs.existsSync(srcStaticPath)) {
+      await copy(srcStaticPath, distPath)
+    }
+    await copy(srcBuiltPath, distNuxtPath)
+    debug('Static & build files copied')
+    if (this.options.router.mode !== 'hash') {
+      // Resolve config.generate.routes promises before generating the routes
+      try {
+        let generateRoutes = await promisifyRoute(this.options.generate.routes || [])
+      } catch (e) {
+        console.error('Could not resolve routes') // eslint-disable-line no-console
+        console.error(e) // eslint-disable-line no-console
+        process.exit(1)
+        throw e // eslint-disable-line no-unreachable
+      }
+    }
+    function decorateWithPayloads (routes) {
+      let routeMap = {}
+      // Fill routeMap for known routes
+      routes.forEach((route) => {
+        routeMap[route] = {
+          route,
+          payload: null
+        }
+      })
+      // Fill routeMap with given generate.routes
+      generateRoutes.forEach((route) => {
+        // route is either a string or like {route : "/my_route/1"}
+        const path = _.isString(route) ? route : route.route
+        routeMap[path] = {
+          route: path,
+          payload: route.payload || null
+        }
+      })
+      return _.values(routeMap)
+    }
+
+    /*
+    ** Generate only index.html for router.mode = 'hash'
+    */
+    let routes = (this.options.router.mode === 'hash') ? ['/'] : this.routes
+    routes = decorateWithPayloads(routes)
+
+    while (routes.length) {
+      let n = 0
+      await Promise.all(routes.splice(0, 500).map(async ({ route, payload }) => {
+        await waitFor(n++ * this.options.generate.interval)
+        let html
+        try {
+          const res = await this.renderRoute(route, { _generate: true, payload })
+          html = res.html
+          if (res.error) {
+            errors.push({ type: 'handled', route, error: res.error })
+          }
+        } catch (err) {
+          /* istanbul ignore next */
+          return errors.push({ type: 'unhandled', route, error: err })
+        }
+        if (this.options.generate.minify) {
+          try {
+            html = minify(html, this.options.generate.minify)
+          } catch (err) /* istanbul ignore next */ {
+            const minifyErr = new Error(`HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n ${html}`)
+            errors.push({ type: 'unhandled', route, error: minifyErr })
+          }
+        }
+        let path = join(route, sep, 'index.html') // /about -> /about/index.html
+        debug('Generate file: ' + path)
+        path = join(distPath, path)
+        // Make sure the sub folders are created
+        await mkdirp(dirname(path))
+        await writeFile(path, html, 'utf8')
+      }))
+    }
+    // Add .nojekyll file to let Github Pages add the _nuxt/ folder
+    // https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
+    const nojekyllPath = resolve(distPath, '.nojekyll')
+    writeFile(nojekyllPath, '')
+    const duration = Math.round((Date.now() - s) / 100) / 10
+    debug(`HTML Files generated in ${duration}s`)
+
+    if (errors.length) {
+      const report = errors.map(({ type, route, error }) => {
+        /* istanbul ignore if */
+        if (type === 'unhandled') {
+          return `Route: '${route}'\n${error.stack}`
+        } else {
+          return `Route: '${route}' thrown an error: \n` + JSON.stringify(error)
+        }
+      })
+      console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
     }
   }
-  function decorateWithPayloads (routes) {
-    let routeMap = {}
-    // Fill routeMap for known routes
-    routes.forEach((route) => {
-      routeMap[route] = {
-        route,
-        payload: null
-      }
-    })
-    // Fill routeMap with given generate.routes
-    generateRoutes.forEach((route) => {
-      // route is either a string or like {route : "/my_route/1"}
-      const path = _.isString(route) ? route : route.route
-      routeMap[path] = {
-        route: path,
-        payload: route.payload || null
-      }
-    })
-    return _.values(routeMap)
-  }
-  /*
-  ** Generate only index.html for router.mode = 'hash'
-  */
-  let routes = (this.options.router.mode === 'hash') ? ['/'] : this.routes
-  routes = decorateWithPayloads(routes)
 
-  while (routes.length) {
-    let n = 0
-    await Promise.all(routes.splice(0, 500).map(async ({route, payload}) => {
-      await waitFor(n++ * this.options.generate.interval)
-      let html
-      try {
-        const res = await this.renderRoute(route, { _generate: true, payload })
-        html = res.html
-        if (res.error) {
-          errors.push({ type: 'handled', route, error: res.error })
-        }
-      } catch (err) {
-        /* istanbul ignore next */
-        return errors.push({ type: 'unhandled', route, error: err })
-      }
-      if (this.options.generate.minify) {
-        try {
-          html = minify(html, this.options.generate.minify)
-        } catch (err) /* istanbul ignore next */ {
-          const minifyErr = new Error(`HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n ${html}`)
-          errors.push({ type: 'unhandled', route, error: minifyErr })
-        }
-      }
-      let path = join(route, sep, 'index.html') // /about -> /about/index.html
-      debug('Generate file: ' + path)
-      path = join(distPath, path)
-      // Make sure the sub folders are created
-      await mkdirp(dirname(path))
-      await writeFile(path, html, 'utf8')
-    }))
-  }
-  // Add .nojekyll file to let Github Pages add the _nuxt/ folder
-  // https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
-  const nojekyllPath = resolve(distPath, '.nojekyll')
-  writeFile(nojekyllPath, '')
-  const duration = Math.round((Date.now() - s) / 100) / 10
-  debug(`HTML Files generated in ${duration}s`)
-
-  if (errors.length) {
-    const report = errors.map(({ type, route, error }) => {
-      /* istanbul ignore if */
-      if (type === 'unhandled') {
-        return `Route: '${route}'\n${error.stack}`
-      } else {
-        return `Route: '${route}' thrown an error: \n` + JSON.stringify(error)
-      }
-    })
-    console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
-  }
 }
+
diff --git a/lib/module.js b/lib/module-container.js
similarity index 94%
rename from lib/module.js
rename to lib/module-container.js
index eed166f5fa..7136af1466 100755
--- a/lib/module.js
+++ b/lib/module-container.js
@@ -1,25 +1,23 @@
-'use strict'
-
 import path from 'path'
 import fs from 'fs'
 import { uniq } from 'lodash'
 import hash from 'hash-sum'
 import { chainFn, sequence } from './utils'
+import Tapable from 'tapable'
 
 const debug = require('debug')('nuxt:module')
 
-class Module {
+export default class ModuleContainer extends Tapable {
   constructor (nuxt) {
+    super()
     this.nuxt = nuxt
     this.options = nuxt.options
     this.requiredModules = []
-    this.initing = this.ready()
   }
 
   async ready () {
-    if (this.initing) {
-      await this.initing
-      return this
+    if (this._ready) {
+      return this._ready
     }
     // Install all modules in sequence
     await sequence(this.options.modules, this.addModule.bind(this))
@@ -61,10 +59,10 @@ class Module {
   }
 
   addPlugin (template) {
-    const {dst} = this.addTemplate(template)
+    const { dst } = this.addTemplate(template)
     // Add to nuxt plugins
     this.options.plugins.unshift({
-      src: path.join(this.nuxt.buildDir, dst),
+      src: path.join(this.options.buildDir, dst),
       ssr: template.ssr
     })
   }
@@ -159,5 +157,3 @@ class Module {
     })
   }
 }
-
-export default Module
diff --git a/lib/nuxt.js b/lib/nuxt.js
index a7373a8cc6..ed0d35398a 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -1,150 +1,104 @@
-'use strict'
-
 import _ from 'lodash'
 import compression from 'compression'
 import fs from 'fs-extra'
 import pify from 'pify'
 import Server from './server'
-import Module from './module'
-import * as build from './build'
-import * as render from './render'
-import generate from './generate'
+import ModuleContainer from './module-container'
+import Builder from './builder'
+import Renderer from './renderer'
+import Generate from './generate'
 import serveStatic from 'serve-static'
 import { resolve, join } from 'path'
-import * as utils from './utils'
+import defaults from './defaults'
+import Tapable from 'tapable'
 
-class Nuxt {
+export default class Nuxt extends Tapable {
   constructor (options = {}) {
-    const defaults = {
-      dev: (process.env.NODE_ENV !== 'production'),
-      buildDir: '.nuxt',
-      env: {},
-      head: {
-        meta: [],
-        link: [],
-        style: [],
-        script: []
-      },
-      plugins: [],
-      css: [],
-      modules: [],
-      layouts: {},
-      serverMiddleware: [],
-      ErrorPage: null,
-      loading: {
-        color: 'black',
-        failedColor: 'red',
-        height: '2px',
-        duration: 5000
-      },
-      transition: {
-        name: 'page',
-        mode: 'out-in'
-      },
-      router: {
-        mode: 'history',
-        base: '/',
-        middleware: [],
-        linkActiveClass: 'nuxt-link-active',
-        linkExactActiveClass: 'nuxt-link-exact-active',
-        extendRoutes: null,
-        scrollBehavior: null
-      },
-      render: {
-        http2: {
-          push: false
-        },
-        static: {},
-        gzip: {
-          threshold: 0
-        },
-        etag: {
-          weak: true // Faster for responses > 5KB
-        }
-      },
-      watchers: {
-        webpack: {},
-        chokidar: {}
-      }
+    super()
+
+    // Normalize options
+    if (options.loading === true) {
+      delete options.loading
+    }
+    if (options.router && typeof options.router.middleware === 'string') {
+      options.router.middleware = [options.router.middleware]
     }
-    // Sanitization
-    if (options.loading === true) delete options.loading
-    if (options.router && typeof options.router.middleware === 'string') options.router.middleware = [options.router.middleware]
     if (options.router && typeof options.router.base === 'string') {
       this._routerBaseSpecified = true
     }
-    if (typeof options.transition === 'string') options.transition = {name: options.transition}
+    if (typeof options.transition === 'string') {
+      options.transition = { name: options.transition }
+    }
+
+    // Apply defaults
     this.options = _.defaultsDeep(options, defaults)
-    // Ready variable
-    this._ready = false
-    // Env variables
-    this.dev = this.options.dev
-    // Explicit srcDir, rootDir and buildDir
-    this.dir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
-    this.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(this.dir, options.srcDir) : this.dir)
-    this.buildDir = join(this.dir, options.buildDir)
-    options.rootDir = this.dir
-    options.srcDir = this.srcDir
-    options.buildDir = this.buildDir
-    // If store defined, update store options to true
-    if (fs.existsSync(join(this.srcDir, 'store'))) {
-      this.options.store = true
-    }
-    // If app.html is defined, set the template path to the user template
-    this.options.appTemplatePath = resolve(__dirname, 'views/app.template.html')
-    if (fs.existsSync(join(this.srcDir, 'app.html'))) {
-      this.options.appTemplatePath = join(this.srcDir, 'app.html')
-    }
-    // renderer used by Vue.js (via createBundleRenderer)
-    this.renderer = null
-    // For serving static/ files to /
-    this.serveStatic = pify(serveStatic(resolve(this.srcDir, 'static'), this.options.render.static))
-    // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
-    this.serveStaticNuxt = pify(serveStatic(resolve(this.buildDir, 'dist'), {
-      maxAge: (this.dev ? 0 : '1y') // 1 year in production
-    }))
-    // gzip middleware for production
-    if (!this.dev && this.options.render.gzip) {
-      this.gzipMiddleware = pify(compression(this.options.render.gzip))
-    }
-    // Add this.Server Class
+
+    // Resolve dirs
+    this.options.rootDir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
+    this.options.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(options.rootDir, options.srcDir) : this.options.rootDir)
+    this.options.buildDir = join(this.options.rootDir, options.buildDir)
+
     this.Server = Server
-    // Add this.build
-    build.options.call(this) // Add build options
-    this.build = build.build.bind(this)
+    this.componentTasks()
+
+    // Create instance of core components
+    this.builder = new Builder(this)
+    this.renderer = new Renderer(this)
+    this.generate = new Generate(this)
+    this.moduleContainer = new ModuleContainer(this)
+
+    // Backward compatibility
+    this.render = this.renderer.render.bind(this.renderer)
+    this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
+    this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
+    this.build = this.ready.bind(this)
+    this.dir = options.rootDir
+    this.srcDir = options.srcDir
+    this.buildDir = options.buildDir
+
+    // Wait for all core components be ready
+    this._ready = this.ready().catch(console.error)
+  }
+
+  componentTasks () {
+    // TODO: This task should move into their own components instead
+
     // Error template
     this.errorTemplate = _.template(fs.readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'), {
       interpolate: /{{([\s\S]+?)}}/g
     })
-    // Add this.render and this.renderRoute
-    this.render = render.render.bind(this)
-    this.renderRoute = render.renderRoute.bind(this)
-    this.renderAndGetWindow = render.renderAndGetWindow.bind(this)
-    // Add this.generate
-    this.generate = generate.bind(this)
-    // Add this.utils (tests purpose)
-    this.utils = utils
-    // Add module integration
-    this.module = new Module(this)
-    // Init nuxt.js
-    this._ready = this.ready()
-    // Return nuxt.js instance
-    return this
+
+    // If store defined, update store options to true
+    if (fs.existsSync(join(this.options.srcDir, 'store'))) {
+      this.options.store = true
+    }
+
+    // If app.html is defined, set the template path to the user template
+    this.options.appTemplatePath = resolve(__dirname, 'views/app.template.html')
+    if (fs.existsSync(join(this.options.srcDir, 'app.html'))) {
+      this.options.appTemplatePath = join(this.options.srcDir, 'app.html')
+    }
+
+    // For serving static/ files to /
+    this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
+    // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
+    this.serveStaticNuxt = pify(serveStatic(resolve(this.options.buildDir, 'dist'), {
+      maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
+    }))
+
+    // gzip middleware for production
+    if (!this.options.dev && this.options.render.gzip) {
+      this.gzipMiddleware = pify(compression(this.options.render.gzip))
+    }
   }
 
   async ready () {
     if (this._ready) {
-      await this._ready
-      return this
-    }
-    // Init modules
-    await this.module.ready()
-    // Launch build in development but don't wait for it to be finished
-    if (this.dev) {
-      this.build()
-    } else {
-      build.production.call(this)
+      return this._ready
     }
+    await this.moduleContainer.ready()
+    await this.builder.ready()
+    console.log('Nuxt Ready!')
     return this
   }
 
@@ -178,4 +132,3 @@ class Nuxt {
   }
 }
 
-export default Nuxt
diff --git a/lib/render.js b/lib/render.js
deleted file mode 100644
index 238c31a528..0000000000
--- a/lib/render.js
+++ /dev/null
@@ -1,196 +0,0 @@
-'use strict'
-
-import ansiHTML from 'ansi-html'
-import serialize from 'serialize-javascript'
-import generateETag from 'etag'
-import fresh from 'fresh'
-import { getContext, setAnsiColors, encodeHtml } from './utils'
-
-const debug = require('debug')('nuxt:render')
-// force blue color
-debug.color = 4
-setAnsiColors(ansiHTML)
-
-export async function render (req, res) {
-  // Wait for nuxt.js to be ready
-  await this.ready()
-  // Check if project is built for production
-  if (!this.renderer && !this.dev) {
-    console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
-    process.exit(1)
-  }
-  /* istanbul ignore if */
-  if (!this.renderer || !this.appTemplate) {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(this.render(req, res))
-      }, 1000)
-    })
-  }
-  // Get context
-  const context = getContext(req, res)
-  res.statusCode = 200
-  try {
-    if (this.dev) {
-      // Call webpack middleware only in development
-      await this.webpackDevMiddleware(req, res)
-      await this.webpackHotMiddleware(req, res)
-    }
-    if (!this.dev && this.options.render.gzip) {
-      await this.gzipMiddleware(req, res)
-    }
-    // If base in req.url, remove it for the middleware and vue-router
-    if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
-      // Compatibility with base url for dev server
-      req.url = req.url.replace(this.options.router.base, '/')
-    }
-    // Serve static/ files
-    await this.serveStatic(req, res)
-    // Serve .nuxt/dist/ files (only for production)
-    if (!this.dev && req.url.indexOf(this.options.build.publicPath) === 0) {
-      const url = req.url
-      req.url = req.url.replace(this.options.build.publicPath, '/')
-      await this.serveStaticNuxt(req, res)
-      /* istanbul ignore next */
-      req.url = url
-    }
-    if (this.dev && req.url.indexOf(this.options.build.publicPath) === 0 && req.url.includes('.hot-update.json')) {
-      res.statusCode = 404
-      return res.end()
-    }
-    const {html, error, redirected, resourceHints} = await this.renderRoute(req.url, context)
-    if (redirected) {
-      return html
-    }
-    if (error) {
-      res.statusCode = context.nuxt.error.statusCode || 500
-    }
-    // ETag header
-    if (!error && this.options.render.etag) {
-      const etag = generateETag(html, this.options.render.etag)
-      if (fresh(req.headers, {etag})) {
-        res.statusCode = 304
-        res.end()
-        return
-      }
-      res.setHeader('ETag', etag)
-    }
-    // HTTP2 push headers
-    if (!error && this.options.render.http2.push) {
-      // Parse resourceHints to extract HTTP.2 prefetch/push headers
-      // https://w3c.github.io/preload/#server-push-http-2
-      const regex = /link rel="([^"]*)" href="([^"]*)" as="([^"]*)"/g
-      const pushAssets = []
-      let m
-      while (m = regex.exec(resourceHints)) { // eslint-disable-line no-cond-assign
-        const [_, rel, href, as] = m // eslint-disable-line no-unused-vars
-        if (rel === 'preload') {
-          pushAssets.push(`<${href}>; rel=${rel}; as=${as}`)
-        }
-      }
-      // Pass with single Link header
-      // https://blog.cloudflare.com/http-2-server-push-with-multiple-assets-per-link-header
-      res.setHeader('Link', pushAssets.join(','))
-    }
-    res.setHeader('Content-Type', 'text/html; charset=utf-8')
-    res.setHeader('Content-Length', Buffer.byteLength(html))
-    res.end(html, 'utf8')
-    return html
-  } catch (err) {
-    if (context.redirected) {
-      console.error(err) // eslint-disable-line no-console
-      return err
-    }
-    const html = this.errorTemplate({
-      /* istanbul ignore if */
-      error: err,
-      stack: ansiHTML(encodeHtml(err.stack))
-    })
-    res.statusCode = 500
-    res.setHeader('Content-Type', 'text/html; charset=utf-8')
-    res.setHeader('Content-Length', Buffer.byteLength(html))
-    res.end(html, 'utf8')
-    return err
-  }
-}
-
-export async function renderRoute (url, context = {}) {
-  // Wait for modules to be initialized
-  await this.ready()
-  // Log rendered url
-  debug(`Rendering url ${url}`)
-  // Add url and isSever to the context
-  context.url = url
-  context.isServer = true
-  // Call renderToString from the bundleRenderer and generate the HTML (will update the context as well)
-  let APP = await this.renderToString(context)
-  if (!context.nuxt.serverRendered) {
-    APP = '<div id="__nuxt"></div>'
-  }
-  const m = context.meta.inject()
-  let HEAD = m.meta.text() + m.title.text() + m.link.text() + m.style.text() + m.script.text() + m.noscript.text()
-  if (this._routerBaseSpecified) {
-    HEAD += `<base href="${this.options.router.base}">`
-  }
-  const resourceHints = context.renderResourceHints()
-  HEAD += resourceHints + context.renderStyles()
-  APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, {isJSON: true})}</script>`
-  APP += context.renderScripts()
-  const html = this.appTemplate({
-    HTML_ATTRS: 'data-n-head-ssr ' + m.htmlAttrs.text(),
-    BODY_ATTRS: m.bodyAttrs.text(),
-    HEAD,
-    APP
-  })
-  return {
-    html,
-    resourceHints,
-    error: context.nuxt.error,
-    redirected: context.redirected
-  }
-}
-
-// Function used to do dom checking via jsdom
-let jsdom = null
-export async function renderAndGetWindow (url, opts = {}) {
-  /* istanbul ignore if */
-  if (!jsdom) {
-    try {
-      jsdom = require('jsdom')
-    } catch (e) {
-      console.error('Fail when calling nuxt.renderAndGetWindow(url)') // eslint-disable-line no-console
-      console.error('jsdom module is not installed') // eslint-disable-line no-console
-      console.error('Please install jsdom with: npm install --save-dev jsdom') // eslint-disable-line no-console
-      process.exit(1)
-    }
-  }
-  let options = {
-    resources: 'usable', // load subresources (https://github.com/tmpvar/jsdom#loading-subresources)
-    runScripts: 'dangerously',
-    beforeParse (window) {
-      // Mock window.scrollTo
-      window.scrollTo = () => {
-      }
-    }
-  }
-  if (opts.virtualConsole !== false) {
-    options.virtualConsole = new jsdom.VirtualConsole().sendTo(console)
-  }
-  url = url || 'http://localhost:3000'
-  const {window} = await jsdom.JSDOM.fromURL(url, options)
-  // If Nuxt could not be loaded (error from the server-side)
-  const nuxtExists = window.document.body.innerHTML.includes('window.__NUXT__')
-  if (!nuxtExists) {
-    /* istanbul ignore next */
-    let error = new Error('Could not load the nuxt app')
-    /* istanbul ignore next */
-    error.body = window.document.body.innerHTML
-    throw error
-  }
-  // Used by nuxt.js to say when the components are loaded and the app ready
-  await new Promise((resolve) => {
-    window._onNuxtLoaded = () => resolve(window)
-  })
-  // Send back window object
-  return window
-}
diff --git a/lib/renderer.js b/lib/renderer.js
new file mode 100644
index 0000000000..50cfc611d9
--- /dev/null
+++ b/lib/renderer.js
@@ -0,0 +1,210 @@
+import ansiHTML from 'ansi-html'
+import serialize from 'serialize-javascript'
+import generateETag from 'etag'
+import fresh from 'fresh'
+import { getContext, setAnsiColors, encodeHtml } from './utils'
+import Tapable from 'tapable'
+
+const debug = require('debug')('nuxt:render')
+debug.color = 4 // Force blue color
+setAnsiColors(ansiHTML)
+
+let jsdom = null
+
+export default class Renderer extends Tapable {
+
+  constructor (nuxt) {
+    super()
+    this.nuxt = nuxt
+    this.options = nuxt.options
+  }
+
+  async render (req, res) {
+    // Wait for nuxt.js to be ready
+    await this.nuxt._ready
+    // Check if project is built for production
+    if (!this.nuxt.builder.renderer && !this.options.dev) {
+      console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
+      process.exit(1)
+    }
+    /* istanbul ignore if */
+    if (!this.nuxt.builder.renderer || !this.nuxt.builder.appTemplate) {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(this.render(req, res))
+        }, 1000)
+      })
+    }
+    // Get context
+    const context = getContext(req, res)
+    res.statusCode = 200
+    try {
+      if (this.options.dev) {
+        // Call webpack middleware only in development
+        await this.nuxt.builder.webpackDevMiddleware(req, res)
+        await this.nuxt.builder.webpackHotMiddleware(req, res)
+      }
+      if (!this.options.dev && this.options.render.gzip) {
+        await this.nuxt.gzipMiddleware(req, res)
+      }
+      // If base in req.url, remove it for the middleware and vue-router
+      if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
+        // Compatibility with base url for dev server
+        req.url = req.url.replace(this.options.router.base, '/')
+      }
+      // Serve static/ files
+      await this.nuxt.serveStatic(req, res)
+      // Serve .nuxt/dist/ files (only for production)
+      if (!this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0) {
+        const url = req.url
+        req.url = req.url.replace(this.options.build.publicPath, '/')
+        await this.nuxt.serveStaticNuxt(req, res)
+        /* istanbul ignore next */
+        req.url = url
+      }
+      if (this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0 && req.url.includes('.hot-update.json')) {
+        res.statusCode = 404
+        return res.end()
+      }
+      const { html, error, redirected, resourceHints } = await this.renderRoute(req.url, context)
+      if (redirected) {
+        return html
+      }
+      if (error) {
+        res.statusCode = context.nuxt.error.statusCode || 500
+      }
+      // ETag header
+      if (!error && this.options.render.etag) {
+        const etag = generateETag(html, this.options.render.etag)
+        if (fresh(req.headers, { etag })) {
+          res.statusCode = 304
+          res.end()
+          return
+        }
+        res.setHeader('ETag', etag)
+      }
+      // HTTP2 push headers
+      if (!error && this.options.render.http2.push) {
+        // Parse resourceHints to extract HTTP.2 prefetch/push headers
+        // https://w3c.github.io/preload/#server-push-http-2
+        const regex = /link rel="([^"]*)" href="([^"]*)" as="([^"]*)"/g
+        const pushAssets = []
+        let m
+        while (m = regex.exec(resourceHints)) { // eslint-disable-line no-cond-assign
+          const [_, rel, href, as] = m // eslint-disable-line no-unused-vars
+          if (rel === 'preload') {
+            pushAssets.push(`<${href}>; rel=${rel}; as=${as}`)
+          }
+        }
+        // Pass with single Link header
+        // https://blog.cloudflare.com/http-2-server-push-with-multiple-assets-per-link-header
+        res.setHeader('Link', pushAssets.join(','))
+      }
+      res.setHeader('Content-Type', 'text/html; charset=utf-8')
+      res.setHeader('Content-Length', Buffer.byteLength(html))
+      res.end(html, 'utf8')
+      return html
+    } catch (err) {
+      if (context.redirected) {
+        console.error(err) // eslint-disable-line no-console
+        return err
+      }
+      const html = this.nuxt.errorTemplate({
+        /* istanbul ignore if */
+        error: err,
+        stack: ansiHTML(encodeHtml(err.stack))
+      })
+      res.statusCode = 500
+      res.setHeader('Content-Type', 'text/html; charset=utf-8')
+      res.setHeader('Content-Length', Buffer.byteLength(html))
+      res.end(html, 'utf8')
+      return err
+    }
+  }
+
+  async renderRoute (url, context = {}) {
+    // Wait for nuxt.js to be ready
+    await this.nuxt._ready
+
+    // Log rendered url
+    debug(`Rendering url ${url}`)
+    // Add url and isSever to the context
+    context.url = url
+    context.isServer = true
+    // Call renderToString from the bundleRenderer and generate the HTML (will update the context as well)
+    let APP = await this.nuxt.builder.renderToString(context)
+    if (!context.nuxt.serverRendered) {
+      APP = '<div id="__nuxt"></div>'
+    }
+    const m = context.meta.inject()
+    let HEAD = m.meta.text() + m.title.text() + m.link.text() + m.style.text() + m.script.text() + m.noscript.text()
+    if (this._routerBaseSpecified) {
+      HEAD += `<base href="${this.options.router.base}">`
+    }
+    const resourceHints = context.renderResourceHints()
+    HEAD += resourceHints + context.renderStyles()
+    APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, { isJSON: true })}</script>`
+    APP += context.renderScripts()
+    const html = this.nuxt.builder.appTemplate({
+      HTML_ATTRS: 'data-n-head-ssr ' + m.htmlAttrs.text(),
+      BODY_ATTRS: m.bodyAttrs.text(),
+      HEAD,
+      APP
+    })
+    return {
+      html,
+      resourceHints,
+      error: context.nuxt.error,
+      redirected: context.redirected
+    }
+  }
+
+  async renderAndGetWindow (url, opts = {}) {
+    if (!this.ready) {
+      // Wait for nuxt.js to be ready
+      await this.nuxt._ready
+      this.ready = true
+    }
+
+    /* istanbul ignore if */
+    if (!jsdom) {
+      try {
+        jsdom = require('jsdom')
+      } catch (e) {
+        console.error('Fail when calling nuxt.renderAndGetWindow(url)') // eslint-disable-line no-console
+        console.error('jsdom module is not installed') // eslint-disable-line no-console
+        console.error('Please install jsdom with: npm install --save-dev jsdom') // eslint-disable-line no-console
+        process.exit(1)
+      }
+    }
+    let options = {
+      resources: 'usable', // load subresources (https://github.com/tmpvar/jsdom#loading-subresources)
+      runScripts: 'dangerously',
+      beforeParse (window) {
+        // Mock window.scrollTo
+        window.scrollTo = () => {
+        }
+      }
+    }
+    if (opts.virtualConsole !== false) {
+      options.virtualConsole = new jsdom.VirtualConsole().sendTo(console)
+    }
+    url = url || 'http://localhost:3000'
+    const { window } = await jsdom.JSDOM.fromURL(url, options)
+    // If Nuxt could not be loaded (error from the server-side)
+    const nuxtExists = window.document.body.innerHTML.includes('window.__NUXT__')
+    if (!nuxtExists) {
+      /* istanbul ignore next */
+      let error = new Error('Could not load the nuxt app')
+      /* istanbul ignore next */
+      error.body = window.document.body.innerHTML
+      throw error
+    }
+    // Used by nuxt.js to say when the components are loaded and the app ready
+    await new Promise((resolve) => {
+      window._onNuxtLoaded = () => resolve(window)
+    })
+    // Send back window object
+    return window
+  }
+}
diff --git a/lib/server.js b/lib/server.js
index 63766e4563..22a08dafc1 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const http = require('http')
 const connect = require('connect')
 const path = require('path')
@@ -7,18 +5,20 @@ const path = require('path')
 class Server {
   constructor (nuxt) {
     this.nuxt = nuxt
+    this.options = nuxt.options
+
     // Initialize
     this.app = connect()
     this.server = http.createServer(this.app)
     this.nuxt.ready()
-    .then(() => {
-      // Add Middleware
-      this.nuxt.options.serverMiddleware.forEach(m => {
-        this.useMiddleware(m)
+      .then(() => {
+        // Add Middleware
+        this.options.serverMiddleware.forEach(m => {
+          this.useMiddleware(m)
+        })
+        // Add default render middleware
+        this.useMiddleware(this.render.bind(this))
       })
-      // Add default render middleware
-      this.useMiddleware(this.render.bind(this))
-    })
     return this
   }
 
@@ -49,11 +49,11 @@ class Server {
     host = host || '127.0.0.1'
     port = port || 3000
     this.nuxt.ready()
-    .then(() => {
-      this.server.listen(port, host, () => {
-        console.log('Ready on http://%s:%s', host, port) // eslint-disable-line no-console
+      .then(() => {
+        this.server.listen(port, host, () => {
+          console.log('Ready on http://%s:%s', host, port) // eslint-disable-line no-console
+        })
       })
-    })
     return this
   }
 
diff --git a/lib/utils.js b/lib/utils.js
index 4e69f0f636..326b153e93 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,4 +1,3 @@
-'use strict'
 import { resolve, sep } from 'path'
 import _ from 'lodash'
 
@@ -91,6 +90,7 @@ const normalize = string => string.replace(reqSep, sysSep)
 
 export function r () {
   let args = Array.from(arguments)
+
   if (_.last(args).includes('~')) {
     return wp(_.last(args))
   }
diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index 406f198fb7..faf635ced0 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -1,5 +1,3 @@
-'use strict'
-
 import vueLoaderConfig from './vue-loader.config'
 import { defaults } from 'lodash'
 import { join } from 'path'
@@ -15,44 +13,46 @@ import ExtractTextPlugin from 'extract-text-webpack-plugin'
 | webpack config files
 |--------------------------------------------------------------------------
 */
-export default function ({ isClient, isServer }) {
+export default function webpackBaseConfig ({ isClient, isServer }) {
   const nodeModulesDir = join(__dirname, '..', 'node_modules')
   let config = {
-    devtool: (this.dev ? 'cheap-module-source-map' : false),
+    devtool: (this.options.dev ? 'cheap-module-source-map' : false),
     entry: {
       vendor: ['vue', 'vue-router', 'vue-meta']
     },
     output: {
-      publicPath: (isUrl(this.options.build.publicPath) ? this.options.build.publicPath : urlJoin(this.options.router.base, this.options.build.publicPath))
+      publicPath: (isUrl(this.options.build.publicPath)
+        ? this.options.build.publicPath
+        : urlJoin(this.options.router.base, this.options.build.publicPath))
     },
     performance: {
       maxEntrypointSize: 300000,
       maxAssetSize: 300000,
-      hints: (this.dev ? false : 'warning')
+      hints: (this.options.dev ? false : 'warning')
     },
     resolve: {
       extensions: ['.js', '.json', '.vue', '.ts'],
       // Disable for now
       alias: {
-        '~': join(this.srcDir),
-        'static': join(this.srcDir, 'static'), // use in template with <img src="~static/nuxt.png" />
-        '~static': join(this.srcDir, 'static'),
-        'assets': join(this.srcDir, 'assets'), // use in template with <img src="~assets/nuxt.png" />
-        '~assets': join(this.srcDir, 'assets'),
-        '~plugins': join(this.srcDir, 'plugins'),
-        '~store': join(this.buildDir, 'store'),
-        '~router': join(this.buildDir, 'router'),
-        '~pages': join(this.srcDir, 'pages'),
-        '~components': join(this.srcDir, 'components')
+        '~': join(this.options.srcDir),
+        'static': join(this.options.srcDir, 'static'), // use in template with <img src="~static/nuxt.png" />
+        '~static': join(this.options.srcDir, 'static'),
+        'assets': join(this.options.srcDir, 'assets'), // use in template with <img src="~assets/nuxt.png" />
+        '~assets': join(this.options.srcDir, 'assets'),
+        '~plugins': join(this.options.srcDir, 'plugins'),
+        '~store': join(this.options.buildDir, 'store'),
+        '~router': join(this.options.buildDir, 'router'),
+        '~pages': join(this.options.srcDir, 'pages'),
+        '~components': join(this.options.srcDir, 'components')
       },
       modules: [
-        join(this.dir, 'node_modules'),
+        join(this.options.rootDir, 'node_modules'),
         nodeModulesDir
       ]
     },
     resolveLoader: {
       modules: [
-        join(this.dir, 'node_modules'),
+        join(this.options.rootDir, 'node_modules'),
         nodeModulesDir
       ]
     },
@@ -70,7 +70,7 @@ export default function ({ isClient, isServer }) {
           query: defaults(this.options.build.babel, {
             presets: ['vue-app'],
             babelrc: false,
-            cacheDirectory: !!this.dev
+            cacheDirectory: !!this.options.dev
           })
         },
         { test: /\.css$/, use: styleLoader.call(this, 'css') },
@@ -85,7 +85,7 @@ export default function ({ isClient, isServer }) {
   // CSS extraction
   if (extractStyles.call(this)) {
     config.plugins.push(
-      new ExtractTextPlugin({filename: this.options.build.filenames.css})
+      new ExtractTextPlugin({ filename: this.options.build.filenames.css })
     )
   }
   // Add nuxt build loaders (can be configured in nuxt.config.js)
diff --git a/lib/webpack/client.config.js b/lib/webpack/client.config.js
index a874071ddf..893d879d34 100644
--- a/lib/webpack/client.config.js
+++ b/lib/webpack/client.config.js
@@ -1,5 +1,3 @@
-'use strict'
-
 import { each, defaults } from 'lodash'
 import webpack from 'webpack'
 import VueSSRClientPlugin from 'vue-server-renderer/client-plugin'
@@ -21,11 +19,11 @@ import { resolve } from 'path'
 | In production, will generate public/dist/style.css
 |--------------------------------------------------------------------------
 */
-export default function () {
+export default function webpackClientConfig() {
   let config = base.call(this, { isClient: true })
 
   // Entry
-  config.entry.app = resolve(this.buildDir, 'client.js')
+  config.entry.app = resolve(this.options.buildDir, 'client.js')
 
   // Add vendors
   if (this.options.store) {
@@ -34,7 +32,7 @@ export default function () {
   config.entry.vendor = config.entry.vendor.concat(this.options.build.vendor)
 
   // Output
-  config.output.path = resolve(this.buildDir, 'dist')
+  config.output.path = resolve(this.options.buildDir, 'dist')
   config.output.filename = this.options.build.filenames.app
 
   // env object defined in nuxt.config.js
@@ -46,7 +44,7 @@ export default function () {
   config.plugins = (config.plugins || []).concat([
     // Strip comments in Vue code
     new webpack.DefinePlugin(Object.assign(env, {
-      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || (this.dev ? 'development' : 'production')),
+      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || (this.options.dev ? 'development' : 'production')),
       'process.BROWSER_BUILD': true,
       'process.SERVER_BUILD': false,
       'process.browser': true,
@@ -87,11 +85,11 @@ export default function () {
     new ProgressBarPlugin()
   )
   // Add friendly error plugin
-  if (this.dev) {
+  if (this.options.dev) {
     config.plugins.push(new FriendlyErrorsWebpackPlugin())
   }
   // Production client build
-  if (!this.dev) {
+  if (!this.options.dev) {
     config.plugins.push(
       // This is needed in webpack 2 for minifying CSS
       new webpack.LoaderOptionsPlugin({
@@ -109,19 +107,19 @@ export default function () {
   // Extend config
   if (typeof this.options.build.extend === 'function') {
     this.options.build.extend.call(this, config, {
-      dev: this.dev,
+      dev: this.options.dev,
       isClient: true
     })
   }
   // Offline-plugin integration
-  if (!this.dev && this.options.offline) {
+  if (!this.options.dev && this.options.offline) {
     const offlineOpts = typeof this.options.offline === 'object' ? this.options.offline : {}
     config.plugins.push(
       new OfflinePlugin(defaults(offlineOpts, {}))
     )
   }
   // Webpack Bundle Analyzer
-  if (!this.dev && this.options.build.analyze) {
+  if (!this.options.dev && this.options.build.analyze) {
     let options = {}
     if (typeof this.options.build.analyze === 'object') {
       options = this.options.build.analyze
diff --git a/lib/webpack/helpers.js b/lib/webpack/helpers.js
index e3fae8288e..e22feda68f 100755
--- a/lib/webpack/helpers.js
+++ b/lib/webpack/helpers.js
@@ -1,7 +1,7 @@
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 
 export function extractStyles () {
-  return !this.dev && this.options.build.extractCSS
+  return !this.options.dev && this.options.build.extractCSS
 }
 
 export function styleLoader (ext, loader = []) {
diff --git a/lib/webpack/server.config.js b/lib/webpack/server.config.js
index e1ba11ccc5..1acf86e0bd 100644
--- a/lib/webpack/server.config.js
+++ b/lib/webpack/server.config.js
@@ -1,5 +1,3 @@
-'use strict'
-
 import webpack from 'webpack'
 import VueSSRServerPlugin from 'vue-server-renderer/server-plugin'
 import nodeExternals from 'webpack-node-externals'
@@ -12,7 +10,7 @@ import { resolve } from 'path'
 | Webpack Server Config
 |--------------------------------------------------------------------------
 */
-export default function () {
+export default function webpackServerConfig () {
   let config = base.call(this, { isServer: true })
 
   // env object defined in nuxt.config.js
@@ -23,10 +21,10 @@ export default function () {
 
   config = Object.assign(config, {
     target: 'node',
-    devtool: (this.dev ? 'source-map' : false),
-    entry: resolve(this.buildDir, 'server.js'),
+    devtool: (this.options.dev ? 'source-map' : false),
+    entry: resolve(this.options.buildDir, 'server.js'),
     output: Object.assign({}, config.output, {
-      path: resolve(this.buildDir, 'dist'),
+      path: resolve(this.options.buildDir, 'dist'),
       filename: 'server-bundle.js',
       libraryTarget: 'commonjs2'
     }),
@@ -44,7 +42,7 @@ export default function () {
         filename: 'server-bundle.json'
       }),
       new webpack.DefinePlugin(Object.assign(env, {
-        'process.env.NODE_ENV': JSON.stringify(this.dev ? 'development' : 'production'),
+        'process.env.NODE_ENV': JSON.stringify(this.options.dev ? 'development' : 'production'),
         'process.BROWSER_BUILD': false, // deprecated
         'process.SERVER_BUILD': true,  // deprecated
         'process.browser': false,
@@ -53,7 +51,7 @@ export default function () {
     ])
   })
   // This is needed in webpack 2 for minifying CSS
-  if (!this.dev) {
+  if (!this.options.dev) {
     config.plugins.push(
       new webpack.LoaderOptionsPlugin({
         minimize: true
@@ -64,7 +62,7 @@ export default function () {
   // Extend config
   if (typeof this.options.build.extend === 'function') {
     this.options.build.extend.call(this, config, {
-      dev: this.dev,
+      dev: this.options.dev,
       isServer: true
     })
   }
diff --git a/lib/webpack/vue-loader.config.js b/lib/webpack/vue-loader.config.js
index ae4c7b8aba..fcb7a0c90a 100644
--- a/lib/webpack/vue-loader.config.js
+++ b/lib/webpack/vue-loader.config.js
@@ -1,5 +1,3 @@
-'use strict'
-
 import { defaults } from 'lodash'
 import { extractStyles, styleLoader } from './helpers'
 
@@ -7,7 +5,7 @@ export default function ({ isClient }) {
   let babelOptions = JSON.stringify(defaults(this.options.build.babel, {
     presets: ['vue-app'],
     babelrc: false,
-    cacheDirectory: !!this.dev
+    cacheDirectory: !!this.options.dev
   }))
 
   // https://github.com/vuejs/vue-loader/blob/master/docs/en/configurations

From 2913d90109d73901c22fefc7921ae2affac5bb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 21:04:59 +0200
Subject: [PATCH 018/236] Remove `build.loaders` option

---
 lib/build.js               | 21 +--------------------
 lib/webpack/base.config.js | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/lib/build.js b/lib/build.js
index 36b2cf5286..7665b4bc8d 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -35,31 +35,13 @@ const defaults = {
     app: 'nuxt.bundle.[chunkhash].js'
   },
   vendor: [],
-  loaders: [],
   plugins: [],
   babel: {},
   postcss: [],
   templates: [],
   watch: []
 }
-const defaultsLoaders = [
-  {
-    test: /\.(png|jpe?g|gif|svg)$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1KO
-      name: 'img/[name].[hash:7].[ext]'
-    }
-  },
-  {
-    test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1 KO
-      name: 'fonts/[name].[hash:7].[ext]'
-    }
-  }
-]
+
 const defaultsPostcss = [
   require('autoprefixer')({
     browsers: ['last 3 versions']
@@ -69,7 +51,6 @@ const defaultsPostcss = [
 export function options () {
   // Defaults build options
   let extraDefaults = {}
-  if (this.options.build && !Array.isArray(this.options.build.loaders)) extraDefaults.loaders = defaultsLoaders
   if (this.options.build && !Array.isArray(this.options.build.postcss)) extraDefaults.postcss = defaultsPostcss
   this.options.build = _.defaultsDeep(this.options.build, defaults, extraDefaults)
   /* istanbul ignore if */
diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index 406f198fb7..46eb0a3221 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -77,7 +77,23 @@ export default function ({ isClient, isServer }) {
         { test: /\.less$/, use: styleLoader.call(this, 'less', 'less-loader') },
         { test: /\.sass$/, use: styleLoader.call(this, 'sass', 'sass-loader?indentedSyntax&sourceMap') },
         { test: /\.scss$/, use: styleLoader.call(this, 'sass', 'sass-loader?sourceMap') },
-        { test: /\.styl(us)?$/, use: styleLoader.call(this, 'stylus', 'stylus-loader') }
+        { test: /\.styl(us)?$/, use: styleLoader.call(this, 'stylus', 'stylus-loader') },
+        {
+          test: /\.(png|jpe?g|gif|svg)$/,
+          loader: 'url-loader',
+          query: {
+            limit: 1000, // 1KO
+            name: 'img/[name].[hash:7].[ext]'
+          }
+        },
+        {
+          test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+          loader: 'url-loader',
+          query: {
+            limit: 1000, // 1 KO
+            name: 'fonts/[name].[hash:7].[ext]'
+          }
+        }
       ]
     },
     plugins: this.options.build.plugins
@@ -88,8 +104,6 @@ export default function ({ isClient, isServer }) {
       new ExtractTextPlugin({filename: this.options.build.filenames.css})
     )
   }
-  // Add nuxt build loaders (can be configured in nuxt.config.js)
-  config.module.rules = config.module.rules.concat(this.options.build.loaders)
   // Return config
   return config
 }

From 76a1969da176941e4e6ba394a34e3e8970d39c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 21:12:51 +0200
Subject: [PATCH 019/236] Update example

---
 examples/custom-build/nuxt.config.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/examples/custom-build/nuxt.config.js b/examples/custom-build/nuxt.config.js
index 22ba1217a6..5feedeaaef 100644
--- a/examples/custom-build/nuxt.config.js
+++ b/examples/custom-build/nuxt.config.js
@@ -7,21 +7,13 @@ module.exports = {
         app: 'app.[chunkhash].js'         // default: nuxt.bundle.[chunkhash].js
     },
     vendor: ['lodash'],
-    // Loaders config (Webpack 2)
-    loaders: [
-      {
-        test: /\.(png|jpg|gif|svg)$/,
-        loader: 'url-loader',
-        options: {
-          limit: 100000, // 100KO
-          name: 'img/[name].[ext]?[hash]'
-        }
-      }
-    ],
     extend (config, { dev }) {
       if (dev) {
         config.devtool = (dev ? 'eval-source-map' : false)
       }
+      const urlLoader = config.module.rules.find((loader) => loader.loader === 'url-loader')
+      // Increase limit to 100KO
+      urlLoader.query.limit = 100000
     }
   }
 }

From 2b2d9e5e713a75ead34a8820c345aa75c67cb8f1 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 12 Jun 2017 04:13:39 +0430
Subject: [PATCH 020/236] feat(nuxt-child): bind transition calls to parent

WIP for #566
---
 lib/app/components/nuxt-child.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/app/components/nuxt-child.js b/lib/app/components/nuxt-child.js
index becc3b82a8..492e002ac8 100644
--- a/lib/app/components/nuxt-child.js
+++ b/lib/app/components/nuxt-child.js
@@ -30,7 +30,7 @@ export default {
   functional: true,
   render (h, { parent, data }) {
     data.nuxtChild = true
-
+    const _parent = parent
     const transitions = parent.$nuxt.nuxt.transitions
     const defaultTransition = parent.$nuxt.nuxt.defaultTransition
     let depth = 0
@@ -51,7 +51,7 @@ export default {
     let listeners = {}
     listenersKeys.forEach((key) => {
       if (typeof transition[key] === 'function') {
-        listeners[key] = transition[key]
+        listeners[key] = transition[key].bind(_parent)
       }
     })
     return h('transition', {

From 549b8da21f062b18a3fd3e7617df4a79c9984eb8 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 12 Jun 2017 04:58:03 +0430
Subject: [PATCH 021/236] fix(client): combine & prefer leave* transitions of
 from route

#566
---
 lib/app/client.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index ccb2381d02..422eff8221 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -14,12 +14,23 @@ let router
 <%= (store ? 'let store' : '') %>
 
 function mapTransitions(Components, to, from) {
+  const resolve = t => (typeof t.options.transition === 'function')
+    ? t.options.transition(to, from)
+    : Object.assign({}, t.options.transition)
+
+  const resolveRoute = r => resolve(r.matched[0].components.default)
+
   return Components.map((Component) => {
-    let transition = Component.options.transition
-    if (typeof transition === 'function') {
-      return transition(to, from)
-    }
-    return transition
+    let transitions = Object.assign({}, to ? resolveRoute(to) : resolve(Component))
+    // Combine transitions
+    // Prefer leave* transitions of from route
+    let from_transitions = from ? resolveRoute(from) : {}
+    Object.keys(from_transitions).forEach(key=> {
+      if(from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
+        transitions[key] = from_transitions[key]
+      }
+    })
+    return transitions
   })
 }
 

From 647f3db3201ab1fdd31a1d94bb58d60c0916fc2f Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 12 Jun 2017 05:09:42 +0430
Subject: [PATCH 022/236] chore(client): simplify resolveTransitions()

#566
---
 lib/app/client.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index 422eff8221..4c2d9ff978 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -14,19 +14,18 @@ let router
 <%= (store ? 'let store' : '') %>
 
 function mapTransitions(Components, to, from) {
-  const resolve = t => (typeof t.options.transition === 'function')
-    ? t.options.transition(to, from)
-    : Object.assign({}, t.options.transition)
+  const resolveTransitions = component => (typeof component.options.transition === 'function')
+    ? component.options.transition(to, from)
+    : component.options.transition
 
-  const resolveRoute = r => resolve(r.matched[0].components.default)
+  const resolveRoute = route => resolveTransitions(route.matched[0].components.default)
 
   return Components.map((Component) => {
-    let transitions = Object.assign({}, to ? resolveRoute(to) : resolve(Component))
-    // Combine transitions
-    // Prefer leave* transitions of from route
-    let from_transitions = from ? resolveRoute(from) : {}
+    const transitions = Object.assign({}, to ? resolveRoute(to) : resolveTransitions(Component))
+    const from_transitions = from ? resolveRoute(from) : {}
+    // Combine transitions & prefer leave* transitions of from route
     Object.keys(from_transitions).forEach(key=> {
-      if(from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
+      if (from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
         transitions[key] = from_transitions[key]
       }
     })

From 602adf046435cb81b5c673b11b94a8ad5a7453e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 15:48:20 +0200
Subject: [PATCH 023/236] Refactor nuxt commands using minimist

---
 bin/nuxt-build    |  84 +++----
 bin/nuxt-dev      |  58 +++--
 bin/nuxt-generate |  47 +++-
 bin/nuxt-start    |  55 ++++-
 package.json      |   1 +
 yarn.lock         | 573 ++++++++++++++++++++++++----------------------
 6 files changed, 479 insertions(+), 339 deletions(-)

diff --git a/bin/nuxt-build b/bin/nuxt-build
index 1af998d2be..53b125765e 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -4,60 +4,66 @@
 process.env.DEBUG = 'nuxt:*'
 
 var fs = require('fs')
+var parseArgs = require('minimist')
 var without = require('lodash').without
 var Nuxt = require('../')
 var resolve = require('path').resolve
 
-// --analyze option
-var analyzeBuild = false
-if (process.argv.indexOf('--analyze') !== -1 || process.argv.indexOf('-a') !== -1) {
-  analyzeBuild = true
-  process.argv = without(process.argv, '--analyze', '-a')
+const argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    c: 'config-file',
+    a: 'analyze'
+  },
+  boolean: ['h', 'a'],
+  string: ['c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
+
+if (argv.help) {
+  console.log(`
+    Description
+      Compiles the application for production deployment
+    Usage
+      $ nuxt build <dir>
+    Options
+      --analyze, -a       Launch webpack-bundle-analyzer to optimize your bundles.
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
 }
 
-var nuxtConfigFileName = 'nuxt.config.js'
-
-// --config-file option
-var indexOfConfig = false
-if (process.argv.indexOf('--config-file') !== -1) {
-  indexOfConfig = process.argv.indexOf('--config-file')
-} else if (process.argv.indexOf('-c') !== -1) {
-  indexOfConfig = process.argv.indexOf('-c')
-}
-
-if (indexOfConfig !== false) {
-  nuxtConfigFileName = process.argv.slice(indexOfConfig)[1]
-  process.argv = without(process.argv, '--config-file', '-c', nuxtConfigFileName)
-}
-
-// Root directory parameter
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFilePath = resolve(rootDir, nuxtConfigFileName)
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
-if (fs.existsSync(nuxtConfigFilePath)) {
-  options = require(nuxtConfigFilePath)
-} else {
-  console.log(`Could not locate ${nuxtConfigFilePath}`) // eslint-disable-line no-console
+if (fs.existsSync(nuxtConfigFile)) {
+  options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
-
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
-options.dev = false // Create production build when calling `nuxt build`
-
+// Create production build when calling `nuxt build`
+options.dev = false
+// Analyze option
 options.build = options.build || {}
-if (analyzeBuild) {
-  options.build.analyze = analyzeBuild
+if (argv.analyze) {
+  options.build.analyze = true
 }
 
 console.log('[nuxt] Building...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
 nuxt.build()
-  .then(() => {
-    console.log('[nuxt] Building done') // eslint-disable-line no-console
-  })
-  .catch((err) => {
-    console.error(err) // eslint-disable-line no-console
-    process.exit(1)
-  })
+.then(() => {
+  console.log('[nuxt] Building done') // eslint-disable-line no-console
+})
+.catch((err) => {
+  console.error(err) // eslint-disable-line no-console
+  process.exit(1)
+})
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 4b1f733ce6..84efb2e442 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -7,41 +7,66 @@ var _ = require('lodash')
 var debug = require('debug')('nuxt:build')
 debug.color = 2 // force green color
 var fs = require('fs')
+var parseArgs = require('minimist')
 var Nuxt = require('../')
 var chokidar = require('chokidar')
 var resolve = require('path').resolve
 var without = require('lodash').without
 
-var nuxtConfigFileName = 'nuxt.config.js'
+var argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    H: 'hostname',
+    p: 'port',
+    c: 'config-file'
+  },
+  boolean: ['h'],
+  string: ['H', 'c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
 
-// --config-file option
-var indexOfConfig = false
-if (process.argv.indexOf('--config-file') !== -1) {
-  indexOfConfig = process.argv.indexOf('--config-file')
-} else if (process.argv.indexOf('-c') !== -1) {
-  indexOfConfig = process.argv.indexOf('-c')
+if (argv.hostname === '') {
+  console.error(`> Provided hostname argument has no value`)
+  process.exit(1)
 }
 
-if (indexOfConfig !== false) {
-  nuxtConfigFileName = process.argv.slice(indexOfConfig)[1]
-  process.argv = without(process.argv, '--config-file', '-c', nuxtConfigFileName)
+if (argv.help) {
+  console.log(`
+    Description
+      Starts the application in development mode (hot-code reloading, error
+      reporting, etc)
+    Usage
+      $ nuxt dev <dir> -p <port number> -H <hostname>
+    Options
+      --port, -p          A port number on which to start the application
+      --hostname, -H      Hostname on which to start the application
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
 }
 
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFile = resolve(rootDir, nuxtConfigFileName)
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
   options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
-options.dev = true // Add hot reloading and watching changes
+// Force development mode: add hot reloading and watching changes
+options.dev = true
 
 var nuxt = module.exports = new Nuxt(options)
-var port = process.env.PORT || process.env.npm_package_config_nuxt_port
-var host = process.env.HOST || process.env.npm_package_config_nuxt_host
+var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
+var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
 var server = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
 
 listenOnConfigChanges(nuxt, server)
@@ -74,7 +99,6 @@ function listenOnConfigChanges(nuxt, server) {
         process.exit(1)
       })
   }, 200)
-  var nuxtConfigFile = resolve(rootDir, nuxtConfigFileName)
-  chokidar.watch(nuxtConfigFile, Object.assign({}, nuxt.options.watchers.chokidar, {ignoreInitial: true}))
+  chokidar.watch(nuxtConfigFile, Object.assign({}, nuxt.options.watchers.chokidar, { ignoreInitial: true }))
     .on('all', build)
 }
diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index c187810fa1..771612bf38 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -4,15 +4,44 @@
 process.env.DEBUG = 'nuxt:*'
 
 var fs = require('fs')
+var parseArgs = require('minimist')
 var Nuxt = require('../')
 var resolve = require('path').resolve
 
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFile = resolve(rootDir, 'nuxt.config.js')
+var argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    c: 'config-file'
+  },
+  boolean: ['h'],
+  string: ['c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
+
+if (argv.help) {
+  console.log(`
+    Description
+      Generate a static web application (server-rendered)
+    Usage
+      $ nuxt generate <dir>
+    Options
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
+}
+
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
   options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
@@ -22,10 +51,10 @@ options.dev = false // Force production mode (no webpack middleware called)
 console.log('[nuxt] Generating...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
 nuxt.generate()
-  .then(() => {
-    console.log('[nuxt] Generate done') // eslint-disable-line no-console
-  })
-  .catch((err) => {
-    console.error(err) // eslint-disable-line no-console
-    process.exit(1)
-  })
+.then(() => {
+  console.log('[nuxt] Generate done') // eslint-disable-line no-console
+})
+.catch((err) => {
+  console.error(err) // eslint-disable-line no-console
+  process.exit(1)
+})
diff --git a/bin/nuxt-start b/bin/nuxt-start
index 8af26fbaf4..970c87d7fd 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -1,22 +1,69 @@
 #!/usr/bin/env node
 
 var fs = require('fs')
+var parseArgs = require('minimist')
 var Nuxt = require('../')
 var resolve = require('path').resolve
+var join = require('path').join
 
-var rootDir = resolve(process.argv.slice(2)[0] || '.')
-var nuxtConfigFile = resolve(rootDir, 'nuxt.config.js')
+var argv = parseArgs(process.argv.slice(2), {
+  alias: {
+    h: 'help',
+    H: 'hostname',
+    p: 'port',
+    c: 'config-file'
+  },
+  boolean: ['h'],
+  string: ['H', 'c'],
+  default: {
+    c: 'nuxt.config.js'
+  }
+})
+
+if (argv.hostname === '') {
+  console.error(`> Provided hostname argument has no value`)
+  process.exit(1)
+}
+
+if (argv.help) {
+  console.log(`
+    Description
+      Starts the application in production mode.
+      The application should be compiled with \`nuxt build\` first.
+    Usage
+      $ nuxt start <dir> -p <port number> -H <hostname>
+    Options
+      --port, -p          A port number on which to start the application
+      --hostname, -H      Hostname on which to start the application
+      --config-file, -c   Path to Nuxt.js config file (default: nuxt.config.js)
+      --help, -h          Displays this message
+  `)
+  process.exit(0)
+}
+
+var rootDir = resolve(argv._[0] || '.')
+var nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
   options = require(nuxtConfigFile)
+} else if (argv['config-file'] !== 'nuxt.config.js') {
+  console.error(`> Could not load config file ${argv['config-file']}`)
+  process.exit(1)
 }
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
 options.dev = false // Force production mode (no webpack middleware called)
 
+var buildDir = join(options.rootDir, (options.buildDir || '.nuxt'), 'dist', 'server-bundle.json')
+// Check if project is built for production
+if (!fs.existsSync(buildDir)) {
+  console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
+  process.exit(1)
+}
+
 var nuxt = module.exports = new Nuxt(options)
-var port = process.env.PORT || process.env.npm_package_config_nuxt_port
-var host = process.env.HOST || process.env.npm_package_config_nuxt_host
+var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
+var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
 var server = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
diff --git a/package.json b/package.json
index 472d26ff40..ba306b2f61 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "html-webpack-plugin": "^2.28.0",
     "lodash": "^4.17.4",
     "memory-fs": "^0.4.1",
+    "minimist": "^1.2.0",
     "offline-plugin": "^4.8.1",
     "opencollective": "^1.0.3",
     "pify": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 47332ff848..9d774bd451 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,14 +1,12 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 "@ava/babel-plugin-throws-helper@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
 
 "@ava/babel-preset-stage-4@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.0.0.tgz#a613b5e152f529305422546b072d47facfb26291"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.1.0.tgz#ae60be881a0babf7d35f52aba770d1f6194f76bd"
   dependencies:
     babel-plugin-check-es2015-constants "^6.8.0"
     babel-plugin-syntax-trailing-function-commas "^6.20.0"
@@ -38,8 +36,8 @@
     esutils "^2.0.2"
 
 "@types/node@^6.0.46":
-  version "6.0.77"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.77.tgz#3e4d569a427f17085e1ee4ecd3c31befb56af7b5"
+  version "6.0.78"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
 
 abab@^1.0.3:
   version "1.0.3"
@@ -90,13 +88,20 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.7.0, 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:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -123,7 +128,7 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-html@0.0.7, ansi-html@^0.0.7:
+ansi-html@^0.0.7, ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
@@ -243,14 +248,14 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
+assert-plus@^1.0.0, assert-plus@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -411,19 +416,19 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     js-tokens "^3.0.0"
 
 babel-core@^6.17.0, babel-core@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
     babel-code-frame "^6.22.0"
-    babel-generator "^6.24.1"
+    babel-generator "^6.25.0"
     babel-helpers "^6.24.1"
     babel-messages "^6.23.0"
     babel-register "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
+    babel-template "^6.25.0"
+    babel-traverse "^6.25.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     convert-source-map "^1.1.0"
     debug "^2.1.1"
     json5 "^0.5.0"
@@ -443,13 +448,13 @@ babel-eslint@^7.2.3:
     babel-types "^6.23.0"
     babylon "^6.17.0"
 
-babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.25.0.tgz#33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    babel-types "^6.25.0"
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
     lodash "^4.2.0"
@@ -902,8 +907,8 @@ babel-polyfill@6.23.0:
     regenerator-runtime "^0.10.0"
 
 babel-preset-env@^1.2.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b"
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -1022,42 +1027,42 @@ babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
+    babel-traverse "^6.25.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     lodash "^4.2.0"
 
-babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    babylon "^6.15.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     debug "^2.2.0"
     globals "^9.0.0"
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
   dependencies:
     babel-runtime "^6.22.0"
     esutils "^2.0.2"
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.1.0, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0:
-  version "6.17.2"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.2.tgz#201d25ef5f892c41bae49488b08db0dd476e9f5c"
+babylon@^6.1.0, babylon@^6.13.0, babylon@^6.17.0, babylon@^6.17.2:
+  version "6.17.3"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.3.tgz#1327d709950b558f204e5352587fd0290f8d8e48"
 
 balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
@@ -1304,12 +1309,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.30000679"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000679.tgz#dd7be12f16577e5d6ae6db880c6d619e77dca365"
+  version "1.0.30000683"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000683.tgz#58b57ed1e0bb9da54eaf1462985147bbe16679fa"
 
 caniuse-lite@^1.0.30000670:
-  version "1.0.30000679"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000679.tgz#0fb5bb3658d4d4448f8f86a1c48df15664aa05ef"
+  version "1.0.30000683"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000683.tgz#a7573707cf2acc9217ca6484d1dfbc9f13898364"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1330,7 +1335,15 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
+chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1340,14 +1353,6 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1459,8 +1464,8 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 coa@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.2.tgz#2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.3.tgz#1b54a5e1dcf77c990455d4deea98c564416dc893"
   dependencies:
     q "^1.1.2"
 
@@ -1524,7 +1529,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
+commander@^2.9.0, commander@~2.9.0, commander@2.9.x:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -1850,7 +1855,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+"cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -1894,7 +1899,13 @@ 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.2.0, debug@~2.2.0:
+debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
+debug@~2.2.0, debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -1906,12 +1917,6 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
 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"
@@ -1969,7 +1974,7 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@1.1.0, depd@~1.1.0:
+depd@~1.1.0, depd@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
@@ -2010,16 +2015,16 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+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"
@@ -2041,7 +2046,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@^1.3.0, domelementtype@1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2049,16 +2054,23 @@ domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  dependencies:
+    domelementtype "1"
+
 domhandler@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
   dependencies:
     domelementtype "1"
 
-domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
   dependencies:
+    dom-serializer "0"
     domelementtype "1"
 
 domutils@1.1:
@@ -2074,27 +2086,20 @@ domutils@1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
   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"
-
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2119,8 +2124,8 @@ ejs@^2.3.4, ejs@^2.5.6:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11:
-  version "1.3.13"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc"
+  version "1.3.14"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2201,7 +2206,7 @@ es6-error@^4.0.1, es6-error@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
-es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@2:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
@@ -2230,7 +2235,7 @@ es6-set@~0.1.5:
     es6-symbol "3.1.1"
     event-emitter "~0.3.5"
 
-es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1, es6-symbol@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -2542,13 +2547,13 @@ extglob@^0.3.1:
     is-extglob "^1.0.0"
 
 extract-text-webpack-plugin@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
   dependencies:
-    ajv "^4.11.2"
     async "^2.1.2"
     loader-utils "^1.0.2"
-    webpack-sources "^0.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
 
 extsprintf@1.0.2:
   version "1.0.2"
@@ -2606,7 +2611,7 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
+finalhandler@^1.0.3, finalhandler@~1.0.3, finalhandler@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
   dependencies:
@@ -2693,7 +2698,7 @@ forwarded@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
-fresh@0.5.0, fresh@^0.5.0:
+fresh@^0.5.0, fresh@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
@@ -2842,8 +2847,8 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
     path-is-absolute "^1.0.0"
 
 globals@^9.0.0, globals@^9.14.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
 globby@^5.0.0:
   version "5.0.0"
@@ -2983,7 +2988,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@1.1.x, he@^1.1.0:
+he@^1.1.0, he@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
@@ -3108,14 +3113,14 @@ hullabaloo-config-manager@^1.0.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
 iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.17"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
 
+iconv-lite@0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+
 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"
@@ -3138,6 +3143,10 @@ ignore@^3.2.0, ignore@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
+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"
@@ -3167,7 +3176,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.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3179,24 +3188,6 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    chalk "^1.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.1"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx "^4.1.0"
-    string-width "^2.0.0"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 inquirer@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
@@ -3215,6 +3206,24 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    chalk "^1.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.1"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx "^4.1.0"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -3342,12 +3351,18 @@ 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.0.2, is-number@^2.1.0:
+is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -3430,14 +3445,14 @@ is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3499,7 +3514,7 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
-jest-diff@19.0.0, jest-diff@^19.0.0:
+jest-diff@^19.0.0, jest-diff@19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
   dependencies:
@@ -3564,12 +3579,6 @@ jest-validate@^19.0.2:
     leven "^2.0.0"
     pretty-format "^19.0.0"
 
-jodid25519@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
-  dependencies:
-    jsbn "~0.1.0"
-
 js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
@@ -3700,6 +3709,12 @@ kind-of@^3.0.2:
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -3722,10 +3737,6 @@ lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
-lazy-req@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-2.0.0.tgz#c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"
-
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -3766,7 +3777,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
+loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@0.2.x:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -3895,11 +3906,11 @@ lru-cache@^3.2.0:
     pseudomap "^1.0.1"
 
 lru-cache@^4.0.0, lru-cache@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
-    pseudomap "^1.0.1"
-    yallist "^2.0.0"
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
 macaddress@^0.2.8:
   version "0.2.8"
@@ -4026,14 +4037,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.27.0"
 
+mime@^1.3.4, mime@1.3.x:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.3.x, mime@^1.3.4:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
-
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -4046,27 +4057,35 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, "minimatch@2 || 3":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8, minimist@~0.0.1:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist, minimist@^1.1.3, minimist@^1.2.0, minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", 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"
 
-ms@0.7.1, ms@^0.7.1:
+ms@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
+ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
@@ -5010,7 +5029,7 @@ prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
-pseudomap@^1.0.1:
+pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
@@ -5024,26 +5043,26 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
 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@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
 q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
-qs@6.4.0, qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
+qs@~6.4.0, qs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -5055,22 +5074,22 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@0.2.0, querystring@^0.2.0:
+querystring@^0.2.0, querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
 randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
   dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.4.tgz#9551df208422c8f80eb58e2326dd0b840ff22efd"
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
   dependencies:
-    safe-buffer "^5.0.1"
+    safe-buffer "^5.1.0"
 
 range-parser@^1.0.3, range-parser@~1.2.0:
   version "1.2.0"
@@ -5115,6 +5134,18 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
+  version "2.2.11"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.0.1"
+    string_decoder "~1.0.0"
+    util-deprecate "~1.0.1"
+
 readable-stream@1.0:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -5124,18 +5155,6 @@ readable-stream@1.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
-  version "2.2.10"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.10.tgz#effe72bb7c884c0dd335e2379d526196d9d011ee"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "^5.0.1"
-    string_decoder "~1.0.0"
-    util-deprecate "~1.0.1"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -5253,8 +5272,8 @@ release-zalgo@^1.0.0:
     es6-error "^4.0.1"
 
 remove-trailing-separator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511"
 
 renderkid@^2.0.1:
   version "2.0.1"
@@ -5294,31 +5313,6 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.4:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.0"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    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"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 request@^2.79.0, request@^2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -5346,6 +5340,31 @@ request@^2.79.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    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"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5413,7 +5432,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
+rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@2:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
@@ -5446,7 +5465,7 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
 
@@ -5458,6 +5477,12 @@ sax@^1.2.1, sax@~1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  dependencies:
+    ajv "^5.0.0"
+
 script-ext-html-webpack-plugin@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195"
@@ -5470,7 +5495,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, "semver@2 || 3 || 4 || 5", semver@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5496,7 +5521,7 @@ serialize-javascript@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
 
-serve-static@1.12.3, serve-static@^1.12.3:
+serve-static@^1.12.3, serve-static@1.12.3:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
   dependencies:
@@ -5528,8 +5553,8 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
 
 shelljs@^0.7.5:
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  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"
@@ -5567,7 +5592,7 @@ sort-keys@^1.0.0, sort-keys@^1.1.1, sort-keys@^1.1.2:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^0.1.7, source-list-map@~0.1.7:
+source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
@@ -5575,22 +5600,26 @@ source-list-map@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
 
+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-support@^0.4.0, source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
     source-map "^0.5.6"
 
-source-map@0.5.6, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
 source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.6, source-map@0.5.x:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -5627,8 +5656,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.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -5637,7 +5666,6 @@ sshpk@^1.7.0:
   optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
     ecc-jsbn "~0.1.1"
-    jodid25519 "^1.0.0"
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
@@ -5684,6 +5712,16 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
+  dependencies:
+    safe-buffer "~5.0.1"
+
 string-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -5705,16 +5743,6 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.1.tgz#62e200f039955a6810d8df0a33ffc0f013662d98"
-  dependencies:
-    safe-buffer "^5.0.1"
-
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -5849,6 +5877,10 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -5856,10 +5888,6 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -5897,7 +5925,7 @@ toposort@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
 
-tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
+tough-cookie@^2.3.2, tough-cookie@>=2.3.0, tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
@@ -5954,13 +5982,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@3.0.x:
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
-  dependencies:
-    commander "~2.9.0"
-    source-map "~0.5.1"
-
 uglify-js@^2.6, uglify-js@^2.8.27:
   version "2.8.28"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
@@ -5970,6 +5991,13 @@ uglify-js@^2.6, uglify-js@^2.8.27:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@3.0.x:
+  version "3.0.15"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
+  dependencies:
+    commander "~2.9.0"
+    source-map "~0.5.1"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -6027,15 +6055,15 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 update-notifier@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.2.0.tgz#1b5837cf90c0736d88627732b661c138f86de72f"
   dependencies:
     boxen "^1.0.0"
     chalk "^1.0.0"
     configstore "^3.0.0"
+    import-lazy "^2.1.0"
     is-npm "^1.0.0"
     latest-version "^3.0.0"
-    lazy-req "^2.0.0"
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
@@ -6077,7 +6105,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@^0.10.3, util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6161,8 +6189,8 @@ vue-router@^2.5.3:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.5.3.tgz#073783f564b6aece6c8a59c63e298dc2aabfb51b"
 
 vue-server-renderer@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.3.tgz#1f450f8a4541b9dd3b084d6470939f82781c3e0a"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.4.tgz#ce1361eb32bfb84573b9c9b83f2810de8fa606c7"
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -6187,8 +6215,8 @@ vue-style-loader@^3.0.0:
     loader-utils "^1.0.2"
 
 vue-template-compiler@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz#b5bab9ec57309c906b82a78c81a02179dbc2f470"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.4.tgz#5a88ac2c5e4d5d6218e6aa80e7e221fb7e67894c"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -6198,8 +6226,8 @@ vue-template-es2015-compiler@^1.2.2:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
 
 vue@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.3.tgz#d1eaa8fde5240735a4563e74f2c7fead9cbb064c"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.4.tgz#5ec3b87a191da8090bbef56b7cfabd4158038171"
 
 vuex@^2.3.1:
   version "2.3.1"
@@ -6259,13 +6287,6 @@ webpack-node-externals@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
 
-webpack-sources@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.5.3"
-
 webpack-sources@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
@@ -6273,6 +6294,13 @@ webpack-sources@^0.2.3:
     source-list-map "^1.1.1"
     source-map "~0.5.3"
 
+webpack-sources@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.5.3"
+
 webpack@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
@@ -6346,14 +6374,18 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2, wordwrap@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6432,7 +6464,7 @@ y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
-yallist@^2.0.0:
+yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
@@ -6498,3 +6530,4 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+

From 4623170c996213cf94008a3dd51ddaa9c9ebadf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 15:49:01 +0200
Subject: [PATCH 024/236] Display localhost instead of 0.0.0.0

---
 lib/server.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index 22a08dafc1..a6f10a300b 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -11,14 +11,14 @@ class Server {
     this.app = connect()
     this.server = http.createServer(this.app)
     this.nuxt.ready()
-      .then(() => {
-        // Add Middleware
-        this.options.serverMiddleware.forEach(m => {
-          this.useMiddleware(m)
-        })
-        // Add default render middleware
-        this.useMiddleware(this.render.bind(this))
+    .then(() => {
+      // Add Middleware
+      this.nuxt.options.serverMiddleware.forEach(m => {
+        this.useMiddleware(m)
       })
+      // Add default render middleware
+      this.useMiddleware(this.render.bind(this))
+    })
     return this
   }
 
@@ -46,9 +46,15 @@ class Server {
   }
 
   listen (port, host) {
-    host = host || '127.0.0.1'
+    host = host || 'localhost'
     port = port || 3000
     this.nuxt.ready()
+    .then(() => {
+      this.server.listen(port, host, () => {
+        let _host = host === '0.0.0.0' ? 'localhost' : host
+        console.log('Ready on http://%s:%s', _host, port) // eslint-disable-line no-console
+      })
+    })
       .then(() => {
         this.server.listen(port, host, () => {
           console.log('Ready on http://%s:%s', host, port) // eslint-disable-line no-console

From 8853b7af04ca7a8ad2b380fc0a61729566596721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 21:04:59 +0200
Subject: [PATCH 025/236] Remove `build.loaders` option

---
 lib/webpack/base.config.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index faf635ced0..2e0011f0bc 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -77,7 +77,23 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
         { test: /\.less$/, use: styleLoader.call(this, 'less', 'less-loader') },
         { test: /\.sass$/, use: styleLoader.call(this, 'sass', 'sass-loader?indentedSyntax&sourceMap') },
         { test: /\.scss$/, use: styleLoader.call(this, 'sass', 'sass-loader?sourceMap') },
-        { test: /\.styl(us)?$/, use: styleLoader.call(this, 'stylus', 'stylus-loader') }
+        { test: /\.styl(us)?$/, use: styleLoader.call(this, 'stylus', 'stylus-loader') },
+        {
+          test: /\.(png|jpe?g|gif|svg)$/,
+          loader: 'url-loader',
+          query: {
+            limit: 1000, // 1KO
+            name: 'img/[name].[hash:7].[ext]'
+          }
+        },
+        {
+          test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+          loader: 'url-loader',
+          query: {
+            limit: 1000, // 1 KO
+            name: 'fonts/[name].[hash:7].[ext]'
+          }
+        }
       ]
     },
     plugins: this.options.build.plugins
@@ -88,8 +104,6 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
       new ExtractTextPlugin({ filename: this.options.build.filenames.css })
     )
   }
-  // Add nuxt build loaders (can be configured in nuxt.config.js)
-  config.module.rules = config.module.rules.concat(this.options.build.loaders)
   // Return config
   return config
 }

From f9584fc810296d7ed97f68af2c346de312d24de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 11 Jun 2017 21:12:51 +0200
Subject: [PATCH 026/236] Update example

---
 examples/custom-build/nuxt.config.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/examples/custom-build/nuxt.config.js b/examples/custom-build/nuxt.config.js
index 22ba1217a6..5feedeaaef 100644
--- a/examples/custom-build/nuxt.config.js
+++ b/examples/custom-build/nuxt.config.js
@@ -7,21 +7,13 @@ module.exports = {
         app: 'app.[chunkhash].js'         // default: nuxt.bundle.[chunkhash].js
     },
     vendor: ['lodash'],
-    // Loaders config (Webpack 2)
-    loaders: [
-      {
-        test: /\.(png|jpg|gif|svg)$/,
-        loader: 'url-loader',
-        options: {
-          limit: 100000, // 100KO
-          name: 'img/[name].[ext]?[hash]'
-        }
-      }
-    ],
     extend (config, { dev }) {
       if (dev) {
         config.devtool = (dev ? 'eval-source-map' : false)
       }
+      const urlLoader = config.module.rules.find((loader) => loader.loader === 'url-loader')
+      // Increase limit to 100KO
+      urlLoader.query.limit = 100000
     }
   }
 }

From 6ca11461cea3000849ecaae9bf11eeb81f483313 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 12 Jun 2017 04:13:39 +0430
Subject: [PATCH 027/236] feat(nuxt-child): bind transition calls to parent

WIP for #566
---
 lib/app/components/nuxt-child.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/app/components/nuxt-child.js b/lib/app/components/nuxt-child.js
index becc3b82a8..492e002ac8 100644
--- a/lib/app/components/nuxt-child.js
+++ b/lib/app/components/nuxt-child.js
@@ -30,7 +30,7 @@ export default {
   functional: true,
   render (h, { parent, data }) {
     data.nuxtChild = true
-
+    const _parent = parent
     const transitions = parent.$nuxt.nuxt.transitions
     const defaultTransition = parent.$nuxt.nuxt.defaultTransition
     let depth = 0
@@ -51,7 +51,7 @@ export default {
     let listeners = {}
     listenersKeys.forEach((key) => {
       if (typeof transition[key] === 'function') {
-        listeners[key] = transition[key]
+        listeners[key] = transition[key].bind(_parent)
       }
     })
     return h('transition', {

From 5c36ed7b7307c54c7323ea003edfd6a42540926c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 12 Jun 2017 04:58:03 +0430
Subject: [PATCH 028/236] fix(client): combine & prefer leave* transitions of
 from route

#566
---
 lib/app/client.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index ccb2381d02..422eff8221 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -14,12 +14,23 @@ let router
 <%= (store ? 'let store' : '') %>
 
 function mapTransitions(Components, to, from) {
+  const resolve = t => (typeof t.options.transition === 'function')
+    ? t.options.transition(to, from)
+    : Object.assign({}, t.options.transition)
+
+  const resolveRoute = r => resolve(r.matched[0].components.default)
+
   return Components.map((Component) => {
-    let transition = Component.options.transition
-    if (typeof transition === 'function') {
-      return transition(to, from)
-    }
-    return transition
+    let transitions = Object.assign({}, to ? resolveRoute(to) : resolve(Component))
+    // Combine transitions
+    // Prefer leave* transitions of from route
+    let from_transitions = from ? resolveRoute(from) : {}
+    Object.keys(from_transitions).forEach(key=> {
+      if(from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
+        transitions[key] = from_transitions[key]
+      }
+    })
+    return transitions
   })
 }
 

From d3f66e132e581edbc1b70cb6376027085ecf2d34 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 12 Jun 2017 05:09:42 +0430
Subject: [PATCH 029/236] chore(client): simplify resolveTransitions()

#566
---
 lib/app/client.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index 422eff8221..4c2d9ff978 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -14,19 +14,18 @@ let router
 <%= (store ? 'let store' : '') %>
 
 function mapTransitions(Components, to, from) {
-  const resolve = t => (typeof t.options.transition === 'function')
-    ? t.options.transition(to, from)
-    : Object.assign({}, t.options.transition)
+  const resolveTransitions = component => (typeof component.options.transition === 'function')
+    ? component.options.transition(to, from)
+    : component.options.transition
 
-  const resolveRoute = r => resolve(r.matched[0].components.default)
+  const resolveRoute = route => resolveTransitions(route.matched[0].components.default)
 
   return Components.map((Component) => {
-    let transitions = Object.assign({}, to ? resolveRoute(to) : resolve(Component))
-    // Combine transitions
-    // Prefer leave* transitions of from route
-    let from_transitions = from ? resolveRoute(from) : {}
+    const transitions = Object.assign({}, to ? resolveRoute(to) : resolveTransitions(Component))
+    const from_transitions = from ? resolveRoute(from) : {}
+    // Combine transitions & prefer leave* transitions of from route
     Object.keys(from_transitions).forEach(key=> {
-      if(from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
+      if (from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
         transitions[key] = from_transitions[key]
       }
     })

From 13a4e71a83b2b20403f364d606adbba9d353e447 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 11 Jun 2017 18:47:36 +0430
Subject: [PATCH 030/236] refactor into components

---
 lib/server.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index a6f10a300b..f011a34dc2 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -11,14 +11,14 @@ class Server {
     this.app = connect()
     this.server = http.createServer(this.app)
     this.nuxt.ready()
-    .then(() => {
-      // Add Middleware
-      this.nuxt.options.serverMiddleware.forEach(m => {
-        this.useMiddleware(m)
+      .then(() => {
+        // Add Middleware
+        this.options.serverMiddleware.forEach(m => {
+          this.useMiddleware(m)
+        })
+        // Add default render middleware
+        this.useMiddleware(this.render.bind(this))
       })
-      // Add default render middleware
-      this.useMiddleware(this.render.bind(this))
-    })
     return this
   }
 

From 61534431a9d7a22197b056d8c7b0a20707d7baf3 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 11 Jun 2017 19:27:39 +0430
Subject: [PATCH 031/236] eslint

---
 lib/builder.js               | 3 ++-
 lib/nuxt.js                  | 5 +++--
 lib/renderer.js              | 1 -
 lib/webpack/client.config.js | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index a920ccf32c..9595cafe1b 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -59,6 +59,7 @@ export default class Builder extends Tapable {
     if (this.options.dev) {
       // Don't await for builder in dev (faster startup)
       this.build().catch(err => {
+        // eslint-disable-next-line no-console
         console.error(err)
         process.exit(1)
       })
@@ -407,7 +408,7 @@ export default class Builder extends Tapable {
     router.forEach((r) => {
       if (!r.path.includes(':') && !r.path.includes('*')) {
         if (r.children) {
-          flatRoutes(r.children, path + r.path + '/', routes)
+          this.flatRoutes(r.children, path + r.path + '/', routes)
         } else {
           routes.push((r.path === '' && path[path.length - 1] === '/' ? path.slice(0, -1) : path) + r.path)
         }
diff --git a/lib/nuxt.js b/lib/nuxt.js
index ed0d35398a..c8cd78b7a4 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -57,6 +57,7 @@ export default class Nuxt extends Tapable {
     this.buildDir = options.buildDir
 
     // Wait for all core components be ready
+    // eslint-disable-next-line no-console
     this._ready = this.ready().catch(console.error)
   }
 
@@ -98,7 +99,8 @@ export default class Nuxt extends Tapable {
     }
     await this.moduleContainer.ready()
     await this.builder.ready()
-    console.log('Nuxt Ready!')
+    // eslint-disable-next-line no-console
+    console.log('[nuxt] ready')
     return this
   }
 
@@ -131,4 +133,3 @@ export default class Nuxt extends Tapable {
     })
   }
 }
-
diff --git a/lib/renderer.js b/lib/renderer.js
index 50cfc611d9..7bf49ad78e 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -12,7 +12,6 @@ setAnsiColors(ansiHTML)
 let jsdom = null
 
 export default class Renderer extends Tapable {
-
   constructor (nuxt) {
     super()
     this.nuxt = nuxt
diff --git a/lib/webpack/client.config.js b/lib/webpack/client.config.js
index 893d879d34..ee97fc9b34 100644
--- a/lib/webpack/client.config.js
+++ b/lib/webpack/client.config.js
@@ -19,7 +19,7 @@ import { resolve } from 'path'
 | In production, will generate public/dist/style.css
 |--------------------------------------------------------------------------
 */
-export default function webpackClientConfig() {
+export default function webpackClientConfig () {
   let config = base.call(this, { isClient: true })
 
   // Entry

From 7760e9a49b8f3ba85dd02406a5c5b3a43531ee50 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Mon, 12 Jun 2017 19:36:47 +0200
Subject: [PATCH 032/236] generate: exit when done and send back duration &
 errors

---
 bin/nuxt-generate | 1 +
 lib/generate.js   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index c187810fa1..7d8c194db2 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -24,6 +24,7 @@ var nuxt = module.exports = new Nuxt(options)
 nuxt.generate()
   .then(() => {
     console.log('[nuxt] Generate done') // eslint-disable-line no-console
+    process.exit(0)
   })
   .catch((err) => {
     console.error(err) // eslint-disable-line no-console
diff --git a/lib/generate.js b/lib/generate.js
index 7525cb843d..9436c97c15 100644
--- a/lib/generate.js
+++ b/lib/generate.js
@@ -158,4 +158,5 @@ export default async function () {
     })
     console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
   }
+  return { duration, errors }
 }

From e753f93f9741f0ce71e549fbf89e4fa594b210a0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 00:06:05 +0430
Subject: [PATCH 033/236] better mapTransitions

prevents some unhandled cases
---
 lib/app/client.js | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index 4c2d9ff978..fb0745b3d1 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -14,21 +14,25 @@ let router
 <%= (store ? 'let store' : '') %>
 
 function mapTransitions(Components, to, from) {
-  const resolveTransitions = component => (typeof component.options.transition === 'function')
-    ? component.options.transition(to, from)
-    : component.options.transition
-
-  const resolveRoute = route => resolveTransitions(route.matched[0].components.default)
-
+  function componentTransitions(component) {
+    if (!component || !component.options || !component.options.transition) {
+      return {}
+    }
+    if(typeof component.options.transition === 'function') {
+      return component.options.transition(to, from)
+    }
+    return component.options.transition
+  }
   return Components.map((Component) => {
-    const transitions = Object.assign({}, to ? resolveRoute(to) : resolveTransitions(Component))
-    const from_transitions = from ? resolveRoute(from) : {}
-    // Combine transitions & prefer leave* transitions of from route
-    Object.keys(from_transitions).forEach(key=> {
-      if (from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
-        transitions[key] = from_transitions[key]
-      }
-    })
+    // Clone original object to prevent overrides
+    const transitions = Object.assign({}, componentTransitions(Component))
+    // Combine transitions & prefer *leave* transitions of 'from' route
+    if(from && from.matched.length && from.matched[0].components.default) {
+      const from_transitions = componentTransitions(from.matched[0].components.default)
+      Object.keys(from_transitions)
+        .filter(key => from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1)
+        .forEach(key => { transitions[key] = from_transitions[key] })
+    }
     return transitions
   })
 }

From 84350e59c50c75063b6752599d09bec2f7439291 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 00:06:52 +0430
Subject: [PATCH 034/236] test(utils): use Nuxt.utils

---
 test/utils.test.js | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/test/utils.test.js b/test/utils.test.js
index 3a2aff00ff..71a269a27f 100644
--- a/test/utils.test.js
+++ b/test/utils.test.js
@@ -1,22 +1,15 @@
 import test from 'ava'
 import ansiHTML from 'ansi-html'
-
-let utils
-// Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
-  let nuxt = new Nuxt({ dev: false })
-  utils = nuxt.utils
-})
+import Nuxt from '..'
 
 test('encodeHtml', t => {
   const html = '<h1>Hello</h1>'
-  t.is(utils.encodeHtml(html), '&lt;h1&gt;Hello&lt;/h1&gt;')
+  t.is(Nuxt.utils.encodeHtml(html), '&lt;h1&gt;Hello&lt;/h1&gt;')
 })
 
 test('getContext', t => {
-  let ctx = utils.getContext({ a: 1 }, { b: 2 })
-  t.is(utils.getContext.length, 2)
+  let ctx = Nuxt.utils.getContext({ a: 1 }, { b: 2 })
+  t.is(Nuxt.utils.getContext.length, 2)
   t.is(typeof ctx.req, 'object')
   t.is(typeof ctx.res, 'object')
   t.is(ctx.req.a, 1)
@@ -24,24 +17,24 @@ test('getContext', t => {
 })
 
 test('setAnsiColors', t => {
-  utils.setAnsiColors(ansiHTML)
+  Nuxt.utils.setAnsiColors(ansiHTML)
   t.pass()
 })
 
 test('waitFor', async (t) => {
   let s = Date.now()
-  await utils.waitFor(100)
+  await Nuxt.utils.waitFor(100)
   t.true(Date.now() - s >= 100)
-  await utils.waitFor()
+  await Nuxt.utils.waitFor()
 })
 
 test('urlJoin', t => {
-  t.is(utils.urlJoin('test', '/about'), 'test/about')
+  t.is(Nuxt.utils.urlJoin('test', '/about'), 'test/about')
 })
 
 test('promisifyRoute (array)', t => {
   const array = [1]
-  const promise = utils.promisifyRoute(array)
+  const promise = Nuxt.utils.promisifyRoute(array)
   t.is(typeof promise, 'object')
   return promise
   .then((res) => {
@@ -54,7 +47,7 @@ test('promisifyRoute (fn => array)', t => {
   const fn = function () {
     return array
   }
-  const promise = utils.promisifyRoute(fn)
+  const promise = Nuxt.utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
   .then((res) => {
@@ -69,7 +62,7 @@ test('promisifyRoute (fn => promise)', t => {
       resolve(array)
     })
   }
-  const promise = utils.promisifyRoute(fn)
+  const promise = Nuxt.utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
   .then((res) => {
@@ -81,7 +74,7 @@ test('promisifyRoute (fn(cb) with error)', t => {
   const fn = function (cb) {
     cb(new Error('Error here'))
   }
-  const promise = utils.promisifyRoute(fn)
+  const promise = Nuxt.utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
   .catch((e) => {
@@ -94,7 +87,7 @@ test('promisifyRoute (fn(cb) with result)', t => {
   const fn = function (cb) {
     cb(null, array)
   }
-  const promise = utils.promisifyRoute(fn)
+  const promise = Nuxt.utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
   .then((res) => {

From 754fcc2f59fce1ac324b362c049030e222d2fc23 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 00:45:28 +0430
Subject: [PATCH 035/236] update tests

---
 test/module.test.js |  8 +++----
 test/utils.test.js  | 56 ++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/test/module.test.js b/test/module.test.js
index 58e15de574..59fd0c4ee3 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -1,6 +1,7 @@
 import test from 'ava'
-import { resolve } from 'path'
+import { resolve, normalize } from 'path'
 import rp from 'request-promise-native'
+import Nuxt from '..'
 
 const port = 4006
 const url = (route) => 'http://localhost:' + port + route
@@ -8,11 +9,8 @@ const url = (route) => 'http://localhost:' + port + route
 let nuxt = null
 let server = null
 
-const wp = p => /^win/.test(process.platform) ? p.replace(/[\\/]/g, '\\\\') : p
-
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const rootDir = resolve(__dirname, 'fixtures/module')
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
@@ -28,7 +26,7 @@ test('Vendor', async t => {
 })
 
 test('Plugin', async t => {
-  t.true(nuxt.options.plugins[0].src.includes(wp('fixtures/module/.nuxt/basic.reverse.')), 'plugin added to config')
+  t.true(nuxt.options.plugins[0].src.includes(normalize('fixtures/module/.nuxt/basic.reverse.')), 'plugin added to config')
   const { html } = await nuxt.renderRoute('/')
   t.true(html.includes('<h1>TXUN</h1>'), 'plugin works')
 })
diff --git a/test/utils.test.js b/test/utils.test.js
index 71a269a27f..acd0b20c18 100644
--- a/test/utils.test.js
+++ b/test/utils.test.js
@@ -1,15 +1,15 @@
 import test from 'ava'
 import ansiHTML from 'ansi-html'
-import Nuxt from '..'
+import { Utils } from '..'
 
 test('encodeHtml', t => {
   const html = '<h1>Hello</h1>'
-  t.is(Nuxt.utils.encodeHtml(html), '&lt;h1&gt;Hello&lt;/h1&gt;')
+  t.is(Utils.encodeHtml(html), '&lt;h1&gt;Hello&lt;/h1&gt;')
 })
 
 test('getContext', t => {
-  let ctx = Nuxt.utils.getContext({ a: 1 }, { b: 2 })
-  t.is(Nuxt.utils.getContext.length, 2)
+  let ctx = Utils.getContext({ a: 1 }, { b: 2 })
+  t.is(Utils.getContext.length, 2)
   t.is(typeof ctx.req, 'object')
   t.is(typeof ctx.res, 'object')
   t.is(ctx.req.a, 1)
@@ -17,29 +17,29 @@ test('getContext', t => {
 })
 
 test('setAnsiColors', t => {
-  Nuxt.utils.setAnsiColors(ansiHTML)
+  Utils.setAnsiColors(ansiHTML)
   t.pass()
 })
 
 test('waitFor', async (t) => {
   let s = Date.now()
-  await Nuxt.utils.waitFor(100)
+  await Utils.waitFor(100)
   t.true(Date.now() - s >= 100)
-  await Nuxt.utils.waitFor()
+  await Utils.waitFor()
 })
 
 test('urlJoin', t => {
-  t.is(Nuxt.utils.urlJoin('test', '/about'), 'test/about')
+  t.is(Utils.urlJoin('test', '/about'), 'test/about')
 })
 
 test('promisifyRoute (array)', t => {
   const array = [1]
-  const promise = Nuxt.utils.promisifyRoute(array)
+  const promise = Utils.promisifyRoute(array)
   t.is(typeof promise, 'object')
   return promise
-  .then((res) => {
-    t.is(res, array)
-  })
+    .then((res) => {
+      t.is(res, array)
+    })
 })
 
 test('promisifyRoute (fn => array)', t => {
@@ -47,12 +47,12 @@ test('promisifyRoute (fn => array)', t => {
   const fn = function () {
     return array
   }
-  const promise = Nuxt.utils.promisifyRoute(fn)
+  const promise = Utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
-  .then((res) => {
-    t.is(res, array)
-  })
+    .then((res) => {
+      t.is(res, array)
+    })
 })
 
 test('promisifyRoute (fn => promise)', t => {
@@ -62,24 +62,24 @@ test('promisifyRoute (fn => promise)', t => {
       resolve(array)
     })
   }
-  const promise = Nuxt.utils.promisifyRoute(fn)
+  const promise = Utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
-  .then((res) => {
-    t.is(res, array)
-  })
+    .then((res) => {
+      t.is(res, array)
+    })
 })
 
 test('promisifyRoute (fn(cb) with error)', t => {
   const fn = function (cb) {
     cb(new Error('Error here'))
   }
-  const promise = Nuxt.utils.promisifyRoute(fn)
+  const promise = Utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
-  .catch((e) => {
-    t.is(e.message, 'Error here')
-  })
+    .catch((e) => {
+      t.is(e.message, 'Error here')
+    })
 })
 
 test('promisifyRoute (fn(cb) with result)', t => {
@@ -87,10 +87,10 @@ test('promisifyRoute (fn(cb) with result)', t => {
   const fn = function (cb) {
     cb(null, array)
   }
-  const promise = Nuxt.utils.promisifyRoute(fn)
+  const promise = Utils.promisifyRoute(fn)
   t.is(typeof promise, 'object')
   return promise
-  .then((res) => {
-    t.is(res, array)
-  })
+    .then((res) => {
+      t.is(res, array)
+    })
 })

From a14819ca88f7e496b8812276a66b8eab09b287a8 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 00:46:27 +0430
Subject: [PATCH 036/236] Nuxt.* Components

---
 lib/nuxt.js | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/lib/nuxt.js b/lib/nuxt.js
index c8cd78b7a4..bd826df691 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -2,15 +2,16 @@ import _ from 'lodash'
 import compression from 'compression'
 import fs from 'fs-extra'
 import pify from 'pify'
-import Server from './server'
-import ModuleContainer from './module-container'
-import Builder from './builder'
-import Renderer from './renderer'
-import Generate from './generate'
 import serveStatic from 'serve-static'
 import { resolve, join } from 'path'
-import defaults from './defaults'
+import * as Utils from './utils'
 import Tapable from 'tapable'
+import Builder from './builder'
+import Renderer from './renderer'
+import Generator from './generator'
+import ModuleContainer from './module-container'
+import Server from './server'
+import Defaults from './defaults'
 
 export default class Nuxt extends Tapable {
   constructor (options = {}) {
@@ -31,30 +32,32 @@ export default class Nuxt extends Tapable {
     }
 
     // Apply defaults
-    this.options = _.defaultsDeep(options, defaults)
+    this.options = _.defaultsDeep(options, Nuxt.Defaults)
 
     // Resolve dirs
     this.options.rootDir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
     this.options.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(options.rootDir, options.srcDir) : this.options.rootDir)
     this.options.buildDir = join(this.options.rootDir, options.buildDir)
 
-    this.Server = Server
     this.componentTasks()
 
     // Create instance of core components
-    this.builder = new Builder(this)
-    this.renderer = new Renderer(this)
-    this.generate = new Generate(this)
-    this.moduleContainer = new ModuleContainer(this)
+    this.builder = new Nuxt.Builder(this)
+    this.renderer = new Nuxt.Renderer(this)
+    this.generator = new Nuxt.Generator(this)
+    this.moduleContainer = new Nuxt.ModuleContainer(this)
 
     // Backward compatibility
     this.render = this.renderer.render.bind(this.renderer)
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
     this.build = this.ready.bind(this)
+    this.generate = this.generator.generate.bind(this.generator)
     this.dir = options.rootDir
     this.srcDir = options.srcDir
     this.buildDir = options.buildDir
+    this.Server = Nuxt.Server
+    this.Utils = Nuxt.Utils
 
     // Wait for all core components be ready
     // eslint-disable-next-line no-console
@@ -99,8 +102,6 @@ export default class Nuxt extends Tapable {
     }
     await this.moduleContainer.ready()
     await this.builder.ready()
-    // eslint-disable-next-line no-console
-    console.log('[nuxt] ready')
     return this
   }
 
@@ -133,3 +134,12 @@ export default class Nuxt extends Tapable {
     })
   }
 }
+
+// Add core components to Nuxt class
+Nuxt.Defaults = Defaults
+Nuxt.Utils = Utils
+Nuxt.Renderer = Renderer
+Nuxt.Builder = Builder
+Nuxt.ModuleContainer = ModuleContainer
+Nuxt.Server = Server
+Nuxt.Generator = Generator

From 344e4a159e10ae940544f868efac9308fd0eaa7c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 00:46:42 +0430
Subject: [PATCH 037/236] Update generator

---
 lib/{generate.js => generator.js} | 86 ++++++++++---------------------
 1 file changed, 26 insertions(+), 60 deletions(-)
 rename lib/{generate.js => generator.js} (72%)

diff --git a/lib/generate.js b/lib/generator.js
similarity index 72%
rename from lib/generate.js
rename to lib/generator.js
index ccc017cd56..fb1e1258e0 100644
--- a/lib/generate.js
+++ b/lib/generator.js
@@ -12,32 +12,6 @@ const remove = pify(fs.remove)
 const writeFile = pify(fs.writeFile)
 const mkdirp = pify(fs.mkdirp)
 
-const defaults = {
-  dir: 'dist',
-  routes: [],
-  interval: 0,
-  minify: {
-    collapseBooleanAttributes: true,
-    collapseWhitespace: true,
-    decodeEntities: true,
-    minifyCSS: true,
-    minifyJS: true,
-    processConditionalComments: true,
-    removeAttributeQuotes: false,
-    removeComments: false,
-    removeEmptyAttributes: true,
-    removeOptionalTags: true,
-    removeRedundantAttributes: true,
-    removeScriptTypeAttributes: false,
-    removeStyleLinkTypeAttributes: false,
-    removeTagWhitespace: false,
-    sortAttributes: true,
-    sortClassName: true,
-    trimCustomFragments: true,
-    useShortDoctype: true
-  }
-}
-
 export default class Generator extends Tapable {
   constructor (nuxt) {
     super()
@@ -48,42 +22,36 @@ export default class Generator extends Tapable {
   async generate () {
     const s = Date.now()
     let errors = []
-    /*
-    ** Wait for modules to be initialized
-    */
-    await this.ready()
-    /*
-    ** Set variables
-    */
-    this.options.generate = _.defaultsDeep(this.options.generate, defaults)
+    let generateRoutes = []
+
+    // Wait for nuxt.js to be ready
+    await this.nuxt._ready
+
+    // Set variables
     let srcStaticPath = resolve(this.options.srcDir, 'static')
-    let srcBuiltPath = resolve(this.buildDir, 'dist')
+    let srcBuiltPath = resolve(this.options.buildDir, 'dist')
     let distPath = resolve(this.options.rootDir, this.options.generate.dir)
     let distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
-    /*
-    ** Launch build process
-    */
-    await this.build()
-    /*
-    ** Clean destination folder
-    */
-    try {
-      await remove(distPath)
-      debug('Destination folder cleaned')
-    } catch (e) {
-    }
-    /*
-    ** Copy static and built files
-    */
+
+    // Launch build process
+    await this.nuxt.builder.build()
+
+    // Clean destination folder
+    await remove(distPath)
+    debug('Destination folder cleaned')
+
+    // Copy static and built files
     if (fs.existsSync(srcStaticPath)) {
       await copy(srcStaticPath, distPath)
     }
     await copy(srcBuiltPath, distNuxtPath)
     debug('Static & build files copied')
+
+    // Resolve config.generate.routes promises before generating the routes
     if (this.options.router.mode !== 'hash') {
-      // Resolve config.generate.routes promises before generating the routes
       try {
-        let generateRoutes = await promisifyRoute(this.options.generate.routes || [])
+        console.log('Generating routes') // eslint-disable-line no-console
+        generateRoutes = await promisifyRoute(this.options.generate.routes || [])
       } catch (e) {
         console.error('Could not resolve routes') // eslint-disable-line no-console
         console.error(e) // eslint-disable-line no-console
@@ -91,7 +59,8 @@ export default class Generator extends Tapable {
         throw e // eslint-disable-line no-unreachable
       }
     }
-    function decorateWithPayloads (routes) {
+
+    const decorateWithPayloads = (routes) => {
       let routeMap = {}
       // Fill routeMap for known routes
       routes.forEach((route) => {
@@ -112,10 +81,8 @@ export default class Generator extends Tapable {
       return _.values(routeMap)
     }
 
-    /*
-    ** Generate only index.html for router.mode = 'hash'
-    */
-    let routes = (this.options.router.mode === 'hash') ? ['/'] : this.routes
+    // Generate only index.html for router.mode = 'hash'
+    let routes = (this.options.router.mode === 'hash') ? ['/'] : this.nuxt.builder.routes
     routes = decorateWithPayloads(routes)
 
     while (routes.length) {
@@ -124,7 +91,7 @@ export default class Generator extends Tapable {
         await waitFor(n++ * this.options.generate.interval)
         let html
         try {
-          const res = await this.renderRoute(route, { _generate: true, payload })
+          const res = await this.nuxt.renderer.renderRoute(route, { _generate: true, payload })
           html = res.html
           if (res.error) {
             errors.push({ type: 'handled', route, error: res.error })
@@ -149,6 +116,7 @@ export default class Generator extends Tapable {
         await writeFile(path, html, 'utf8')
       }))
     }
+
     // Add .nojekyll file to let Github Pages add the _nuxt/ folder
     // https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
     const nojekyllPath = resolve(distPath, '.nojekyll')
@@ -168,6 +136,4 @@ export default class Generator extends Tapable {
       console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
     }
   }
-
 }
-

From a774a11720d6095d4ed83dde517226a098d04417 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 01:00:16 +0430
Subject: [PATCH 038/236] update nuxt tests

---
 test/index.test.js | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/test/index.test.js b/test/index.test.js
index f910f1ea5e..619cb94f5d 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -8,13 +8,11 @@ test('Nuxt.js Class', t => {
 })
 
 test.serial('Nuxt.js Instance', async t => {
-  process.env.NODE_ENV = 'production'
-  const nuxt = new Nuxt()
+  const nuxt = new Nuxt({ dev: false })
   t.is(typeof nuxt, 'object')
-  t.is(nuxt.dev, false)
+  t.is(nuxt.options.dev, false)
   t.is(typeof nuxt.build, 'function')
   t.is(typeof nuxt.generate, 'function')
-  delete process.env.NODE_ENV
 })
 
 test.serial('Fail when build not done and try to render', async t => {
@@ -23,10 +21,12 @@ test.serial('Fail when build not done and try to render', async t => {
     rootDir: resolve(__dirname, 'fixtures/empty')
   })
   return new Promise((resolve) => {
-    var oldExit = process.exit
-    var oldCE = console.error // eslint-disable-line no-console
-    var _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
+    let oldExit = process.exit
+    let oldCE = console.error // eslint-disable-line no-console
+    let _log = ''
+    console.error = (s) => {
+      _log += s
+    } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console
@@ -40,14 +40,16 @@ test.serial('Fail when build not done and try to render', async t => {
 
 test.serial('Fail to build when no pages/ directory but is in the parent', async t => {
   const nuxt = new Nuxt({
-    dev: false,
+    dev: true,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
   })
   return new Promise((resolve) => {
-    var oldExit = process.exit
-    var oldCE = console.error // eslint-disable-line no-console
-    var _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
+    let oldExit = process.exit
+    let oldCE = console.error // eslint-disable-line no-console
+    let _log = ''
+    console.error = (s) => {
+      _log += s
+    } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console
@@ -61,14 +63,16 @@ test.serial('Fail to build when no pages/ directory but is in the parent', async
 
 test.serial('Fail to build when no pages/ directory', async t => {
   const nuxt = new Nuxt({
-    dev: false,
+    dev: true,
     rootDir: resolve(__dirname)
   })
   return new Promise((resolve) => {
-    var oldExit = process.exit
-    var oldCE = console.error // eslint-disable-line no-console
-    var _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
+    let oldExit = process.exit
+    let oldCE = console.error // eslint-disable-line no-console
+    let _log = ''
+    console.error = (s) => {
+      _log += s
+    } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console

From a318144b9a5fd1683781029f266beef835602031 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 01:02:34 +0430
Subject: [PATCH 039/236] reorder imports

---
 lib/builder.js               | 2 +-
 lib/generator.js             | 2 +-
 lib/module-container.js      | 2 +-
 lib/nuxt.js                  | 2 +-
 lib/renderer.js              | 2 +-
 lib/webpack/base.config.js   | 4 ++--
 lib/webpack/client.config.js | 2 +-
 lib/webpack/server.config.js | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 9595cafe1b..0c93052aa5 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -8,11 +8,11 @@ import PostCompilePlugin from 'post-compile-webpack-plugin'
 import serialize from 'serialize-javascript'
 import { createBundleRenderer } from 'vue-server-renderer'
 import { join, resolve, basename, dirname } from 'path'
+import Tapable from 'tapable'
 import { isUrl, r, wp } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
 import defaults from './defaults'
-import Tapable from 'tapable'
 
 const debug = require('debug')('nuxt:build')
 debug.color = 2 // Force green color
diff --git a/lib/generator.js b/lib/generator.js
index fb1e1258e0..a74e6a536b 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -2,9 +2,9 @@ import fs from 'fs-extra'
 import pify from 'pify'
 import _ from 'lodash'
 import { resolve, join, dirname, sep } from 'path'
-import { isUrl, promisifyRoute, waitFor } from './utils'
 import { minify } from 'html-minifier'
 import Tapable from 'tapable'
+import { isUrl, promisifyRoute, waitFor } from './utils'
 
 const debug = require('debug')('nuxt:generate')
 const copy = pify(fs.copy)
diff --git a/lib/module-container.js b/lib/module-container.js
index 7136af1466..8a46732f5c 100755
--- a/lib/module-container.js
+++ b/lib/module-container.js
@@ -2,8 +2,8 @@ import path from 'path'
 import fs from 'fs'
 import { uniq } from 'lodash'
 import hash from 'hash-sum'
-import { chainFn, sequence } from './utils'
 import Tapable from 'tapable'
+import { chainFn, sequence } from './utils'
 
 const debug = require('debug')('nuxt:module')
 
diff --git a/lib/nuxt.js b/lib/nuxt.js
index bd826df691..a52b6c6cc9 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -4,8 +4,8 @@ import fs from 'fs-extra'
 import pify from 'pify'
 import serveStatic from 'serve-static'
 import { resolve, join } from 'path'
-import * as Utils from './utils'
 import Tapable from 'tapable'
+import * as Utils from './utils'
 import Builder from './builder'
 import Renderer from './renderer'
 import Generator from './generator'
diff --git a/lib/renderer.js b/lib/renderer.js
index 7bf49ad78e..945fb03720 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -2,8 +2,8 @@ import ansiHTML from 'ansi-html'
 import serialize from 'serialize-javascript'
 import generateETag from 'etag'
 import fresh from 'fresh'
-import { getContext, setAnsiColors, encodeHtml } from './utils'
 import Tapable from 'tapable'
+import { getContext, setAnsiColors, encodeHtml } from './utils'
 
 const debug = require('debug')('nuxt:render')
 debug.color = 4 // Force blue color
diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index 2e0011f0bc..fdadcbce9b 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -1,9 +1,9 @@
-import vueLoaderConfig from './vue-loader.config'
+import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import { defaults } from 'lodash'
 import { join } from 'path'
 import { isUrl, urlJoin } from '../utils'
+import vueLoaderConfig from './vue-loader.config'
 import { styleLoader, extractStyles } from './helpers'
-import ExtractTextPlugin from 'extract-text-webpack-plugin'
 
 /*
 |--------------------------------------------------------------------------
diff --git a/lib/webpack/client.config.js b/lib/webpack/client.config.js
index ee97fc9b34..05b0ed2dbc 100644
--- a/lib/webpack/client.config.js
+++ b/lib/webpack/client.config.js
@@ -6,8 +6,8 @@ import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'
 import ProgressBarPlugin from 'progress-bar-webpack-plugin'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 import OfflinePlugin from 'offline-plugin'
-import base from './base.config.js'
 import { resolve } from 'path'
+import base from './base.config.js'
 
 /*
 |--------------------------------------------------------------------------
diff --git a/lib/webpack/server.config.js b/lib/webpack/server.config.js
index 1acf86e0bd..62a2eb2b5e 100644
--- a/lib/webpack/server.config.js
+++ b/lib/webpack/server.config.js
@@ -1,9 +1,9 @@
 import webpack from 'webpack'
 import VueSSRServerPlugin from 'vue-server-renderer/server-plugin'
 import nodeExternals from 'webpack-node-externals'
-import base from './base.config.js'
 import { each } from 'lodash'
 import { resolve } from 'path'
+import base from './base.config.js'
 
 /*
 |--------------------------------------------------------------------------

From c347a1bf4853802e6c3349db83508dc8d1e5e1f4 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 01:10:44 +0430
Subject: [PATCH 040/236] generator: send back duration & errors

Manual merge 7760e9a49b8f3ba85dd02406a5c5b3a43531ee50
---
 lib/generator.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/generator.js b/lib/generator.js
index a74e6a536b..14191d9939 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -135,5 +135,7 @@ export default class Generator extends Tapable {
       })
       console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
     }
+
+    return { duration, errors }
   }
 }

From 00af7e5b53d7f7a2e5d6bbc0d51af7f7a22de81a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 01:11:26 +0430
Subject: [PATCH 041/236] eslint

---
 test/index.test.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/test/index.test.js b/test/index.test.js
index 619cb94f5d..64b90556ce 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -24,9 +24,7 @@ test.serial('Fail when build not done and try to render', async t => {
     let oldExit = process.exit
     let oldCE = console.error // eslint-disable-line no-console
     let _log = ''
-    console.error = (s) => {
-      _log += s
-    } // eslint-disable-line no-console
+    console.error = (s) => { _log += s } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console
@@ -47,9 +45,7 @@ test.serial('Fail to build when no pages/ directory but is in the parent', async
     let oldExit = process.exit
     let oldCE = console.error // eslint-disable-line no-console
     let _log = ''
-    console.error = (s) => {
-      _log += s
-    } // eslint-disable-line no-console
+    console.error = (s) => { _log += s } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console
@@ -70,9 +66,7 @@ test.serial('Fail to build when no pages/ directory', async t => {
     let oldExit = process.exit
     let oldCE = console.error // eslint-disable-line no-console
     let _log = ''
-    console.error = (s) => {
-      _log += s
-    } // eslint-disable-line no-console
+    console.error = (s) => { _log += s } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console

From dfa1d915d64a48192c070b5bf6a32a48d3eedb73 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 13 Jun 2017 22:28:04 +0430
Subject: [PATCH 042/236] working version!

---
 lib/builder.js          |  38 ++---
 lib/defaults.js         |   1 +
 lib/generator.js        |   4 +-
 lib/module-container.js |  13 +-
 lib/nuxt.js             |  23 +--
 lib/renderer.js         |   9 +-
 lib/server.js           |   4 +-
 package.json            |   1 +
 yarn.lock               | 352 ++++++++++++++++++++--------------------
 9 files changed, 219 insertions(+), 226 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 0c93052aa5..a659aab4d0 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -8,7 +8,7 @@ import PostCompilePlugin from 'post-compile-webpack-plugin'
 import serialize from 'serialize-javascript'
 import { createBundleRenderer } from 'vue-server-renderer'
 import { join, resolve, basename, dirname } from 'path'
-import Tapable from 'tapable'
+import Tapable from 'tappable'
 import { isUrl, r, wp } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
@@ -41,7 +41,7 @@ export default class Builder extends Tapable {
     this.options.build = _.defaultsDeep(this.options.build, extraDefaults)
     /* istanbul ignore if */
     if (this.options.dev && isUrl(this.options.build.publicPath)) {
-      this.options.build.publicPath = defaults.publicPath.publicPath
+      this.options.build.publicPath = defaults.build.publicPath
     }
 
     // Stats
@@ -52,21 +52,16 @@ export default class Builder extends Tapable {
       colors: true
     }
 
-    this._buildStatus = STATUS.INITIAL
-  }
-
-  ready () {
-    if (this.options.dev) {
+    // Register build hook on init when in dev mode
+    this.nuxt.plugin('init', () => {
       // Don't await for builder in dev (faster startup)
       this.build().catch(err => {
         // eslint-disable-next-line no-console
         console.error(err)
-        process.exit(1)
       })
-      return Promise.resolve(this)
-    } else {
-      return this.production()
-    }
+    })
+
+    this._buildStatus = STATUS.INITIAL
   }
 
   async build () {
@@ -83,6 +78,7 @@ export default class Builder extends Tapable {
       })
     }
     this._buildStatus = STATUS.BUILDING
+
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
 
@@ -96,6 +92,7 @@ export default class Builder extends Tapable {
         process.exit(1)
       }
     }
+
     debug(`App root: ${this.options.srcDir}`)
     debug(`Generating ${this.options.buildDir} files...`)
 
@@ -115,6 +112,10 @@ export default class Builder extends Tapable {
   }
 
   production () {
+    // Avoid calling this method multiple times
+    if (this._buildStatus === STATUS.BUILD_DONE) {
+      return this
+    }
     // Production, create server-renderer
     const serverConfig = this.getWebpackServerConfig()
     const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
@@ -125,6 +126,8 @@ export default class Builder extends Tapable {
       this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
       this.addAppTemplate()
     }
+    // Flag to set that building is done
+    this._buildStatus = STATUS.BUILD_DONE
     return this
   }
 
@@ -158,14 +161,7 @@ export default class Builder extends Tapable {
       options: this.options,
       uniqBy: _.uniqBy,
       isDev: this.options.dev,
-      router: {
-        mode: this.options.router.mode,
-        base: this.options.router.base,
-        middleware: this.options.router.middleware,
-        linkActiveClass: this.options.router.linkActiveClass,
-        linkExactActiveClass: this.options.router.linkExactActiveClass,
-        scrollBehavior: this.options.router.scrollBehavior
-      },
+      router: this.options.router,
       env: this.options.env,
       head: this.options.head,
       middleware: fs.existsSync(join(this.options.srcDir, 'middleware')),
@@ -217,7 +213,7 @@ export default class Builder extends Tapable {
     // router.extendRoutes method
     if (typeof this.options.router.extendRoutes === 'function') {
       // let the user extend the routes
-      this.options.router.extendRoutes(this, templateVars.router.routes || [], r)
+      this.options.router.extendRoutes(templateVars.router.routes, r)
     }
     // Routes for generate command
     this.routes = this.flatRoutes(templateVars.router.routes || [])
diff --git a/lib/defaults.js b/lib/defaults.js
index d8d20df8a7..8d6ff4c75f 100755
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -70,6 +70,7 @@ export default {
   router: {
     mode: 'history',
     base: '/',
+    routes: [],
     middleware: [],
     linkActiveClass: 'nuxt-link-active',
     linkExactActiveClass: 'nuxt-link-exact-active',
diff --git a/lib/generator.js b/lib/generator.js
index 14191d9939..432dcecff5 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -3,7 +3,7 @@ import pify from 'pify'
 import _ from 'lodash'
 import { resolve, join, dirname, sep } from 'path'
 import { minify } from 'html-minifier'
-import Tapable from 'tapable'
+import Tapable from 'tappable'
 import { isUrl, promisifyRoute, waitFor } from './utils'
 
 const debug = require('debug')('nuxt:generate')
@@ -25,7 +25,7 @@ export default class Generator extends Tapable {
     let generateRoutes = []
 
     // Wait for nuxt.js to be ready
-    await this.nuxt._ready
+    await this.nuxt.init()
 
     // Set variables
     let srcStaticPath = resolve(this.options.srcDir, 'static')
diff --git a/lib/module-container.js b/lib/module-container.js
index 8a46732f5c..313b738632 100755
--- a/lib/module-container.js
+++ b/lib/module-container.js
@@ -2,7 +2,7 @@ import path from 'path'
 import fs from 'fs'
 import { uniq } from 'lodash'
 import hash from 'hash-sum'
-import Tapable from 'tapable'
+import Tapable from 'tappable'
 import { chainFn, sequence } from './utils'
 
 const debug = require('debug')('nuxt:module')
@@ -13,15 +13,10 @@ export default class ModuleContainer extends Tapable {
     this.nuxt = nuxt
     this.options = nuxt.options
     this.requiredModules = []
-  }
 
-  async ready () {
-    if (this._ready) {
-      return this._ready
-    }
-    // Install all modules in sequence
-    await sequence(this.options.modules, this.addModule.bind(this))
-    return this
+    this.nuxt.plugin('beforeInit', () => {
+      return sequence(this.options.modules, this.addModule.bind(this))
+    })
   }
 
   addVendor (vendor) {
diff --git a/lib/nuxt.js b/lib/nuxt.js
index a52b6c6cc9..d8c7c087a5 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -4,7 +4,7 @@ import fs from 'fs-extra'
 import pify from 'pify'
 import serveStatic from 'serve-static'
 import { resolve, join } from 'path'
-import Tapable from 'tapable'
+import Tapable from 'tappable'
 import * as Utils from './utils'
 import Builder from './builder'
 import Renderer from './renderer'
@@ -42,16 +42,16 @@ export default class Nuxt extends Tapable {
     this.componentTasks()
 
     // Create instance of core components
+    this.moduleContainer = new Nuxt.ModuleContainer(this)
     this.builder = new Nuxt.Builder(this)
     this.renderer = new Nuxt.Renderer(this)
     this.generator = new Nuxt.Generator(this)
-    this.moduleContainer = new Nuxt.ModuleContainer(this)
 
     // Backward compatibility
     this.render = this.renderer.render.bind(this.renderer)
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
-    this.build = this.ready.bind(this)
+    this.build = this.builder.build.bind(this.builder)
     this.generate = this.generator.generate.bind(this.generator)
     this.dir = options.rootDir
     this.srcDir = options.srcDir
@@ -59,9 +59,9 @@ export default class Nuxt extends Tapable {
     this.Server = Nuxt.Server
     this.Utils = Nuxt.Utils
 
-    // Wait for all core components be ready
     // eslint-disable-next-line no-console
-    this._ready = this.ready().catch(console.error)
+    this._init = this.init().catch(console.error)
+    this.initialized = false
   }
 
   componentTasks () {
@@ -96,12 +96,15 @@ export default class Nuxt extends Tapable {
     }
   }
 
-  async ready () {
-    if (this._ready) {
-      return this._ready
+  async init () {
+    if (this._init) {
+      return this._init
     }
-    await this.moduleContainer.ready()
-    await this.builder.ready()
+    // Wait for all components to be ready
+    await this.applyPluginsAsync('beforeInit')
+    await this.applyPluginsAsync('init')
+    await this.applyPluginsAsync('afterInit')
+    this.initialized = true
     return this
   }
 
diff --git a/lib/renderer.js b/lib/renderer.js
index 945fb03720..88511d9eba 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -2,7 +2,7 @@ import ansiHTML from 'ansi-html'
 import serialize from 'serialize-javascript'
 import generateETag from 'etag'
 import fresh from 'fresh'
-import Tapable from 'tapable'
+import Tapable from 'tappable'
 import { getContext, setAnsiColors, encodeHtml } from './utils'
 
 const debug = require('debug')('nuxt:render')
@@ -19,8 +19,6 @@ export default class Renderer extends Tapable {
   }
 
   async render (req, res) {
-    // Wait for nuxt.js to be ready
-    await this.nuxt._ready
     // Check if project is built for production
     if (!this.nuxt.builder.renderer && !this.options.dev) {
       console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
@@ -123,8 +121,7 @@ export default class Renderer extends Tapable {
 
   async renderRoute (url, context = {}) {
     // Wait for nuxt.js to be ready
-    await this.nuxt._ready
-
+    await this.nuxt.init()
     // Log rendered url
     debug(`Rendering url ${url}`)
     // Add url and isSever to the context
@@ -161,7 +158,7 @@ export default class Renderer extends Tapable {
   async renderAndGetWindow (url, opts = {}) {
     if (!this.ready) {
       // Wait for nuxt.js to be ready
-      await this.nuxt._ready
+      await this.nuxt._init
       this.ready = true
     }
 
diff --git a/lib/server.js b/lib/server.js
index f011a34dc2..db242edb6a 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -10,7 +10,7 @@ class Server {
     // Initialize
     this.app = connect()
     this.server = http.createServer(this.app)
-    this.nuxt.ready()
+    this.nuxt.init()
       .then(() => {
         // Add Middleware
         this.options.serverMiddleware.forEach(m => {
@@ -48,7 +48,7 @@ class Server {
   listen (port, host) {
     host = host || 'localhost'
     port = port || 3000
-    this.nuxt.ready()
+    this.nuxt.init()
     .then(() => {
       this.server.listen(port, host, () => {
         let _host = host === '0.0.0.0' ? 'localhost' : host
diff --git a/package.json b/package.json
index ba306b2f61..13896c2897 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
     "serialize-javascript": "^1.3.0",
     "serve-static": "^1.12.3",
     "tapable": "^0.2.6",
+    "tappable": "^1.0.1",
     "url-loader": "^0.5.8",
     "vue": "~2.3.3",
     "vue-loader": "^12.2.1",
diff --git a/yarn.lock b/yarn.lock
index 9d774bd451..7379f9afb8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,5 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+
+
 "@ava/babel-plugin-throws-helper@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
@@ -128,7 +130,7 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-html@^0.0.7, ansi-html@0.0.7:
+ansi-html@0.0.7, ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
@@ -248,14 +250,14 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert-plus@^1.0.0, assert-plus@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -1335,15 +1337,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.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"
   dependencies:
@@ -1353,6 +1347,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1529,7 +1531,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.9.0, commander@~2.9.0, commander@2.9.x:
+commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -1855,7 +1857,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-"cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x:
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -1899,13 +1901,7 @@ 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.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
-debug@~2.2.0, debug@2.2.0:
+debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -1917,6 +1913,12 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
+debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
 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"
@@ -1974,7 +1976,7 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@~1.1.0, depd@1.1.0:
+depd@1.1.0, depd@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
@@ -2015,16 +2017,16 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+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@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
@@ -2046,7 +2048,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@^1.3.0, domelementtype@1:
+domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2054,23 +2056,16 @@ domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
-domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
-  dependencies:
-    domelementtype "1"
-
 domhandler@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
   dependencies:
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
   dependencies:
-    dom-serializer "0"
     domelementtype "1"
 
 domutils@1.1:
@@ -2086,20 +2081,27 @@ domutils@1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
   dependencies:
     is-obj "^1.0.0"
 
-duplexer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2206,7 +2208,7 @@ es6-error@^4.0.1, es6-error@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
-es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@2:
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
@@ -2235,7 +2237,7 @@ es6-set@~0.1.5:
     es6-symbol "3.1.1"
     event-emitter "~0.3.5"
 
-es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1, es6-symbol@3.1.1:
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -2611,7 +2613,7 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@^1.0.3, finalhandler@~1.0.3, finalhandler@1.0.3:
+finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
   dependencies:
@@ -2698,7 +2700,7 @@ forwarded@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
-fresh@^0.5.0, fresh@0.5.0:
+fresh@0.5.0, fresh@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
@@ -2988,7 +2990,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@^1.1.0, he@1.1.x:
+he@1.1.x, he@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
@@ -3113,14 +3115,14 @@ hullabaloo-config-manager@^1.0.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@^0.4.17, iconv-lite@~0.4.13:
-  version "0.4.17"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
-
 iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
+iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+  version "0.4.17"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
+
 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"
@@ -3176,7 +3178,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3188,24 +3190,6 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    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"
-    through "^2.3.6"
-
 inquirer@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
@@ -3224,6 +3208,24 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^2.0.0"
+    figures "^1.3.5"
+    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"
+    through "^2.3.6"
+
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -3445,14 +3447,14 @@ is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3514,7 +3516,7 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
-jest-diff@^19.0.0, jest-diff@19.0.0:
+jest-diff@19.0.0, jest-diff@^19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
   dependencies:
@@ -3777,7 +3779,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@0.2.x:
+loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -4037,14 +4039,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.27.0"
 
-mime@^1.3.4, mime@1.3.x:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
-
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
+mime@1.3.x, mime@^1.3.4:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -4057,34 +4059,26 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, "minimatch@2 || 3":
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist, minimist@^1.1.3, minimist@^1.2.0, minimist@1.2.0:
+minimist, minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, 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:
     minimist "0.0.8"
 
-ms@^0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -4093,6 +4087,10 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -5043,26 +5041,26 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-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@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
 q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
+qs@6.4.0, qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
-qs@~6.4.0, qs@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -5074,7 +5072,7 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@^0.2.0, querystring@0.2.0:
+querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
@@ -5134,6 +5132,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+readable-stream@1.0:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
   version "2.2.11"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
@@ -5146,15 +5153,6 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -5313,6 +5311,31 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.4:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.0"
 
+request@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    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"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 request@^2.79.0, request@^2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -5340,31 +5363,6 @@ request@^2.79.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    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"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5432,7 +5430,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
@@ -5495,7 +5493,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, "semver@2 || 3 || 4 || 5", semver@5.3.0:
+"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5521,7 +5519,7 @@ serialize-javascript@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
 
-serve-static@^1.12.3, serve-static@1.12.3:
+serve-static@1.12.3, serve-static@^1.12.3:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
   dependencies:
@@ -5610,16 +5608,16 @@ source-map-support@^0.4.0, source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.6"
 
+source-map@0.5.6, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
 source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.6, source-map@0.5.x:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -5712,16 +5710,6 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
-  dependencies:
-    safe-buffer "~5.0.1"
-
 string-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -5743,6 +5731,16 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
+  dependencies:
+    safe-buffer "~5.0.1"
+
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -5836,6 +5834,13 @@ tapable@^0.2.5, tapable@^0.2.6, tapable@~0.2.5:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
 
+tappable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tappable/-/tappable-1.0.1.tgz#9cda1fdeb73011d30db5edc42bc6cc42c9f3028f"
+  dependencies:
+    pify "^3.0.0"
+    tapable "^0.2.6"
+
 tar-pack@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
@@ -5877,10 +5882,6 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -5888,6 +5889,10 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -5925,7 +5930,7 @@ toposort@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
 
-tough-cookie@^2.3.2, tough-cookie@>=2.3.0, tough-cookie@~2.3.0:
+tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
@@ -5982,6 +5987,13 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
+uglify-js@3.0.x:
+  version "3.0.15"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
+  dependencies:
+    commander "~2.9.0"
+    source-map "~0.5.1"
+
 uglify-js@^2.6, uglify-js@^2.8.27:
   version "2.8.28"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
@@ -5991,13 +6003,6 @@ uglify-js@^2.6, uglify-js@^2.8.27:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@3.0.x:
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
-  dependencies:
-    commander "~2.9.0"
-    source-map "~0.5.1"
-
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -6105,7 +6110,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@^0.10.3, util@0.10.3:
+util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6374,18 +6379,14 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+wordwrap@0.0.2, wordwrap@~0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6530,4 +6531,3 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
-

From 030273db498e058a7d8423f30d7fe08f29fb340c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:01:30 +0430
Subject: [PATCH 043/236] improve build lifecycle

---
 bin/nuxt-start  | 10 +---------
 lib/builder.js  | 35 +++++++++++++++++++++--------------
 lib/nuxt.js     |  2 +-
 lib/renderer.js | 13 -------------
 4 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/bin/nuxt-start b/bin/nuxt-start
index 970c87d7fd..d1d6a0b16c 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -4,7 +4,6 @@ var fs = require('fs')
 var parseArgs = require('minimist')
 var Nuxt = require('../')
 var resolve = require('path').resolve
-var join = require('path').join
 
 var argv = parseArgs(process.argv.slice(2), {
   alias: {
@@ -56,14 +55,7 @@ if (typeof options.rootDir !== 'string') {
 }
 options.dev = false // Force production mode (no webpack middleware called)
 
-var buildDir = join(options.rootDir, (options.buildDir || '.nuxt'), 'dist', 'server-bundle.json')
-// Check if project is built for production
-if (!fs.existsSync(buildDir)) {
-  console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
-  process.exit(1)
-}
-
 var nuxt = module.exports = new Nuxt(options)
 var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
 var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-var server = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
+module.exports = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
diff --git a/lib/builder.js b/lib/builder.js
index a659aab4d0..ad5bd872f1 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -52,19 +52,25 @@ export default class Builder extends Tapable {
       colors: true
     }
 
-    // Register build hook on init when in dev mode
-    this.nuxt.plugin('init', () => {
-      // Don't await for builder in dev (faster startup)
-      this.build().catch(err => {
-        // eslint-disable-next-line no-console
-        console.error(err)
-      })
+    // Register lifecycle hooks
+    this.nuxt.plugin('afterInit', () => {
+      if (this.nuxt.dev) {
+        // But don't await for builder on dev (faster startup)
+        this.build().catch(err => {
+          // eslint-disable-next-line no-console
+          console.error(err)
+        })
+      } else {
+        return this.production()
+      }
     })
 
     this._buildStatus = STATUS.INITIAL
   }
 
   async build () {
+    // Ensure nuxt initialized
+    await this.nuxt.init()
     // Avoid calling this method multiple times
     if (this._buildStatus === STATUS.BUILD_DONE) {
       return this
@@ -111,7 +117,7 @@ export default class Builder extends Tapable {
     return this
   }
 
-  production () {
+  async production () {
     // Avoid calling this method multiple times
     if (this._buildStatus === STATUS.BUILD_DONE) {
       return this
@@ -120,13 +126,14 @@ export default class Builder extends Tapable {
     const serverConfig = this.getWebpackServerConfig()
     const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
     const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
-    if (fs.existsSync(bundlePath) && fs.existsSync(manifestPath)) {
-      const bundle = fs.readFileSync(bundlePath, 'utf8')
-      const manifest = fs.readFileSync(manifestPath, 'utf8')
-      this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
-      this.addAppTemplate()
+    if (!fs.existsSync(bundlePath) || !fs.existsSync(manifestPath)) {
+      console.error('[warning] No build files found, trying to build for production') // eslint-disable-line no-console
+      await this.build()
     }
-    // Flag to set that building is done
+    const bundle = fs.readFileSync(bundlePath, 'utf8')
+    const manifest = fs.readFileSync(manifestPath, 'utf8')
+    this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
+    this.addAppTemplate()
     this._buildStatus = STATUS.BUILD_DONE
     return this
   }
diff --git a/lib/nuxt.js b/lib/nuxt.js
index d8c7c087a5..5e96727f77 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -103,7 +103,7 @@ export default class Nuxt extends Tapable {
     // Wait for all components to be ready
     await this.applyPluginsAsync('beforeInit')
     await this.applyPluginsAsync('init')
-    await this.applyPluginsAsync('afterInit')
+    this.applyPluginsAsync('afterInit')
     this.initialized = true
     return this
   }
diff --git a/lib/renderer.js b/lib/renderer.js
index 88511d9eba..fae6fec069 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -19,11 +19,6 @@ export default class Renderer extends Tapable {
   }
 
   async render (req, res) {
-    // Check if project is built for production
-    if (!this.nuxt.builder.renderer && !this.options.dev) {
-      console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
-      process.exit(1)
-    }
     /* istanbul ignore if */
     if (!this.nuxt.builder.renderer || !this.nuxt.builder.appTemplate) {
       return new Promise((resolve) => {
@@ -120,8 +115,6 @@ export default class Renderer extends Tapable {
   }
 
   async renderRoute (url, context = {}) {
-    // Wait for nuxt.js to be ready
-    await this.nuxt.init()
     // Log rendered url
     debug(`Rendering url ${url}`)
     // Add url and isSever to the context
@@ -156,12 +149,6 @@ export default class Renderer extends Tapable {
   }
 
   async renderAndGetWindow (url, opts = {}) {
-    if (!this.ready) {
-      // Wait for nuxt.js to be ready
-      await this.nuxt._init
-      this.ready = true
-    }
-
     /* istanbul ignore if */
     if (!jsdom) {
       try {

From 103365d81ba6b83eb8c27194e8ce620c9ac86eae Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:14:54 +0430
Subject: [PATCH 044/236] update nuxt tests

---
 test/index.test.js | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/test/index.test.js b/test/index.test.js
index 64b90556ce..697144577b 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -8,32 +8,17 @@ test('Nuxt.js Class', t => {
 })
 
 test.serial('Nuxt.js Instance', async t => {
-  const nuxt = new Nuxt({ dev: false })
+  const nuxt = new Nuxt({
+    dev: false,
+    rootDir: resolve(__dirname, 'fixtures', 'empty')
+  })
   t.is(typeof nuxt, 'object')
   t.is(nuxt.options.dev, false)
   t.is(typeof nuxt.build, 'function')
   t.is(typeof nuxt.generate, 'function')
-})
-
-test.serial('Fail when build not done and try to render', async t => {
-  const nuxt = new Nuxt({
-    dev: false,
-    rootDir: resolve(__dirname, 'fixtures/empty')
-  })
-  return new Promise((resolve) => {
-    let oldExit = process.exit
-    let oldCE = console.error // eslint-disable-line no-console
-    let _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
-    process.exit = (code) => {
-      process.exit = oldExit
-      console.error = oldCE // eslint-disable-line no-console
-      t.is(code, 1)
-      t.true(_log.includes('No build files found, please run `nuxt build` before launching `nuxt start`'))
-      resolve()
-    }
-    nuxt.render()
-  })
+  t.is(typeof nuxt._init.then, 'function')
+  await nuxt.init()
+  t.is(nuxt.initialized, true)
 })
 
 test.serial('Fail to build when no pages/ directory but is in the parent', async t => {
@@ -45,7 +30,9 @@ test.serial('Fail to build when no pages/ directory but is in the parent', async
     let oldExit = process.exit
     let oldCE = console.error // eslint-disable-line no-console
     let _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
+    console.error = (s) => {
+      _log += s
+    } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console
@@ -66,7 +53,9 @@ test.serial('Fail to build when no pages/ directory', async t => {
     let oldExit = process.exit
     let oldCE = console.error // eslint-disable-line no-console
     let _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
+    console.error = (s) => {
+      _log += s
+    } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console

From 1d95e38f9cd309012bae5dbb064bc8cbe366aa8b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:15:37 +0430
Subject: [PATCH 045/236] eslint

---
 test/index.test.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/index.test.js b/test/index.test.js
index 697144577b..85900835c1 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -30,9 +30,7 @@ test.serial('Fail to build when no pages/ directory but is in the parent', async
     let oldExit = process.exit
     let oldCE = console.error // eslint-disable-line no-console
     let _log = ''
-    console.error = (s) => {
-      _log += s
-    } // eslint-disable-line no-console
+    console.error = (s) => { _log += s } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console
@@ -53,9 +51,7 @@ test.serial('Fail to build when no pages/ directory', async t => {
     let oldExit = process.exit
     let oldCE = console.error // eslint-disable-line no-console
     let _log = ''
-    console.error = (s) => {
-      _log += s
-    } // eslint-disable-line no-console
+    console.error = (s) => { _log += s } // eslint-disable-line no-console
     process.exit = (code) => {
       process.exit = oldExit
       console.error = oldCE // eslint-disable-line no-console

From 277aa7e6fac2a426c57a3f9d864fd6e2be01f236 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:24:23 +0430
Subject: [PATCH 046/236] refactor renderer init into it's component

---
 lib/nuxt.js     | 50 ++++++++++++-------------------------------------
 lib/renderer.js | 26 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/lib/nuxt.js b/lib/nuxt.js
index 5e96727f77..ab9a3e6573 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -1,8 +1,5 @@
 import _ from 'lodash'
-import compression from 'compression'
 import fs from 'fs-extra'
-import pify from 'pify'
-import serveStatic from 'serve-static'
 import { resolve, join } from 'path'
 import Tapable from 'tappable'
 import * as Utils from './utils'
@@ -34,13 +31,22 @@ export default class Nuxt extends Tapable {
     // Apply defaults
     this.options = _.defaultsDeep(options, Nuxt.Defaults)
 
+    // If store defined, update store options to true
+    if (fs.existsSync(join(this.options.srcDir, 'store'))) {
+      this.options.store = true
+    }
+
+    // If app.html is defined, set the template path to the user template
+    this.options.appTemplatePath = resolve(__dirname, 'views/app.template.html')
+    if (fs.existsSync(join(this.options.srcDir, 'app.html'))) {
+      this.options.appTemplatePath = join(this.options.srcDir, 'app.html')
+    }
+
     // Resolve dirs
     this.options.rootDir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
     this.options.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(options.rootDir, options.srcDir) : this.options.rootDir)
     this.options.buildDir = join(this.options.rootDir, options.buildDir)
 
-    this.componentTasks()
-
     // Create instance of core components
     this.moduleContainer = new Nuxt.ModuleContainer(this)
     this.builder = new Nuxt.Builder(this)
@@ -64,38 +70,6 @@ export default class Nuxt extends Tapable {
     this.initialized = false
   }
 
-  componentTasks () {
-    // TODO: This task should move into their own components instead
-
-    // Error template
-    this.errorTemplate = _.template(fs.readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'), {
-      interpolate: /{{([\s\S]+?)}}/g
-    })
-
-    // If store defined, update store options to true
-    if (fs.existsSync(join(this.options.srcDir, 'store'))) {
-      this.options.store = true
-    }
-
-    // If app.html is defined, set the template path to the user template
-    this.options.appTemplatePath = resolve(__dirname, 'views/app.template.html')
-    if (fs.existsSync(join(this.options.srcDir, 'app.html'))) {
-      this.options.appTemplatePath = join(this.options.srcDir, 'app.html')
-    }
-
-    // For serving static/ files to /
-    this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
-    // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
-    this.serveStaticNuxt = pify(serveStatic(resolve(this.options.buildDir, 'dist'), {
-      maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
-    }))
-
-    // gzip middleware for production
-    if (!this.options.dev && this.options.render.gzip) {
-      this.gzipMiddleware = pify(compression(this.options.render.gzip))
-    }
-  }
-
   async init () {
     if (this._init) {
       return this._init
@@ -108,7 +82,7 @@ export default class Nuxt extends Tapable {
     return this
   }
 
-  close (callback) {
+  async close (callback) {
     let promises = []
     /* istanbul ignore if */
     if (this.webpackDevMiddleware) {
diff --git a/lib/renderer.js b/lib/renderer.js
index fae6fec069..6dc5ae4b32 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -3,6 +3,12 @@ import serialize from 'serialize-javascript'
 import generateETag from 'etag'
 import fresh from 'fresh'
 import Tapable from 'tappable'
+import pify from 'pify'
+import serveStatic from 'serve-static'
+import compression from 'compression'
+import _ from 'lodash'
+import { resolve } from 'path'
+import {readFileSync} from 'fs'
 import { getContext, setAnsiColors, encodeHtml } from './utils'
 
 const debug = require('debug')('nuxt:render')
@@ -16,6 +22,26 @@ export default class Renderer extends Tapable {
     super()
     this.nuxt = nuxt
     this.options = nuxt.options
+
+    this.nuxt.plugin('init', () => {
+      // For serving static/ files to /
+      this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
+
+      // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
+      this.serveStaticNuxt = pify(serveStatic(resolve(this.options.buildDir, 'dist'), {
+        maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
+      }))
+
+      // gzip middleware for production
+      if (!this.options.dev && this.options.render.gzip) {
+        this.gzipMiddleware = pify(compression(this.options.render.gzip))
+      }
+
+      // Error template
+      this.errorTemplate = _.template(readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'), {
+        interpolate: /{{([\s\S]+?)}}/g
+      })
+    })
   }
 
   async render (req, res) {

From 5ba7d593aa727172aff30153e8755cb22c5eddab Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:29:26 +0430
Subject: [PATCH 047/236] fix constructor order logic

---
 lib/nuxt.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/nuxt.js b/lib/nuxt.js
index ab9a3e6573..7430e6fbc6 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -31,6 +31,11 @@ export default class Nuxt extends Tapable {
     // Apply defaults
     this.options = _.defaultsDeep(options, Nuxt.Defaults)
 
+    // Resolve dirs
+    this.options.rootDir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
+    this.options.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(options.rootDir, options.srcDir) : this.options.rootDir)
+    this.options.buildDir = join(this.options.rootDir, options.buildDir)
+
     // If store defined, update store options to true
     if (fs.existsSync(join(this.options.srcDir, 'store'))) {
       this.options.store = true
@@ -42,11 +47,6 @@ export default class Nuxt extends Tapable {
       this.options.appTemplatePath = join(this.options.srcDir, 'app.html')
     }
 
-    // Resolve dirs
-    this.options.rootDir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
-    this.options.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(options.rootDir, options.srcDir) : this.options.rootDir)
-    this.options.buildDir = join(this.options.rootDir, options.buildDir)
-
     // Create instance of core components
     this.moduleContainer = new Nuxt.ModuleContainer(this)
     this.builder = new Nuxt.Builder(this)

From f3ecfb6a92770a73402aadde6047bd14da73eb78 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:44:51 +0430
Subject: [PATCH 048/236] better exit message

---
 lib/builder.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index ad5bd872f1..24eb400cad 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -90,10 +90,11 @@ export default class Builder extends Tapable {
 
     if (this._nuxtPages) {
       if (!fs.existsSync(join(this.options.srcDir, 'pages'))) {
+        let dir = this.options.srcDir
         if (fs.existsSync(join(this.options.srcDir, '..', 'pages'))) {
-          console.error('> No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?') // eslint-disable-line no-console
+          console.error(`> No 'pages' directory found in ${dir}. Did you mean to run 'nuxt' in the parent ('../') directory?`) // eslint-disable-line no-console
         } else {
-          console.error('> Couldn\'t find a `pages` directory. Please create one under the project root') // eslint-disable-line no-console
+          console.error(`> Couldn't find a 'pages' directory in ${dir}. Please create one under the project root`) // eslint-disable-line no-console
         }
         process.exit(1)
       }

From b79f8458426ac42e284f5f821b265540760d7999 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:45:06 +0430
Subject: [PATCH 049/236] update tests

---
 test/fixtures/module/modules/template/index.js | 2 +-
 test/module.test.js                            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/module/modules/template/index.js b/test/fixtures/module/modules/template/index.js
index 7e85b80d56..4ae607b4b6 100644
--- a/test/fixtures/module/modules/template/index.js
+++ b/test/fixtures/module/modules/template/index.js
@@ -2,7 +2,7 @@ const path = require('path')
 
 module.exports = function () {
     // Disable parsing pages/
-    this.nuxt.createRoutes = () => {}
+    this.nuxt.options.build.createRoutes = () => {}
     // Add /api endpoint
     this.addTemplate({
         fileName: 'router.js',
diff --git a/test/module.test.js b/test/module.test.js
index 59fd0c4ee3..14b79171c8 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -26,7 +26,8 @@ test('Vendor', async t => {
 })
 
 test('Plugin', async t => {
-  t.true(nuxt.options.plugins[0].src.includes(normalize('fixtures/module/.nuxt/basic.reverse.')), 'plugin added to config')
+  t.true(normalize(nuxt.options.plugins[0].src)
+    .includes(normalize('fixtures/module/.nuxt/basic.reverse.')), 'plugin added to config')
   const { html } = await nuxt.renderRoute('/')
   t.true(html.includes('<h1>TXUN</h1>'), 'plugin works')
 })

From 5768ef50922a7d9ec05a36f048f5cbb224e8270e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 00:53:02 +0430
Subject: [PATCH 050/236] update render references

---
 lib/renderer.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/renderer.js b/lib/renderer.js
index 6dc5ae4b32..d77290d380 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -63,7 +63,7 @@ export default class Renderer extends Tapable {
         await this.nuxt.builder.webpackHotMiddleware(req, res)
       }
       if (!this.options.dev && this.options.render.gzip) {
-        await this.nuxt.gzipMiddleware(req, res)
+        await this.gzipMiddleware(req, res)
       }
       // If base in req.url, remove it for the middleware and vue-router
       if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
@@ -71,12 +71,12 @@ export default class Renderer extends Tapable {
         req.url = req.url.replace(this.options.router.base, '/')
       }
       // Serve static/ files
-      await this.nuxt.serveStatic(req, res)
+      await this.serveStatic(req, res)
       // Serve .nuxt/dist/ files (only for production)
       if (!this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0) {
         const url = req.url
         req.url = req.url.replace(this.options.build.publicPath, '/')
-        await this.nuxt.serveStaticNuxt(req, res)
+        await this.serveStaticNuxt(req, res)
         /* istanbul ignore next */
         req.url = url
       }
@@ -127,7 +127,7 @@ export default class Renderer extends Tapable {
         console.error(err) // eslint-disable-line no-console
         return err
       }
-      const html = this.nuxt.errorTemplate({
+      const html = this.errorTemplate({
         /* istanbul ignore if */
         error: err,
         stack: ansiHTML(encodeHtml(err.stack))

From 4c07a397e215ef96d95346fa6ae4fc4e0ecefe2e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 01:04:28 +0430
Subject: [PATCH 051/236] builder: decouple build from production logic

---
 lib/builder.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 24eb400cad..487a762531 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -119,10 +119,6 @@ export default class Builder extends Tapable {
   }
 
   async production () {
-    // Avoid calling this method multiple times
-    if (this._buildStatus === STATUS.BUILD_DONE) {
-      return this
-    }
     // Production, create server-renderer
     const serverConfig = this.getWebpackServerConfig()
     const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
@@ -135,7 +131,6 @@ export default class Builder extends Tapable {
     const manifest = fs.readFileSync(manifestPath, 'utf8')
     this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
     this.addAppTemplate()
-    this._buildStatus = STATUS.BUILD_DONE
     return this
   }
 

From fa97b2af67580ba5ac748771eb96f02d837b427d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 01:07:28 +0430
Subject: [PATCH 052/236] typo

---
 lib/server.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index db242edb6a..f18f2e1706 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -55,11 +55,6 @@ class Server {
         console.log('Ready on http://%s:%s', _host, port) // eslint-disable-line no-console
       })
     })
-      .then(() => {
-        this.server.listen(port, host, () => {
-          console.log('Ready on http://%s:%s', host, port) // eslint-disable-line no-console
-        })
-      })
     return this
   }
 

From 37c92e73984d7f90ae41a14f8b20841512e471c5 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 01:13:00 +0430
Subject: [PATCH 053/236] better build chain

---
 lib/builder.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/builder.js b/lib/builder.js
index 487a762531..8ff1e3e5c0 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -125,7 +125,9 @@ export default class Builder extends Tapable {
     const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
     if (!fs.existsSync(bundlePath) || !fs.existsSync(manifestPath)) {
       console.error('[warning] No build files found, trying to build for production') // eslint-disable-line no-console
-      await this.build()
+      return this.build().then(() => {
+        return this.production()
+      })
     }
     const bundle = fs.readFileSync(bundlePath, 'utf8')
     const manifest = fs.readFileSync(manifestPath, 'utf8')

From c519c3edff47c9fe805a36729a85bb1eee76b6ad Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 02:39:03 +0430
Subject: [PATCH 054/236] fixes + improvements

---
 lib/builder.js                   | 43 ++++++++++++++++---------------
 lib/generator.js                 |  4 ---
 lib/module-container.js          | 26 +++++++------------
 lib/nuxt.js                      | 28 +++++++++++++++++---
 lib/renderer.js                  |  2 +-
 test/basic.fail.generate.test.js | 21 +++------------
 test/index.test.js               | 44 ++++++++++----------------------
 7 files changed, 74 insertions(+), 94 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 8ff1e3e5c0..ef27ca6667 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -53,38 +53,43 @@ export default class Builder extends Tapable {
     }
 
     // Register lifecycle hooks
-    this.nuxt.plugin('afterInit', () => {
-      if (this.nuxt.dev) {
-        // But don't await for builder on dev (faster startup)
-        this.build().catch(err => {
-          // eslint-disable-next-line no-console
-          console.error(err)
-        })
-      } else {
-        return this.production()
-      }
-    })
+    if (this.nuxt.options.dev) {
+      // Don't await for build on dev (faster startup)
+      this.nuxt.plugin('afterInit', () => {
+        this.build().catch(this.nuxt.errorHandler)
+      })
+    } else {
+      this.nuxt.plugin('init', () => {
+        // Guess it is build or production
+        // If build is not called it may be nuxt.start
+        if (this._buildStatus === STATUS.INITIAL) {
+          return this.production()
+        }
+      })
+    }
 
     this._buildStatus = STATUS.INITIAL
   }
 
   async build () {
-    // Ensure nuxt initialized
-    await this.nuxt.init()
     // Avoid calling this method multiple times
     if (this._buildStatus === STATUS.BUILD_DONE) {
       return this
     }
+
     // If building
     if (this._buildStatus === STATUS.BUILDING) {
       return new Promise((resolve) => {
         setTimeout(() => {
           resolve(this.build())
-        }, 300)
+        }, 1000)
       })
     }
     this._buildStatus = STATUS.BUILDING
 
+    // Ensure nuxt initialized
+    await this.nuxt.init()
+
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
 
@@ -92,11 +97,10 @@ export default class Builder extends Tapable {
       if (!fs.existsSync(join(this.options.srcDir, 'pages'))) {
         let dir = this.options.srcDir
         if (fs.existsSync(join(this.options.srcDir, '..', 'pages'))) {
-          console.error(`> No 'pages' directory found in ${dir}. Did you mean to run 'nuxt' in the parent ('../') directory?`) // eslint-disable-line no-console
+          throw new Error(`No \`pages\` directory found in ${dir}. Did you mean to run \`nuxt\` in the parent (\`../\`) directory?`)
         } else {
-          console.error(`> Couldn't find a 'pages' directory in ${dir}. Please create one under the project root`) // eslint-disable-line no-console
+          throw new Error(`Couldn't find a \`pages\` directory in ${dir}. Please create one under the project root`)
         }
-        process.exit(1)
       }
     }
 
@@ -124,10 +128,7 @@ export default class Builder extends Tapable {
     const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
     const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
     if (!fs.existsSync(bundlePath) || !fs.existsSync(manifestPath)) {
-      console.error('[warning] No build files found, trying to build for production') // eslint-disable-line no-console
-      return this.build().then(() => {
-        return this.production()
-      })
+      throw new Error('No build files found, please run `nuxt build` before launching `nuxt start`')
     }
     const bundle = fs.readFileSync(bundlePath, 'utf8')
     const manifest = fs.readFileSync(manifestPath, 'utf8')
diff --git a/lib/generator.js b/lib/generator.js
index 432dcecff5..d73cb05cec 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -24,9 +24,6 @@ export default class Generator extends Tapable {
     let errors = []
     let generateRoutes = []
 
-    // Wait for nuxt.js to be ready
-    await this.nuxt.init()
-
     // Set variables
     let srcStaticPath = resolve(this.options.srcDir, 'static')
     let srcBuiltPath = resolve(this.options.buildDir, 'dist')
@@ -55,7 +52,6 @@ export default class Generator extends Tapable {
       } catch (e) {
         console.error('Could not resolve routes') // eslint-disable-line no-console
         console.error(e) // eslint-disable-line no-console
-        process.exit(1)
         throw e // eslint-disable-line no-unreachable
       }
     }
diff --git a/lib/module-container.js b/lib/module-container.js
index 313b738632..4f13c3b9c9 100755
--- a/lib/module-container.js
+++ b/lib/module-container.js
@@ -96,28 +96,20 @@ export default class ModuleContainer extends Tapable {
     const originalSrc = moduleOpts.src || moduleOpts
     // Resolve module
     let module = originalSrc
-    try {
-      if (typeof module === 'string') {
-        // Using ~ or ./ shorthand modules are resolved from project srcDir
-        if (module.indexOf('~') === 0 || module.indexOf('./') === 0) {
-          module = path.join(this.options.srcDir, module.substr(1))
-        }
-        // eslint-disable-next-line no-eval
-        module = eval('require')(module)
+
+    if (typeof module === 'string') {
+      // Using ~ or ./ shorthand modules are resolved from project srcDir
+      if (module.indexOf('~') === 0 || module.indexOf('./') === 0) {
+        module = path.join(this.options.srcDir, module.substr(1))
       }
-    } catch (e) /* istanbul ignore next */ {
-      // eslint-disable-next-line no-console
-      console.error('[nuxt] Unable to resolve module', module)
-      // eslint-disable-next-line no-console
-      console.error(e)
-      process.exit(0)
+      // eslint-disable-next-line no-eval
+      module = eval('require')(module)
     }
+
     // Validate module
     /* istanbul ignore if */
     if (typeof module !== 'function') {
-      // eslint-disable-next-line no-console
-      console.error(`[nuxt] Module [${originalSrc}] should export a function`)
-      process.exit(1)
+      throw new Error(`[nuxt] Module ${JSON.stringify(originalSrc)} should export a function`)
     }
     // Module meta
     if (!module.meta) {
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 7430e6fbc6..93ee1499cc 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -62,11 +62,12 @@ export default class Nuxt extends Tapable {
     this.dir = options.rootDir
     this.srcDir = options.srcDir
     this.buildDir = options.buildDir
+    this.dev = options.dev
     this.Server = Nuxt.Server
     this.Utils = Nuxt.Utils
 
-    // eslint-disable-next-line no-console
-    this._init = this.init().catch(console.error)
+    this.errorHandler = this.errorHandler.bind(this)
+    this._init = this.init().catch(this.errorHandler)
     this.initialized = false
   }
 
@@ -74,14 +75,35 @@ export default class Nuxt extends Tapable {
     if (this._init) {
       return this._init
     }
+
     // Wait for all components to be ready
+    // Including modules
     await this.applyPluginsAsync('beforeInit')
+    // Including Build
     await this.applyPluginsAsync('init')
-    this.applyPluginsAsync('afterInit')
+    // Extra jobs
+    this.applyPluginsAsync('afterInit').catch(this.errorHandler)
+
     this.initialized = true
     return this
   }
 
+  errorHandler () {
+    // Global error handler
+    // Silent
+    if (this.options.errorHandler === false) {
+      return
+    }
+    // Custom eventHandler
+    if (typeof this.options.errorHandler === 'function') {
+      return this.options.errorHandler.apply(this, arguments)
+    }
+    // Default
+    // eslint-disable-next-line no-console
+    console.error.apply(this, arguments)
+    process.exit(1)
+  }
+
   async close (callback) {
     let promises = []
     /* istanbul ignore if */
diff --git a/lib/renderer.js b/lib/renderer.js
index d77290d380..f0ae561a75 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -183,7 +183,7 @@ export default class Renderer extends Tapable {
         console.error('Fail when calling nuxt.renderAndGetWindow(url)') // eslint-disable-line no-console
         console.error('jsdom module is not installed') // eslint-disable-line no-console
         console.error('Please install jsdom with: npm install --save-dev jsdom') // eslint-disable-line no-console
-        process.exit(1)
+        throw e
       }
     }
     let options = {
diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js
index c1c85a30fa..996dc142fd 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/basic.fail.generate.test.js
@@ -7,29 +7,14 @@ test('Fail with routes() which throw an error', async t => {
     rootDir: resolve(__dirname, 'fixtures/basic'),
     dev: false,
     generate: {
-      routes: function () {
-        return new Promise((resolve, reject) => {
-          reject(new Error('Not today!'))
-        })
+      async routes () {
+        throw new Error('Not today!')
       }
     }
   }
   const nuxt = new Nuxt(options)
-  return new Promise((resolve) => {
-    var oldExit = process.exit
-    var oldCE = console.error // eslint-disable-line no-console
-    var _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
-    process.exit = (code) => {
-      process.exit = oldExit
-      console.error = oldCE // eslint-disable-line no-console
-      t.is(code, 1)
-      t.true(_log.includes('Could not resolve routes'))
-      resolve()
-    }
-    nuxt.generate()
+  return nuxt.generate()
     .catch((e) => {
       t.true(e.message === 'Not today!')
     })
-  })
 })
diff --git a/test/index.test.js b/test/index.test.js
index 85900835c1..73cce8fe9f 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -21,44 +21,28 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(nuxt.initialized, true)
 })
 
-test.serial('Fail to build when no pages/ directory but is in the parent', async t => {
+test.serial('Fail to build when no pages/ directory but is in the parent', t => {
   const nuxt = new Nuxt({
-    dev: true,
+    dev: false,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
   })
-  return new Promise((resolve) => {
-    let oldExit = process.exit
-    let oldCE = console.error // eslint-disable-line no-console
-    let _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
-    process.exit = (code) => {
-      process.exit = oldExit
-      console.error = oldCE // eslint-disable-line no-console
-      t.is(code, 1)
-      t.true(_log.includes('No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?'))
-      resolve()
-    }
-    nuxt.build()
+  return nuxt.build().catch(err => {
+    let s = String(err)
+    t.true(s.includes('No `pages` directory found'))
+    t.true(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?'))
+    resolve()
   })
 })
 
-test.serial('Fail to build when no pages/ directory', async t => {
+test.serial('Fail to build when no pages/ directory', t => {
   const nuxt = new Nuxt({
-    dev: true,
+    dev: false,
     rootDir: resolve(__dirname)
   })
-  return new Promise((resolve) => {
-    let oldExit = process.exit
-    let oldCE = console.error // eslint-disable-line no-console
-    let _log = ''
-    console.error = (s) => { _log += s } // eslint-disable-line no-console
-    process.exit = (code) => {
-      process.exit = oldExit
-      console.error = oldCE // eslint-disable-line no-console
-      t.is(code, 1)
-      t.true(_log.includes('Couldn\'t find a `pages` directory. Please create one under the project root'))
-      resolve()
-    }
-    nuxt.build()
+  return nuxt.build().catch(err => {
+    let s = String(err)
+    t.true(s.includes('Couldn\'t find a `pages` directory'))
+    t.true(s.includes('Please create one under the project root'))
+    resolve()
   })
 })

From ce5cb62ee64fbc0e8b31bdfeb61ea39ebc96dc1e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 02:50:19 +0430
Subject: [PATCH 055/236] fix index.test

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

diff --git a/test/index.test.js b/test/index.test.js
index 73cce8fe9f..cafaa08158 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -17,7 +17,7 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(typeof nuxt.build, 'function')
   t.is(typeof nuxt.generate, 'function')
   t.is(typeof nuxt._init.then, 'function')
-  await nuxt.init()
+  await nuxt.build()
   t.is(nuxt.initialized, true)
 })
 

From 76c3b358ccae3c4ba2ce32460ae6c2edf3176612 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 03:17:22 +0430
Subject: [PATCH 056/236] better No build files found error

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

diff --git a/lib/builder.js b/lib/builder.js
index ef27ca6667..4ae2efa29f 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -128,7 +128,7 @@ export default class Builder extends Tapable {
     const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
     const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
     if (!fs.existsSync(bundlePath) || !fs.existsSync(manifestPath)) {
-      throw new Error('No build files found, please run `nuxt build` before launching `nuxt start`')
+      throw new Error(`No build files found in ${serverConfig.output.path}, please run \`nuxt build\` before launching \`nuxt start\``)
     }
     const bundle = fs.readFileSync(bundlePath, 'utf8')
     const manifest = fs.readFileSync(manifestPath, 'utf8')

From b61694ca219bc8def106aabdc2d5c0ad4e4686c0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 03:22:30 +0430
Subject: [PATCH 057/236] clone options to prevent unwanted side-effects

fixes with-config test that runs nuxt twice with same nuxt.config.js file
---
 lib/nuxt.js              | 5 ++++-
 test/with-config.test.js | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/nuxt.js b/lib/nuxt.js
index 93ee1499cc..6a6fbed55c 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -11,9 +11,12 @@ import Server from './server'
 import Defaults from './defaults'
 
 export default class Nuxt extends Tapable {
-  constructor (options = {}) {
+  constructor (_options = {}) {
     super()
 
+    // Clone options to prevent unwanted side-effects
+    const options = Object.assign({}, _options)
+
     // Normalize options
     if (options.loading === true) {
       delete options.loading
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 07c299f245..41fb678f42 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -111,4 +111,5 @@ test.after('Should be able to start Nuxt with build done', async t => {
   config.rootDir = rootDir
   config.dev = false
   nuxt = new Nuxt(config)
+  await nuxt.init()
 })

From 42bf9bb41d50e05bf20c7f61cdaa5a10d5edbc9a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 20:43:43 +0430
Subject: [PATCH 058/236] decouple builder from renderer + improvements

---
 bin/nuxt-dev             |   6 +-
 bin/nuxt-start           |   6 +-
 lib/builder.js           | 428 ++++++++++++---------------------------
 lib/defaults.js          |  42 +++-
 lib/generator.js         |   8 +-
 lib/nuxt.js              | 103 ++++------
 lib/renderer.js          | 152 +++++++++++---
 lib/utils.js             | 115 +++++++++++
 package.json             |   1 -
 test/basic.test.js       |   2 +-
 test/children.test.js    |   2 +-
 test/error.test.js       |   2 +-
 test/with-config.test.js |   2 +-
 13 files changed, 473 insertions(+), 396 deletions(-)

diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 84efb2e442..df72c433c6 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -64,10 +64,10 @@ if (typeof options.rootDir !== 'string') {
 // Force development mode: add hot reloading and watching changes
 options.dev = true
 
-var nuxt = module.exports = new Nuxt(options)
+var nuxt = new Nuxt(options)
 var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
 var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-var server = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
+var server = new Nuxt.Server(nuxt).listen(port, host)
 
 listenOnConfigChanges(nuxt, server)
 
@@ -102,3 +102,5 @@ function listenOnConfigChanges(nuxt, server) {
   chokidar.watch(nuxtConfigFile, Object.assign({}, nuxt.options.watchers.chokidar, { ignoreInitial: true }))
     .on('all', build)
 }
+
+module.exports = nuxt
diff --git a/bin/nuxt-start b/bin/nuxt-start
index d1d6a0b16c..bbdb5df1ae 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -55,7 +55,9 @@ if (typeof options.rootDir !== 'string') {
 }
 options.dev = false // Force production mode (no webpack middleware called)
 
-var nuxt = module.exports = new Nuxt(options)
+var nuxt = new Nuxt(options)
 var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
 var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-module.exports = nuxt.server = new nuxt.Server(nuxt).listen(port, host)
+new Nuxt.Server(nuxt).listen(port, host)
+
+module.exports = nuxt
diff --git a/lib/builder.js b/lib/builder.js
index 4ae2efa29f..710769b1c2 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -4,15 +4,16 @@ import fs from 'fs-extra'
 import hash from 'hash-sum'
 import pify from 'pify'
 import webpack from 'webpack'
-import PostCompilePlugin from 'post-compile-webpack-plugin'
 import serialize from 'serialize-javascript'
-import { createBundleRenderer } from 'vue-server-renderer'
+import webpackDevMiddleware from 'webpack-dev-middleware'
+import webpackHotMiddleware from 'webpack-hot-middleware'
 import { join, resolve, basename, dirname } from 'path'
 import Tapable from 'tappable'
-import { isUrl, r, wp } from './utils'
+import { isUrl, r, wp, createRoutes } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
 import defaults from './defaults'
+import MFS from 'memory-fs'
 
 const debug = require('debug')('nuxt:build')
 debug.color = 2 // Force green color
@@ -24,12 +25,39 @@ const writeFile = pify(fs.writeFile)
 const mkdirp = pify(fs.mkdirp)
 const glob = pify(require('glob'))
 
+const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
+const port = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
+
+debug('loaded')
+
 export default class Builder extends Tapable {
   constructor (nuxt) {
     super()
     this.nuxt = nuxt
     this.options = nuxt.options
 
+    this._buildStatus = STATUS.INITIAL
+    this.initialized = false
+
+    // Fields that set on build
+    this.compiler = null
+    this.webpackDevMiddleware = null
+    this.webpackHotMiddleware = null
+
+    if (nuxt.initialized) {
+      // If nuxt already initialized
+      this._init = this.init().catch(this.nuxt.errorHandler)
+    } else {
+      // Wait for hook
+      this.nuxt.plugin('init', this.init.bind(this))
+    }
+  }
+
+  async init () {
+    if (this._init) {
+      return this._init
+    }
+
     // Add extra loaders only if they are not already provided
     let extraDefaults = {}
     if (this.options.build && !Array.isArray(this.options.build.loaders)) {
@@ -38,37 +66,25 @@ export default class Builder extends Tapable {
     if (this.options.build && !Array.isArray(this.options.build.postcss)) {
       extraDefaults.postcss = defaultsPostcss
     }
-    this.options.build = _.defaultsDeep(this.options.build, extraDefaults)
+    _.defaultsDeep(this.options.build, extraDefaults)
+
     /* istanbul ignore if */
     if (this.options.dev && isUrl(this.options.build.publicPath)) {
       this.options.build.publicPath = defaults.build.publicPath
     }
 
-    // Stats
-    this.webpackStats = {
+    // If store defined, update store options to true unless explicitly disabled
+    if (this.options.store !== false && fs.existsSync(join(this.options.srcDir, 'store'))) {
+      this.options.store = true
+    }
+
+    // Mute stats on dev
+    this.webpackStats = this.options.dev ? '' : {
       chunks: false,
       children: false,
       modules: false,
       colors: true
     }
-
-    // Register lifecycle hooks
-    if (this.nuxt.options.dev) {
-      // Don't await for build on dev (faster startup)
-      this.nuxt.plugin('afterInit', () => {
-        this.build().catch(this.nuxt.errorHandler)
-      })
-    } else {
-      this.nuxt.plugin('init', () => {
-        // Guess it is build or production
-        // If build is not called it may be nuxt.start
-        if (this._buildStatus === STATUS.INITIAL) {
-          return this.production()
-        }
-      })
-    }
-
-    this._buildStatus = STATUS.INITIAL
   }
 
   async build () {
@@ -76,7 +92,6 @@ export default class Builder extends Tapable {
     if (this._buildStatus === STATUS.BUILD_DONE) {
       return this
     }
-
     // If building
     if (this._buildStatus === STATUS.BUILDING) {
       return new Promise((resolve) => {
@@ -92,7 +107,6 @@ export default class Builder extends Tapable {
 
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
-
     if (this._nuxtPages) {
       if (!fs.existsSync(join(this.options.srcDir, 'pages'))) {
         let dir = this.options.srcDir
@@ -113,39 +127,19 @@ export default class Builder extends Tapable {
     if (!this.options.dev) {
       await mkdirp(r(this.options.buildDir, 'dist'))
     }
+
     // Generate routes and interpret the template files
     await this.generateRoutesAndFiles()
-    // Generate .nuxt/dist/ files
-    await this.buildFiles()
+
+    // Start webpack build
+    await this.webpackBuild()
+
     // Flag to set that building is done
     this._buildStatus = STATUS.BUILD_DONE
-    return this
-  }
 
-  async production () {
-    // Production, create server-renderer
-    const serverConfig = this.getWebpackServerConfig()
-    const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
-    const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
-    if (!fs.existsSync(bundlePath) || !fs.existsSync(manifestPath)) {
-      throw new Error(`No build files found in ${serverConfig.output.path}, please run \`nuxt build\` before launching \`nuxt start\``)
-    }
-    const bundle = fs.readFileSync(bundlePath, 'utf8')
-    const manifest = fs.readFileSync(manifestPath, 'utf8')
-    this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
-    this.addAppTemplate()
     return this
   }
 
-  addAppTemplate () {
-    let templatePath = resolve(this.options.buildDir, 'dist', 'index.html')
-    if (fs.existsSync(templatePath)) {
-      this.appTemplate = _.template(fs.readFileSync(templatePath, 'utf8'), {
-        interpolate: /{{([\s\S]+?)}}/g
-      })
-    }
-  }
-
   async generateRoutesAndFiles () {
     debug('Generating files...')
     // -- Templates --
@@ -171,7 +165,7 @@ export default class Builder extends Tapable {
       env: this.options.env,
       head: this.options.head,
       middleware: fs.existsSync(join(this.options.srcDir, 'middleware')),
-      store: this.options.store || fs.existsSync(join(this.options.srcDir, 'store')),
+      store: this.options.store,
       css: this.options.css,
       plugins: this.options.plugins.map((p, i) => {
         if (typeof p === 'string') p = { src: p }
@@ -180,7 +174,7 @@ export default class Builder extends Tapable {
       }),
       appPath: './App.vue',
       layouts: Object.assign({}, this.options.layouts),
-      loading: (typeof this.options.loading === 'string' ? r(this.options.srcDir, this.options.loading) : this.options.loading),
+      loading: typeof this.options.loading === 'string' ? r(this.options.srcDir, this.options.loading) : this.options.loading,
       transition: this.options.transition,
       components: {
         ErrorPage: this.options.ErrorPage ? r(this.options.ErrorPage) : null
@@ -212,7 +206,7 @@ export default class Builder extends Tapable {
     if (this._nuxtPages) {
       // Use nuxt.js createRoutes bases on pages/
       const files = await glob('pages/**/*.vue', { cwd: this.options.srcDir })
-      templateVars.router.routes = this.createRoutes(files, this.options.srcDir)
+      templateVars.router.routes = createRoutes(files, this.options.srcDir)
     } else {
       templateVars.router.routes = this.options.build.createRoutes(this.options.srcDir)
     }
@@ -221,8 +215,6 @@ export default class Builder extends Tapable {
       // let the user extend the routes
       this.options.router.extendRoutes(templateVars.router.routes, r)
     }
-    // Routes for generate command
-    this.routes = this.flatRoutes(templateVars.router.routes || [])
 
     // -- Store --
     // Add store if needed
@@ -290,258 +282,100 @@ export default class Builder extends Tapable {
     }))
   }
 
-  async buildFiles () {
+  webpackBuild () {
+    debug('Building files...')
+    let compilersOptions = []
+
+    // Client
+    let clientConfig = clientWebpackConfig.call(this)
+    clientConfig.name = '$client'
+    compilersOptions.push(clientConfig)
+
+    // Server
+    if (this.options.ssr !== false) {
+      let serverConfig = serverWebpackConfig.call(this)
+      serverConfig.name = '$server'
+      compilersOptions.push(serverConfig)
+    }
+
+    // Leverage webpack multi-compiler for faster builds
+    this.compiler = webpack(compilersOptions)
+
+    // Access to compilers with name
+    this.compiler.compilers.forEach(compiler => {
+      if (compiler.name) {
+        this.compiler[compiler.name] = compiler
+      }
+    })
+
+    // Add middleware for dev
     if (this.options.dev) {
-      debug('Adding webpack middleware...')
-      this.createWebpackMiddleware()
-      this.webpackWatchAndUpdate()
-      this.watchFiles()
-    } else {
-      debug('Building files...')
-      await this.webpackRunClient()
-      await this.webpackRunServer()
-      this.addAppTemplate()
+      this.webpackDev()
     }
-  }
 
-  createRoutes (files, srcDir) {
-    let routes = []
-    files.forEach((file) => {
-      let keys = file.replace(/^pages/, '').replace(/\.vue$/, '').replace(/\/{2,}/g, '/').split('/').slice(1)
-      let route = { name: '', path: '', component: r(srcDir, file) }
-      let parent = routes
-      keys.forEach((key, i) => {
-        route.name = route.name ? route.name + '-' + key.replace('_', '') : key.replace('_', '')
-        route.name += (key === '_') ? 'all' : ''
-        let child = _.find(parent, { name: route.name })
-        if (child) {
-          if (!child.children) {
-            child.children = []
-          }
-          parent = child.children
-          route.path = ''
-        } else {
-          if (key === 'index' && (i + 1) === keys.length) {
-            route.path += (i > 0 ? '' : '/')
-          } else {
-            route.path += '/' + (key === '_' ? '*' : key.replace('_', ':'))
-            if (key !== '_' && key.indexOf('_') !== -1) {
-              route.path += '?'
-            }
-          }
-        }
-      })
-      // Order Routes path
-      parent.push(route)
-      parent.sort((a, b) => {
-        if (!a.path.length || a.path === '/') {
-          return -1
-        }
-        if (!b.path.length || b.path === '/') {
-          return 1
-        }
-        let res = 0
-        let _a = a.path.split('/')
-        let _b = b.path.split('/')
-        for (let i = 0; i < _a.length; i++) {
-          if (res !== 0) {
-            break
-          }
-          let y = (_a[i].indexOf('*') > -1) ? 2 : (_a[i].indexOf(':') > -1 ? 1 : 0)
-          let z = (_b[i].indexOf('*') > -1) ? 2 : (_b[i].indexOf(':') > -1 ? 1 : 0)
-          res = y - z
-          if (i === _b.length - 1 && res === 0) {
-            res = 1
-          }
-        }
-        return res === 0 ? -1 : res
-      })
-    })
-    return this.cleanChildrenRoutes(routes)
-  }
-
-  cleanChildrenRoutes (routes, isChild = false) {
-    let start = -1
-    let routesIndex = []
-    routes.forEach((route) => {
-      if (/-index$/.test(route.name) || route.name === 'index') {
-        // Save indexOf 'index' key in name
-        let res = route.name.split('-')
-        let s = res.indexOf('index')
-        start = (start === -1 || s < start) ? s : start
-        routesIndex.push(res)
-      }
-    })
-    routes.forEach((route) => {
-      route.path = (isChild) ? route.path.replace('/', '') : route.path
-      if (route.path.indexOf('?') > -1) {
-        let names = route.name.split('-')
-        let paths = route.path.split('/')
-        if (!isChild) {
-          paths.shift()
-        } // clean first / for parents
-        routesIndex.forEach((r) => {
-          let i = r.indexOf('index') - start //  children names
-          if (i < paths.length) {
-            for (let a = 0; a <= i; a++) {
-              if (a === i) {
-                paths[a] = paths[a].replace('?', '')
-              }
-              if (a < i && names[a] !== r[a]) {
-                break
-              }
-            }
-          }
-        })
-        route.path = (isChild ? '' : '/') + paths.join('/')
-      }
-      route.name = route.name.replace(/-index$/, '')
-      if (route.children) {
-        if (route.children.find((child) => child.path === '')) {
-          delete route.name
-        }
-        route.children = this.cleanChildrenRoutes(route.children, true)
-      }
-    })
-    return routes
-  }
-
-  flatRoutes (router, path = '', routes = []) {
-    router.forEach((r) => {
-      if (!r.path.includes(':') && !r.path.includes('*')) {
-        if (r.children) {
-          this.flatRoutes(r.children, path + r.path + '/', routes)
-        } else {
-          routes.push((r.path === '' && path[path.length - 1] === '/' ? path.slice(0, -1) : path) + r.path)
-        }
-      }
-    })
-    return routes
-  }
-
-  getWebpackClientConfig () {
-    return clientWebpackConfig.call(this)
-  }
-
-  getWebpackServerConfig () {
-    return serverWebpackConfig.call(this)
-  }
-
-  createWebpackMiddleware () {
-    const clientConfig = this.getWebpackClientConfig()
-    const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
-    const port = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
-
-    // setup on the fly compilation + hot-reload
-    clientConfig.entry.app = _.flatten(['webpack-hot-middleware/client?reload=true', clientConfig.entry.app])
-    clientConfig.plugins.push(
-      new webpack.HotModuleReplacementPlugin(),
-      new webpack.NoEmitOnErrorsPlugin(),
-      new PostCompilePlugin(stats => {
-        if (!stats.hasErrors() && !stats.hasWarnings()) {
-          // We don't use os.host() here because browsers have special behaviour with localhost
-          // For example chrome allows Geolocation api only to https or localhost origins
-          let _host = host === '0.0.0.0' ? 'localhost' : host
-          console.log(`> Open http://${_host}:${port}\n`) // eslint-disable-line no-console
-        }
-      })
-    )
-    const clientCompiler = webpack(clientConfig)
-    this.clientCompiler = clientCompiler
-    // Add the middleware to the instance context
-    this.webpackDevMiddleware = pify(require('webpack-dev-middleware')(clientCompiler, {
-      publicPath: clientConfig.output.publicPath,
-      stats: this.webpackStats,
-      quiet: true,
-      noInfo: true,
-      watchOptions: this.options.watchers.webpack
-    }))
-    this.webpackHotMiddleware = pify(require('webpack-hot-middleware')(clientCompiler, {
-      log: () => {
-      }
-    }))
-    clientCompiler.plugin('done', () => {
-      const fs = this.webpackDevMiddleware.fileSystem
-      const filePath = join(clientConfig.output.path, 'index.html')
-      if (fs.existsSync(filePath)) {
-        const template = fs.readFileSync(filePath, 'utf-8')
-        this.appTemplate = _.template(template, {
-          interpolate: /{{([\s\S]+?)}}/g
-        })
-      }
-      this.watchHandler()
-    })
-  }
-
-  webpackWatchAndUpdate () {
-    const MFS = require('memory-fs') // <- dependencies of webpack
-    const serverFS = new MFS()
-    const clientFS = this.clientCompiler.outputFileSystem
-    const serverConfig = this.getWebpackServerConfig()
-    const serverCompiler = webpack(serverConfig)
-    const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
-    const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
-    serverCompiler.outputFileSystem = serverFS
-    const watchHandler = (err) => {
-      if (err) throw err
-      const bundleExists = serverFS.existsSync(bundlePath)
-      const manifestExists = clientFS.existsSync(manifestPath)
-      if (bundleExists && manifestExists) {
-        const bundle = serverFS.readFileSync(bundlePath, 'utf8')
-        const manifest = clientFS.readFileSync(manifestPath, 'utf8')
-        this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
-      }
-    }
-    this.watchHandler = watchHandler
-    this.webpackServerWatcher = serverCompiler.watch(this.options.watchers.webpack, watchHandler)
-  }
-
-  webpackRunClient () {
+    // Start build
     return new Promise((resolve, reject) => {
-      const clientConfig = this.getWebpackClientConfig()
-      const clientCompiler = webpack(clientConfig)
-      clientCompiler.run((err, stats) => {
-        if (err) return reject(err)
-        console.log('[nuxt:build:client]\n', stats.toString(this.webpackStats)) // eslint-disable-line no-console
-        if (stats.hasErrors()) {
-          return reject(new Error('Webpack build exited with errors'))
+      this.compiler.run((err, multiStats) => {
+        if (err) {
+          return reject(err)
+        }
+        for (let _stats of multiStats.stats) {
+          console.log(_stats.toString(this.webpackStats))  // eslint-disable-line no-console
+          if (_stats.hasErrors()) {
+            return reject(new Error('Webpack build exited with errors'))
+          }
         }
         resolve()
       })
     })
   }
 
-  webpackRunServer () {
-    return new Promise((resolve, reject) => {
-      const serverConfig = this.getWebpackServerConfig()
-      const serverCompiler = webpack(serverConfig)
-      serverCompiler.run((err, stats) => {
-        if (err) return reject(err)
-        console.log('[nuxt:build:server]\n', stats.toString(this.webpackStats)) // eslint-disable-line no-console
-        if (stats.hasErrors()) return reject(new Error('Webpack build exited with errors'))
-        const bundlePath = join(serverConfig.output.path, 'server-bundle.json')
-        const manifestPath = join(serverConfig.output.path, 'client-manifest.json')
-        readFile(bundlePath, 'utf8')
-          .then(bundle => {
-            readFile(manifestPath, 'utf8')
-              .then(manifest => {
-                this.createRenderer(JSON.parse(bundle), JSON.parse(manifest))
-                resolve()
-              })
-          })
-      })
-    })
-  }
+  webpackDev () {
+    debug('Adding webpack middleware...')
 
-  createRenderer (bundle, manifest) {
-    // Create bundle renderer to give a fresh context for every request
-    this.renderer = createBundleRenderer(bundle, Object.assign({
-      clientManifest: manifest,
-      runInNewContext: false,
-      basedir: this.options.rootDir
-    }, this.options.build.ssr))
-    this.renderToString = pify(this.renderer.renderToString)
-    this.renderToStream = this.renderer.renderToStream
+    // Use MFS for faster builds
+    let mfs = new MFS()
+    this.compiler.compilers.forEach(compiler => {
+      compiler.outputFileSystem = mfs
+    })
+
+    let clientConfig = this.compiler.$client.options
+
+    // Setup on the fly compilation + hot-reload
+    clientConfig.entry.app = _.flatten(['webpack-hot-middleware/client?reload=true', clientConfig.entry.app])
+    clientConfig.plugins.push(
+      new webpack.HotModuleReplacementPlugin(),
+      new webpack.NoEmitOnErrorsPlugin()
+    )
+
+    // Create webpack dev middleware
+    this.webpackDevMiddleware = pify(webpackDevMiddleware(this.compiler.$client, {
+      publicPath: clientConfig.output.publicPath,
+      stats: this.webpackStats,
+      quiet: true,
+      noInfo: true,
+      watchOptions: this.options.watchers.webpack
+    }))
+
+    this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.$client, {
+      log: false,
+      heartbeat: 2500
+    }))
+
+    // Run after compilation is done
+    this.compiler.plugin('done', async stats => {
+      // Reload renderer if available
+      if (this.nuxt.renderer) {
+        await this.nuxt.renderer.loadResources(mfs)
+      }
+      // Show open URL
+      if (!stats.hasErrors() && !stats.hasWarnings()) {
+        let _host = host === '0.0.0.0' ? 'localhost' : host
+        console.log(`> Open http://${_host}:${port}\n`) // eslint-disable-line no-console
+      }
+    })
+
+    this.watchFiles()
   }
 
   watchFiles () {
diff --git a/lib/defaults.js b/lib/defaults.js
index 8d6ff4c75f..137e31e56d 100755
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -1,4 +1,43 @@
-export default {
+import _ from 'lodash'
+import { join, resolve } from 'path'
+import { existsSync } from 'fs'
+
+export default function defaults (_options) {
+  // Clone options to prevent unwanted side-effects
+  const options = Object.assign({}, _options)
+
+  // Normalize options
+  if (options.loading === true) {
+    delete options.loading
+  }
+  if (options.router && typeof options.router.middleware === 'string') {
+    options.router.middleware = [options.router.middleware]
+  }
+  if (options.router && typeof options.router.base === 'string') {
+    options._routerBaseSpecified = true
+  }
+  if (typeof options.transition === 'string') {
+    options.transition = { name: options.transition }
+  }
+
+  // Apply defaults
+  _.defaultsDeep(options, defaultOptions)
+
+  // Resolve dirs
+  options.rootDir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
+  options.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(options.rootDir, options.srcDir) : options.rootDir)
+  options.buildDir = join(options.rootDir, options.buildDir)
+
+  // If app.html is defined, set the template path to the user template
+  options.appTemplatePath = resolve(__dirname, 'views/app.template.html')
+  if (existsSync(join(options.srcDir, 'app.html'))) {
+    options.appTemplatePath = join(options.srcDir, 'app.html')
+  }
+
+  return options
+}
+
+const defaultOptions = {
   dev: (process.env.NODE_ENV !== 'production'),
   buildDir: '.nuxt',
   build: {
@@ -78,6 +117,7 @@ export default {
     scrollBehavior: null
   },
   render: {
+    ssr: {},
     http2: {
       push: false
     },
diff --git a/lib/generator.js b/lib/generator.js
index d73cb05cec..61bf3f142e 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -4,7 +4,7 @@ import _ from 'lodash'
 import { resolve, join, dirname, sep } from 'path'
 import { minify } from 'html-minifier'
 import Tapable from 'tappable'
-import { isUrl, promisifyRoute, waitFor } from './utils'
+import { isUrl, promisifyRoute, waitFor, flatRoutes } from './utils'
 
 const debug = require('debug')('nuxt:generate')
 const copy = pify(fs.copy)
@@ -12,6 +12,8 @@ const remove = pify(fs.remove)
 const writeFile = pify(fs.writeFile)
 const mkdirp = pify(fs.mkdirp)
 
+debug('loaded')
+
 export default class Generator extends Tapable {
   constructor (nuxt) {
     super()
@@ -31,7 +33,7 @@ export default class Generator extends Tapable {
     let distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
 
     // Launch build process
-    await this.nuxt.builder.build()
+    await this.nuxt.build()
 
     // Clean destination folder
     await remove(distPath)
@@ -78,7 +80,7 @@ export default class Generator extends Tapable {
     }
 
     // Generate only index.html for router.mode = 'hash'
-    let routes = (this.options.router.mode === 'hash') ? ['/'] : this.nuxt.builder.routes
+    let routes = (this.options.router.mode === 'hash') ? ['/'] : flatRoutes(this.options.router.routes)
     routes = decorateWithPayloads(routes)
 
     while (routes.length) {
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 6a6fbed55c..415909c329 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -1,77 +1,29 @@
-import _ from 'lodash'
-import fs from 'fs-extra'
-import { resolve, join } from 'path'
 import Tapable from 'tappable'
 import * as Utils from './utils'
-import Builder from './builder'
 import Renderer from './renderer'
-import Generator from './generator'
 import ModuleContainer from './module-container'
 import Server from './server'
-import Defaults from './defaults'
+import defaults from './defaults'
 
 export default class Nuxt extends Tapable {
   constructor (_options = {}) {
     super()
 
-    // Clone options to prevent unwanted side-effects
-    const options = Object.assign({}, _options)
+    this.options = defaults(_options)
 
-    // Normalize options
-    if (options.loading === true) {
-      delete options.loading
-    }
-    if (options.router && typeof options.router.middleware === 'string') {
-      options.router.middleware = [options.router.middleware]
-    }
-    if (options.router && typeof options.router.base === 'string') {
-      this._routerBaseSpecified = true
-    }
-    if (typeof options.transition === 'string') {
-      options.transition = { name: options.transition }
-    }
-
-    // Apply defaults
-    this.options = _.defaultsDeep(options, Nuxt.Defaults)
-
-    // Resolve dirs
-    this.options.rootDir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
-    this.options.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(options.rootDir, options.srcDir) : this.options.rootDir)
-    this.options.buildDir = join(this.options.rootDir, options.buildDir)
-
-    // If store defined, update store options to true
-    if (fs.existsSync(join(this.options.srcDir, 'store'))) {
-      this.options.store = true
-    }
-
-    // If app.html is defined, set the template path to the user template
-    this.options.appTemplatePath = resolve(__dirname, 'views/app.template.html')
-    if (fs.existsSync(join(this.options.srcDir, 'app.html'))) {
-      this.options.appTemplatePath = join(this.options.srcDir, 'app.html')
-    }
+    this.initialized = false
+    this.errorHandler = this.errorHandler.bind(this)
 
     // Create instance of core components
     this.moduleContainer = new Nuxt.ModuleContainer(this)
-    this.builder = new Nuxt.Builder(this)
     this.renderer = new Nuxt.Renderer(this)
-    this.generator = new Nuxt.Generator(this)
 
     // Backward compatibility
     this.render = this.renderer.render.bind(this.renderer)
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
-    this.build = this.builder.build.bind(this.builder)
-    this.generate = this.generator.generate.bind(this.generator)
-    this.dir = options.rootDir
-    this.srcDir = options.srcDir
-    this.buildDir = options.buildDir
-    this.dev = options.dev
-    this.Server = Nuxt.Server
-    this.Utils = Nuxt.Utils
 
-    this.errorHandler = this.errorHandler.bind(this)
     this._init = this.init().catch(this.errorHandler)
-    this.initialized = false
   }
 
   async init () {
@@ -79,29 +31,56 @@ export default class Nuxt extends Tapable {
       return this._init
     }
 
+    // Call to build on dev
+    if (this.options.dev) {
+      this.builder.build().catch(this.errorHandler)
+    }
+
     // Wait for all components to be ready
-    // Including modules
     await this.applyPluginsAsync('beforeInit')
-    // Including Build
     await this.applyPluginsAsync('init')
-    // Extra jobs
+    this.initialized = true
     this.applyPluginsAsync('afterInit').catch(this.errorHandler)
 
-    this.initialized = true
     return this
   }
 
+  get builder () {
+    if (this._builder) {
+      return this._builder
+    }
+    const Builder = require('./builder').default
+    this._builder = new Builder(this)
+    return this._builder
+  }
+
+  get generator () {
+    if (this._generator) {
+      return this._generator
+    }
+    const Generator = require('./generator').default
+    this._generator = new Generator(this)
+    return this._generator
+  }
+
+  build () {
+    return this.builder.build.apply(this.builder, arguments)
+  }
+
+  generate () {
+    return this.generator.generate.apply(this.generator, arguments)
+  }
+
   errorHandler () {
-    // Global error handler
     // Silent
     if (this.options.errorHandler === false) {
       return
     }
-    // Custom eventHandler
+    // Custom errorHandler
     if (typeof this.options.errorHandler === 'function') {
       return this.options.errorHandler.apply(this, arguments)
     }
-    // Default
+    // Default handler
     // eslint-disable-next-line no-console
     console.error.apply(this, arguments)
     process.exit(1)
@@ -131,6 +110,9 @@ export default class Nuxt extends Tapable {
     if (this.customFilesWatcher) {
       this.customFilesWatcher.close()
     }
+
+    promises.push(this.applyPluginsAsync('close'))
+
     return Promise.all(promises).then(() => {
       if (typeof callback === 'function') callback()
     })
@@ -138,10 +120,7 @@ export default class Nuxt extends Tapable {
 }
 
 // Add core components to Nuxt class
-Nuxt.Defaults = Defaults
 Nuxt.Utils = Utils
 Nuxt.Renderer = Renderer
-Nuxt.Builder = Builder
 Nuxt.ModuleContainer = ModuleContainer
 Nuxt.Server = Server
-Nuxt.Generator = Generator
diff --git a/lib/renderer.js b/lib/renderer.js
index f0ae561a75..bead1a7796 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -7,8 +7,9 @@ import pify from 'pify'
 import serveStatic from 'serve-static'
 import compression from 'compression'
 import _ from 'lodash'
-import { resolve } from 'path'
-import {readFileSync} from 'fs'
+import { resolve, join } from 'path'
+import fs from 'fs-extra'
+import { createBundleRenderer } from 'vue-server-renderer'
 import { getContext, setAnsiColors, encodeHtml } from './utils'
 
 const debug = require('debug')('nuxt:render')
@@ -17,61 +18,149 @@ setAnsiColors(ansiHTML)
 
 let jsdom = null
 
+const parseTemplate = templateStr => _.template(templateStr, {
+  interpolate: /{{([\s\S]+?)}}/g
+})
+
 export default class Renderer extends Tapable {
   constructor (nuxt) {
     super()
     this.nuxt = nuxt
     this.options = nuxt.options
 
-    this.nuxt.plugin('init', () => {
-      // For serving static/ files to /
-      this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
+    // Will be loaded by createRenderer
+    this.bundleRenderer = null
+    this.renderToStream = null
+    this.renderToString = null
 
-      // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
-      this.serveStaticNuxt = pify(serveStatic(resolve(this.options.buildDir, 'dist'), {
-        maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
-      }))
+    if (nuxt.initialized) {
+      // If nuxt already initialized
+      this._init = this.init().catch(this.nuxt.errorHandler)
+    } else {
+      // Wait for hook
+      this.nuxt.plugin('init', this.init.bind(this))
+    }
+  }
 
-      // gzip middleware for production
-      if (!this.options.dev && this.options.render.gzip) {
-        this.gzipMiddleware = pify(compression(this.options.render.gzip))
+  async init () {
+    if (this._init) {
+      return this._init
+    }
+
+    // Renderer runtime resources
+    this.resources = {
+      clientManifest: null,
+      serverBundle: null,
+      appTemplate: null,
+      errorTemplate: parseTemplate(fs.readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'))
+    }
+
+    // For serving static/ files to /
+    this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
+
+    // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
+    this.serveStaticNuxt = pify(serveStatic(resolve(this.options.buildDir, 'dist'), {
+      maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
+    }))
+
+    // gzip middleware for production
+    if (!this.options.dev && this.options.render.gzip) {
+      this.gzipMiddleware = pify(compression(this.options.render.gzip))
+    }
+
+    // Try to load resources from fs
+    return this.loadResources()
+  }
+
+  async loadResources (_fs = fs, distPath) {
+    distPath = distPath || resolve(this.options.buildDir, 'dist')
+
+    const resourceMap = {
+      clientManifest: {
+        path: join(distPath, 'client-manifest.json'),
+        transform: JSON.parse
+      },
+      serverBundle: {
+        path: join(distPath, 'server-bundle.json'),
+        transform: JSON.parse
+      },
+      appTemplate: {
+        path: join(distPath, 'index.html'),
+        transform: parseTemplate
       }
+    }
 
-      // Error template
-      this.errorTemplate = _.template(readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'), {
-        interpolate: /{{([\s\S]+?)}}/g
-      })
+    Object.keys(resourceMap).forEach(resourceKey => {
+      let { path, transform } = resourceMap[resourceKey]
+      let data
+      if (_fs.existsSync(path)) {
+        data = _fs.readFileSync(path, 'utf8')
+        if (typeof transform === 'function') {
+          data = transform(data)
+        }
+      }
+      if (data) {
+        this.resources[resourceKey] = data
+      }
     })
+
+    this.createRenderer()
+  }
+
+  createRenderer () {
+    // If resources are not yet provided
+    if (!this.resources.serverBundle || !this.resources.clientManifest) {
+      return
+    }
+
+    // Create bundle renderer for SSR
+    this.bundleRenderer = createBundleRenderer(this.resources.serverBundle, Object.assign({
+      clientManifest: this.resources.clientManifest,
+      runInNewContext: false,
+      basedir: this.options.rootDir
+    }, this.options.render.ssr))
+
+    // Promisify renderToString
+    this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)
+
+    debug('ready')
   }
 
   async render (req, res) {
     /* istanbul ignore if */
-    if (!this.nuxt.builder.renderer || !this.nuxt.builder.appTemplate) {
+    if (!this.bundleRenderer || !this.resources.appTemplate) {
       return new Promise((resolve) => {
         setTimeout(() => {
           resolve(this.render(req, res))
         }, 1000)
       })
     }
+
     // Get context
     const context = getContext(req, res)
     res.statusCode = 200
+
     try {
-      if (this.options.dev) {
-        // Call webpack middleware only in development
+      // Call webpack middleware only in development
+      if (this.options.dev && this.nuxt.builder && this.nuxt.builder.webpackDevMiddleware) {
         await this.nuxt.builder.webpackDevMiddleware(req, res)
         await this.nuxt.builder.webpackHotMiddleware(req, res)
       }
-      if (!this.options.dev && this.options.render.gzip) {
+
+      // Gzip middleware for production
+      if (this.gzipMiddleware) {
         await this.gzipMiddleware(req, res)
       }
+
       // If base in req.url, remove it for the middleware and vue-router
       if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
         // Compatibility with base url for dev server
         req.url = req.url.replace(this.options.router.base, '/')
       }
+
       // Serve static/ files
       await this.serveStatic(req, res)
+
       // Serve .nuxt/dist/ files (only for production)
       if (!this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0) {
         const url = req.url
@@ -80,17 +169,22 @@ export default class Renderer extends Tapable {
         /* istanbul ignore next */
         req.url = url
       }
+
       if (this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0 && req.url.includes('.hot-update.json')) {
         res.statusCode = 404
         return res.end()
       }
+
       const { html, error, redirected, resourceHints } = await this.renderRoute(req.url, context)
+
       if (redirected) {
         return html
       }
+
       if (error) {
         res.statusCode = context.nuxt.error.statusCode || 500
       }
+
       // ETag header
       if (!error && this.options.render.etag) {
         const etag = generateETag(html, this.options.render.etag)
@@ -101,6 +195,7 @@ export default class Renderer extends Tapable {
         }
         res.setHeader('ETag', etag)
       }
+
       // HTTP2 push headers
       if (!error && this.options.render.http2.push) {
         // Parse resourceHints to extract HTTP.2 prefetch/push headers
@@ -118,6 +213,8 @@ export default class Renderer extends Tapable {
         // https://blog.cloudflare.com/http-2-server-push-with-multiple-assets-per-link-header
         res.setHeader('Link', pushAssets.join(','))
       }
+
+      // Send response
       res.setHeader('Content-Type', 'text/html; charset=utf-8')
       res.setHeader('Content-Length', Buffer.byteLength(html))
       res.end(html, 'utf8')
@@ -127,11 +224,13 @@ export default class Renderer extends Tapable {
         console.error(err) // eslint-disable-line no-console
         return err
       }
-      const html = this.errorTemplate({
+      // Render error template
+      const html = this.resources.errorTemplate({
         /* istanbul ignore if */
         error: err,
         stack: ansiHTML(encodeHtml(err.stack))
       })
+      // Send response
       res.statusCode = 500
       res.setHeader('Content-Type', 'text/html; charset=utf-8')
       res.setHeader('Content-Length', Buffer.byteLength(html))
@@ -143,29 +242,34 @@ export default class Renderer extends Tapable {
   async renderRoute (url, context = {}) {
     // Log rendered url
     debug(`Rendering url ${url}`)
+
     // Add url and isSever to the context
     context.url = url
     context.isServer = true
+
     // Call renderToString from the bundleRenderer and generate the HTML (will update the context as well)
-    let APP = await this.nuxt.builder.renderToString(context)
+    let APP = await this.bundleRenderer.renderToString(context)
+
     if (!context.nuxt.serverRendered) {
       APP = '<div id="__nuxt"></div>'
     }
     const m = context.meta.inject()
     let HEAD = m.meta.text() + m.title.text() + m.link.text() + m.style.text() + m.script.text() + m.noscript.text()
-    if (this._routerBaseSpecified) {
+    if (this.options._routerBaseSpecified) {
       HEAD += `<base href="${this.options.router.base}">`
     }
     const resourceHints = context.renderResourceHints()
     HEAD += resourceHints + context.renderStyles()
     APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, { isJSON: true })}</script>`
     APP += context.renderScripts()
-    const html = this.nuxt.builder.appTemplate({
+
+    const html = this.resources.appTemplate({
       HTML_ATTRS: 'data-n-head-ssr ' + m.htmlAttrs.text(),
       BODY_ATTRS: m.bodyAttrs.text(),
       HEAD,
       APP
     })
+
     return {
       html,
       resourceHints,
diff --git a/lib/utils.js b/lib/utils.js
index 326b153e93..9bf2167488 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -97,3 +97,118 @@ export function r () {
   args = args.map(normalize)
   return wp(resolve.apply(null, args))
 }
+
+export function flatRoutes (router, path = '', routes = []) {
+  router.forEach((r) => {
+    if (!r.path.includes(':') && !r.path.includes('*')) {
+      if (r.children) {
+        flatRoutes(r.children, path + r.path + '/', routes)
+      } else {
+        routes.push((r.path === '' && path[path.length - 1] === '/' ? path.slice(0, -1) : path) + r.path)
+      }
+    }
+  })
+  return routes
+}
+
+export function cleanChildrenRoutes (routes, isChild = false) {
+  let start = -1
+  let routesIndex = []
+  routes.forEach((route) => {
+    if (/-index$/.test(route.name) || route.name === 'index') {
+      // Save indexOf 'index' key in name
+      let res = route.name.split('-')
+      let s = res.indexOf('index')
+      start = (start === -1 || s < start) ? s : start
+      routesIndex.push(res)
+    }
+  })
+  routes.forEach((route) => {
+    route.path = (isChild) ? route.path.replace('/', '') : route.path
+    if (route.path.indexOf('?') > -1) {
+      let names = route.name.split('-')
+      let paths = route.path.split('/')
+      if (!isChild) {
+        paths.shift()
+      } // clean first / for parents
+      routesIndex.forEach((r) => {
+        let i = r.indexOf('index') - start //  children names
+        if (i < paths.length) {
+          for (let a = 0; a <= i; a++) {
+            if (a === i) {
+              paths[a] = paths[a].replace('?', '')
+            }
+            if (a < i && names[a] !== r[a]) {
+              break
+            }
+          }
+        }
+      })
+      route.path = (isChild ? '' : '/') + paths.join('/')
+    }
+    route.name = route.name.replace(/-index$/, '')
+    if (route.children) {
+      if (route.children.find((child) => child.path === '')) {
+        delete route.name
+      }
+      route.children = cleanChildrenRoutes(route.children, true)
+    }
+  })
+  return routes
+}
+
+export function createRoutes (files, srcDir) {
+  let routes = []
+  files.forEach((file) => {
+    let keys = file.replace(/^pages/, '').replace(/\.vue$/, '').replace(/\/{2,}/g, '/').split('/').slice(1)
+    let route = { name: '', path: '', component: r(srcDir, file) }
+    let parent = routes
+    keys.forEach((key, i) => {
+      route.name = route.name ? route.name + '-' + key.replace('_', '') : key.replace('_', '')
+      route.name += (key === '_') ? 'all' : ''
+      let child = _.find(parent, { name: route.name })
+      if (child) {
+        if (!child.children) {
+          child.children = []
+        }
+        parent = child.children
+        route.path = ''
+      } else {
+        if (key === 'index' && (i + 1) === keys.length) {
+          route.path += (i > 0 ? '' : '/')
+        } else {
+          route.path += '/' + (key === '_' ? '*' : key.replace('_', ':'))
+          if (key !== '_' && key.indexOf('_') !== -1) {
+            route.path += '?'
+          }
+        }
+      }
+    })
+    // Order Routes path
+    parent.push(route)
+    parent.sort((a, b) => {
+      if (!a.path.length || a.path === '/') {
+        return -1
+      }
+      if (!b.path.length || b.path === '/') {
+        return 1
+      }
+      let res = 0
+      let _a = a.path.split('/')
+      let _b = b.path.split('/')
+      for (let i = 0; i < _a.length; i++) {
+        if (res !== 0) {
+          break
+        }
+        let y = (_a[i].indexOf('*') > -1) ? 2 : (_a[i].indexOf(':') > -1 ? 1 : 0)
+        let z = (_b[i].indexOf('*') > -1) ? 2 : (_b[i].indexOf(':') > -1 ? 1 : 0)
+        res = y - z
+        if (i === _b.length - 1 && res === 0) {
+          res = 1
+        }
+      }
+      return res === 0 ? -1 : res
+    })
+  })
+  return cleanChildrenRoutes(routes)
+}
diff --git a/package.json b/package.json
index 13896c2897..242035d12c 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,6 @@
     "offline-plugin": "^4.8.1",
     "opencollective": "^1.0.3",
     "pify": "^3.0.0",
-    "post-compile-webpack-plugin": "^0.1.1",
     "preload-webpack-plugin": "^1.2.2",
     "progress-bar-webpack-plugin": "^1.9.3",
     "script-ext-html-webpack-plugin": "^1.8.1",
diff --git a/test/basic.test.js b/test/basic.test.js
index e064a5a4db..2b246363cf 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -18,7 +18,7 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await nuxt.build()
-  server = new nuxt.Server(nuxt)
+  server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
 
diff --git a/test/children.test.js b/test/children.test.js
index 2536ed4e22..d79f5a768c 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -15,7 +15,7 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await nuxt.build()
-  server = new nuxt.Server(nuxt)
+  server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
 
diff --git a/test/error.test.js b/test/error.test.js
index 26fba45f6e..c11446ba1a 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -15,7 +15,7 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await nuxt.build()
-  server = new nuxt.Server(nuxt)
+  server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
 
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 41fb678f42..0cab513c7c 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   nuxt = new Nuxt(config)
   await nuxt.build()
-  server = new nuxt.Server(nuxt)
+  server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
 

From 36c1deda17f23d629201e4cd13398e5ed6546802 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 20:47:49 +0430
Subject: [PATCH 059/236] fix tests

---
 test/basic.dev.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 42e60e22fa..58ed448ad4 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await nuxt.build()
-  server = new nuxt.Server(nuxt)
+  server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
 

From 17d0082861c7e9b90fe1fbc81ab9dc1fdbcad4c2 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 21:03:04 +0430
Subject: [PATCH 060/236] prevent calling init multi times

---
 lib/builder.js  | 5 ++++-
 lib/renderer.js | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 710769b1c2..977c13f127 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -49,7 +49,10 @@ export default class Builder extends Tapable {
       this._init = this.init().catch(this.nuxt.errorHandler)
     } else {
       // Wait for hook
-      this.nuxt.plugin('init', this.init.bind(this))
+      this.nuxt.plugin('init', () => {
+        this._init = this.init()
+        return this._init
+      })
     }
   }
 
diff --git a/lib/renderer.js b/lib/renderer.js
index bead1a7796..5e21128016 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -28,17 +28,18 @@ export default class Renderer extends Tapable {
     this.nuxt = nuxt
     this.options = nuxt.options
 
-    // Will be loaded by createRenderer
+    // Will be set by createRenderer
     this.bundleRenderer = null
-    this.renderToStream = null
-    this.renderToString = null
 
     if (nuxt.initialized) {
       // If nuxt already initialized
       this._init = this.init().catch(this.nuxt.errorHandler)
     } else {
       // Wait for hook
-      this.nuxt.plugin('init', this.init.bind(this))
+      this.nuxt.plugin('init', () => {
+        this._init = this.init()
+        return this._init
+      })
     }
   }
 

From a00378102b20bb4f3375b9386c5f809816afe2dd Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 21:22:23 +0430
Subject: [PATCH 061/236] move bundleRenderer to renderRoute with proper
 timeout

---
 lib/renderer.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/renderer.js b/lib/renderer.js
index 5e21128016..7f93d4f418 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -128,15 +128,6 @@ export default class Renderer extends Tapable {
   }
 
   async render (req, res) {
-    /* istanbul ignore if */
-    if (!this.bundleRenderer || !this.resources.appTemplate) {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(this.render(req, res))
-        }, 1000)
-      })
-    }
-
     // Get context
     const context = getContext(req, res)
     res.statusCode = 200
@@ -240,7 +231,20 @@ export default class Renderer extends Tapable {
     }
   }
 
-  async renderRoute (url, context = {}) {
+  async renderRoute (url, context = {}, ctr = 0) {
+    /* istanbul ignore if */
+    if (!this.bundleRenderer || !this.resources.appTemplate) {
+      if (ctr > 5) {
+        // Don't wait more than 5 seconds
+        return Promise.reject(new Error('bundleRenderer is not ready'))
+      }
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(this.renderRoute(url, context, ctr++))
+        }, 1000)
+      })
+    }
+
     // Log rendered url
     debug(`Rendering url ${url}`)
 

From 4569b3a46f23a781f463ee862f5359f52ee66f82 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 21:28:14 +0430
Subject: [PATCH 062/236] remove ssr === false condition

---
 lib/builder.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 977c13f127..0db6874ab7 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -295,11 +295,9 @@ export default class Builder extends Tapable {
     compilersOptions.push(clientConfig)
 
     // Server
-    if (this.options.ssr !== false) {
-      let serverConfig = serverWebpackConfig.call(this)
-      serverConfig.name = '$server'
-      compilersOptions.push(serverConfig)
-    }
+    let serverConfig = serverWebpackConfig.call(this)
+    serverConfig.name = '$server'
+    compilersOptions.push(serverConfig)
 
     // Leverage webpack multi-compiler for faster builds
     this.compiler = webpack(compilersOptions)

From de51b8a6da8602894323439de4cc9fd23f9267b5 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 21:41:38 +0430
Subject: [PATCH 063/236] set this.resources in constructor

Prevent error when access methods earlier than init is called
---
 lib/renderer.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/renderer.js b/lib/renderer.js
index 7f93d4f418..ba93de2195 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -31,6 +31,14 @@ export default class Renderer extends Tapable {
     // Will be set by createRenderer
     this.bundleRenderer = null
 
+    // Renderer runtime resources
+    this.resources = {
+      clientManifest: null,
+      serverBundle: null,
+      appTemplate: null,
+      errorTemplate: parseTemplate(fs.readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'))
+    }
+
     if (nuxt.initialized) {
       // If nuxt already initialized
       this._init = this.init().catch(this.nuxt.errorHandler)
@@ -48,14 +56,6 @@ export default class Renderer extends Tapable {
       return this._init
     }
 
-    // Renderer runtime resources
-    this.resources = {
-      clientManifest: null,
-      serverBundle: null,
-      appTemplate: null,
-      errorTemplate: parseTemplate(fs.readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'))
-    }
-
     // For serving static/ files to /
     this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
 

From 8691e21efb27a141828b8de84c09a1fced506772 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 21:58:20 +0430
Subject: [PATCH 064/236] remove unnecessary initialized

---
 lib/builder.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/builder.js b/lib/builder.js
index 0db6874ab7..e22b455f3e 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -37,7 +37,6 @@ export default class Builder extends Tapable {
     this.options = nuxt.options
 
     this._buildStatus = STATUS.INITIAL
-    this.initialized = false
 
     // Fields that set on build
     this.compiler = null

From 3747e3cc3602b73cb9dd3be53ed00832bd9f8054 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 22:02:25 +0430
Subject: [PATCH 065/236] refactor more into defaults

---
 lib/builder.js  | 13 +------------
 lib/defaults.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index e22b455f3e..42eb59719b 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -9,10 +9,9 @@ import webpackDevMiddleware from 'webpack-dev-middleware'
 import webpackHotMiddleware from 'webpack-hot-middleware'
 import { join, resolve, basename, dirname } from 'path'
 import Tapable from 'tappable'
-import { isUrl, r, wp, createRoutes } from './utils'
+import { r, wp, createRoutes } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
-import defaults from './defaults'
 import MFS from 'memory-fs'
 
 const debug = require('debug')('nuxt:build')
@@ -70,16 +69,6 @@ export default class Builder extends Tapable {
     }
     _.defaultsDeep(this.options.build, extraDefaults)
 
-    /* istanbul ignore if */
-    if (this.options.dev && isUrl(this.options.build.publicPath)) {
-      this.options.build.publicPath = defaults.build.publicPath
-    }
-
-    // If store defined, update store options to true unless explicitly disabled
-    if (this.options.store !== false && fs.existsSync(join(this.options.srcDir, 'store'))) {
-      this.options.store = true
-    }
-
     // Mute stats on dev
     this.webpackStats = this.options.dev ? '' : {
       chunks: false,
diff --git a/lib/defaults.js b/lib/defaults.js
index 137e31e56d..b1cb609ed3 100755
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import { join, resolve } from 'path'
 import { existsSync } from 'fs'
+import { isUrl } from './utils'
 
 export default function defaults (_options) {
   // Clone options to prevent unwanted side-effects
@@ -34,6 +35,16 @@ export default function defaults (_options) {
     options.appTemplatePath = join(options.srcDir, 'app.html')
   }
 
+  // Ignore publicPath on dev
+  if (options.dev && isUrl(options.build.publicPath)) {
+    options.build.publicPath = defaultOptions.build.publicPath
+  }
+
+  // If store defined, update store options to true unless explicitly disabled
+  if (options.store !== false && existsSync(join(options.srcDir, 'store'))) {
+    this.options.store = true
+  }
+
   return options
 }
 

From 7343af0d5f23790a2b1ee8561a2c33f84aad0574 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 22:08:07 +0430
Subject: [PATCH 066/236] typo

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

diff --git a/lib/defaults.js b/lib/defaults.js
index b1cb609ed3..d34475e5e0 100755
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -42,7 +42,7 @@ export default function defaults (_options) {
 
   // If store defined, update store options to true unless explicitly disabled
   if (options.store !== false && existsSync(join(options.srcDir, 'store'))) {
-    this.options.store = true
+    options.store = true
   }
 
   return options

From 59f8e48549c3482afdb29e0d25f37e2f2fbe3efc Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 22:09:32 +0430
Subject: [PATCH 067/236] builder no longer needs init

---
 lib/builder.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 42eb59719b..ab6920c236 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -42,23 +42,6 @@ export default class Builder extends Tapable {
     this.webpackDevMiddleware = null
     this.webpackHotMiddleware = null
 
-    if (nuxt.initialized) {
-      // If nuxt already initialized
-      this._init = this.init().catch(this.nuxt.errorHandler)
-    } else {
-      // Wait for hook
-      this.nuxt.plugin('init', () => {
-        this._init = this.init()
-        return this._init
-      })
-    }
-  }
-
-  async init () {
-    if (this._init) {
-      return this._init
-    }
-
     // Add extra loaders only if they are not already provided
     let extraDefaults = {}
     if (this.options.build && !Array.isArray(this.options.build.loaders)) {

From e2ee016a22bf915b04a38032382ca6d15a6d52a6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 22:12:20 +0430
Subject: [PATCH 068/236] simpler bundleRenderer check

---
 lib/renderer.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/renderer.js b/lib/renderer.js
index ba93de2195..f73604ce86 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -231,18 +231,10 @@ export default class Renderer extends Tapable {
     }
   }
 
-  async renderRoute (url, context = {}, ctr = 0) {
+  async renderRoute (url, context = {}) {
     /* istanbul ignore if */
     if (!this.bundleRenderer || !this.resources.appTemplate) {
-      if (ctr > 5) {
-        // Don't wait more than 5 seconds
-        return Promise.reject(new Error('bundleRenderer is not ready'))
-      }
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(this.renderRoute(url, context, ctr++))
-        }, 1000)
-      })
+      return Promise.reject(new Error('bundleRenderer is not available'))
     }
 
     // Log rendered url

From 3df51f7f45f0947ef99941fcb86da406d623e8f8 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 22:20:58 +0430
Subject: [PATCH 069/236] remove debug

---
 lib/builder.js   | 2 --
 lib/generator.js | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index ab6920c236..45b779a5e7 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -27,8 +27,6 @@ const glob = pify(require('glob'))
 const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
 const port = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
 
-debug('loaded')
-
 export default class Builder extends Tapable {
   constructor (nuxt) {
     super()
diff --git a/lib/generator.js b/lib/generator.js
index 61bf3f142e..df91c8f03c 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -12,8 +12,6 @@ const remove = pify(fs.remove)
 const writeFile = pify(fs.writeFile)
 const mkdirp = pify(fs.mkdirp)
 
-debug('loaded')
-
 export default class Generator extends Tapable {
   constructor (nuxt) {
     super()

From 25d106e2ababd9ac6d38943ab8ad1ba3466477da Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 14 Jun 2017 23:21:14 +0430
Subject: [PATCH 070/236] runBuild option

---
 bin/nuxt-build                   |   4 +-
 bin/nuxt-generate                |   1 +
 lib/builder.js                   |   3 -
 lib/defaults.js                  |   6 ++
 lib/generator.js                 |   4 +-
 lib/nuxt.js                      |  29 +++----
 lib/renderer.js                  |   4 +-
 test/basic.dev.test.js           |   2 +-
 test/basic.fail.generate.test.js |   1 +
 test/basic.generate.test.js      |   5 +-
 test/basic.test.js               |   5 +-
 test/children.test.js            |   6 +-
 test/dynamic-routes.test.js      | 130 ++++++++++++++++---------------
 test/error.test.js               |   6 +-
 test/index.test.js               |   9 ++-
 test/module.test.js              |   3 +-
 test/with-config.test.js         |   4 +-
 17 files changed, 123 insertions(+), 99 deletions(-)

diff --git a/bin/nuxt-build b/bin/nuxt-build
index 53b125765e..8c4fffd038 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -51,6 +51,8 @@ if (typeof options.rootDir !== 'string') {
 }
 // Create production build when calling `nuxt build`
 options.dev = false
+options.runBuild = true // Force doing production build before init
+
 // Analyze option
 options.build = options.build || {}
 if (argv.analyze) {
@@ -59,7 +61,7 @@ if (argv.analyze) {
 
 console.log('[nuxt] Building...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
-nuxt.build()
+nuxt.init()
 .then(() => {
   console.log('[nuxt] Building done') // eslint-disable-line no-console
 })
diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index b39f8de6e6..e9607b174a 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -47,6 +47,7 @@ if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
 options.dev = false // Force production mode (no webpack middleware called)
+options.runBuild = true // Force doing production build before init
 
 console.log('[nuxt] Generating...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
diff --git a/lib/builder.js b/lib/builder.js
index 45b779a5e7..160cb58518 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -74,9 +74,6 @@ export default class Builder extends Tapable {
     }
     this._buildStatus = STATUS.BUILDING
 
-    // Ensure nuxt initialized
-    await this.nuxt.init()
-
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
     if (this._nuxtPages) {
diff --git a/lib/defaults.js b/lib/defaults.js
index d34475e5e0..1a2195cc73 100755
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -45,11 +45,17 @@ export default function defaults (_options) {
     options.store = true
   }
 
+  // runBuild can not be enabled for dev === true
+  if (options.dev === true) {
+    options.runBuild = false
+  }
+
   return options
 }
 
 const defaultOptions = {
   dev: (process.env.NODE_ENV !== 'production'),
+  runBuild: false,
   buildDir: '.nuxt',
   build: {
     analyze: false,
diff --git a/lib/generator.js b/lib/generator.js
index df91c8f03c..3cc54b6d93 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -30,8 +30,8 @@ export default class Generator extends Tapable {
     let distPath = resolve(this.options.rootDir, this.options.generate.dir)
     let distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
 
-    // Launch build process
-    await this.nuxt.build()
+    // Wait for nuxt be ready
+    await this.nuxt.init()
 
     // Clean destination folder
     await remove(distPath)
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 415909c329..38cf9769b7 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -23,6 +23,18 @@ export default class Nuxt extends Tapable {
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
 
+    // Builder is lazy loaded, so register plugin here
+    this.plugin('init', async () => {
+      // Call to build on dev
+      if (this.options.dev) {
+        this.builder.build().catch(this.errorHandler)
+      }
+      // If explicitly runBuild required
+      if (this.options.runBuild) {
+        await this.builder.build()
+      }
+    })
+
     this._init = this.init().catch(this.errorHandler)
   }
 
@@ -31,17 +43,12 @@ export default class Nuxt extends Tapable {
       return this._init
     }
 
-    // Call to build on dev
-    if (this.options.dev) {
-      this.builder.build().catch(this.errorHandler)
-    }
-
     // Wait for all components to be ready
-    await this.applyPluginsAsync('beforeInit')
-    await this.applyPluginsAsync('init')
-    this.initialized = true
-    this.applyPluginsAsync('afterInit').catch(this.errorHandler)
+    await this.applyPluginsAsync('beforeInit') // 1- Modules
+    await this.applyPluginsAsync('init')       // 2- Builder
+    await this.applyPluginsAsync('afterInit')  // 3- Renderer
 
+    this.initialized = true
     return this
   }
 
@@ -63,10 +70,6 @@ export default class Nuxt extends Tapable {
     return this._generator
   }
 
-  build () {
-    return this.builder.build.apply(this.builder, arguments)
-  }
-
   generate () {
     return this.generator.generate.apply(this.generator, arguments)
   }
diff --git a/lib/renderer.js b/lib/renderer.js
index f73604ce86..f51fb396df 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -44,7 +44,7 @@ export default class Renderer extends Tapable {
       this._init = this.init().catch(this.nuxt.errorHandler)
     } else {
       // Wait for hook
-      this.nuxt.plugin('init', () => {
+      this.nuxt.plugin('afterInit', () => {
         this._init = this.init()
         return this._init
       })
@@ -123,8 +123,6 @@ export default class Renderer extends Tapable {
 
     // Promisify renderToString
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)
-
-    debug('ready')
   }
 
   async render (req, res) {
diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 58ed448ad4..108bd5c35d 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -15,7 +15,7 @@ test.before('Init Nuxt.js', async t => {
     dev: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.build()
+  await nuxt.init()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js
index 996dc142fd..b8861e8e0a 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/basic.fail.generate.test.js
@@ -6,6 +6,7 @@ test('Fail with routes() which throw an error', async t => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
     dev: false,
+    runBuild: true,
     generate: {
       async routes () {
         throw new Error('Not today!')
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index cc0c160912..cd270c13ac 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -4,6 +4,7 @@ import http from 'http'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
+
 const port = 4002
 const url = (route) => 'http://localhost:' + port + route
 
@@ -17,10 +18,12 @@ test.before('Init Nuxt.js', async t => {
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = false
+  config.runBuild = true
   nuxt = new Nuxt(config)
   try {
     await nuxt.generate() // throw an error (of /validate route)
-  } catch (err) {}
+  } catch (err) {
+  }
   const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
   server = http.createServer((req, res) => {
     serve(req, res, finalhandler(req, res))
diff --git a/test/basic.test.js b/test/basic.test.js
index 2b246363cf..71372e0636 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -14,10 +14,11 @@ test.before('Init Nuxt.js', async t => {
   const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
-    dev: false
+    dev: false,
+    runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.build()
+  await nuxt.init()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/children.test.js b/test/children.test.js
index d79f5a768c..5bae366e0b 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -1,5 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
+
 const port = 4004
 // const url = (route) => 'http://localhost:' + port + route
 
@@ -11,10 +12,11 @@ test.before('Init Nuxt.js', async t => {
   const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/children'),
-    dev: false
+    dev: false,
+    runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.build()
+  await nuxt.init()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js
index 40bd5446d2..ebd1760d44 100644
--- a/test/dynamic-routes.test.js
+++ b/test/dynamic-routes.test.js
@@ -2,79 +2,81 @@ import test from 'ava'
 import { resolve } from 'path'
 import fs from 'fs'
 import pify from 'pify'
+
 const readFile = pify(fs.readFile)
 
 test.before('Init Nuxt.js', async t => {
   const Nuxt = require('../')
   const nuxt = new Nuxt({
     rootDir: resolve(__dirname, 'fixtures/dynamic-routes'),
-    dev: false
+    dev: false,
+    runBuild: true
   })
-  await nuxt.build()
+  await nuxt.init()
 })
 
 test('Check .nuxt/router.js', t => {
   return readFile(resolve(__dirname, './fixtures/dynamic-routes/.nuxt/router.js'), 'utf-8')
-  .then((routerFile) => {
-    routerFile = routerFile
-      .slice(routerFile.indexOf('routes: ['))
-      .replace('routes: [', '[')
-      .replace(/ _[0-9A-z]+,/g, ' "",')
-    routerFile = routerFile.substr(routerFile.indexOf('['), routerFile.lastIndexOf(']') + 1)
-    let routes = eval('( ' + routerFile + ')') // eslint-disable-line no-eval
-    // pages/index.vue
-    t.is(routes[0].path, '/')
-    t.is(routes[0].name, 'index')
-    // pages/test/index.vue
-    t.is(routes[1].path, '/test')
-    t.is(routes[1].name, 'test')
-    // pages/posts.vue
-    t.is(routes[2].path, '/posts')
-    t.is(routes[2].name, 'posts')
-    t.is(routes[2].children.length, 1)
-    // pages/posts/_id.vue
-    t.is(routes[2].children[0].path, ':id?')
-    t.is(routes[2].children[0].name, 'posts-id')
-    // pages/parent.vue
-    t.is(routes[3].path, '/parent')
-    t.falsy(routes[3].name) // parent route has no name
-    // pages/parent/*.vue
-    t.is(routes[3].children.length, 3) // parent has 3 children
-    t.deepEqual(routes[3].children.map((r) => r.path), ['', 'teub', 'child'])
-    t.deepEqual(routes[3].children.map((r) => r.name), ['parent', 'parent-teub', 'parent-child'])
-    // pages/test/projects/index.vue
-    t.is(routes[4].path, '/test/projects')
-    t.is(routes[4].name, 'test-projects')
-    // pages/test/users.vue
-    t.is(routes[5].path, '/test/users')
-    t.falsy(routes[5].name) // parent route has no name
-    // pages/test/users/*.vue
-    t.is(routes[5].children.length, 5) // parent has 5 children
-    t.deepEqual(routes[5].children.map((r) => r.path), ['', 'projects', 'projects/:category', ':id', ':index/teub'])
-    t.deepEqual(routes[5].children.map((r) => r.name), ['test-users', 'test-users-projects', 'test-users-projects-category', 'test-users-id', 'test-users-index-teub'])
-    // pages/test/songs/toto.vue
-    t.is(routes[6].path, '/test/songs/toto')
-    t.is(routes[6].name, 'test-songs-toto')
-    // pages/test/songs/_id.vue
-    t.is(routes[7].path, '/test/songs/:id?')
-    t.is(routes[7].name, 'test-songs-id')
-    // pages/test/projects/_category.vue
-    t.is(routes[8].path, '/test/projects/:category')
-    t.is(routes[8].name, 'test-projects-category')
-    // pages/users/_id.vue
-    t.is(routes[9].path, '/users/:id?')
-    t.is(routes[9].name, 'users-id')
-    // pages/test/_.vue
-    t.is(routes[10].path, '/test/*')
-    t.is(routes[10].name, 'test-all')
-    // pages/_slug.vue
-    t.is(routes[11].path, '/:slug')
-    t.is(routes[11].name, 'slug')
-    // pages/_key/_id.vue
-    t.is(routes[12].path, '/:key/:id?')
-    t.is(routes[12].name, 'key-id')
-    // pages/_.vue
-    t.is(routes[13].path, '/*')
-    t.is(routes[13].name, 'all')
-  })
+    .then((routerFile) => {
+      routerFile = routerFile
+        .slice(routerFile.indexOf('routes: ['))
+        .replace('routes: [', '[')
+        .replace(/ _[0-9A-z]+,/g, ' "",')
+      routerFile = routerFile.substr(routerFile.indexOf('['), routerFile.lastIndexOf(']') + 1)
+      let routes = eval('( ' + routerFile + ')') // eslint-disable-line no-eval
+      // pages/index.vue
+      t.is(routes[0].path, '/')
+      t.is(routes[0].name, 'index')
+      // pages/test/index.vue
+      t.is(routes[1].path, '/test')
+      t.is(routes[1].name, 'test')
+      // pages/posts.vue
+      t.is(routes[2].path, '/posts')
+      t.is(routes[2].name, 'posts')
+      t.is(routes[2].children.length, 1)
+      // pages/posts/_id.vue
+      t.is(routes[2].children[0].path, ':id?')
+      t.is(routes[2].children[0].name, 'posts-id')
+      // pages/parent.vue
+      t.is(routes[3].path, '/parent')
+      t.falsy(routes[3].name) // parent route has no name
+      // pages/parent/*.vue
+      t.is(routes[3].children.length, 3) // parent has 3 children
+      t.deepEqual(routes[3].children.map((r) => r.path), ['', 'teub', 'child'])
+      t.deepEqual(routes[3].children.map((r) => r.name), ['parent', 'parent-teub', 'parent-child'])
+      // pages/test/projects/index.vue
+      t.is(routes[4].path, '/test/projects')
+      t.is(routes[4].name, 'test-projects')
+      // pages/test/users.vue
+      t.is(routes[5].path, '/test/users')
+      t.falsy(routes[5].name) // parent route has no name
+      // pages/test/users/*.vue
+      t.is(routes[5].children.length, 5) // parent has 5 children
+      t.deepEqual(routes[5].children.map((r) => r.path), ['', 'projects', 'projects/:category', ':id', ':index/teub'])
+      t.deepEqual(routes[5].children.map((r) => r.name), ['test-users', 'test-users-projects', 'test-users-projects-category', 'test-users-id', 'test-users-index-teub'])
+      // pages/test/songs/toto.vue
+      t.is(routes[6].path, '/test/songs/toto')
+      t.is(routes[6].name, 'test-songs-toto')
+      // pages/test/songs/_id.vue
+      t.is(routes[7].path, '/test/songs/:id?')
+      t.is(routes[7].name, 'test-songs-id')
+      // pages/test/projects/_category.vue
+      t.is(routes[8].path, '/test/projects/:category')
+      t.is(routes[8].name, 'test-projects-category')
+      // pages/users/_id.vue
+      t.is(routes[9].path, '/users/:id?')
+      t.is(routes[9].name, 'users-id')
+      // pages/test/_.vue
+      t.is(routes[10].path, '/test/*')
+      t.is(routes[10].name, 'test-all')
+      // pages/_slug.vue
+      t.is(routes[11].path, '/:slug')
+      t.is(routes[11].name, 'slug')
+      // pages/_key/_id.vue
+      t.is(routes[12].path, '/:key/:id?')
+      t.is(routes[12].name, 'key-id')
+      // pages/_.vue
+      t.is(routes[13].path, '/*')
+      t.is(routes[13].name, 'all')
+    })
 })
diff --git a/test/error.test.js b/test/error.test.js
index c11446ba1a..ddd3fa4ada 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -1,5 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
+
 const port = 4005
 const url = (route) => 'http://localhost:' + port + route
 
@@ -11,10 +12,11 @@ test.before('Init Nuxt.js', async t => {
   const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/error'),
-    dev: false
+    dev: false,
+    runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.build()
+  await nuxt.init()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/index.test.js b/test/index.test.js
index cafaa08158..b54b304715 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -10,6 +10,7 @@ test('Nuxt.js Class', t => {
 test.serial('Nuxt.js Instance', async t => {
   const nuxt = new Nuxt({
     dev: false,
+    runBuild: true,
     rootDir: resolve(__dirname, 'fixtures', 'empty')
   })
   t.is(typeof nuxt, 'object')
@@ -17,16 +18,17 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(typeof nuxt.build, 'function')
   t.is(typeof nuxt.generate, 'function')
   t.is(typeof nuxt._init.then, 'function')
-  await nuxt.build()
+  await nuxt.init()
   t.is(nuxt.initialized, true)
 })
 
 test.serial('Fail to build when no pages/ directory but is in the parent', t => {
   const nuxt = new Nuxt({
     dev: false,
+    runBuild: true,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
   })
-  return nuxt.build().catch(err => {
+  return nuxt.init().catch(err => {
     let s = String(err)
     t.true(s.includes('No `pages` directory found'))
     t.true(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?'))
@@ -37,9 +39,10 @@ test.serial('Fail to build when no pages/ directory but is in the parent', t =>
 test.serial('Fail to build when no pages/ directory', t => {
   const nuxt = new Nuxt({
     dev: false,
+    runBuild: true,
     rootDir: resolve(__dirname)
   })
-  return nuxt.build().catch(err => {
+  return nuxt.init().catch(err => {
     let s = String(err)
     t.true(s.includes('Couldn\'t find a `pages` directory'))
     t.true(s.includes('Please create one under the project root'))
diff --git a/test/module.test.js b/test/module.test.js
index 14b79171c8..646408e92d 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -15,8 +15,9 @@ test.before('Init Nuxt.js', async t => {
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = false
+  config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.build()
+  await nuxt.init()
   server = new nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 0cab513c7c..78668a2688 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -15,8 +15,9 @@ test.before('Init Nuxt.js', async t => {
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = false
+  config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.build()
+  await nuxt.init()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
@@ -110,6 +111,7 @@ test.after('Should be able to start Nuxt with build done', async t => {
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = false
+  config.runBuild = true
   nuxt = new Nuxt(config)
   await nuxt.init()
 })

From 15bc36afb0ac0cfe465bf69111da223b1a9972e8 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 15 Jun 2017 14:33:54 +0430
Subject: [PATCH 071/236] fix some tests

---
 test/fixtures/module/modules/template/index.js | 2 +-
 test/index.test.js                             | 7 +------
 test/module.test.js                            | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/fixtures/module/modules/template/index.js b/test/fixtures/module/modules/template/index.js
index 4ae607b4b6..4a2d917897 100644
--- a/test/fixtures/module/modules/template/index.js
+++ b/test/fixtures/module/modules/template/index.js
@@ -6,6 +6,6 @@ module.exports = function () {
     // Add /api endpoint
     this.addTemplate({
         fileName: 'router.js',
-        src: path.resolve(this.nuxt.srcDir, 'router.js')
+        src: path.resolve(this.options.srcDir, 'router.js')
     })
 }
diff --git a/test/index.test.js b/test/index.test.js
index b54b304715..21e09014f3 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -9,13 +9,10 @@ test('Nuxt.js Class', t => {
 
 test.serial('Nuxt.js Instance', async t => {
   const nuxt = new Nuxt({
-    dev: false,
-    runBuild: true,
     rootDir: resolve(__dirname, 'fixtures', 'empty')
   })
   t.is(typeof nuxt, 'object')
-  t.is(nuxt.options.dev, false)
-  t.is(typeof nuxt.build, 'function')
+  t.is(nuxt.options.dev, true)
   t.is(typeof nuxt.generate, 'function')
   t.is(typeof nuxt._init.then, 'function')
   await nuxt.init()
@@ -32,7 +29,6 @@ test.serial('Fail to build when no pages/ directory but is in the parent', t =>
     let s = String(err)
     t.true(s.includes('No `pages` directory found'))
     t.true(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?'))
-    resolve()
   })
 })
 
@@ -46,6 +42,5 @@ test.serial('Fail to build when no pages/ directory', t => {
     let s = String(err)
     t.true(s.includes('Couldn\'t find a `pages` directory'))
     t.true(s.includes('Please create one under the project root'))
-    resolve()
   })
 })
diff --git a/test/module.test.js b/test/module.test.js
index 646408e92d..bdb658a82e 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -18,7 +18,7 @@ test.before('Init Nuxt.js', async t => {
   config.runBuild = true
   nuxt = new Nuxt(config)
   await nuxt.init()
-  server = new nuxt.Server(nuxt)
+  server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
 

From d882b1ac779f18944ac1b83579b7ae7cb21e75f7 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 15 Jun 2017 19:23:00 +0430
Subject: [PATCH 072/236] improvements

---
 lib/builder.js               | 53 +++++++++++++++++-------------------
 lib/nuxt.js                  |  3 +-
 lib/renderer.js              | 39 ++++++++++++++++++--------
 lib/webpack/client.config.js | 11 +++++++-
 4 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 160cb58518..e2c17ab7e9 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -5,10 +5,9 @@ import hash from 'hash-sum'
 import pify from 'pify'
 import webpack from 'webpack'
 import serialize from 'serialize-javascript'
-import webpackDevMiddleware from 'webpack-dev-middleware'
-import webpackHotMiddleware from 'webpack-hot-middleware'
 import { join, resolve, basename, dirname } from 'path'
 import Tapable from 'tappable'
+import chalk from 'chalk'
 import { r, wp, createRoutes } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
@@ -282,7 +281,7 @@ export default class Builder extends Tapable {
 
     // Start build
     return new Promise((resolve, reject) => {
-      this.compiler.run((err, multiStats) => {
+      const handler = (err, multiStats) => {
         if (err) {
           return reject(err)
         }
@@ -292,8 +291,15 @@ export default class Builder extends Tapable {
             return reject(new Error('Webpack build exited with errors'))
           }
         }
+        // Use watch handler instead of compiler.apply('done') to prevent duplicate emits
+        this.applyPlugins('reload', multiStats)
         resolve()
-      })
+      }
+      if (this.options.dev) {
+        this.compiler.watch(this.options.watchers.webpack, handler)
+      } else {
+        this.compiler.run(handler)
+      }
     })
   }
 
@@ -306,42 +312,33 @@ export default class Builder extends Tapable {
       compiler.outputFileSystem = mfs
     })
 
-    let clientConfig = this.compiler.$client.options
+    // Watch
+    this.plugin('reload', () => {
+      // Show open URL
+      let _host = host === '0.0.0.0' ? 'localhost' : host
+      // eslint-disable-next-line no-console
+      console.log(chalk.bold(chalk.bgCyan.black(' OPEN ') + chalk.cyan(` http://${_host}:${port}\n`)))
 
-    // Setup on the fly compilation + hot-reload
-    clientConfig.entry.app = _.flatten(['webpack-hot-middleware/client?reload=true', clientConfig.entry.app])
-    clientConfig.plugins.push(
-      new webpack.HotModuleReplacementPlugin(),
-      new webpack.NoEmitOnErrorsPlugin()
-    )
+      // Reload renderer if available
+      if (this.nuxt.renderer) {
+        this.nuxt.renderer.loadResources(mfs)
+      }
+    })
 
-    // Create webpack dev middleware
-    this.webpackDevMiddleware = pify(webpackDevMiddleware(this.compiler.$client, {
-      publicPath: clientConfig.output.publicPath,
+    // Create webpack Dev/Hot middleware
+    this.webpackDevMiddleware = pify(require('webpack-dev-middleware')(this.compiler.$client, {
+      publicPath: this.options.build.publicPath,
       stats: this.webpackStats,
       quiet: true,
       noInfo: true,
       watchOptions: this.options.watchers.webpack
     }))
 
-    this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.$client, {
+    this.webpackHotMiddleware = pify(require('webpack-hot-middleware')(this.compiler.$client, {
       log: false,
       heartbeat: 2500
     }))
 
-    // Run after compilation is done
-    this.compiler.plugin('done', async stats => {
-      // Reload renderer if available
-      if (this.nuxt.renderer) {
-        await this.nuxt.renderer.loadResources(mfs)
-      }
-      // Show open URL
-      if (!stats.hasErrors() && !stats.hasWarnings()) {
-        let _host = host === '0.0.0.0' ? 'localhost' : host
-        console.log(`> Open http://${_host}:${port}\n`) // eslint-disable-line no-console
-      }
-    })
-
     this.watchFiles()
   }
 
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 38cf9769b7..e6aafdcde9 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -1,4 +1,5 @@
 import Tapable from 'tappable'
+import Builder from './builder'
 import * as Utils from './utils'
 import Renderer from './renderer'
 import ModuleContainer from './module-container'
@@ -56,7 +57,7 @@ export default class Nuxt extends Tapable {
     if (this._builder) {
       return this._builder
     }
-    const Builder = require('./builder').default
+    // const Builder = require('./builder').default
     this._builder = new Builder(this)
     return this._builder
   }
diff --git a/lib/renderer.js b/lib/renderer.js
index f51fb396df..0aa1729356 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -69,8 +69,10 @@ export default class Renderer extends Tapable {
       this.gzipMiddleware = pify(compression(this.options.render.gzip))
     }
 
-    // Try to load resources from fs
-    return this.loadResources()
+    // Load resources from fs
+    if (!this.options.dev) {
+      return this.loadResources()
+    }
   }
 
   async loadResources (_fs = fs, distPath) {
@@ -91,21 +93,32 @@ export default class Renderer extends Tapable {
       }
     }
 
+    let updated = []
+
     Object.keys(resourceMap).forEach(resourceKey => {
       let { path, transform } = resourceMap[resourceKey]
-      let data
-      if (_fs.existsSync(path)) {
-        data = _fs.readFileSync(path, 'utf8')
-        if (typeof transform === 'function') {
-          data = transform(data)
-        }
+      let rawKey = '$$' + resourceKey
+      let rawData, data
+      if (!_fs.existsSync(path)) {
+        return // Resource not exists
       }
-      if (data) {
-        this.resources[resourceKey] = data
+      rawData = _fs.readFileSync(path, 'utf8')
+      if (!rawData || rawData === this.resources[rawKey]) {
+        return // No changes
       }
+      this.resources[rawKey] = rawData
+      data = transform(rawData)
+      if (!data) {
+        return // Invalid data ?
+      }
+      this.resources[resourceKey] = data
+      updated.push(resourceKey)
     })
 
-    this.createRenderer()
+    if (updated.length > 0) {
+      // debug('Updated', updated.join(', '))
+      this.createRenderer()
+    }
   }
 
   createRenderer () {
@@ -232,7 +245,9 @@ export default class Renderer extends Tapable {
   async renderRoute (url, context = {}) {
     /* istanbul ignore if */
     if (!this.bundleRenderer || !this.resources.appTemplate) {
-      return Promise.reject(new Error('bundleRenderer is not available'))
+      return new Promise(resolve => {
+        setTimeout(() => resolve(this.renderRoute(url, context)), 1000)
+      })
     }
 
     // Log rendered url
diff --git a/lib/webpack/client.config.js b/lib/webpack/client.config.js
index 05b0ed2dbc..f68ddf1e18 100644
--- a/lib/webpack/client.config.js
+++ b/lib/webpack/client.config.js
@@ -1,4 +1,4 @@
-import { each, defaults } from 'lodash'
+import { each, defaults, flatten } from 'lodash'
 import webpack from 'webpack'
 import VueSSRClientPlugin from 'vue-server-renderer/client-plugin'
 import HTMLPlugin from 'html-webpack-plugin'
@@ -88,6 +88,15 @@ export default function webpackClientConfig () {
   if (this.options.dev) {
     config.plugins.push(new FriendlyErrorsWebpackPlugin())
   }
+  // Dev client build
+  if(this.options.dev){
+    // Add HMR support
+    config.entry.app = flatten(['webpack-hot-middleware/client?name=$client&reload=true', config.entry.app])
+    config.plugins.push(
+      new webpack.HotModuleReplacementPlugin(),
+      new webpack.NoEmitOnErrorsPlugin()
+    )
+  }
   // Production client build
   if (!this.options.dev) {
     config.plugins.push(

From 2576e8795e328d8d7a10cb4ff7cc23baf4c79009 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 15 Jun 2017 19:29:26 +0430
Subject: [PATCH 073/236] init() ~> ready()

---
 bin/nuxt-build              |  2 +-
 lib/generator.js            |  2 +-
 lib/nuxt.js                 |  8 ++++----
 lib/renderer.js             | 12 ++++++------
 lib/server.js               |  4 ++--
 test/basic.dev.test.js      |  2 +-
 test/basic.test.js          |  2 +-
 test/children.test.js       |  2 +-
 test/dynamic-routes.test.js |  2 +-
 test/error.test.js          |  2 +-
 test/index.test.js          |  8 ++++----
 test/module.test.js         |  2 +-
 test/with-config.test.js    |  4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/bin/nuxt-build b/bin/nuxt-build
index 8c4fffd038..0f7b956563 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -61,7 +61,7 @@ if (argv.analyze) {
 
 console.log('[nuxt] Building...') // eslint-disable-line no-console
 var nuxt = module.exports = new Nuxt(options)
-nuxt.init()
+nuxt.ready()
 .then(() => {
   console.log('[nuxt] Building done') // eslint-disable-line no-console
 })
diff --git a/lib/generator.js b/lib/generator.js
index 3cc54b6d93..e92907d32e 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -31,7 +31,7 @@ export default class Generator extends Tapable {
     let distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
 
     // Wait for nuxt be ready
-    await this.nuxt.init()
+    await this.nuxt.ready()
 
     // Clean destination folder
     await remove(distPath)
diff --git a/lib/nuxt.js b/lib/nuxt.js
index e6aafdcde9..1a14ffd9d2 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -36,12 +36,12 @@ export default class Nuxt extends Tapable {
       }
     })
 
-    this._init = this.init().catch(this.errorHandler)
+    this._ready = this.ready().catch(this.errorHandler)
   }
 
-  async init () {
-    if (this._init) {
-      return this._init
+  async ready () {
+    if (this._ready) {
+      return this._ready
     }
 
     // Wait for all components to be ready
diff --git a/lib/renderer.js b/lib/renderer.js
index 0aa1729356..c7deae435a 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -41,19 +41,19 @@ export default class Renderer extends Tapable {
 
     if (nuxt.initialized) {
       // If nuxt already initialized
-      this._init = this.init().catch(this.nuxt.errorHandler)
+      this._ready = this.ready().catch(this.nuxt.errorHandler)
     } else {
       // Wait for hook
       this.nuxt.plugin('afterInit', () => {
-        this._init = this.init()
-        return this._init
+        this._ready = this.ready()
+        return this._ready
       })
     }
   }
 
-  async init () {
-    if (this._init) {
-      return this._init
+  async ready () {
+    if (this._ready) {
+      return this._ready
     }
 
     // For serving static/ files to /
diff --git a/lib/server.js b/lib/server.js
index f18f2e1706..09bd816c09 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -10,7 +10,7 @@ class Server {
     // Initialize
     this.app = connect()
     this.server = http.createServer(this.app)
-    this.nuxt.init()
+    this.nuxt.ready()
       .then(() => {
         // Add Middleware
         this.options.serverMiddleware.forEach(m => {
@@ -48,7 +48,7 @@ class Server {
   listen (port, host) {
     host = host || 'localhost'
     port = port || 3000
-    this.nuxt.init()
+    this.nuxt.ready()
     .then(() => {
       this.server.listen(port, host, () => {
         let _host = host === '0.0.0.0' ? 'localhost' : host
diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 108bd5c35d..be75b6cac1 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -15,7 +15,7 @@ test.before('Init Nuxt.js', async t => {
     dev: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/basic.test.js b/test/basic.test.js
index 71372e0636..b29df1ead9 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -18,7 +18,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/children.test.js b/test/children.test.js
index 5bae366e0b..01786707c9 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js
index ebd1760d44..b2256a9951 100644
--- a/test/dynamic-routes.test.js
+++ b/test/dynamic-routes.test.js
@@ -12,7 +12,7 @@ test.before('Init Nuxt.js', async t => {
     dev: false,
     runBuild: true
   })
-  await nuxt.init()
+  await nuxt.ready()
 })
 
 test('Check .nuxt/router.js', t => {
diff --git a/test/error.test.js b/test/error.test.js
index ddd3fa4ada..ab361c4d03 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/index.test.js b/test/index.test.js
index 21e09014f3..066578f632 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -15,8 +15,8 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(nuxt.options.dev, true)
   t.is(typeof nuxt.generate, 'function')
   t.is(typeof nuxt._init.then, 'function')
-  await nuxt.init()
-  t.is(nuxt.initialized, true)
+  await nuxt.ready()
+  t.is(nuxt.readyialized, true)
 })
 
 test.serial('Fail to build when no pages/ directory but is in the parent', t => {
@@ -25,7 +25,7 @@ test.serial('Fail to build when no pages/ directory but is in the parent', t =>
     runBuild: true,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
   })
-  return nuxt.init().catch(err => {
+  return nuxt.ready().catch(err => {
     let s = String(err)
     t.true(s.includes('No `pages` directory found'))
     t.true(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?'))
@@ -38,7 +38,7 @@ test.serial('Fail to build when no pages/ directory', t => {
     runBuild: true,
     rootDir: resolve(__dirname)
   })
-  return nuxt.init().catch(err => {
+  return nuxt.ready().catch(err => {
     let s = String(err)
     t.true(s.includes('Couldn\'t find a `pages` directory'))
     t.true(s.includes('Please create one under the project root'))
diff --git a/test/module.test.js b/test/module.test.js
index bdb658a82e..eca4d7bfea 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 78668a2688..a7366ea65d 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.init()
+  await nuxt.ready()
   server = new Nuxt.Server(nuxt)
   server.listen(port, 'localhost')
 })
@@ -113,5 +113,5 @@ test.after('Should be able to start Nuxt with build done', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.init()
+  await nuxt.ready()
 })

From ce959878e79ae2c28f6cfc330da37fb48b4ad3dc Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 15 Jun 2017 19:30:23 +0430
Subject: [PATCH 074/236] eslint

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

diff --git a/lib/webpack/client.config.js b/lib/webpack/client.config.js
index f68ddf1e18..5bb047b234 100644
--- a/lib/webpack/client.config.js
+++ b/lib/webpack/client.config.js
@@ -89,7 +89,7 @@ export default function webpackClientConfig () {
     config.plugins.push(new FriendlyErrorsWebpackPlugin())
   }
   // Dev client build
-  if(this.options.dev){
+  if (this.options.dev) {
     // Add HMR support
     config.entry.app = flatten(['webpack-hot-middleware/client?name=$client&reload=true', config.entry.app])
     config.plugins.push(

From d68b4f0c00b1459d17666eb4a082f90645ced987 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 15 Jun 2017 20:56:13 +0430
Subject: [PATCH 075/236] webpack3

---
 lib/utils.js |   2 +-
 package.json |   8 +-
 yarn.lock    | 239 +++++++++++++++------------------------------------
 3 files changed, 76 insertions(+), 173 deletions(-)

diff --git a/lib/utils.js b/lib/utils.js
index 9bf2167488..2f2fbac7b8 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -89,7 +89,7 @@ const sysSep = _.escapeRegExp(sep)
 const normalize = string => string.replace(reqSep, sysSep)
 
 export function r () {
-  let args = Array.from(arguments)
+  let args = Array.prototype.slice.apply(arguments)
 
   if (_.last(args).includes('~')) {
     return wp(_.last(args))
diff --git a/package.json b/package.json
index 242035d12c..af39026350 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "serve-static": "^1.12.3",
     "tapable": "^0.2.6",
     "tappable": "^1.0.1",
-    "url-loader": "^0.5.8",
+    "url-loader": "^0.5.9",
     "vue": "~2.3.3",
     "vue-loader": "^12.2.1",
     "vue-meta": "^1.0.4",
@@ -100,7 +100,7 @@
     "vue-ssr-html-stream": "^2.2.0",
     "vue-template-compiler": "~2.3.3",
     "vuex": "^2.3.1",
-    "webpack": "^2.6.1",
+    "webpack": "^3.0.0-rc.2",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-dev-middleware": "^1.10.2",
     "webpack-hot-middleware": "^2.18.0",
@@ -115,9 +115,9 @@
     "babel-preset-stage-2": "^6.24.1",
     "codecov": "^2.2.0",
     "copy-webpack-plugin": "^4.0.1",
-    "eslint": "^3.19.0",
+    "eslint": "^4.0.0",
     "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-html": "^2.0.3",
+    "eslint-plugin-html": "^3.0.0",
     "eslint-plugin-import": "^2.3.0",
     "eslint-plugin-node": "^5.0.0",
     "eslint-plugin-promise": "^3.5.0",
diff --git a/yarn.lock b/yarn.lock
index 7379f9afb8..c44bae33a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -86,10 +86,14 @@ acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
 
-ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
+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:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+
 ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
@@ -97,7 +101,7 @@ ajv@^4.7.0, ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0:
+ajv@^5.0.0, ajv@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68"
   dependencies:
@@ -1408,12 +1412,6 @@ 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:
-  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"
@@ -1566,7 +1564,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.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:
@@ -2074,20 +2072,13 @@ domutils@1.1:
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1:
+domutils@1.5.1, domutils@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
@@ -2300,9 +2291,9 @@ eslint-module-utils@^2.0.0:
     debug "2.2.0"
     pkg-dir "^1.0.0"
 
-eslint-plugin-html@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz#7c89883ab0c85fa5d28b666a14a4e906aa90b897"
+eslint-plugin-html@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.0.0.tgz#2c982a71b9d965654f0f3a52358735821a1a4239"
   dependencies:
     htmlparser2 "^3.8.2"
 
@@ -2338,45 +2329,49 @@ 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@^3.19.0:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+eslint-scope@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
   dependencies:
-    babel-code-frame "^6.16.0"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.0.0.tgz#7277c01437fdf41dccd168d5aa0e49b75ca1f260"
+  dependencies:
+    babel-code-frame "^6.22.0"
     chalk "^1.1.3"
-    concat-stream "^1.5.2"
-    debug "^2.1.1"
+    concat-stream "^1.6.0"
+    debug "^2.6.8"
     doctrine "^2.0.0"
-    escope "^3.6.0"
-    espree "^3.4.0"
+    eslint-scope "^3.7.1"
+    espree "^3.4.3"
     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"
+    glob "^7.1.2"
+    globals "^9.17.0"
+    ignore "^3.3.3"
     imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
+    inquirer "^3.0.6"
+    is-my-json-valid "^2.16.0"
     is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
+    js-yaml "^3.8.4"
+    json-stable-stringify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
+    lodash "^4.17.4"
+    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 "^4.0.0"
+    progress "^2.0.0"
+    require-uncached "^1.0.3"
     strip-json-comments "~2.0.1"
-    table "^3.7.8"
+    table "^4.0.1"
     text-table "~0.2.0"
-    user-home "^2.0.0"
 
 espower-location-detector@^1.0.0:
   version "1.0.0"
@@ -2387,7 +2382,7 @@ espower-location-detector@^1.0.0:
     source-map "^0.5.0"
     xtend "^4.0.0"
 
-espree@^3.4.0:
+espree@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
   dependencies:
@@ -2481,10 +2476,6 @@ execa@^0.5.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -2569,13 +2560,6 @@ fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
-figures@^1.3.5:
-  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"
@@ -2837,7 +2821,7 @@ glob@^6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
+glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -2848,7 +2832,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^9.0.0, globals@^9.14.0:
+globals@^9.0.0, globals@^9.17.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -3141,7 +3125,7 @@ ignore-by-default@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
-ignore@^3.2.0, ignore@^3.3.3:
+ignore@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
@@ -3190,7 +3174,7 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@3.0.6:
+inquirer@3.0.6, inquirer@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
   dependencies:
@@ -3208,24 +3192,6 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    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"
-    through "^2.3.6"
-
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -3340,7 +3306,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
+is-my-json-valid@^2.12.4, is-my-json-valid@^2.16.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
   dependencies:
@@ -3598,7 +3564,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.8.2:
+js-yaml@^3.4.3, js-yaml@^3.8.2, js-yaml@^3.8.4:
   version "3.8.4"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
   dependencies:
@@ -3662,7 +3628,7 @@ 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@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
@@ -4100,10 +4066,6 @@ multimatch@^2.1.0:
     arrify "^1.0.0"
     minimatch "^3.0.0"
 
-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"
@@ -4359,10 +4321,6 @@ once@^1.3.0, once@^1.3.3:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/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"
@@ -4557,7 +4515,7 @@ path-is-absolute@^1.0.0:
   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"
 
@@ -4662,18 +4620,14 @@ plur@^2.0.0:
   dependencies:
     irregular-plurals "^1.0.0"
 
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+pluralize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-4.0.0.tgz#59b708c1c0190a2f692f1c7618c446b052fd1762"
 
 pn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.0.0.tgz#1cf5a30b0d806cd18f88fc41a6b5d4ad615b3ba9"
 
-post-compile-webpack-plugin@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/post-compile-webpack-plugin/-/post-compile-webpack-plugin-0.1.1.tgz#1b1a0eea890ce748556ca49e066a48c900e0b370"
-
 postcss-calc@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
@@ -5012,6 +4966,10 @@ 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"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -5162,20 +5120,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"
-
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -5379,7 +5323,7 @@ require-precompiled@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
 
-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:
@@ -5410,13 +5354,6 @@ resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.3:
   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"
-  dependencies:
-    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"
@@ -5443,22 +5380,12 @@ 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"
-  dependencies:
-    once "^1.3.0"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
   dependencies:
     is-promise "^2.1.0"
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-
 rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
@@ -5550,14 +5477,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
   dependencies:
     inherits "^2.0.1"
 
-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"
-
 sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -5594,10 +5513,6 @@ source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
-source-list-map@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
-
 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"
@@ -5819,9 +5734,9 @@ 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.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
   dependencies:
     ajv "^4.7.0"
     ajv-keywords "^1.0.0"
@@ -6076,9 +5991,9 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
-url-loader@^0.5.8:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
+url-loader@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
   dependencies:
     loader-utils "^1.0.2"
     mime "1.3.x"
@@ -6100,12 +6015,6 @@ urlgrey@0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  dependencies:
-    os-homedir "^1.0.0"
-
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -6292,13 +6201,6 @@ webpack-node-externals@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
 
-webpack-sources@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
-  dependencies:
-    source-list-map "^1.1.1"
-    source-map "~0.5.3"
-
 webpack-sources@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
@@ -6306,21 +6208,22 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
+webpack@^3.0.0-rc.2:
+  version "3.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0-rc.2.tgz#20c903580fa9fba8497bc1c6455810d3d397c958"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
-    ajv "^4.7.0"
-    ajv-keywords "^1.1.1"
+    ajv "^5.1.5"
+    ajv-keywords "^2.0.0"
     async "^2.1.2"
     enhanced-resolve "^3.0.0"
+    escope "^3.6.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
     json5 "^0.5.1"
     loader-runner "^2.3.0"
-    loader-utils "^0.2.16"
+    loader-utils "^1.1.0"
     memory-fs "~0.4.1"
     mkdirp "~0.5.0"
     node-libs-browser "^2.0.0"
@@ -6329,7 +6232,7 @@ webpack@^2.6.1:
     tapable "~0.2.5"
     uglify-js "^2.8.27"
     watchpack "^1.3.1"
-    webpack-sources "^0.2.3"
+    webpack-sources "^1.0.1"
     yargs "^6.0.0"
 
 whatwg-encoding@^1.0.1:

From 5722a92c4c0150c9c67af1dde195e40026990aa4 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 02:49:53 +0430
Subject: [PATCH 076/236] many improvements

---
 bin/nuxt-dev                     |   6 +-
 lib/builder.js                   | 107 +++++++++++++--------
 lib/nuxt.js                      |  53 +++++------
 lib/renderer.js                  |  16 +++-
 lib/server.js                    |  45 ++++++---
 lib/utils.js                     |   4 +
 lib/webpack/base.config.js       |  39 ++++++--
 lib/webpack/client.config.js     | 155 +++++++++++++++++--------------
 lib/webpack/server.config.js     |  22 +++--
 lib/webpack/vue-loader.config.js |   3 +-
 10 files changed, 268 insertions(+), 182 deletions(-)

diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index df72c433c6..7f52e988f5 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -87,12 +87,10 @@ function listenOnConfigChanges(nuxt, server) {
     options.rootDir = rootDir
     nuxt.close()
       .then(() => {
-        nuxt.renderer = null
         debug('Rebuilding the app...')
-        return new Nuxt(options).build()
-      })
-      .then((nuxt) => {
+        var nuxt = new Nuxt(options)
         server.nuxt = nuxt
+        return nuxt.ready()
       })
       .catch((error) => {
         console.error('Error while rebuild the app:', error) // eslint-disable-line no-console
diff --git a/lib/builder.js b/lib/builder.js
index e2c17ab7e9..2f1eb98b35 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -7,11 +7,11 @@ import webpack from 'webpack'
 import serialize from 'serialize-javascript'
 import { join, resolve, basename, dirname } from 'path'
 import Tapable from 'tappable'
-import chalk from 'chalk'
+import MFS from 'memory-fs'
+import { sequence, parallel } from "./utils"
 import { r, wp, createRoutes } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
-import MFS from 'memory-fs'
 
 const debug = require('debug')('nuxt:build')
 debug.color = 2 // Force green color
@@ -23,9 +23,6 @@ const writeFile = pify(fs.writeFile)
 const mkdirp = pify(fs.mkdirp)
 const glob = pify(require('glob'))
 
-const host = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
-const port = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
-
 export default class Builder extends Tapable {
   constructor (nuxt) {
     super()
@@ -50,7 +47,7 @@ export default class Builder extends Tapable {
     _.defaultsDeep(this.options.build, extraDefaults)
 
     // Mute stats on dev
-    this.webpackStats = this.options.dev ? '' : {
+    this.webpackStats = this.options.dev ? false : {
       chunks: false,
       children: false,
       modules: false,
@@ -220,7 +217,7 @@ export default class Builder extends Tapable {
     }))
 
     // Interpret and move template files to .nuxt/
-    return Promise.all(templatesFiles.map(async ({ src, dst, options, custom }) => {
+    await Promise.all(templatesFiles.map(async ({ src, dst, options, custom }) => {
       // Add template to watchers
       this.options.build.watch.push(src)
       // Render template to dst
@@ -245,7 +242,7 @@ export default class Builder extends Tapable {
       // Write file
       await writeFile(path, content, 'utf8')
       // Fix webpack loop (https://github.com/webpack/watchpack/issues/25#issuecomment-287789288)
-      const dateFS = Date.now() / 1000 - 30
+      const dateFS = Date.now() / 1000 - 1000
       return utimes(path, dateFS, dateFS)
     }))
   }
@@ -256,16 +253,23 @@ export default class Builder extends Tapable {
 
     // Client
     let clientConfig = clientWebpackConfig.call(this)
-    clientConfig.name = '$client'
     compilersOptions.push(clientConfig)
 
     // Server
     let serverConfig = serverWebpackConfig.call(this)
-    serverConfig.name = '$server'
     compilersOptions.push(serverConfig)
 
-    // Leverage webpack multi-compiler for faster builds
-    this.compiler = webpack(compilersOptions)
+    // Simulate webpack multi compiler interface
+    // Separate compilers are simpler, safer and faster
+    this.compiler = { cache: {}, compilers: [] }
+    compilersOptions.forEach(compilersOption => {
+      this.compiler.compilers.push(webpack(compilersOption))
+    })
+    this.compiler.plugin = (...args) => {
+      this.compiler.compilers.forEach(compiler => {
+        compiler.plugin(...args)
+      })
+    }
 
     // Access to compilers with name
     this.compiler.compilers.forEach(compiler => {
@@ -274,71 +278,84 @@ export default class Builder extends Tapable {
       }
     })
 
-    // Add middleware for dev
+    // Add dev Stuff
     if (this.options.dev) {
       this.webpackDev()
     }
 
-    // Start build
-    return new Promise((resolve, reject) => {
-      const handler = (err, multiStats) => {
+    // Start Builds
+    return parallel(this.compiler.compilers, compiler => new Promise((resolve, reject) => {
+      let _resolved = false
+      const handler = (err, stats) => {
+        if (_resolved) return
+        _resolved = true
         if (err) {
           return reject(err)
         }
-        for (let _stats of multiStats.stats) {
-          console.log(_stats.toString(this.webpackStats))  // eslint-disable-line no-console
-          if (_stats.hasErrors()) {
+        if (!this.options.dev) {
+          // Show build stats for production
+          console.log(stats.toString(this.webpackStats))  // eslint-disable-line no-console
+          if (stats.hasErrors()) {
             return reject(new Error('Webpack build exited with errors'))
           }
         }
-        // Use watch handler instead of compiler.apply('done') to prevent duplicate emits
-        this.applyPlugins('reload', multiStats)
         resolve()
       }
       if (this.options.dev) {
-        this.compiler.watch(this.options.watchers.webpack, handler)
+        if (compiler.options.name === 'client') {
+          // Client watch is started by dev-middleware
+          resolve()
+        } else {
+          // Build and watch for changes
+          compiler.watch(this.options.watchers.webpack, handler)
+        }
       } else {
-        this.compiler.run(handler)
+        // Production build
+        compiler.run(handler)
       }
-    })
+    }))
   }
 
   webpackDev () {
-    debug('Adding webpack middleware...')
-
-    // Use MFS for faster builds
+    // Use shared MFS + Cache for faster builds
     let mfs = new MFS()
     this.compiler.compilers.forEach(compiler => {
       compiler.outputFileSystem = mfs
+      compiler.cache = this.compiler.cache
     })
 
-    // Watch
-    this.plugin('reload', () => {
-      // Show open URL
-      let _host = host === '0.0.0.0' ? 'localhost' : host
-      // eslint-disable-next-line no-console
-      console.log(chalk.bold(chalk.bgCyan.black(' OPEN ') + chalk.cyan(` http://${_host}:${port}\n`)))
-
+    // Run after each compile
+    this.compiler.plugin('done', stats => {
+      console.log(stats.toString(this.webpackStats))  // eslint-disable-line no-console
       // Reload renderer if available
       if (this.nuxt.renderer) {
         this.nuxt.renderer.loadResources(mfs)
       }
     })
 
-    // Create webpack Dev/Hot middleware
-    this.webpackDevMiddleware = pify(require('webpack-dev-middleware')(this.compiler.$client, {
+    // Add dev Middleware
+    debug('Adding webpack middleware...')
+
+    // Create webpack dev middleware
+    this.webpackDevMiddleware = pify(require('webpack-dev-middleware')(this.compiler.client, {
       publicPath: this.options.build.publicPath,
       stats: this.webpackStats,
-      quiet: true,
       noInfo: true,
+      quiet: true,
       watchOptions: this.options.watchers.webpack
     }))
 
-    this.webpackHotMiddleware = pify(require('webpack-hot-middleware')(this.compiler.$client, {
+    this.webpackHotMiddleware = pify(require('webpack-hot-middleware')(this.compiler.client, {
       log: false,
       heartbeat: 2500
     }))
 
+    // Stop webpack middleware on nuxt.close()
+    this.nuxt.plugin('close', () => new Promise(resolve => {
+      this.webpackDevMiddleware.close(() => resolve())
+    }))
+
+    // Start watching files
     this.watchFiles()
   }
 
@@ -360,13 +377,21 @@ export default class Builder extends Tapable {
     })
     /* istanbul ignore next */
     const refreshFiles = _.debounce(this.generateRoutesAndFiles, 200)
-    // Watch for internals
-    this.filesWatcher = chokidar.watch(patterns, options)
+
+    // Watch for src Files
+    let filesWatcher = chokidar.watch(patterns, options)
       .on('add', refreshFiles)
       .on('unlink', refreshFiles)
+
     // Watch for custom provided files
-    this.customFilesWatcher = chokidar.watch(_.uniq(this.options.build.watch), options)
+    let customFilesWatcher = chokidar.watch(_.uniq(this.options.build.watch), options)
       .on('change', refreshFiles)
+
+    // Stop watching on nuxt.close()
+    this.nuxt.plugin('close', () => {
+      filesWatcher.close()
+      customFilesWatcher.close()
+    })
   }
 }
 
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 1a14ffd9d2..499d254343 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -1,11 +1,14 @@
 import Tapable from 'tappable'
-import Builder from './builder'
+import chalk from 'chalk'
 import * as Utils from './utils'
 import Renderer from './renderer'
 import ModuleContainer from './module-container'
 import Server from './server'
 import defaults from './defaults'
 
+const defaultHost = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
+const defaultPort = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
+
 export default class Nuxt extends Tapable {
   constructor (_options = {}) {
     super()
@@ -57,7 +60,7 @@ export default class Nuxt extends Tapable {
     if (this._builder) {
       return this._builder
     }
-    // const Builder = require('./builder').default
+    const Builder = require('./builder').default
     this._builder = new Builder(this)
     return this._builder
   }
@@ -90,36 +93,28 @@ export default class Nuxt extends Tapable {
     process.exit(1)
   }
 
+  serverReady ({ host = defaultHost, port = defaultPort } = {}) {
+    let _host = host === '0.0.0.0' ? 'localhost' : host
+
+    // eslint-disable-next-line no-console
+    console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
+
+    return this.applyPluginsAsync('serverReady').catch(this.errorHandler)
+  }
+
   async close (callback) {
-    let promises = []
-    /* istanbul ignore if */
-    if (this.webpackDevMiddleware) {
-      const p = new Promise((resolve, reject) => {
-        this.webpackDevMiddleware.close(() => resolve())
-      })
-      promises.push(p)
-    }
-    /* istanbul ignore if */
-    if (this.webpackServerWatcher) {
-      const p = new Promise((resolve, reject) => {
-        this.webpackServerWatcher.close(() => resolve())
-      })
-      promises.push(p)
-    }
-    /* istanbul ignore if */
-    if (this.filesWatcher) {
-      this.filesWatcher.close()
-    }
-    /* istanbul ignore if */
-    if (this.customFilesWatcher) {
-      this.customFilesWatcher.close()
-    }
+    // Call for close
+    await this.applyPluginsAsync('close')
 
-    promises.push(this.applyPluginsAsync('close'))
+    // Remove all references
+    delete this._generator
+    delete this._builder
 
-    return Promise.all(promises).then(() => {
-      if (typeof callback === 'function') callback()
-    })
+    this.initialized = false
+
+    if (typeof callback === 'function') {
+      callback()
+    }
   }
 }
 
diff --git a/lib/renderer.js b/lib/renderer.js
index c7deae435a..d9c311fbcb 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -10,6 +10,7 @@ import _ from 'lodash'
 import { resolve, join } from 'path'
 import fs from 'fs-extra'
 import { createBundleRenderer } from 'vue-server-renderer'
+import chalk from 'chalk'
 import { getContext, setAnsiColors, encodeHtml } from './utils'
 
 const debug = require('debug')('nuxt:render')
@@ -39,6 +40,7 @@ export default class Renderer extends Tapable {
       errorTemplate: parseTemplate(fs.readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'))
     }
 
+    // Initialize
     if (nuxt.initialized) {
       // If nuxt already initialized
       this._ready = this.ready().catch(this.nuxt.errorHandler)
@@ -71,16 +73,18 @@ export default class Renderer extends Tapable {
 
     // Load resources from fs
     if (!this.options.dev) {
-      return this.loadResources()
+      await this.loadResources()
     }
+
+    return this
   }
 
-  async loadResources (_fs = fs, distPath) {
-    distPath = distPath || resolve(this.options.buildDir, 'dist')
+  async loadResources (_fs = fs, isServer) {
+    let distPath = resolve(this.options.buildDir, 'dist')
 
     const resourceMap = {
       clientManifest: {
-        path: join(distPath, 'client-manifest.json'),
+        path: join(distPath, 'vue-ssr-client-manifest.json'),
         transform: JSON.parse
       },
       serverBundle: {
@@ -116,7 +120,7 @@ export default class Renderer extends Tapable {
     })
 
     if (updated.length > 0) {
-      // debug('Updated', updated.join(', '))
+      // debug('Updated', updated.join(', '), isServer)
       this.createRenderer()
     }
   }
@@ -136,6 +140,8 @@ export default class Renderer extends Tapable {
 
     // Promisify renderToString
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)
+
+    this.nuxt.serverReady()
   }
 
   async render (req, res) {
diff --git a/lib/server.js b/lib/server.js
index 09bd816c09..f0082e8e7c 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -8,17 +8,33 @@ class Server {
     this.options = nuxt.options
 
     // Initialize
+    if (nuxt.initialized) {
+      // If nuxt already initialized
+      this._ready = this.ready().catch(this.nuxt.errorHandler)
+    } else {
+      // Wait for hook
+      this.nuxt.plugin('afterInit', () => {
+        this._ready = this.ready()
+        return this._ready
+      })
+    }
+  }
+
+  async ready() {
+    if (this._ready) {
+      return this._ready
+    }
+
     this.app = connect()
     this.server = http.createServer(this.app)
-    this.nuxt.ready()
-      .then(() => {
-        // Add Middleware
-        this.options.serverMiddleware.forEach(m => {
-          this.useMiddleware(m)
-        })
-        // Add default render middleware
-        this.useMiddleware(this.render.bind(this))
-      })
+
+    // Add Middleware
+    this.options.serverMiddleware.forEach(m => {
+      this.useMiddleware(m)
+    })
+    // Add default render middleware
+    this.useMiddleware(this.render.bind(this))
+
     return this
   }
 
@@ -49,12 +65,13 @@ class Server {
     host = host || 'localhost'
     port = port || 3000
     this.nuxt.ready()
-    .then(() => {
-      this.server.listen(port, host, () => {
-        let _host = host === '0.0.0.0' ? 'localhost' : host
-        console.log('Ready on http://%s:%s', _host, port) // eslint-disable-line no-console
+      .then(() => {
+        this.server.listen(port, host, () => {
+          // Renderer calls showURL when server is really ready
+          // this.nuxt.showURL(host, port)
+        })
       })
-    })
+      .catch(this.nuxt.errorHandler)
     return this
   }
 
diff --git a/lib/utils.js b/lib/utils.js
index 2f2fbac7b8..fcfe7eba4b 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -63,6 +63,10 @@ export function sequence (tasks, fn) {
   return tasks.reduce((promise, task) => promise.then(() => fn(task)), Promise.resolve())
 }
 
+export function parallel (tasks, fn) {
+  return Promise.all(tasks.map(task => fn(task)))
+}
+
 export function chainFn (base, fn) {
   /* istanbul ignore if */
   if (!(fn instanceof Function)) {
diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index fdadcbce9b..fd15de3ac2 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -1,6 +1,8 @@
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import { defaults } from 'lodash'
-import { join } from 'path'
+import { join, resolve, } from 'path'
+import webpack from 'webpack'
+import { cloneDeep } from 'lodash'
 import { isUrl, urlJoin } from '../utils'
 import vueLoaderConfig from './vue-loader.config'
 import { styleLoader, extractStyles } from './helpers'
@@ -15,12 +17,15 @@ import { styleLoader, extractStyles } from './helpers'
 */
 export default function webpackBaseConfig ({ isClient, isServer }) {
   const nodeModulesDir = join(__dirname, '..', 'node_modules')
-  let config = {
-    devtool: (this.options.dev ? 'cheap-module-source-map' : false),
+
+  const config = {
+    devtool: this.options.dev ? 'cheap-module-source-map' : false,
     entry: {
       vendor: ['vue', 'vue-router', 'vue-meta']
     },
     output: {
+      path: resolve(this.options.buildDir, 'dist'),
+      filename: this.options.build.filenames.app,
       publicPath: (isUrl(this.options.build.publicPath)
         ? this.options.build.publicPath
         : urlJoin(this.options.router.base, this.options.build.publicPath))
@@ -28,7 +33,7 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
     performance: {
       maxEntrypointSize: 300000,
       maxAssetSize: 300000,
-      hints: (this.options.dev ? false : 'warning')
+      hints: this.options.dev ? false : 'warning'
     },
     resolve: {
       extensions: ['.js', '.json', '.vue', '.ts'],
@@ -57,6 +62,7 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
       ]
     },
     module: {
+      noParse: /es6-promise\.js$/, // avoid webpack shimming process
       rules: [
         {
           test: /\.vue$/,
@@ -98,12 +104,33 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
     },
     plugins: this.options.build.plugins
   }
+
   // CSS extraction
   if (extractStyles.call(this)) {
     config.plugins.push(
       new ExtractTextPlugin({ filename: this.options.build.filenames.css })
     )
   }
-  // Return config
-  return config
+
+  // --------------------------------------
+  // Dev specific config
+  // --------------------------------------
+  if (this.options.dev) {
+    //
+  }
+
+  // --------------------------------------
+  // Production specific config
+  // --------------------------------------
+  if (!this.options.dev) {
+    // This is needed in webpack 2 for minify CSS
+    config.plugins.push(
+      new webpack.LoaderOptionsPlugin({
+        minimize: true
+      })
+    )
+  }
+
+  // Clone deep avoid leaking config between Client and Server
+  return cloneDeep(config)
 }
diff --git a/lib/webpack/client.config.js b/lib/webpack/client.config.js
index 5bb047b234..3b2e320b9a 100644
--- a/lib/webpack/client.config.js
+++ b/lib/webpack/client.config.js
@@ -22,89 +22,108 @@ import base from './base.config.js'
 export default function webpackClientConfig () {
   let config = base.call(this, { isClient: true })
 
+  config.name = 'client'
+
   // Entry
   config.entry.app = resolve(this.options.buildDir, 'client.js')
 
   // Add vendors
-  if (this.options.store) {
-    config.entry.vendor.push('vuex')
+  if (!this.options.dev) {
+    if (this.options.store) {
+      config.entry.vendor.push('vuex')
+    }
+    config.entry.vendor = config.entry.vendor.concat(this.options.build.vendor)
+    // Extract vendor chunks for better caching
+    config.plugins.push(
+      new webpack.optimize.CommonsChunkPlugin({
+        name: 'vendor',
+        filename: this.options.build.filenames.vendor,
+        minChunks (module) {
+          // A module is extracted into the vendor chunk when...
+          return (
+            // If it's inside node_modules
+            /node_modules/.test(module.context) &&
+            // Do not externalize if the request is a CSS file
+            !/\.(css|less|scss|sass|styl|stylus)$/.test(module.request)
+          )
+        }
+      })
+    )
   }
-  config.entry.vendor = config.entry.vendor.concat(this.options.build.vendor)
 
-  // Output
-  config.output.path = resolve(this.options.buildDir, 'dist')
-  config.output.filename = this.options.build.filenames.app
-
-  // env object defined in nuxt.config.js
+  // Env object defined in nuxt.config.js
   let env = {}
   each(this.options.env, (value, key) => {
     env['process.env.' + key] = (typeof value === 'string' ? JSON.stringify(value) : value)
   })
-  // Webpack plugins
-  config.plugins = (config.plugins || []).concat([
-    // Strip comments in Vue code
-    new webpack.DefinePlugin(Object.assign(env, {
-      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || (this.options.dev ? 'development' : 'production')),
-      'process.BROWSER_BUILD': true,
-      'process.SERVER_BUILD': false,
-      'process.browser': true,
-      'process.server': true
-    })),
-    // Extract vendor chunks for better caching
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'vendor',
-      filename: this.options.build.filenames.vendor,
-      minChunks (module) {
-        // A module is extracted into the vendor chunk when...
-        return (
-          // If it's inside node_modules
-          /node_modules/.test(module.context) &&
-          // Do not externalize if the request is a CSS file
-          !/\.(css|less|scss|sass|styl|stylus)$/.test(module.request)
-        )
-      }
-    }),
-    // Extract webpack runtime & manifest
+
+  // Webpack common plugins
+  if (!Array.isArray(config.plugins)) {
+    config.plugins = []
+  }
+
+  // Generate output HTML
+  config.plugins.push(
+    new HTMLPlugin({
+      template: this.options.appTemplatePath,
+      inject: false
+    })
+  )
+
+  // Generate vue-ssr-client-manifest
+  config.plugins.push(
+    new VueSSRClientPlugin({
+      filename: 'vue-ssr-client-manifest.json'
+    })
+  )
+
+  // Extract webpack runtime & manifest
+  config.plugins.push(
     new webpack.optimize.CommonsChunkPlugin({
       name: 'manifest',
       minChunks: Infinity,
       filename: this.options.build.filenames.manifest
-    }),
-    // Generate output HTML
-    new HTMLPlugin({
-      template: this.options.appTemplatePath,
-      inject: false // <- Resources will be injected using vue server renderer
-    }),
-    // Generate client manifest json
-    new VueSSRClientPlugin({
-      filename: 'client-manifest.json'
     })
-  ])
-  // client bundle progress bar
+  )
+
+
+  // Define Env
+  config.plugins.push(
+    new webpack.DefinePlugin(Object.assign(env, {
+      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || (this.options.dev ? 'development' : 'production')),
+      'process.env.VUE_ENV': JSON.stringify('client'),
+      'process.browser': true,
+      'process.server': false
+    }))
+  )
+
+  // Build progress bar
   config.plugins.push(
     new ProgressBarPlugin()
   )
-  // Add friendly error plugin
+
+  // --------------------------------------
+  // Dev specific config
+  // --------------------------------------
   if (this.options.dev) {
+    // Add friendly error plugin
     config.plugins.push(new FriendlyErrorsWebpackPlugin())
-  }
-  // Dev client build
-  if (this.options.dev) {
+
     // Add HMR support
-    config.entry.app = flatten(['webpack-hot-middleware/client?name=$client&reload=true', config.entry.app])
+    config.entry.app = ['webpack-hot-middleware/client?name=$client&reload=true', config.entry.app]
+    config.output.filename = '[name].js'
     config.plugins.push(
       new webpack.HotModuleReplacementPlugin(),
       new webpack.NoEmitOnErrorsPlugin()
     )
   }
-  // Production client build
+
+  // --------------------------------------
+  // Production specific config
+  // --------------------------------------
   if (!this.options.dev) {
+    // Minify JS
     config.plugins.push(
-      // This is needed in webpack 2 for minifying CSS
-      new webpack.LoaderOptionsPlugin({
-        minimize: true
-      }),
-      // Minify JS
       new webpack.optimize.UglifyJsPlugin({
         sourceMap: true,
         compress: {
@@ -112,7 +131,15 @@ export default function webpackClientConfig () {
         }
       })
     )
+
+    // Webpack Bundle Analyzer
+    if (this.options.build.analyze) {
+      config.plugins.push(
+        new BundleAnalyzerPlugin(Object.assign({}, this.options.build.analyze))
+      )
+    }
   }
+
   // Extend config
   if (typeof this.options.build.extend === 'function') {
     this.options.build.extend.call(this, config, {
@@ -120,22 +147,6 @@ export default function webpackClientConfig () {
       isClient: true
     })
   }
-  // Offline-plugin integration
-  if (!this.options.dev && this.options.offline) {
-    const offlineOpts = typeof this.options.offline === 'object' ? this.options.offline : {}
-    config.plugins.push(
-      new OfflinePlugin(defaults(offlineOpts, {}))
-    )
-  }
-  // Webpack Bundle Analyzer
-  if (!this.options.dev && this.options.build.analyze) {
-    let options = {}
-    if (typeof this.options.build.analyze === 'object') {
-      options = this.options.build.analyze
-    }
-    config.plugins.push(
-      new BundleAnalyzerPlugin(options)
-    )
-  }
+
   return config
 }
diff --git a/lib/webpack/server.config.js b/lib/webpack/server.config.js
index 62a2eb2b5e..185a19a0fe 100644
--- a/lib/webpack/server.config.js
+++ b/lib/webpack/server.config.js
@@ -13,6 +13,8 @@ import base from './base.config.js'
 export default function webpackServerConfig () {
   let config = base.call(this, { isServer: true })
 
+  config.name = 'server'
+
   // env object defined in nuxt.config.js
   let env = {}
   each(this.options.env, (value, key) => {
@@ -24,7 +26,6 @@ export default function webpackServerConfig () {
     devtool: (this.options.dev ? 'source-map' : false),
     entry: resolve(this.options.buildDir, 'server.js'),
     output: Object.assign({}, config.output, {
-      path: resolve(this.options.buildDir, 'dist'),
       filename: 'server-bundle.js',
       libraryTarget: 'commonjs2'
     }),
@@ -32,6 +33,8 @@ export default function webpackServerConfig () {
       hints: false
     },
     externals: [
+      // https://webpack.js.org/configuration/externals/#externals
+      // https://github.com/liady/webpack-node-externals
       nodeExternals({
         // load non-javascript files with extensions, presumably via loaders
         whitelist: [/\.(?!(?:js|json)$).{1,5}$/i]
@@ -42,21 +45,19 @@ export default function webpackServerConfig () {
         filename: 'server-bundle.json'
       }),
       new webpack.DefinePlugin(Object.assign(env, {
-        'process.env.NODE_ENV': JSON.stringify(this.options.dev ? 'development' : 'production'),
-        'process.BROWSER_BUILD': false, // deprecated
-        'process.SERVER_BUILD': true,  // deprecated
+        'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || (this.options.dev ? 'development' : 'production')),
+        'process.env.VUE_ENV': JSON.stringify('server'),
         'process.browser': false,
         'process.server': true
       }))
     ])
   })
-  // This is needed in webpack 2 for minifying CSS
+
+  // --------------------------------------
+  // Production specific config
+  // --------------------------------------
   if (!this.options.dev) {
-    config.plugins.push(
-      new webpack.LoaderOptionsPlugin({
-        minimize: true
-      })
-    )
+
   }
 
   // Extend config
@@ -66,5 +67,6 @@ export default function webpackServerConfig () {
       isServer: true
     })
   }
+
   return config
 }
diff --git a/lib/webpack/vue-loader.config.js b/lib/webpack/vue-loader.config.js
index fcb7a0c90a..d8f3a1171c 100644
--- a/lib/webpack/vue-loader.config.js
+++ b/lib/webpack/vue-loader.config.js
@@ -9,7 +9,7 @@ export default function ({ isClient }) {
   }))
 
   // https://github.com/vuejs/vue-loader/blob/master/docs/en/configurations
-  let config = {
+  const config = {
     postcss: this.options.build.postcss,
     loaders: {
       'js': 'babel-loader?' + babelOptions,
@@ -23,6 +23,7 @@ export default function ({ isClient }) {
     preserveWhitespace: false,
     extractCSS: extractStyles.call(this)
   }
+
   // Return the config
   return config
 }

From 644d19f7ecd63d79620ec436e90199c621d2e0b4 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 02:58:08 +0430
Subject: [PATCH 077/236] eslint

---
 lib/builder.js               | 7 +++----
 lib/nuxt.js                  | 4 ++--
 lib/renderer.js              | 1 -
 lib/server.js                | 2 +-
 lib/webpack/base.config.js   | 5 ++---
 lib/webpack/client.config.js | 4 +---
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/builder.js b/lib/builder.js
index 2f1eb98b35..2f9251b8c7 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -8,8 +8,7 @@ import serialize from 'serialize-javascript'
 import { join, resolve, basename, dirname } from 'path'
 import Tapable from 'tappable'
 import MFS from 'memory-fs'
-import { sequence, parallel } from "./utils"
-import { r, wp, createRoutes } from './utils'
+import { r, wp, createRoutes, parallel } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
 
@@ -294,7 +293,7 @@ export default class Builder extends Tapable {
         }
         if (!this.options.dev) {
           // Show build stats for production
-          console.log(stats.toString(this.webpackStats))  // eslint-disable-line no-console
+          console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
           if (stats.hasErrors()) {
             return reject(new Error('Webpack build exited with errors'))
           }
@@ -326,7 +325,7 @@ export default class Builder extends Tapable {
 
     // Run after each compile
     this.compiler.plugin('done', stats => {
-      console.log(stats.toString(this.webpackStats))  // eslint-disable-line no-console
+      console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
       // Reload renderer if available
       if (this.nuxt.renderer) {
         this.nuxt.renderer.loadResources(mfs)
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 499d254343..99ed0a87ca 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -49,8 +49,8 @@ export default class Nuxt extends Tapable {
 
     // Wait for all components to be ready
     await this.applyPluginsAsync('beforeInit') // 1- Modules
-    await this.applyPluginsAsync('init')       // 2- Builder
-    await this.applyPluginsAsync('afterInit')  // 3- Renderer
+    await this.applyPluginsAsync('init') // 2- Builder
+    await this.applyPluginsAsync('afterInit') // 3- Renderer
 
     this.initialized = true
     return this
diff --git a/lib/renderer.js b/lib/renderer.js
index d9c311fbcb..cc5b93ca80 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -10,7 +10,6 @@ import _ from 'lodash'
 import { resolve, join } from 'path'
 import fs from 'fs-extra'
 import { createBundleRenderer } from 'vue-server-renderer'
-import chalk from 'chalk'
 import { getContext, setAnsiColors, encodeHtml } from './utils'
 
 const debug = require('debug')('nuxt:render')
diff --git a/lib/server.js b/lib/server.js
index f0082e8e7c..661a3e7a1a 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -20,7 +20,7 @@ class Server {
     }
   }
 
-  async ready() {
+  async ready () {
     if (this._ready) {
       return this._ready
     }
diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index fd15de3ac2..25b56c8206 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -1,8 +1,7 @@
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
-import { defaults } from 'lodash'
-import { join, resolve, } from 'path'
+import { defaults, cloneDeep } from 'lodash'
+import { join, resolve } from 'path'
 import webpack from 'webpack'
-import { cloneDeep } from 'lodash'
 import { isUrl, urlJoin } from '../utils'
 import vueLoaderConfig from './vue-loader.config'
 import { styleLoader, extractStyles } from './helpers'
diff --git a/lib/webpack/client.config.js b/lib/webpack/client.config.js
index 3b2e320b9a..da7e553555 100644
--- a/lib/webpack/client.config.js
+++ b/lib/webpack/client.config.js
@@ -1,11 +1,10 @@
-import { each, defaults, flatten } from 'lodash'
+import { each } from 'lodash'
 import webpack from 'webpack'
 import VueSSRClientPlugin from 'vue-server-renderer/client-plugin'
 import HTMLPlugin from 'html-webpack-plugin'
 import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'
 import ProgressBarPlugin from 'progress-bar-webpack-plugin'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
-import OfflinePlugin from 'offline-plugin'
 import { resolve } from 'path'
 import base from './base.config.js'
 
@@ -86,7 +85,6 @@ export default function webpackClientConfig () {
     })
   )
 
-
   // Define Env
   config.plugins.push(
     new webpack.DefinePlugin(Object.assign(env, {

From 42b603304d1b1f810ba44d8bb33692604b5db467 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 03:08:43 +0430
Subject: [PATCH 078/236] fix tests

---
 lib/nuxt.js        | 2 +-
 test/index.test.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/nuxt.js b/lib/nuxt.js
index 99ed0a87ca..6ffc424243 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -39,7 +39,7 @@ export default class Nuxt extends Tapable {
       }
     })
 
-    this._ready = this.ready().catch(this.errorHandler)
+    this._ready = this.ready()
   }
 
   async ready () {
diff --git a/test/index.test.js b/test/index.test.js
index 066578f632..ae20a2ef74 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -14,9 +14,9 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(typeof nuxt, 'object')
   t.is(nuxt.options.dev, true)
   t.is(typeof nuxt.generate, 'function')
-  t.is(typeof nuxt._init.then, 'function')
+  t.is(typeof nuxt._ready.then, 'function')
   await nuxt.ready()
-  t.is(nuxt.readyialized, true)
+  t.is(nuxt.initialized, true)
 })
 
 test.serial('Fail to build when no pages/ directory but is in the parent', t => {

From 25f11a05abb22281e4e50823331afb9b2984c270 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 03:17:47 +0430
Subject: [PATCH 079/236] fix tests

---
 test/with-config.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/with-config.test.js b/test/with-config.test.js
index a7366ea65d..f621ca9f2d 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -91,7 +91,7 @@ test('/test/about-bis (added with extendRoutes)', async t => {
 
 test('Check stats.json generated by build.analyze', t => {
   const stats = require(resolve(__dirname, 'fixtures/with-config/.nuxt/dist/stats.json'))
-  t.is(stats.assets.length, 29)
+  t.is(stats.assets.length, 26)
 })
 
 test('Check /test.txt with custom serve-static options', async t => {

From 0895b333ecf21f5e13b933234e3401c08f585300 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 03:30:53 +0430
Subject: [PATCH 080/236] fix devMiddleware with baseUrl

---
 lib/renderer.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/renderer.js b/lib/renderer.js
index cc5b93ca80..12b5f74f46 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -149,12 +149,6 @@ export default class Renderer extends Tapable {
     res.statusCode = 200
 
     try {
-      // Call webpack middleware only in development
-      if (this.options.dev && this.nuxt.builder && this.nuxt.builder.webpackDevMiddleware) {
-        await this.nuxt.builder.webpackDevMiddleware(req, res)
-        await this.nuxt.builder.webpackHotMiddleware(req, res)
-      }
-
       // Gzip middleware for production
       if (this.gzipMiddleware) {
         await this.gzipMiddleware(req, res)
@@ -166,6 +160,12 @@ export default class Renderer extends Tapable {
         req.url = req.url.replace(this.options.router.base, '/')
       }
 
+      // Call webpack middleware only in development
+      if (this.options.dev && this.nuxt.builder && this.nuxt.builder.webpackDevMiddleware) {
+        await this.nuxt.builder.webpackDevMiddleware(req, res)
+        await this.nuxt.builder.webpackHotMiddleware(req, res)
+      }
+
       // Serve static/ files
       await this.serveStatic(req, res)
 

From 829ffa634bc03f83320d1aebcc2e8599908e4d95 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 17:12:45 +0430
Subject: [PATCH 081/236] refactor structure

---
 {lib/app => app}/App.vue                      |   0
 {lib/app => app}/client.js                    |   0
 {lib/app => app}/components/nuxt-child.js     |   0
 {lib/app => app}/components/nuxt-error.vue    |   0
 {lib/app => app}/components/nuxt-link.js      |   0
 {lib/app => app}/components/nuxt-loading.vue  |   0
 {lib/app => app}/components/nuxt.vue          |   0
 {lib/app => app}/index.js                     |   0
 {lib/app => app}/layouts/default.vue          |   0
 {lib/app => app}/middleware.js                |   0
 {lib/app => app}/router.js                    |   0
 {lib/app => app}/server.js                    |   0
 {lib/app => app}/store.js                     |   0
 {lib/app => app}/utils.js                     |   0
 {lib => app}/views/app.template.html          |   0
 {lib => app}/views/error.html                 |   0
 bin/nuxt                                      |   8 +-
 bin/nuxt-build                                |  34 +-
 bin/nuxt-dev                                  |  38 +-
 bin/nuxt-generate                             |  36 +-
 bin/nuxt-start                                |  22 +-
 build/rollup.config.js                        | 106 +++
 index.js                                      |  20 +-
 package.json                                  |  21 +-
 {lib => src/builder}/builder.js               |  21 +-
 {lib => src/builder}/generator.js             |   2 +-
 src/builder/index.js                          |   7 +
 {lib => src/builder}/webpack/base.config.js   |   2 +-
 {lib => src/builder}/webpack/client.config.js |   0
 {lib => src/builder}/webpack/helpers.js       |   0
 {lib => src/builder}/webpack/server.config.js |   0
 .../builder}/webpack/vue-loader.config.js     |   0
 {lib => src/common}/utils.js                  |   0
 src/core/index.js                             |  15 +
 lib/module-container.js => src/core/module.js |   5 +-
 {lib => src/core}/nuxt.js                     |  28 +-
 lib/defaults.js => src/core/options.js        |   6 +-
 {lib => src/core}/renderer.js                 |  13 +-
 {lib => src/core}/server.js                   |   3 +-
 webpack.config.js                             |  59 --
 yarn.lock                                     | 627 +++++++++++++++++-
 41 files changed, 873 insertions(+), 200 deletions(-)
 rename {lib/app => app}/App.vue (100%)
 rename {lib/app => app}/client.js (100%)
 rename {lib/app => app}/components/nuxt-child.js (100%)
 rename {lib/app => app}/components/nuxt-error.vue (100%)
 rename {lib/app => app}/components/nuxt-link.js (100%)
 rename {lib/app => app}/components/nuxt-loading.vue (100%)
 rename {lib/app => app}/components/nuxt.vue (100%)
 rename {lib/app => app}/index.js (100%)
 rename {lib/app => app}/layouts/default.vue (100%)
 rename {lib/app => app}/middleware.js (100%)
 rename {lib/app => app}/router.js (100%)
 rename {lib/app => app}/server.js (100%)
 rename {lib/app => app}/store.js (100%)
 rename {lib/app => app}/utils.js (100%)
 rename {lib => app}/views/app.template.html (100%)
 rename {lib => app}/views/error.html (100%)
 create mode 100755 build/rollup.config.js
 rename {lib => src/builder}/builder.js (95%)
 rename {lib => src/builder}/generator.js (98%)
 create mode 100755 src/builder/index.js
 rename {lib => src/builder}/webpack/base.config.js (99%)
 rename {lib => src/builder}/webpack/client.config.js (100%)
 rename {lib => src/builder}/webpack/helpers.js (100%)
 rename {lib => src/builder}/webpack/server.config.js (100%)
 rename {lib => src/builder}/webpack/vue-loader.config.js (100%)
 rename {lib => src/common}/utils.js (100%)
 create mode 100755 src/core/index.js
 rename lib/module-container.js => src/core/module.js (96%)
 rename {lib => src/core}/nuxt.js (81%)
 rename lib/defaults.js => src/core/options.js (95%)
 rename {lib => src/core}/renderer.js (96%)
 rename {lib => src/core}/server.js (96%)
 delete mode 100644 webpack.config.js

diff --git a/lib/app/App.vue b/app/App.vue
similarity index 100%
rename from lib/app/App.vue
rename to app/App.vue
diff --git a/lib/app/client.js b/app/client.js
similarity index 100%
rename from lib/app/client.js
rename to app/client.js
diff --git a/lib/app/components/nuxt-child.js b/app/components/nuxt-child.js
similarity index 100%
rename from lib/app/components/nuxt-child.js
rename to app/components/nuxt-child.js
diff --git a/lib/app/components/nuxt-error.vue b/app/components/nuxt-error.vue
similarity index 100%
rename from lib/app/components/nuxt-error.vue
rename to app/components/nuxt-error.vue
diff --git a/lib/app/components/nuxt-link.js b/app/components/nuxt-link.js
similarity index 100%
rename from lib/app/components/nuxt-link.js
rename to app/components/nuxt-link.js
diff --git a/lib/app/components/nuxt-loading.vue b/app/components/nuxt-loading.vue
similarity index 100%
rename from lib/app/components/nuxt-loading.vue
rename to app/components/nuxt-loading.vue
diff --git a/lib/app/components/nuxt.vue b/app/components/nuxt.vue
similarity index 100%
rename from lib/app/components/nuxt.vue
rename to app/components/nuxt.vue
diff --git a/lib/app/index.js b/app/index.js
similarity index 100%
rename from lib/app/index.js
rename to app/index.js
diff --git a/lib/app/layouts/default.vue b/app/layouts/default.vue
similarity index 100%
rename from lib/app/layouts/default.vue
rename to app/layouts/default.vue
diff --git a/lib/app/middleware.js b/app/middleware.js
similarity index 100%
rename from lib/app/middleware.js
rename to app/middleware.js
diff --git a/lib/app/router.js b/app/router.js
similarity index 100%
rename from lib/app/router.js
rename to app/router.js
diff --git a/lib/app/server.js b/app/server.js
similarity index 100%
rename from lib/app/server.js
rename to app/server.js
diff --git a/lib/app/store.js b/app/store.js
similarity index 100%
rename from lib/app/store.js
rename to app/store.js
diff --git a/lib/app/utils.js b/app/utils.js
similarity index 100%
rename from lib/app/utils.js
rename to app/utils.js
diff --git a/lib/views/app.template.html b/app/views/app.template.html
similarity index 100%
rename from lib/views/app.template.html
rename to app/views/app.template.html
diff --git a/lib/views/error.html b/app/views/error.html
similarity index 100%
rename from lib/views/error.html
rename to app/views/error.html
diff --git a/bin/nuxt b/bin/nuxt
index 4e9019757d..04764d440f 100755
--- a/bin/nuxt
+++ b/bin/nuxt
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-var join = require('path').join
+const join = require('path').join
 
-var defaultCommand = 'dev'
-var commands = new Set([
+const defaultCommand = 'dev'
+const commands = new Set([
   defaultCommand,
   'init',
   'build',
@@ -19,6 +19,6 @@ if (commands.has(cmd)) {
   cmd = defaultCommand
 }
 
-var bin = join(__dirname, 'nuxt-' + cmd)
+const bin = join(__dirname, 'nuxt-' + cmd)
 
 require(bin)
diff --git a/bin/nuxt-build b/bin/nuxt-build
index 0f7b956563..5d70258cef 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -3,11 +3,13 @@
 // Show logs
 process.env.DEBUG = 'nuxt:*'
 
-var fs = require('fs')
-var parseArgs = require('minimist')
-var without = require('lodash').without
-var Nuxt = require('../')
-var resolve = require('path').resolve
+const fs = require('fs')
+const parseArgs = require('minimist')
+const without = require('lodash').without
+const { Nuxt } = require('../')
+const resolve = require('path').resolve
+const debug = require('debug')('nuxt:build')
+debug.color = 2 // Force green color
 
 const argv = parseArgs(process.argv.slice(2), {
   alias: {
@@ -36,8 +38,8 @@ if (argv.help) {
   process.exit(0)
 }
 
-var rootDir = resolve(argv._[0] || '.')
-var nuxtConfigFile = resolve(rootDir, argv['config-file'])
+const rootDir = resolve(argv._[0] || '.')
+const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
@@ -59,13 +61,13 @@ if (argv.analyze) {
   options.build.analyze = true
 }
 
-console.log('[nuxt] Building...') // eslint-disable-line no-console
-var nuxt = module.exports = new Nuxt(options)
+debug('Building...')
+const nuxt = module.exports = new Nuxt(options)
 nuxt.ready()
-.then(() => {
-  console.log('[nuxt] Building done') // eslint-disable-line no-console
-})
-.catch((err) => {
-  console.error(err) // eslint-disable-line no-console
-  process.exit(1)
-})
+  .then(() => {
+    debug('Building done')
+  })
+  .catch((err) => {
+    console.error(err) // eslint-disable-line no-console
+    process.exit(1)
+  })
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 7f52e988f5..f42e911ba0 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -3,17 +3,17 @@
 // Show logs
 process.env.DEBUG = 'nuxt:*'
 
-var _ = require('lodash')
-var debug = require('debug')('nuxt:build')
+const _ = require('lodash')
+const debug = require('debug')('nuxt:build')
 debug.color = 2 // force green color
-var fs = require('fs')
-var parseArgs = require('minimist')
-var Nuxt = require('../')
-var chokidar = require('chokidar')
-var resolve = require('path').resolve
-var without = require('lodash').without
+const fs = require('fs')
+const parseArgs = require('minimist')
+const { Nuxt,Server } = require('../')
+const chokidar = require('chokidar')
+const resolve = require('path').resolve
+const without = require('lodash').without
 
-var argv = parseArgs(process.argv.slice(2), {
+const argv = parseArgs(process.argv.slice(2), {
   alias: {
     h: 'help',
     H: 'hostname',
@@ -48,8 +48,8 @@ if (argv.help) {
   process.exit(0)
 }
 
-var rootDir = resolve(argv._[0] || '.')
-var nuxtConfigFile = resolve(rootDir, argv['config-file'])
+const rootDir = resolve(argv._[0] || '.')
+const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
@@ -64,19 +64,19 @@ if (typeof options.rootDir !== 'string') {
 // Force development mode: add hot reloading and watching changes
 options.dev = true
 
-var nuxt = new Nuxt(options)
-var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
-var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-var server = new Nuxt.Server(nuxt).listen(port, host)
+const nuxt = new Nuxt(options)
+const port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
+const host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
+const server = new Server(nuxt).listen(port, host)
 
 listenOnConfigChanges(nuxt, server)
 
-function listenOnConfigChanges(nuxt, server) {
+function listenOnConfigChanges (nuxt, server) {
   // Listen on nuxt.config.js changes
-  var build = _.debounce(() => {
+  const build = _.debounce(() => {
     debug('[nuxt.config.js] changed')
     delete require.cache[nuxtConfigFile]
-    var options = {}
+    const options = {}
     if (fs.existsSync(nuxtConfigFile)) {
       try {
         options = require(nuxtConfigFile)
@@ -88,7 +88,7 @@ function listenOnConfigChanges(nuxt, server) {
     nuxt.close()
       .then(() => {
         debug('Rebuilding the app...')
-        var nuxt = new Nuxt(options)
+        const nuxt = new Nuxt(options)
         server.nuxt = nuxt
         return nuxt.ready()
       })
diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index e9607b174a..ad7d4da2e0 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -3,12 +3,14 @@
 // Show logs
 process.env.DEBUG = 'nuxt:*'
 
-var fs = require('fs')
-var parseArgs = require('minimist')
-var Nuxt = require('../')
-var resolve = require('path').resolve
+const fs = require('fs')
+const parseArgs = require('minimist')
+const debug = require('debug')('nuxt:generate')
 
-var argv = parseArgs(process.argv.slice(2), {
+const { Nuxt } = require('../')
+const resolve = require('path').resolve
+
+const argv = parseArgs(process.argv.slice(2), {
   alias: {
     h: 'help',
     c: 'config-file'
@@ -33,8 +35,8 @@ if (argv.help) {
   process.exit(0)
 }
 
-var rootDir = resolve(argv._[0] || '.')
-var nuxtConfigFile = resolve(rootDir, argv['config-file'])
+const rootDir = resolve(argv._[0] || '.')
+const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
@@ -49,14 +51,14 @@ if (typeof options.rootDir !== 'string') {
 options.dev = false // Force production mode (no webpack middleware called)
 options.runBuild = true // Force doing production build before init
 
-console.log('[nuxt] Generating...') // eslint-disable-line no-console
-var nuxt = module.exports = new Nuxt(options)
+debug('Generating...')
+const nuxt = module.exports = new Nuxt(options)
 nuxt.generate()
-.then(() => {
-  console.log('[nuxt] Generate done') // eslint-disable-line no-console
-  process.exit(0)
-})
-.catch((err) => {
-  console.error(err) // eslint-disable-line no-console
-  process.exit(1)
-})
+  .then(() => {
+    debug('Generate done')
+    process.exit(0)
+  })
+  .catch((err) => {
+    console.error(err) // eslint-disable-line no-console
+    process.exit(1)
+  })
diff --git a/bin/nuxt-start b/bin/nuxt-start
index bbdb5df1ae..34c73f6a72 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
-var fs = require('fs')
-var parseArgs = require('minimist')
-var Nuxt = require('../')
-var resolve = require('path').resolve
+const fs = require('fs')
+const parseArgs = require('minimist')
+const { Nuxt, Server } = require('../')
+const resolve = require('path').resolve
 
-var argv = parseArgs(process.argv.slice(2), {
+const argv = parseArgs(process.argv.slice(2), {
   alias: {
     h: 'help',
     H: 'hostname',
@@ -40,8 +40,8 @@ if (argv.help) {
   process.exit(0)
 }
 
-var rootDir = resolve(argv._[0] || '.')
-var nuxtConfigFile = resolve(rootDir, argv['config-file'])
+const rootDir = resolve(argv._[0] || '.')
+const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
 var options = {}
 if (fs.existsSync(nuxtConfigFile)) {
@@ -55,9 +55,9 @@ if (typeof options.rootDir !== 'string') {
 }
 options.dev = false // Force production mode (no webpack middleware called)
 
-var nuxt = new Nuxt(options)
-var port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
-var host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-new Nuxt.Server(nuxt).listen(port, host)
+const nuxt = new Nuxt(options)
+const port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
+const host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
+new Server(nuxt).listen(port, host)
 
 module.exports = nuxt
diff --git a/build/rollup.config.js b/build/rollup.config.js
new file mode 100755
index 0000000000..75e03d0074
--- /dev/null
+++ b/build/rollup.config.js
@@ -0,0 +1,106 @@
+// Some parts brought from https://github.com/vuejs/vue/blob/dev/build/config.js
+const { resolve } = require('path')
+const rollupBabel = require('rollup-plugin-babel')
+const rollupAlias = require('rollup-plugin-alias')
+const rollupCommonJS = require('rollup-plugin-commonjs')
+const rollupReplace = require('rollup-plugin-replace')
+const rollupResolve = require('rollup-plugin-node-resolve')
+const packageJson = require('../package.json')
+
+const dependencies = Object.keys(packageJson.dependencies)
+const version = packageJson.version || process.env.VERSION
+
+// -----------------------------
+// Banner
+// -----------------------------
+const banner =
+  '/*!\n' +
+  ' * Nuxt.js v' + version + '\n' +
+  ' * Released under the MIT License.\n' +
+  ' */'
+
+
+// -----------------------------
+// Aliases
+// -----------------------------
+const rootDir = resolve(__dirname, '..')
+const srcDir = resolve(rootDir, 'src')
+const distDir = resolve(rootDir, 'dist')
+
+const aliases = {
+  core: resolve(srcDir, 'core/index.js'),
+  builder: resolve(srcDir, 'builder/index.js'),
+  common: resolve(srcDir, 'common/index.js'),
+  utils: resolve(srcDir, 'common/utils.js'),
+  app: resolve(srcDir, 'app'),
+}
+
+// -----------------------------
+// Builds
+// -----------------------------
+const builds = {
+  core: {
+    entry: resolve(srcDir, 'core/index.js'),
+    dest: resolve(distDir, 'core.js')
+  },
+  builder: {
+    entry: resolve(srcDir, 'builder/index.js'),
+    dest: resolve(distDir, 'builder.js')
+  }
+}
+
+// -----------------------------
+// Default config
+// -----------------------------
+function genConfig (opts) {
+  const config = {
+    entry: opts.entry,
+    dest: opts.dest,
+    external: ['fs', 'path'].concat(dependencies, opts.external),
+    format: opts.format || 'cjs',
+    banner: opts.banner || banner,
+    moduleName: opts.moduleName || 'Nuxt',
+    sourceMap: true,
+    plugins: [
+      rollupAlias(Object.assign({
+        resolve: ['.js', '.json', '.jsx', '.ts']
+      }, aliases, opts.alias)),
+
+      rollupCommonJS(),
+
+      rollupResolve({ jsnext: true }),
+
+      rollupBabel(Object.assign({
+        exclude: 'node_modules/**',
+        runtimeHelpers: true,
+        plugins: [
+          ['transform-runtime', { 'helpers': false, 'polyfill': false }],
+          'transform-async-to-generator',
+          'array-includes'
+        ],
+        presets: [
+          'babel-preset-es2015-rollup'
+        ]
+      }, opts.babel)),
+
+      rollupReplace({
+        __VERSION__: version
+      })
+    ].concat(opts.plugins || [])
+  }
+
+  if (opts.env) {
+    config.plugins.push(rollupReplace({
+      'process.env.NODE_ENV': JSON.stringify(opts.env)
+    }))
+  }
+
+  return config
+}
+
+if (process.env.TARGET) {
+  module.exports = genConfig(builds[process.env.TARGET])
+} else {
+  exports.getBuild = name => genConfig(builds[name])
+  exports.getAllBuilds = () => Object.keys(builds).map(name => genConfig(builds[name]))
+}
diff --git a/index.js b/index.js
index 8e7487a896..fa3a31ff19 100644
--- a/index.js
+++ b/index.js
@@ -4,8 +4,24 @@
  * Released under the MIT License.
  */
 
+const path = require('path')
+
 process.noDeprecation = true
 
-var Nuxt = require('./dist/nuxt.js')
+// Node Source Map Support
+// https://github.com/evanw/node-source-map-support
+require('source-map-support').install();
 
-module.exports = Nuxt.default ? Nuxt.default : Nuxt
+const Core = require('./dist/core.js')
+
+// ------------------------------------------------------------------
+// Polyfill Builder into Core
+const Builder = require('./dist/builder')
+// Use special env flag to specify app dir without modify builder
+if (!process.env.NUXT_APP_TEMPALTE_DIR) {
+  process.env.NUXT_APP_TEMPALTE_DIR = path.resolve(__dirname, 'app')
+}
+Object.assign(Core, Builder)
+// ------------------------------------------------------------------
+
+module.exports = Core.default ? Core.default : Core
diff --git a/package.json b/package.json
index af39026350..53fefac7d8 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,11 @@
     "test": "npm run lint && nyc ava --verbose --serial test/",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.vue bin lib pages test/*.js --ignore-pattern lib/app",
-    "build": "webpack",
-    "watch": "webpack --watch",
+    "build": "npm run build:core && npm run build:builder",
+    "build:core": "rollup -c build/rollup.config.js --environment TARGET:core",
+    "watch": "npm run build:core -- -w",
+    "build:builder": "rollup -c build/rollup.config.js --environment TARGET:builder",
+    "watch:builder": "npm run build:builder -- -w",
     "precommit": "npm run lint",
     "prepublish": "npm run build",
     "postinstall": "opencollective postinstall"
@@ -63,6 +66,7 @@
     "babel-loader": "^7.0.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-vue-app": "^1.2.0",
+    "chalk": "^1.1.3",
     "chokidar": "^1.7.0",
     "compression": "^1.6.2",
     "connect": "^3.6.2",
@@ -89,6 +93,7 @@
     "script-ext-html-webpack-plugin": "^1.8.1",
     "serialize-javascript": "^1.3.0",
     "serve-static": "^1.12.3",
+    "source-map-support": "^0.4.15",
     "tapable": "^0.2.6",
     "tappable": "^1.0.1",
     "url-loader": "^0.5.9",
@@ -112,6 +117,7 @@
     "babel-plugin-array-includes": "^2.0.3",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-es2015-rollup": "^3.0.0",
     "babel-preset-stage-2": "^6.24.1",
     "codecov": "^2.2.0",
     "copy-webpack-plugin": "^4.0.1",
@@ -125,10 +131,19 @@
     "finalhandler": "^1.0.3",
     "jsdom": "^11.0.0",
     "json-loader": "^0.5.4",
+    "lerna": "2.0.0-rc.5",
     "nyc": "^11.0.2",
     "request": "^2.81.0",
     "request-promise-native": "^1.0.4",
-    "std-mocks": "^1.0.1"
+    "rollup": "^0.43.0",
+    "rollup-plugin-alias": "^1.3.1",
+    "rollup-plugin-babel": "^2.7.1",
+    "rollup-plugin-commonjs": "^8.0.2",
+    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-plugin-replace": "^1.1.1",
+    "rollup-watch": "^4.0.0",
+    "std-mocks": "^1.0.1",
+    "uglify-js": "^3.0.17"
   },
   "collective": {
     "type": "opencollective",
diff --git a/lib/builder.js b/src/builder/builder.js
similarity index 95%
rename from lib/builder.js
rename to src/builder/builder.js
index 2f9251b8c7..7667d03448 100644
--- a/lib/builder.js
+++ b/src/builder/builder.js
@@ -8,7 +8,9 @@ import serialize from 'serialize-javascript'
 import { join, resolve, basename, dirname } from 'path'
 import Tapable from 'tappable'
 import MFS from 'memory-fs'
-import { r, wp, createRoutes, parallel } from './utils'
+import webpackDevMiddleware from 'webpack-dev-middleware'
+import webpackHotMiddleware from 'webpack-hot-middleware'
+import { r, wp, createRoutes, parallel } from 'utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
 
@@ -119,7 +121,9 @@ export default class Builder extends Tapable {
       'components/nuxt-loading.vue',
       'components/nuxt-child.js',
       'components/nuxt-link.js',
-      'components/nuxt.vue'
+      'components/nuxt.vue',
+      'views/app.template.html',
+      'views/error.html'
     ]
     const templateVars = {
       options: this.options,
@@ -199,7 +203,9 @@ export default class Builder extends Tapable {
       const customFileExists = fs.existsSync(customPath)
 
       return {
-        src: customFileExists ? customPath : r(__dirname, 'app', file),
+        src: customFileExists
+          ? customPath
+          : r(__dirname, '../app', file), // Relative to dist
         dst: file,
         custom: customFileExists
       }
@@ -325,7 +331,10 @@ export default class Builder extends Tapable {
 
     // Run after each compile
     this.compiler.plugin('done', stats => {
-      console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
+      // Don't reload failed builds
+      if (stats.hasErrors() || stats.hasWarnings()) {
+        return
+      }
       // Reload renderer if available
       if (this.nuxt.renderer) {
         this.nuxt.renderer.loadResources(mfs)
@@ -336,7 +345,7 @@ export default class Builder extends Tapable {
     debug('Adding webpack middleware...')
 
     // Create webpack dev middleware
-    this.webpackDevMiddleware = pify(require('webpack-dev-middleware')(this.compiler.client, {
+    this.webpackDevMiddleware = pify(webpackDevMiddleware(this.compiler.client, {
       publicPath: this.options.build.publicPath,
       stats: this.webpackStats,
       noInfo: true,
@@ -344,7 +353,7 @@ export default class Builder extends Tapable {
       watchOptions: this.options.watchers.webpack
     }))
 
-    this.webpackHotMiddleware = pify(require('webpack-hot-middleware')(this.compiler.client, {
+    this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, {
       log: false,
       heartbeat: 2500
     }))
diff --git a/lib/generator.js b/src/builder/generator.js
similarity index 98%
rename from lib/generator.js
rename to src/builder/generator.js
index e92907d32e..4095fd4b6f 100644
--- a/lib/generator.js
+++ b/src/builder/generator.js
@@ -4,7 +4,7 @@ import _ from 'lodash'
 import { resolve, join, dirname, sep } from 'path'
 import { minify } from 'html-minifier'
 import Tapable from 'tappable'
-import { isUrl, promisifyRoute, waitFor, flatRoutes } from './utils'
+import { isUrl, promisifyRoute, waitFor, flatRoutes } from 'utils'
 
 const debug = require('debug')('nuxt:generate')
 const copy = pify(fs.copy)
diff --git a/src/builder/index.js b/src/builder/index.js
new file mode 100755
index 0000000000..34547d0c2a
--- /dev/null
+++ b/src/builder/index.js
@@ -0,0 +1,7 @@
+import Builder from './builder'
+import Generator from './generator'
+
+export default {
+  Builder,
+  Generator
+}
diff --git a/lib/webpack/base.config.js b/src/builder/webpack/base.config.js
similarity index 99%
rename from lib/webpack/base.config.js
rename to src/builder/webpack/base.config.js
index 25b56c8206..8fb8dbc652 100644
--- a/lib/webpack/base.config.js
+++ b/src/builder/webpack/base.config.js
@@ -2,7 +2,7 @@ import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import { defaults, cloneDeep } from 'lodash'
 import { join, resolve } from 'path'
 import webpack from 'webpack'
-import { isUrl, urlJoin } from '../utils'
+import { isUrl, urlJoin } from 'utils'
 import vueLoaderConfig from './vue-loader.config'
 import { styleLoader, extractStyles } from './helpers'
 
diff --git a/lib/webpack/client.config.js b/src/builder/webpack/client.config.js
similarity index 100%
rename from lib/webpack/client.config.js
rename to src/builder/webpack/client.config.js
diff --git a/lib/webpack/helpers.js b/src/builder/webpack/helpers.js
similarity index 100%
rename from lib/webpack/helpers.js
rename to src/builder/webpack/helpers.js
diff --git a/lib/webpack/server.config.js b/src/builder/webpack/server.config.js
similarity index 100%
rename from lib/webpack/server.config.js
rename to src/builder/webpack/server.config.js
diff --git a/lib/webpack/vue-loader.config.js b/src/builder/webpack/vue-loader.config.js
similarity index 100%
rename from lib/webpack/vue-loader.config.js
rename to src/builder/webpack/vue-loader.config.js
diff --git a/lib/utils.js b/src/common/utils.js
similarity index 100%
rename from lib/utils.js
rename to src/common/utils.js
diff --git a/src/core/index.js b/src/core/index.js
new file mode 100755
index 0000000000..19e55a107e
--- /dev/null
+++ b/src/core/index.js
@@ -0,0 +1,15 @@
+import Options from './options'
+import ModuleContainer from './module'
+import Nuxt from './nuxt'
+import Renderer from './renderer'
+import Server from './server'
+import * as Utils from 'utils'
+
+export default {
+  Options,
+  ModuleContainer,
+  Nuxt,
+  Renderer,
+  Server,
+  Utils
+}
diff --git a/lib/module-container.js b/src/core/module.js
similarity index 96%
rename from lib/module-container.js
rename to src/core/module.js
index 4f13c3b9c9..e25ae67cd5 100755
--- a/lib/module-container.js
+++ b/src/core/module.js
@@ -3,7 +3,7 @@ import fs from 'fs'
 import { uniq } from 'lodash'
 import hash from 'hash-sum'
 import Tapable from 'tappable'
-import { chainFn, sequence } from './utils'
+import { chainFn, sequence } from 'utils'
 
 const debug = require('debug')('nuxt:module')
 
@@ -102,8 +102,7 @@ export default class ModuleContainer extends Tapable {
       if (module.indexOf('~') === 0 || module.indexOf('./') === 0) {
         module = path.join(this.options.srcDir, module.substr(1))
       }
-      // eslint-disable-next-line no-eval
-      module = eval('require')(module)
+      module = require(module)
     }
 
     // Validate module
diff --git a/lib/nuxt.js b/src/core/nuxt.js
similarity index 81%
rename from lib/nuxt.js
rename to src/core/nuxt.js
index 6ffc424243..b07016894c 100644
--- a/lib/nuxt.js
+++ b/src/core/nuxt.js
@@ -1,10 +1,9 @@
 import Tapable from 'tappable'
 import chalk from 'chalk'
-import * as Utils from './utils'
+import ModuleContainer from './module'
 import Renderer from './renderer'
-import ModuleContainer from './module-container'
-import Server from './server'
-import defaults from './defaults'
+import Options from './options'
+import Core from './index'
 
 const defaultHost = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
 const defaultPort = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
@@ -13,14 +12,14 @@ export default class Nuxt extends Tapable {
   constructor (_options = {}) {
     super()
 
-    this.options = defaults(_options)
+    this.options = Options(_options)
 
     this.initialized = false
     this.errorHandler = this.errorHandler.bind(this)
 
     // Create instance of core components
-    this.moduleContainer = new Nuxt.ModuleContainer(this)
-    this.renderer = new Nuxt.Renderer(this)
+    this.moduleContainer = new ModuleContainer(this)
+    this.renderer = new Renderer(this)
 
     // Backward compatibility
     this.render = this.renderer.render.bind(this.renderer)
@@ -60,8 +59,7 @@ export default class Nuxt extends Tapable {
     if (this._builder) {
       return this._builder
     }
-    const Builder = require('./builder').default
-    this._builder = new Builder(this)
+    this._builder = new Core.Builder(this)
     return this._builder
   }
 
@@ -69,8 +67,7 @@ export default class Nuxt extends Tapable {
     if (this._generator) {
       return this._generator
     }
-    const Generator = require('./generator').default
-    this._generator = new Generator(this)
+    this._generator = new Core.Generator(this)
     return this._generator
   }
 
@@ -93,6 +90,7 @@ export default class Nuxt extends Tapable {
     process.exit(1)
   }
 
+  // Both Renderer & Server depend on this method
   serverReady ({ host = defaultHost, port = defaultPort } = {}) {
     let _host = host === '0.0.0.0' ? 'localhost' : host
 
@@ -113,13 +111,7 @@ export default class Nuxt extends Tapable {
     this.initialized = false
 
     if (typeof callback === 'function') {
-      callback()
+      await callback()
     }
   }
 }
-
-// Add core components to Nuxt class
-Nuxt.Utils = Utils
-Nuxt.Renderer = Renderer
-Nuxt.ModuleContainer = ModuleContainer
-Nuxt.Server = Server
diff --git a/lib/defaults.js b/src/core/options.js
similarity index 95%
rename from lib/defaults.js
rename to src/core/options.js
index 1a2195cc73..42e2e5e29a 100755
--- a/lib/defaults.js
+++ b/src/core/options.js
@@ -1,9 +1,9 @@
 import _ from 'lodash'
 import { join, resolve } from 'path'
 import { existsSync } from 'fs'
-import { isUrl } from './utils'
+import { isUrl } from 'utils'
 
-export default function defaults (_options) {
+export default function Options (_options) {
   // Clone options to prevent unwanted side-effects
   const options = Object.assign({}, _options)
 
@@ -30,7 +30,7 @@ export default function defaults (_options) {
   options.buildDir = join(options.rootDir, options.buildDir)
 
   // If app.html is defined, set the template path to the user template
-  options.appTemplatePath = resolve(__dirname, 'views/app.template.html')
+  options.appTemplatePath = resolve(options.buildDir, 'views/app.template.html')
   if (existsSync(join(options.srcDir, 'app.html'))) {
     options.appTemplatePath = join(options.srcDir, 'app.html')
   }
diff --git a/lib/renderer.js b/src/core/renderer.js
similarity index 96%
rename from lib/renderer.js
rename to src/core/renderer.js
index 12b5f74f46..6388293758 100644
--- a/lib/renderer.js
+++ b/src/core/renderer.js
@@ -10,7 +10,7 @@ import _ from 'lodash'
 import { resolve, join } from 'path'
 import fs from 'fs-extra'
 import { createBundleRenderer } from 'vue-server-renderer'
-import { getContext, setAnsiColors, encodeHtml } from './utils'
+import { getContext, setAnsiColors, encodeHtml } from 'utils'
 
 const debug = require('debug')('nuxt:render')
 debug.color = 4 // Force blue color
@@ -36,7 +36,7 @@ export default class Renderer extends Tapable {
       clientManifest: null,
       serverBundle: null,
       appTemplate: null,
-      errorTemplate: parseTemplate(fs.readFileSync(resolve(__dirname, 'views', 'error.html'), 'utf8'))
+      errorTemplate: '<pre>{{ stack }}</pre>' // Will be loaded on ready
     }
 
     // Initialize
@@ -70,6 +70,11 @@ export default class Renderer extends Tapable {
       this.gzipMiddleware = pify(compression(this.options.render.gzip))
     }
 
+    const errorTemplatePath = resolve(this.options.buildDir, 'views/error.html')
+    if (fs.existsSync(errorTemplatePath)) {
+      this.resources.errorTemplate = parseTemplate(fs.readFileSync(errorTemplatePath, 'utf8'))
+    }
+
     // Load resources from fs
     if (!this.options.dev) {
       await this.loadResources()
@@ -140,7 +145,9 @@ export default class Renderer extends Tapable {
     // Promisify renderToString
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)
 
-    this.nuxt.serverReady()
+    if (!this.options.runBuild) {
+      this.nuxt.serverReady()
+    }
   }
 
   async render (req, res) {
diff --git a/lib/server.js b/src/core/server.js
similarity index 96%
rename from lib/server.js
rename to src/core/server.js
index 661a3e7a1a..fb094e0f8c 100644
--- a/lib/server.js
+++ b/src/core/server.js
@@ -46,8 +46,7 @@ class Server {
       if (src.indexOf('~') === 0 || src.indexOf('./') === 0) {
         src = path.join(this.nuxt.options.srcDir, src.substr(1))
       }
-      // eslint-disable-next-line no-eval
-      m = eval('require')(src)
+      m = require(src)
     }
     if (m instanceof Function) {
       this.app.use(m)
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 946eb0d6db..0000000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// Until babel-loader 7 is released
-process.noDeprecation = true
-
-var nodeExternals = require('webpack-node-externals')
-var ProgressBarPlugin = require('progress-bar-webpack-plugin')
-var CopyWebpackPlugin = require('copy-webpack-plugin')
-var resolve = require('path').resolve
-var r = function (p) { return resolve(__dirname, p) }
-
-module.exports = {
-  target: 'node',
-  node: {
-    __dirname: false,
-    __filename: false
-  },
-  devtool: 'source-map',
-  entry: r('./lib/nuxt.js'),
-  output: {
-    path: r('./dist'),
-    filename: 'nuxt.js',
-    libraryTarget: 'commonjs2'
-  },
-  externals: [
-    nodeExternals()
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.json$/,
-        loader: 'json-loader'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-        query: {
-          plugins: [
-            'transform-async-to-generator',
-            'array-includes',
-            'transform-runtime'
-          ],
-          presets: [
-            ['es2015', { modules: false }],
-            'stage-2'
-          ],
-          cacheDirectory: true
-        }
-      }
-    ]
-  },
-  plugins: [
-    new CopyWebpackPlugin([
-      { from: 'lib/app', to: 'app' },
-      { from: 'lib/views', to: 'views' }
-    ]),
-    new ProgressBarPlugin()
-  ]
-}
diff --git a/yarn.lock b/yarn.lock
index c44bae33a7..9c7c9a3089 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -41,6 +41,13 @@
   version "6.0.78"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
 
+JSONStream@^1.0.4:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abab@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -78,7 +85,7 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.3, acorn@^4.0.4:
+acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
@@ -86,6 +93,10 @@ acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
 
+add-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
+
 ajv-keywords@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
@@ -224,6 +235,10 @@ array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
 
+array-ify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -272,7 +287,7 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^1.4.0:
+async@^1.4.0, async@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -421,7 +436,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.17.0, babel-core@^6.24.1:
+babel-core@6, babel-core@^6.17.0, babel-core@^6.24.1:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
@@ -625,6 +640,12 @@ babel-plugin-espower@^2.3.2:
     espurify "^1.6.0"
     estraverse "^4.1.1"
 
+babel-plugin-external-helpers@^6.18.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 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"
@@ -718,7 +739,7 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es20
     babel-types "^6.24.1"
     lodash "^4.2.0"
 
-babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
+babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1, babel-plugin-transform-es2015-classes@^6.9.0:
   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:
@@ -947,7 +968,15 @@ babel-preset-env@^1.2.1:
     invariant "^2.2.2"
     semver "^5.3.0"
 
-babel-preset-es2015@^6.24.1:
+babel-preset-es2015-rollup@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015-rollup/-/babel-preset-es2015-rollup-3.0.0.tgz#854b63ecde2ee98cac40e882f67bfcf185b1f24a"
+  dependencies:
+    babel-plugin-external-helpers "^6.18.0"
+    babel-preset-es2015 "^6.3.13"
+    require-relative "^0.8.7"
+
+babel-preset-es2015@^6.24.1, babel-preset-es2015@^6.3.13:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
   dependencies:
@@ -1151,6 +1180,12 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
+browser-resolve@^1.11.0:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  dependencies:
+    resolve "1.1.7"
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
@@ -1232,7 +1267,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1240,6 +1275,10 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
+byline@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+
 bytes@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
@@ -1453,6 +1492,13 @@ clone@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
+cmd-shim@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+  dependencies:
+    graceful-fs "^4.1.2"
+    mkdirp "~0.5.0"
+
 co-with-promise@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"
@@ -1523,12 +1569,23 @@ colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
+columnify@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  dependencies:
+    strip-ansi "^3.0.0"
+    wcwidth "^1.0.0"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
+command-join@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
+
 commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -1543,6 +1600,13 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
+compare-func@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  dependencies:
+    array-ify "^1.0.0"
+    dot-prop "^3.0.0"
+
 compressible@~2.0.8:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
@@ -1564,7 +1628,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.4.10, concat-stream@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1635,6 +1699,152 @@ content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
+conventional-changelog-angular@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.3.4.tgz#7d7cdfbd358948312904d02229a61fd6075cf455"
+  dependencies:
+    compare-func "^1.3.1"
+    github-url-from-git "^1.4.0"
+    q "^1.4.1"
+
+conventional-changelog-atom@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.0.tgz#67a47c66a42b2f8909ef1587c9989ae1de730b92"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-cli@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.1.tgz#1cd5a9dbae25ffb5ffe67afef1e136eaceefd2d5"
+  dependencies:
+    add-stream "^1.0.0"
+    conventional-changelog "^1.1.3"
+    lodash "^4.1.0"
+    meow "^3.7.0"
+    tempfile "^1.1.1"
+
+conventional-changelog-codemirror@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz#7577a591dbf9b538e7a150a7ee62f65a2872b334"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-core@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz#de5dfbc091847656508d4a389e35c9a1bc49e7f4"
+  dependencies:
+    conventional-changelog-writer "^1.1.0"
+    conventional-commits-parser "^1.0.0"
+    dateformat "^1.0.12"
+    get-pkg-repo "^1.0.0"
+    git-raw-commits "^1.2.0"
+    git-remote-origin-url "^2.0.0"
+    git-semver-tags "^1.2.0"
+    lodash "^4.0.0"
+    normalize-package-data "^2.3.5"
+    q "^1.4.1"
+    read-pkg "^1.1.0"
+    read-pkg-up "^1.0.1"
+    through2 "^2.0.0"
+
+conventional-changelog-ember@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz#8b7355419f5127493c4c562473ab2fc792f1c2b6"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-eslint@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz#a52411e999e0501ce500b856b0a643d0330907e2"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-express@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz#55c6c841c811962036c037bdbd964a54ae310fce"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-jquery@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-jscs@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-jshint@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz#00cab8e9a3317487abd94c4d84671342918d2a07"
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.4.1"
+
+conventional-changelog-writer@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz#3f4cb4d003ebb56989d30d345893b52a43639c8e"
+  dependencies:
+    compare-func "^1.3.1"
+    conventional-commits-filter "^1.0.0"
+    dateformat "^1.0.11"
+    handlebars "^4.0.2"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.0.0"
+    meow "^3.3.0"
+    semver "^5.0.1"
+    split "^1.0.0"
+    through2 "^2.0.0"
+
+conventional-changelog@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.4.tgz#108bc750c2a317e200e2f9b413caaa1f8c7efa3b"
+  dependencies:
+    conventional-changelog-angular "^1.3.4"
+    conventional-changelog-atom "^0.1.0"
+    conventional-changelog-codemirror "^0.1.0"
+    conventional-changelog-core "^1.9.0"
+    conventional-changelog-ember "^0.2.6"
+    conventional-changelog-eslint "^0.1.0"
+    conventional-changelog-express "^0.1.0"
+    conventional-changelog-jquery "^0.1.0"
+    conventional-changelog-jscs "^0.1.0"
+    conventional-changelog-jshint "^0.1.0"
+
+conventional-commits-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz#6fc2a659372bc3f2339cf9ffff7e1b0344b93039"
+  dependencies:
+    is-subset "^0.1.1"
+    modify-values "^1.0.0"
+
+conventional-commits-parser@^1.0.0, conventional-commits-parser@^1.0.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz#e327b53194e1a7ad5dc63479ee9099a52b024865"
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
+    lodash "^4.2.1"
+    meow "^3.3.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+    trim-off-newlines "^1.0.0"
+
+conventional-recommended-bump@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.0.0.tgz#6d303a27837ae938b7c68c8ddeed34559b4b0789"
+  dependencies:
+    concat-stream "^1.4.10"
+    conventional-commits-filter "^1.0.0"
+    conventional-commits-parser "^1.0.1"
+    git-raw-commits "^1.2.0"
+    git-semver-tags "^1.2.0"
+    meow "^3.3.0"
+    object-assign "^4.0.1"
+
 convert-source-map@^1.1.0, convert-source-map@^1.2.0, convert-source-map@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -1738,6 +1948,14 @@ cross-spawn@^4, cross-spawn@^4.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1877,6 +2095,12 @@ d@1:
   dependencies:
     es5-ext "^0.10.9"
 
+dargs@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  dependencies:
+    number-is-nan "^1.0.0"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -1891,6 +2115,13 @@ date-time@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
 
+dateformat@^1.0.11, dateformat@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
+  dependencies:
+    get-stdin "^4.0.1"
+    meow "^3.3.0"
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -1921,6 +2152,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"
 
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+
 deep-equal@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -1943,6 +2178,12 @@ default-require-extensions@^1.0.0:
   dependencies:
     strip-bom "^2.0.0"
 
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  dependencies:
+    clone "^1.0.2"
+
 define-properties@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
@@ -2079,6 +2320,12 @@ domutils@1.5.1, domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+dot-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  dependencies:
+    is-obj "^1.0.0"
+
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
@@ -2428,6 +2675,14 @@ estraverse@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
 
+estree-walker@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
+
+estree-walker@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -2476,6 +2731,18 @@ execa@^0.5.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -2773,7 +3040,17 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
-get-port@^3.0.0:
+get-pkg-repo@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.3.0.tgz#43c6b4c048b75dd604fc5388edecde557f6335df"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    meow "^3.3.0"
+    normalize-package-data "^2.3.0"
+    parse-github-repo-url "^1.3.0"
+    through2 "^2.0.0"
+
+get-port@^3.0.0, get-port@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e"
 
@@ -2798,6 +3075,40 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+git-raw-commits@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.2.0.tgz#0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c"
+  dependencies:
+    dargs "^4.0.1"
+    lodash.template "^4.0.2"
+    meow "^3.3.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+
+git-remote-origin-url@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  dependencies:
+    gitconfiglocal "^1.0.0"
+    pify "^2.3.0"
+
+git-semver-tags@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.0.tgz#b31fd02c8ab578bd6c9b5cacca5e1c64c1177ac1"
+  dependencies:
+    meow "^3.3.0"
+    semver "^5.0.1"
+
+gitconfiglocal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  dependencies:
+    ini "^1.3.2"
+
+github-url-from-git@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/github-url-from-git/-/github-url-from-git-1.5.0.tgz#f985fedcc0a9aa579dc88d7aff068d55cc6251a0"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -2847,7 +3158,7 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^6.0.0:
+globby@^6.0.0, globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
@@ -2887,7 +3198,7 @@ gzip-size@^3.0.0:
   dependencies:
     duplexer "^0.1.1"
 
-handlebars@^4.0.3:
+handlebars@^4.0.2, handlebars@^4.0.3:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
@@ -3170,7 +3481,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.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
@@ -3238,7 +3549,7 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-ci@^1.0.7:
+is-ci@^1.0.10, is-ci@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies:
@@ -3306,6 +3617,10 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+
 is-my-json-valid@^2.12.4, is-my-json-valid@^2.16.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
@@ -3395,12 +3710,22 @@ is-stream@^1.0.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"
 
+is-subset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
   dependencies:
     html-comment-regex "^1.1.0"
 
+is-text-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  dependencies:
+    text-extensions "^1.0.0"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -3634,7 +3959,7 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@~5.0.1:
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
@@ -3658,6 +3983,10 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -3711,6 +4040,46 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+lerna@2.0.0-rc.5:
+  version "2.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.0.0-rc.5.tgz#b59d168caaac6e3443078c1bce194208c9aa3090"
+  dependencies:
+    async "^1.5.0"
+    chalk "^1.1.1"
+    cmd-shim "^2.0.2"
+    columnify "^1.5.4"
+    command-join "^2.0.0"
+    conventional-changelog-cli "^1.3.1"
+    conventional-recommended-bump "^1.0.0"
+    dedent "^0.7.0"
+    execa "^0.6.3"
+    find-up "^2.1.0"
+    fs-extra "^3.0.1"
+    get-port "^3.1.0"
+    glob "^7.1.2"
+    globby "^6.1.0"
+    graceful-fs "^4.1.11"
+    inquirer "^3.0.6"
+    is-ci "^1.0.10"
+    load-json-file "^2.0.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    npmlog "^4.1.0"
+    p-finally "^1.0.0"
+    path-exists "^3.0.0"
+    read-cmd-shim "^1.0.1"
+    read-pkg "^2.0.0"
+    rimraf "^2.6.1"
+    safe-buffer "^5.0.1"
+    semver "^5.1.0"
+    signal-exit "^3.0.2"
+    strong-log-transformer "^1.0.6"
+    temp-write "^3.3.0"
+    write-file-atomic "^2.1.0"
+    write-json-file "^2.1.0"
+    write-pkg "^3.0.1"
+    yargs "^8.0.1"
+
 leven@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
@@ -3821,7 +4190,7 @@ lodash.merge@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
-lodash.template@^4.4.0:
+lodash.template@^4.0.2, lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
   dependencies:
@@ -3838,7 +4207,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -3884,6 +4253,18 @@ macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
+magic-string@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.15.2.tgz#0681d7388741bbc3addaa65060992624c6c09e9c"
+  dependencies:
+    vlq "^0.2.1"
+
+magic-string@^0.19.0:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201"
+  dependencies:
+    vlq "^0.2.1"
+
 make-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
@@ -3937,7 +4318,7 @@ memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
+meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
@@ -4039,12 +4420,24 @@ minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
+minimist@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
+
 "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:
     minimist "0.0.8"
 
+modify-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
+
+moment@^2.6.0:
+  version "2.18.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -4162,7 +4555,7 @@ nopt@~3.0.1:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
   dependencies:
@@ -4202,7 +4595,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
+npmlog@^4.0.2, npmlog@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
   dependencies:
@@ -4464,6 +4857,10 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
+parse-github-repo-url@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz#286c53e2c9962e0641649ee3ac9508fca4dd959c"
+
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -4563,7 +4960,7 @@ performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
-pify@^2.0.0, pify@^2.3.0:
+pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -5007,7 +5404,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@^1.1.2:
+q@^1.1.2, q@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
@@ -5060,6 +5457,12 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+read-cmd-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
+  dependencies:
+    graceful-fs "^4.1.2"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -5074,7 +5477,7 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
-read-pkg@^1.0.0:
+read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
@@ -5323,6 +5726,10 @@ require-precompiled@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
 
+require-relative@0.8.7, require-relative@^0.8.7:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
+
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -5348,7 +5755,11 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.3:
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   dependencies:
@@ -5380,6 +5791,75 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
+rollup-plugin-alias@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-alias/-/rollup-plugin-alias-1.3.1.tgz#a9152fec4b6a6510dae93989517ca7853c32a6fa"
+  dependencies:
+    slash "^1.0.0"
+
+rollup-plugin-babel@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-2.7.1.tgz#16528197b0f938a1536f44683c7a93d573182f57"
+  dependencies:
+    babel-core "6"
+    babel-plugin-transform-es2015-classes "^6.9.0"
+    object-assign "^4.1.0"
+    rollup-pluginutils "^1.5.0"
+
+rollup-plugin-commonjs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.0.2.tgz#98b1589bfe32a6c0f67790b60c0b499972afed89"
+  dependencies:
+    acorn "^4.0.1"
+    estree-walker "^0.3.0"
+    magic-string "^0.19.0"
+    resolve "^1.1.7"
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-node-resolve@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
+  dependencies:
+    browser-resolve "^1.11.0"
+    builtin-modules "^1.1.0"
+    is-module "^1.0.0"
+    resolve "^1.1.6"
+
+rollup-plugin-replace@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-1.1.1.tgz#396315ded050a6ce43b9518a886a3f60efb1ea33"
+  dependencies:
+    magic-string "^0.15.2"
+    minimatch "^3.0.2"
+    rollup-pluginutils "^1.5.0"
+
+rollup-pluginutils@^1.5.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
+  dependencies:
+    estree-walker "^0.2.1"
+    minimatch "^3.0.2"
+
+rollup-pluginutils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+  dependencies:
+    estree-walker "^0.3.0"
+    micromatch "^2.3.11"
+
+rollup-watch@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.0.0.tgz#309051b9403b9e5445c5746c9eba9a466951d39e"
+  dependencies:
+    chokidar "^1.7.0"
+    require-relative "0.8.7"
+
+rollup@^0.43.0:
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.0.tgz#b36bdb75fa5e0823b6de8aee18ff7b5655520543"
+  dependencies:
+    source-map-support "^0.4.0"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -5420,7 +5900,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5477,6 +5957,16 @@ sha.js@^2.4.0, sha.js@^2.4.8:
   dependencies:
     inherits "^2.0.1"
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
 sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -5517,7 +6007,7 @@ 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-support@^0.4.0, source-map-support@^0.4.2:
+source-map-support@^0.4.0, source-map-support@^0.4.15, source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
@@ -5564,6 +6054,18 @@ 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"
 
+split2@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
+  dependencies:
+    through2 "^2.0.2"
+
+split@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/split/-/split-1.0.0.tgz#c4395ce683abcd254bc28fe1dabb6e5c27dcffae"
+  dependencies:
+    through "2"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -5700,6 +6202,16 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+strong-log-transformer@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
+  dependencies:
+    byline "^5.0.0"
+    duplexer "^0.1.1"
+    minimist "^0.1.0"
+    moment "^2.6.0"
+    through "^2.3.4"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -5777,6 +6289,28 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+
+temp-write@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.3.0.tgz#c1a96de2b36061342eae81f44ff001aec8f615a9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    is-stream "^1.1.0"
+    make-dir "^1.0.0"
+    pify "^2.2.0"
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
+tempfile@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
+  dependencies:
+    os-tmpdir "^1.0.0"
+    uuid "^2.0.1"
+
 term-size@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
@@ -5793,18 +6327,22 @@ test-exclude@^4.1.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
+text-extensions@^1.0.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.5.0.tgz#d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc"
+
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through2@^2.0.0:
+through2@^2.0.0, through2@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@^2.3.6:
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -5859,6 +6397,10 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
+trim-off-newlines@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -5902,9 +6444,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@3.0.x:
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.15.tgz#aacb323a846b234602270dead8a32441a8806f42"
+uglify-js@3.0.x, uglify-js@^3.0.17:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.17.tgz#d228cd55c2df9b3d2f53f147568cb4cc4a72cc06"
   dependencies:
     commander "~2.9.0"
     source-map "~0.5.1"
@@ -6037,7 +6579,11 @@ utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
-uuid@^3.0.0:
+uuid@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+
+uuid@^3.0.0, uuid@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
 
@@ -6062,6 +6608,10 @@ verror@1.3.6:
   dependencies:
     extsprintf "1.0.2"
 
+vlq@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -6155,6 +6705,12 @@ watchpack@^1.3.1:
     chokidar "^1.4.3"
     graceful-fs "^4.1.2"
 
+wcwidth@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  dependencies:
+    defaults "^1.0.3"
+
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -6309,7 +6865,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.0.0, write-file-atomic@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37"
   dependencies:
@@ -6317,7 +6873,7 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-write-json-file@^2.0.0:
+write-json-file@^2.0.0, write-json-file@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
   dependencies:
@@ -6335,6 +6891,13 @@ write-pkg@^2.0.0:
     sort-keys "^1.1.2"
     write-json-file "^2.0.0"
 
+write-pkg@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.0.1.tgz#f95245805be6f6a4eb1d6c31c43b57226815e6e3"
+  dependencies:
+    sort-keys "^1.1.2"
+    write-json-file "^2.0.0"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"

From 45485f5b8ad4bc44da8b27df823b0ab073788fd6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 17:19:35 +0430
Subject: [PATCH 082/236] update tests

---
 test/basic.dev.test.js           | 8 +++++---
 test/basic.fail.generate.test.js | 2 +-
 test/basic.generate.test.js      | 2 +-
 test/basic.test.js               | 4 ++--
 test/children.test.js            | 4 ++--
 test/dynamic-routes.test.js      | 2 +-
 test/error.test.js               | 4 ++--
 test/index.test.js               | 3 +--
 test/module.test.js              | 4 ++--
 test/utils.test.js               | 2 +-
 test/with-config.test.js         | 4 ++--
 11 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index be75b6cac1..5ee3d73025 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -1,6 +1,8 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
+import { Nuxt, Server } from '../index.js'
+
 const port = 4001
 const url = (route) => 'http://localhost:' + port + route
 
@@ -9,14 +11,13 @@ let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
     dev: true
   }
   nuxt = new Nuxt(options)
   await nuxt.ready()
-  server = new Nuxt.Server(nuxt)
+  server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
 
@@ -38,5 +39,6 @@ test('/_nuxt/test.hot-update.json should returns empty html', async t => {
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
   server.close()
-  nuxt.close(() => {})
+  nuxt.close(() => {
+  })
 })
diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js
index b8861e8e0a..340bf4d253 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/basic.fail.generate.test.js
@@ -1,8 +1,8 @@
 import test from 'ava'
 import { resolve } from 'path'
+import { Nuxt } from '../index.js'
 
 test('Fail with routes() which throw an error', async t => {
-  const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
     dev: false,
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index cd270c13ac..e896360ad0 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -4,6 +4,7 @@ import http from 'http'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
+import { Nuxt } from '../index.js'
 
 const port = 4002
 const url = (route) => 'http://localhost:' + port + route
@@ -13,7 +14,6 @@ let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const rootDir = resolve(__dirname, 'fixtures/basic')
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
diff --git a/test/basic.test.js b/test/basic.test.js
index b29df1ead9..49a86d25c4 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -2,6 +2,7 @@ import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
 import stdMocks from 'std-mocks'
+import { Nuxt, Server } from '../index.js'
 
 const port = 4003
 const url = (route) => 'http://localhost:' + port + route
@@ -11,7 +12,6 @@ let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
     dev: false,
@@ -19,7 +19,7 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await nuxt.ready()
-  server = new Nuxt.Server(nuxt)
+  server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
 
diff --git a/test/children.test.js b/test/children.test.js
index 01786707c9..3424a5e15c 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -1,5 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
+import { Nuxt, Server } from '../index.js'
 
 const port = 4004
 // const url = (route) => 'http://localhost:' + port + route
@@ -9,7 +10,6 @@ let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/children'),
     dev: false,
@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await nuxt.ready()
-  server = new Nuxt.Server(nuxt)
+  server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
 
diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js
index b2256a9951..79618677cd 100644
--- a/test/dynamic-routes.test.js
+++ b/test/dynamic-routes.test.js
@@ -2,11 +2,11 @@ import test from 'ava'
 import { resolve } from 'path'
 import fs from 'fs'
 import pify from 'pify'
+import { Nuxt } from '../index.js'
 
 const readFile = pify(fs.readFile)
 
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const nuxt = new Nuxt({
     rootDir: resolve(__dirname, 'fixtures/dynamic-routes'),
     dev: false,
diff --git a/test/error.test.js b/test/error.test.js
index ab361c4d03..6f1cc7c8e3 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -1,5 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
+import { Nuxt, Server } from '../index.js'
 
 const port = 4005
 const url = (route) => 'http://localhost:' + port + route
@@ -9,7 +10,6 @@ let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const options = {
     rootDir: resolve(__dirname, 'fixtures/error'),
     dev: false,
@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await nuxt.ready()
-  server = new Nuxt.Server(nuxt)
+  server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
 
diff --git a/test/index.test.js b/test/index.test.js
index ae20a2ef74..b008b1ee04 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -1,7 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-
-const Nuxt = require('../')
+import { Nuxt } from '../index.js'
 
 test('Nuxt.js Class', t => {
   t.is(typeof Nuxt, 'function')
diff --git a/test/module.test.js b/test/module.test.js
index eca4d7bfea..331d42943f 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { resolve, normalize } from 'path'
 import rp from 'request-promise-native'
-import Nuxt from '..'
+import { Nuxt, Server } from '../index.js'
 
 const port = 4006
 const url = (route) => 'http://localhost:' + port + route
@@ -18,7 +18,7 @@ test.before('Init Nuxt.js', async t => {
   config.runBuild = true
   nuxt = new Nuxt(config)
   await nuxt.ready()
-  server = new Nuxt.Server(nuxt)
+  server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
 
diff --git a/test/utils.test.js b/test/utils.test.js
index acd0b20c18..de741554ac 100644
--- a/test/utils.test.js
+++ b/test/utils.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import ansiHTML from 'ansi-html'
-import { Utils } from '..'
+import { Utils } from '../index.js'
 
 test('encodeHtml', t => {
   const html = '<h1>Hello</h1>'
diff --git a/test/with-config.test.js b/test/with-config.test.js
index f621ca9f2d..def656d841 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -1,6 +1,7 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
+import { Nuxt, Server } from '../index.js'
 
 const port = 4007
 const url = (route) => 'http://localhost:' + port + route
@@ -10,7 +11,6 @@ let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
-  const Nuxt = require('../')
   const rootDir = resolve(__dirname, 'fixtures/with-config')
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
@@ -18,7 +18,7 @@ test.before('Init Nuxt.js', async t => {
   config.runBuild = true
   nuxt = new Nuxt(config)
   await nuxt.ready()
-  server = new Nuxt.Server(nuxt)
+  server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
 

From 8f2945111a2189b53419e84d18cecd790ef3bf9b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 17:34:42 +0430
Subject: [PATCH 083/236] use nuxtAppDir

---
 index.js                 | 11 +++++------
 src/builder/builder.js   |  4 ++--
 src/core/options.js      |  1 +
 test/with-config.test.js |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/index.js b/index.js
index fa3a31ff19..b753f4c108 100644
--- a/index.js
+++ b/index.js
@@ -14,14 +14,13 @@ require('source-map-support').install();
 
 const Core = require('./dist/core.js')
 
-// ------------------------------------------------------------------
+// Use special env flag to specify app dir without modify builder
+if (!process.env.NUXT_APP_DIR) {
+  process.env.NUXT_APP_DIR = path.resolve(__dirname, 'app')
+}
+
 // Polyfill Builder into Core
 const Builder = require('./dist/builder')
-// Use special env flag to specify app dir without modify builder
-if (!process.env.NUXT_APP_TEMPALTE_DIR) {
-  process.env.NUXT_APP_TEMPALTE_DIR = path.resolve(__dirname, 'app')
-}
 Object.assign(Core, Builder)
-// ------------------------------------------------------------------
 
 module.exports = Core.default ? Core.default : Core
diff --git a/src/builder/builder.js b/src/builder/builder.js
index 7667d03448..5a65c2b9d5 100644
--- a/src/builder/builder.js
+++ b/src/builder/builder.js
@@ -165,7 +165,7 @@ export default class Builder extends Tapable {
     if (!templateVars.layouts.default) {
       await mkdirp(r(this.options.buildDir, 'layouts'))
       templatesFiles.push('layouts/default.vue')
-      templateVars.layouts.default = r(__dirname, 'app', 'layouts', 'default.vue')
+      templateVars.layouts.default = r(this.options.nuxtAppDir, 'layouts', 'default.vue')
     }
 
     // -- Routes --
@@ -205,7 +205,7 @@ export default class Builder extends Tapable {
       return {
         src: customFileExists
           ? customPath
-          : r(__dirname, '../app', file), // Relative to dist
+          : r(this.options.nuxtAppDir, file),
         dst: file,
         custom: customFileExists
       }
diff --git a/src/core/options.js b/src/core/options.js
index 42e2e5e29a..a01e346cde 100755
--- a/src/core/options.js
+++ b/src/core/options.js
@@ -57,6 +57,7 @@ const defaultOptions = {
   dev: (process.env.NODE_ENV !== 'production'),
   runBuild: false,
   buildDir: '.nuxt',
+  nuxtAppDir: process.env.NUXT_APP_DIR || resolve(__dirname, '../app'), // relative to dist
   build: {
     analyze: false,
     extractCSS: false,
diff --git a/test/with-config.test.js b/test/with-config.test.js
index def656d841..ae4db48b02 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -106,7 +106,6 @@ test.after('Closing server and nuxt.js', t => {
 })
 
 test.after('Should be able to start Nuxt with build done', async t => {
-  const Nuxt = require('../')
   const rootDir = resolve(__dirname, 'fixtures/with-config')
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir

From 0453308e5ec11c20f174b930c0890b4ed2e9eb1e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 17:53:34 +0430
Subject: [PATCH 084/236] code coverage

---
 package.json                                | 5 +++++
 src/builder/builder.js                      | 5 ++++-
 src/core/renderer.js                        | 2 ++
 test/fixtures/module/modules/empty/index.js | 5 ++++-
 test/fixtures/with-config/nuxt.config.js    | 3 +++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 53fefac7d8..a1b7a717e7 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,11 @@
   "bin": {
     "nuxt": "./bin/nuxt"
   },
+  "nyc": {
+    "exclude": [
+      "/index.js"
+    ]
+  },
   "scripts": {
     "test": "npm run lint && nyc ava --verbose --serial test/",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
diff --git a/src/builder/builder.js b/src/builder/builder.js
index 5a65c2b9d5..c1945d3f0d 100644
--- a/src/builder/builder.js
+++ b/src/builder/builder.js
@@ -292,7 +292,10 @@ export default class Builder extends Tapable {
     return parallel(this.compiler.compilers, compiler => new Promise((resolve, reject) => {
       let _resolved = false
       const handler = (err, stats) => {
-        if (_resolved) return
+        /* istanbul ignore if */
+        if (_resolved) {
+          return
+        }
         _resolved = true
         if (err) {
           return reject(err)
diff --git a/src/core/renderer.js b/src/core/renderer.js
index 6388293758..44f7e90cd2 100644
--- a/src/core/renderer.js
+++ b/src/core/renderer.js
@@ -235,6 +235,7 @@ export default class Renderer extends Tapable {
       res.end(html, 'utf8')
       return html
     } catch (err) {
+      /* istanbul ignore if  */
       if (context.redirected) {
         console.error(err) // eslint-disable-line no-console
         return err
@@ -306,6 +307,7 @@ export default class Renderer extends Tapable {
       try {
         jsdom = require('jsdom')
       } catch (e) {
+        // istanbul ignore next
         console.error('Fail when calling nuxt.renderAndGetWindow(url)') // eslint-disable-line no-console
         console.error('jsdom module is not installed') // eslint-disable-line no-console
         console.error('Please install jsdom with: npm install --save-dev jsdom') // eslint-disable-line no-console
diff --git a/test/fixtures/module/modules/empty/index.js b/test/fixtures/module/modules/empty/index.js
index b994d6d28a..e9d4d060d1 100755
--- a/test/fixtures/module/modules/empty/index.js
+++ b/test/fixtures/module/modules/empty/index.js
@@ -1,4 +1,7 @@
-
 module.exports = function middlewareModule (options) {
   // Empty module
 }
+
+module.exports.meta = {
+  name: 'Empty Module!'
+}
diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js
index f9e56aa032..14a13a92b8 100644
--- a/test/fixtures/with-config/nuxt.config.js
+++ b/test/fixtures/with-config/nuxt.config.js
@@ -39,6 +39,9 @@ module.exports = {
     { src: '~/assets/app.css' }
   ],
   render: {
+    http2: {
+      push: true
+    },
     static: {
       maxAge: '1y'
     }

From 2df044664a77b5434523ed908833e66ce9cde9f0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 18:13:45 +0430
Subject: [PATCH 085/236] code coverage

---
 package.json         | 2 +-
 src/core/renderer.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a1b7a717e7..5ccb3b3678 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   },
   "nyc": {
     "exclude": [
-      "/index.js"
+      "index.js"
     ]
   },
   "scripts": {
diff --git a/src/core/renderer.js b/src/core/renderer.js
index 44f7e90cd2..011ae488cc 100644
--- a/src/core/renderer.js
+++ b/src/core/renderer.js
@@ -235,7 +235,7 @@ export default class Renderer extends Tapable {
       res.end(html, 'utf8')
       return html
     } catch (err) {
-      /* istanbul ignore if  */
+      /* istanbul ignore if */
       if (context.redirected) {
         console.error(err) // eslint-disable-line no-console
         return err
@@ -306,8 +306,7 @@ export default class Renderer extends Tapable {
     if (!jsdom) {
       try {
         jsdom = require('jsdom')
-      } catch (e) {
-        // istanbul ignore next
+      } catch (e) /* istanbul ignore next */{
         console.error('Fail when calling nuxt.renderAndGetWindow(url)') // eslint-disable-line no-console
         console.error('jsdom module is not installed') // eslint-disable-line no-console
         console.error('Please install jsdom with: npm install --save-dev jsdom') // eslint-disable-line no-console

From faa8db470162bb7a9a66ae9f037b6fd821dfe84d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 18:30:03 +0430
Subject: [PATCH 086/236] Remove `build.loaders` option

Also moves default postCSS logic into webpack config
---
 src/builder/builder.js             | 35 ------------------------------
 src/builder/webpack/base.config.js |  8 +++++++
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/src/builder/builder.js b/src/builder/builder.js
index c1945d3f0d..061d61ed0a 100644
--- a/src/builder/builder.js
+++ b/src/builder/builder.js
@@ -37,16 +37,6 @@ export default class Builder extends Tapable {
     this.webpackDevMiddleware = null
     this.webpackHotMiddleware = null
 
-    // Add extra loaders only if they are not already provided
-    let extraDefaults = {}
-    if (this.options.build && !Array.isArray(this.options.build.loaders)) {
-      extraDefaults.loaders = defaultsLoaders
-    }
-    if (this.options.build && !Array.isArray(this.options.build.postcss)) {
-      extraDefaults.postcss = defaultsPostcss
-    }
-    _.defaultsDeep(this.options.build, extraDefaults)
-
     // Mute stats on dev
     this.webpackStats = this.options.dev ? false : {
       chunks: false,
@@ -406,31 +396,6 @@ export default class Builder extends Tapable {
   }
 }
 
-const defaultsLoaders = [
-  {
-    test: /\.(png|jpe?g|gif|svg)$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1KO
-      name: 'img/[name].[hash:7].[ext]'
-    }
-  },
-  {
-    test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-    loader: 'url-loader',
-    query: {
-      limit: 1000, // 1 KO
-      name: 'fonts/[name].[hash:7].[ext]'
-    }
-  }
-]
-
-const defaultsPostcss = [
-  require('autoprefixer')({
-    browsers: ['last 3 versions']
-  })
-]
-
 const STATUS = {
   INITIAL: 1,
   BUILD_DONE: 2,
diff --git a/src/builder/webpack/base.config.js b/src/builder/webpack/base.config.js
index 8fb8dbc652..5e35c1e503 100644
--- a/src/builder/webpack/base.config.js
+++ b/src/builder/webpack/base.config.js
@@ -17,6 +17,14 @@ import { styleLoader, extractStyles } from './helpers'
 export default function webpackBaseConfig ({ isClient, isServer }) {
   const nodeModulesDir = join(__dirname, '..', 'node_modules')
 
+  if (!Array.isArray(this.options.build.postcss)) {
+    this.options.build.postcss = [
+      require('autoprefixer')({
+        browsers: ['last 3 versions']
+      })
+    ]
+  }
+
   const config = {
     devtool: this.options.dev ? 'cheap-module-source-map' : false,
     entry: {

From 9d1765ae916de1e39184cba71300ff45f0823cd1 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 18:34:40 +0430
Subject: [PATCH 087/236] nuxt-start: throw error if `nuxt build` not called

---
 bin/nuxt-start | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/nuxt-start b/bin/nuxt-start
index 34c73f6a72..c1ad090ba0 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -3,7 +3,7 @@
 const fs = require('fs')
 const parseArgs = require('minimist')
 const { Nuxt, Server } = require('../')
-const resolve = require('path').resolve
+const { join, resolve } = require('path')
 
 const argv = parseArgs(process.argv.slice(2), {
   alias: {
@@ -55,6 +55,13 @@ if (typeof options.rootDir !== 'string') {
 }
 options.dev = false // Force production mode (no webpack middleware called)
 
+// Check if project is built for production
+const distDir = join(options.rootDir, options.buildDir || '.nuxt', 'dist' )
+if (!fs.existsSync(join(distDir,'server-bundle.json'))) {
+  console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
+  process.exit(1)
+}
+
 const nuxt = new Nuxt(options)
 const port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
 const host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host

From c25409ff704f1ce233e034d89aa0f0991f8e6148 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 16 Jun 2017 18:42:33 +0430
Subject: [PATCH 088/236] include only src in coverage

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

diff --git a/package.json b/package.json
index 5ccb3b3678..79b52b1b5e 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
     "nuxt": "./bin/nuxt"
   },
   "nyc": {
-    "exclude": [
-      "index.js"
+    "include": [
+      "src/**"
     ]
   },
   "scripts": {

From 766009dbbaf5120e16cf8828d5e98e7bb4fff0bf Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 12:06:00 +0430
Subject: [PATCH 089/236] Cleaner structure

---
 index.js                                      | 14 ++++++-------
 {app => lib/app}/App.vue                      |  0
 {app => lib/app}/client.js                    |  0
 {app => lib/app}/components/nuxt-child.js     |  0
 {app => lib/app}/components/nuxt-error.vue    |  0
 {app => lib/app}/components/nuxt-link.js      |  0
 {app => lib/app}/components/nuxt-loading.vue  |  0
 {app => lib/app}/components/nuxt.vue          |  0
 {app => lib/app}/index.js                     |  0
 {app => lib/app}/layouts/default.vue          |  0
 {app => lib/app}/middleware.js                |  0
 {app => lib/app}/router.js                    |  0
 {app => lib/app}/server.js                    |  0
 {app => lib/app}/store.js                     |  0
 {app => lib/app}/utils.js                     |  0
 {app => lib/app}/views/app.template.html      |  0
 {app => lib/app}/views/error.html             |  0
 {src => lib}/builder/builder.js               |  0
 {src => lib}/builder/generator.js             |  0
 {src => lib}/builder/index.js                 |  0
 {src => lib}/builder/webpack/base.config.js   |  0
 {src => lib}/builder/webpack/client.config.js |  0
 {src => lib}/builder/webpack/helpers.js       |  0
 {src => lib}/builder/webpack/server.config.js |  0
 .../builder/webpack/vue-loader.config.js      |  0
 {src => lib}/common/utils.js                  |  0
 {src => lib}/core/index.js                    |  0
 {src => lib}/core/module.js                   |  0
 {src => lib}/core/nuxt.js                     |  0
 {src => lib}/core/options.js                  |  2 +-
 {src => lib}/core/renderer.js                 |  0
 {src => lib}/core/server.js                   |  0
 package.json                                  | 11 +++-------
 build/rollup.config.js => rollup.config.js    | 21 +++++++++----------
 34 files changed, 21 insertions(+), 27 deletions(-)
 rename {app => lib/app}/App.vue (100%)
 rename {app => lib/app}/client.js (100%)
 rename {app => lib/app}/components/nuxt-child.js (100%)
 rename {app => lib/app}/components/nuxt-error.vue (100%)
 rename {app => lib/app}/components/nuxt-link.js (100%)
 rename {app => lib/app}/components/nuxt-loading.vue (100%)
 rename {app => lib/app}/components/nuxt.vue (100%)
 rename {app => lib/app}/index.js (100%)
 rename {app => lib/app}/layouts/default.vue (100%)
 rename {app => lib/app}/middleware.js (100%)
 rename {app => lib/app}/router.js (100%)
 rename {app => lib/app}/server.js (100%)
 rename {app => lib/app}/store.js (100%)
 rename {app => lib/app}/utils.js (100%)
 rename {app => lib/app}/views/app.template.html (100%)
 rename {app => lib/app}/views/error.html (100%)
 rename {src => lib}/builder/builder.js (100%)
 rename {src => lib}/builder/generator.js (100%)
 rename {src => lib}/builder/index.js (100%)
 rename {src => lib}/builder/webpack/base.config.js (100%)
 rename {src => lib}/builder/webpack/client.config.js (100%)
 rename {src => lib}/builder/webpack/helpers.js (100%)
 rename {src => lib}/builder/webpack/server.config.js (100%)
 rename {src => lib}/builder/webpack/vue-loader.config.js (100%)
 rename {src => lib}/common/utils.js (100%)
 rename {src => lib}/core/index.js (100%)
 rename {src => lib}/core/module.js (100%)
 rename {src => lib}/core/nuxt.js (100%)
 rename {src => lib}/core/options.js (99%)
 rename {src => lib}/core/renderer.js (100%)
 rename {src => lib}/core/server.js (100%)
 rename build/rollup.config.js => rollup.config.js (85%)

diff --git a/index.js b/index.js
index b753f4c108..0aa0e8afc6 100644
--- a/index.js
+++ b/index.js
@@ -12,15 +12,15 @@ process.noDeprecation = true
 // https://github.com/evanw/node-source-map-support
 require('source-map-support').install();
 
+// Require Core
 const Core = require('./dist/core.js')
+Object.assign(exports, Core.default || Core)
+
+// Require Builder
+const Builder = require('./dist/builder')
+Object.assign(exports, Builder.default || Builder)
 
 // Use special env flag to specify app dir without modify builder
 if (!process.env.NUXT_APP_DIR) {
-  process.env.NUXT_APP_DIR = path.resolve(__dirname, 'app')
+  process.env.NUXT_APP_DIR = path.resolve(__dirname, 'lib/app')
 }
-
-// Polyfill Builder into Core
-const Builder = require('./dist/builder')
-Object.assign(Core, Builder)
-
-module.exports = Core.default ? Core.default : Core
diff --git a/app/App.vue b/lib/app/App.vue
similarity index 100%
rename from app/App.vue
rename to lib/app/App.vue
diff --git a/app/client.js b/lib/app/client.js
similarity index 100%
rename from app/client.js
rename to lib/app/client.js
diff --git a/app/components/nuxt-child.js b/lib/app/components/nuxt-child.js
similarity index 100%
rename from app/components/nuxt-child.js
rename to lib/app/components/nuxt-child.js
diff --git a/app/components/nuxt-error.vue b/lib/app/components/nuxt-error.vue
similarity index 100%
rename from app/components/nuxt-error.vue
rename to lib/app/components/nuxt-error.vue
diff --git a/app/components/nuxt-link.js b/lib/app/components/nuxt-link.js
similarity index 100%
rename from app/components/nuxt-link.js
rename to lib/app/components/nuxt-link.js
diff --git a/app/components/nuxt-loading.vue b/lib/app/components/nuxt-loading.vue
similarity index 100%
rename from app/components/nuxt-loading.vue
rename to lib/app/components/nuxt-loading.vue
diff --git a/app/components/nuxt.vue b/lib/app/components/nuxt.vue
similarity index 100%
rename from app/components/nuxt.vue
rename to lib/app/components/nuxt.vue
diff --git a/app/index.js b/lib/app/index.js
similarity index 100%
rename from app/index.js
rename to lib/app/index.js
diff --git a/app/layouts/default.vue b/lib/app/layouts/default.vue
similarity index 100%
rename from app/layouts/default.vue
rename to lib/app/layouts/default.vue
diff --git a/app/middleware.js b/lib/app/middleware.js
similarity index 100%
rename from app/middleware.js
rename to lib/app/middleware.js
diff --git a/app/router.js b/lib/app/router.js
similarity index 100%
rename from app/router.js
rename to lib/app/router.js
diff --git a/app/server.js b/lib/app/server.js
similarity index 100%
rename from app/server.js
rename to lib/app/server.js
diff --git a/app/store.js b/lib/app/store.js
similarity index 100%
rename from app/store.js
rename to lib/app/store.js
diff --git a/app/utils.js b/lib/app/utils.js
similarity index 100%
rename from app/utils.js
rename to lib/app/utils.js
diff --git a/app/views/app.template.html b/lib/app/views/app.template.html
similarity index 100%
rename from app/views/app.template.html
rename to lib/app/views/app.template.html
diff --git a/app/views/error.html b/lib/app/views/error.html
similarity index 100%
rename from app/views/error.html
rename to lib/app/views/error.html
diff --git a/src/builder/builder.js b/lib/builder/builder.js
similarity index 100%
rename from src/builder/builder.js
rename to lib/builder/builder.js
diff --git a/src/builder/generator.js b/lib/builder/generator.js
similarity index 100%
rename from src/builder/generator.js
rename to lib/builder/generator.js
diff --git a/src/builder/index.js b/lib/builder/index.js
similarity index 100%
rename from src/builder/index.js
rename to lib/builder/index.js
diff --git a/src/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
similarity index 100%
rename from src/builder/webpack/base.config.js
rename to lib/builder/webpack/base.config.js
diff --git a/src/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
similarity index 100%
rename from src/builder/webpack/client.config.js
rename to lib/builder/webpack/client.config.js
diff --git a/src/builder/webpack/helpers.js b/lib/builder/webpack/helpers.js
similarity index 100%
rename from src/builder/webpack/helpers.js
rename to lib/builder/webpack/helpers.js
diff --git a/src/builder/webpack/server.config.js b/lib/builder/webpack/server.config.js
similarity index 100%
rename from src/builder/webpack/server.config.js
rename to lib/builder/webpack/server.config.js
diff --git a/src/builder/webpack/vue-loader.config.js b/lib/builder/webpack/vue-loader.config.js
similarity index 100%
rename from src/builder/webpack/vue-loader.config.js
rename to lib/builder/webpack/vue-loader.config.js
diff --git a/src/common/utils.js b/lib/common/utils.js
similarity index 100%
rename from src/common/utils.js
rename to lib/common/utils.js
diff --git a/src/core/index.js b/lib/core/index.js
similarity index 100%
rename from src/core/index.js
rename to lib/core/index.js
diff --git a/src/core/module.js b/lib/core/module.js
similarity index 100%
rename from src/core/module.js
rename to lib/core/module.js
diff --git a/src/core/nuxt.js b/lib/core/nuxt.js
similarity index 100%
rename from src/core/nuxt.js
rename to lib/core/nuxt.js
diff --git a/src/core/options.js b/lib/core/options.js
similarity index 99%
rename from src/core/options.js
rename to lib/core/options.js
index a01e346cde..ae36a265e6 100755
--- a/src/core/options.js
+++ b/lib/core/options.js
@@ -57,7 +57,7 @@ const defaultOptions = {
   dev: (process.env.NODE_ENV !== 'production'),
   runBuild: false,
   buildDir: '.nuxt',
-  nuxtAppDir: process.env.NUXT_APP_DIR || resolve(__dirname, '../app'), // relative to dist
+  nuxtAppDir: process.env.NUXT_APP_DIR || resolve(__dirname, '../lib/app'), // Relative to dist
   build: {
     analyze: false,
     extractCSS: false,
diff --git a/src/core/renderer.js b/lib/core/renderer.js
similarity index 100%
rename from src/core/renderer.js
rename to lib/core/renderer.js
diff --git a/src/core/server.js b/lib/core/server.js
similarity index 100%
rename from src/core/server.js
rename to lib/core/server.js
diff --git a/package.json b/package.json
index 79b52b1b5e..0cb911de65 100644
--- a/package.json
+++ b/package.json
@@ -42,19 +42,14 @@
   "bin": {
     "nuxt": "./bin/nuxt"
   },
-  "nyc": {
-    "include": [
-      "src/**"
-    ]
-  },
   "scripts": {
     "test": "npm run lint && nyc ava --verbose --serial test/",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "lint": "eslint --ext .js,.vue bin lib pages test/*.js --ignore-pattern lib/app",
+    "lint": "eslint --ext .js,.vue bin lib pages test/*.js --ignore-pattern app",
     "build": "npm run build:core && npm run build:builder",
-    "build:core": "rollup -c build/rollup.config.js --environment TARGET:core",
+    "build:core": "rollup -c rollup.config.js --environment TARGET:core",
     "watch": "npm run build:core -- -w",
-    "build:builder": "rollup -c build/rollup.config.js --environment TARGET:builder",
+    "build:builder": "rollup -c rollup.config.js --environment TARGET:builder",
     "watch:builder": "npm run build:builder -- -w",
     "precommit": "npm run lint",
     "prepublish": "npm run build",
diff --git a/build/rollup.config.js b/rollup.config.js
similarity index 85%
rename from build/rollup.config.js
rename to rollup.config.js
index 75e03d0074..32aadd37c8 100755
--- a/build/rollup.config.js
+++ b/rollup.config.js
@@ -5,7 +5,7 @@ const rollupAlias = require('rollup-plugin-alias')
 const rollupCommonJS = require('rollup-plugin-commonjs')
 const rollupReplace = require('rollup-plugin-replace')
 const rollupResolve = require('rollup-plugin-node-resolve')
-const packageJson = require('../package.json')
+const packageJson = require('./package.json')
 
 const dependencies = Object.keys(packageJson.dependencies)
 const version = packageJson.version || process.env.VERSION
@@ -19,20 +19,19 @@ const banner =
   ' * Released under the MIT License.\n' +
   ' */'
 
-
 // -----------------------------
 // Aliases
 // -----------------------------
-const rootDir = resolve(__dirname, '..')
-const srcDir = resolve(rootDir, 'src')
+const rootDir = resolve(__dirname)
+const libDir = resolve(rootDir, 'lib')
 const distDir = resolve(rootDir, 'dist')
 
 const aliases = {
-  core: resolve(srcDir, 'core/index.js'),
-  builder: resolve(srcDir, 'builder/index.js'),
-  common: resolve(srcDir, 'common/index.js'),
-  utils: resolve(srcDir, 'common/utils.js'),
-  app: resolve(srcDir, 'app'),
+  core: resolve(libDir, 'core/index.js'),
+  builder: resolve(libDir, 'builder/index.js'),
+  common: resolve(libDir, 'common/index.js'),
+  utils: resolve(libDir, 'common/utils.js'),
+  app: resolve(libDir, 'app'),
 }
 
 // -----------------------------
@@ -40,11 +39,11 @@ const aliases = {
 // -----------------------------
 const builds = {
   core: {
-    entry: resolve(srcDir, 'core/index.js'),
+    entry: resolve(libDir, 'core/index.js'),
     dest: resolve(distDir, 'core.js')
   },
   builder: {
-    entry: resolve(srcDir, 'builder/index.js'),
+    entry: resolve(libDir, 'builder/index.js'),
     dest: resolve(distDir, 'builder.js')
   }
 }

From d593d117209aa20f0474a6a2bff636a989f9bf85 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 12:15:13 +0430
Subject: [PATCH 090/236] common index.js

---
 lib/common/index.js | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100755 lib/common/index.js

diff --git a/lib/common/index.js b/lib/common/index.js
new file mode 100755
index 0000000000..46498a8c10
--- /dev/null
+++ b/lib/common/index.js
@@ -0,0 +1,5 @@
+import * as Utils from './utils'
+
+export default {
+  Utils
+}

From 6146de34f87ffbf8fb8ba8b5425980bf10616646 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 12:40:24 +0430
Subject: [PATCH 091/236] temporary for for Core.Builder

---
 index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 0aa0e8afc6..c31a643f6f 100644
--- a/index.js
+++ b/index.js
@@ -14,11 +14,15 @@ require('source-map-support').install();
 
 // Require Core
 const Core = require('./dist/core.js')
-Object.assign(exports, Core.default || Core)
+// Object.assign(exports, Core.default || Core)
 
 // Require Builder
 const Builder = require('./dist/builder')
-Object.assign(exports, Builder.default || Builder)
+// Object.assign(exports, Builder.default || Builder)
+
+// FIXME
+Object.assign(Core.default || Core, Builder.default || Builder)
+module.exports = Core.default || Core
 
 // Use special env flag to specify app dir without modify builder
 if (!process.env.NUXT_APP_DIR) {

From fa9bc9445bf7f4778768b01992f073201935ea35 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 12:48:45 +0430
Subject: [PATCH 092/236] forbid access to server-bundle.json in production
 (#916)

---
 lib/core/renderer.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 011ae488cc..d93365a5bc 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -180,6 +180,11 @@ export default class Renderer extends Tapable {
       if (!this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0) {
         const url = req.url
         req.url = req.url.replace(this.options.build.publicPath, '/')
+        // Forbid access to sensitive data (#916)
+        if (req.url.includes('server-bundle.json')) {
+          res.statusCode = 404
+          return res.end()
+        }
         await this.serveStaticNuxt(req, res)
         /* istanbul ignore next */
         req.url = url
@@ -306,7 +311,7 @@ export default class Renderer extends Tapable {
     if (!jsdom) {
       try {
         jsdom = require('jsdom')
-      } catch (e) /* istanbul ignore next */{
+      } catch (e) /* istanbul ignore next */ {
         console.error('Fail when calling nuxt.renderAndGetWindow(url)') // eslint-disable-line no-console
         console.error('jsdom module is not installed') // eslint-disable-line no-console
         console.error('Please install jsdom with: npm install --save-dev jsdom') // eslint-disable-line no-console

From 20f93b8b54b57d867ae9ddef70514ff72f7f0c5f Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 14:05:00 +0430
Subject: [PATCH 093/236] migrate require to ES6 imports

---
 lib/builder/builder.js             | 6 ++++--
 lib/builder/generator.js           | 3 ++-
 lib/builder/webpack/base.config.js | 3 ++-
 lib/core/module.js                 | 3 ++-
 lib/core/renderer.js               | 4 +++-
 lib/core/server.js                 | 6 +++---
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 061d61ed0a..cf9b127b71 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -11,10 +11,12 @@ import MFS from 'memory-fs'
 import webpackDevMiddleware from 'webpack-dev-middleware'
 import webpackHotMiddleware from 'webpack-hot-middleware'
 import { r, wp, createRoutes, parallel } from 'utils'
+import Debug from 'debug'
+import Glob from 'glob'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
 
-const debug = require('debug')('nuxt:build')
+const debug = Debug('nuxt:build')
 debug.color = 2 // Force green color
 
 const remove = pify(fs.remove)
@@ -22,7 +24,7 @@ const readFile = pify(fs.readFile)
 const utimes = pify(fs.utimes)
 const writeFile = pify(fs.writeFile)
 const mkdirp = pify(fs.mkdirp)
-const glob = pify(require('glob'))
+const glob = pify(Glob)
 
 export default class Builder extends Tapable {
   constructor (nuxt) {
diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index 4095fd4b6f..e9ac779805 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -5,8 +5,9 @@ import { resolve, join, dirname, sep } from 'path'
 import { minify } from 'html-minifier'
 import Tapable from 'tappable'
 import { isUrl, promisifyRoute, waitFor, flatRoutes } from 'utils'
+import Debug from 'debug'
 
-const debug = require('debug')('nuxt:generate')
+const debug = Debug('nuxt:generate')
 const copy = pify(fs.copy)
 const remove = pify(fs.remove)
 const writeFile = pify(fs.writeFile)
diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index 5e35c1e503..ce1440d8fa 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -3,6 +3,7 @@ import { defaults, cloneDeep } from 'lodash'
 import { join, resolve } from 'path'
 import webpack from 'webpack'
 import { isUrl, urlJoin } from 'utils'
+import autoprefixer from 'autoprefixer'
 import vueLoaderConfig from './vue-loader.config'
 import { styleLoader, extractStyles } from './helpers'
 
@@ -19,7 +20,7 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
 
   if (!Array.isArray(this.options.build.postcss)) {
     this.options.build.postcss = [
-      require('autoprefixer')({
+      autoprefixer({
         browsers: ['last 3 versions']
       })
     ]
diff --git a/lib/core/module.js b/lib/core/module.js
index e25ae67cd5..fdd2746764 100755
--- a/lib/core/module.js
+++ b/lib/core/module.js
@@ -4,8 +4,9 @@ import { uniq } from 'lodash'
 import hash from 'hash-sum'
 import Tapable from 'tappable'
 import { chainFn, sequence } from 'utils'
+import Debug from 'debug'
 
-const debug = require('debug')('nuxt:module')
+const debug = Debug('nuxt:module')
 
 export default class ModuleContainer extends Tapable {
   constructor (nuxt) {
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index d93365a5bc..8fa9fb0d7a 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -11,9 +11,11 @@ import { resolve, join } from 'path'
 import fs from 'fs-extra'
 import { createBundleRenderer } from 'vue-server-renderer'
 import { getContext, setAnsiColors, encodeHtml } from 'utils'
+import Debug from 'debug'
 
-const debug = require('debug')('nuxt:render')
+const debug = Debug('nuxt:render')
 debug.color = 4 // Force blue color
+
 setAnsiColors(ansiHTML)
 
 let jsdom = null
diff --git a/lib/core/server.js b/lib/core/server.js
index fb094e0f8c..dd27891aca 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -1,6 +1,6 @@
-const http = require('http')
-const connect = require('connect')
-const path = require('path')
+import http from 'http'
+import connect from 'connect'
+import path from 'path'
 
 class Server {
   constructor (nuxt) {

From 13fd8713590a5006738834d1f2aef1bfb14d75d8 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 14:08:52 +0430
Subject: [PATCH 094/236] add http as external dependency

---
 rollup.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollup.config.js b/rollup.config.js
index 32aadd37c8..a6ace59fb0 100755
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -55,7 +55,7 @@ function genConfig (opts) {
   const config = {
     entry: opts.entry,
     dest: opts.dest,
-    external: ['fs', 'path'].concat(dependencies, opts.external),
+    external: ['fs', 'path', 'http'].concat(dependencies, opts.external),
     format: opts.format || 'cjs',
     banner: opts.banner || banner,
     moduleName: opts.moduleName || 'Nuxt',

From 7ea16f8bdeafac396a6bc14a7a6d1a63a3619f16 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 14:12:03 +0430
Subject: [PATCH 095/236] update nyc config

---
 package.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package.json b/package.json
index 0cb911de65..c00ab289b9 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,13 @@
   "bin": {
     "nuxt": "./bin/nuxt"
   },
+  "nyc": {
+    "exclude": [
+      "index.js",
+      "node_mdoules/**/*.js",
+      "test/**/*.js"
+    ]
+  },
   "scripts": {
     "test": "npm run lint && nyc ava --verbose --serial test/",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",

From 5a3aed3bc106d011d9c53d4f06084a96a0e5366e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 15:10:49 +0430
Subject: [PATCH 096/236] improve coverage

---
 rollup.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rollup.config.js b/rollup.config.js
index a6ace59fb0..be2a550c8b 100755
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -4,7 +4,7 @@ const rollupBabel = require('rollup-plugin-babel')
 const rollupAlias = require('rollup-plugin-alias')
 const rollupCommonJS = require('rollup-plugin-commonjs')
 const rollupReplace = require('rollup-plugin-replace')
-const rollupResolve = require('rollup-plugin-node-resolve')
+const rollupNodeResolve = require('rollup-plugin-node-resolve')
 const packageJson = require('./package.json')
 
 const dependencies = Object.keys(packageJson.dependencies)
@@ -65,9 +65,9 @@ function genConfig (opts) {
         resolve: ['.js', '.json', '.jsx', '.ts']
       }, aliases, opts.alias)),
 
-      rollupCommonJS(),
+      rollupNodeResolve({ main: true, jsnext: true }),
 
-      rollupResolve({ jsnext: true }),
+      rollupCommonJS(),
 
       rollupBabel(Object.assign({
         exclude: 'node_modules/**',

From c61f40e16d7952fc47420c5a39414551a770e579 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 15:29:46 +0430
Subject: [PATCH 097/236] coverage

---
 package.json     | 6 +++---
 rollup.config.js | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index c00ab289b9..2617d3d8b2 100644
--- a/package.json
+++ b/package.json
@@ -44,9 +44,9 @@
   },
   "nyc": {
     "exclude": [
-      "index.js",
-      "node_mdoules/**/*.js",
-      "test/**/*.js"
+      "test/**",
+      "node_modules/**",
+      "index.js"
     ]
   },
   "scripts": {
diff --git a/rollup.config.js b/rollup.config.js
index be2a550c8b..3e53508217 100755
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -65,13 +65,8 @@ function genConfig (opts) {
         resolve: ['.js', '.json', '.jsx', '.ts']
       }, aliases, opts.alias)),
 
-      rollupNodeResolve({ main: true, jsnext: true }),
-
-      rollupCommonJS(),
-
       rollupBabel(Object.assign({
         exclude: 'node_modules/**',
-        runtimeHelpers: true,
         plugins: [
           ['transform-runtime', { 'helpers': false, 'polyfill': false }],
           'transform-async-to-generator',
@@ -82,6 +77,10 @@ function genConfig (opts) {
         ]
       }, opts.babel)),
 
+      rollupNodeResolve({ main: true, jsnext: true }),
+
+      rollupCommonJS(),
+
       rollupReplace({
         __VERSION__: version
       })

From 18fd47ee613e36bc2735db24bcbbe396c682dee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 13:35:44 +0200
Subject: [PATCH 098/236] Remove npm check & update yarn.lock

---
 .travis.yml |   4 +-
 yarn.lock   | 345 ++++++++++++++++++++++++++--------------------------
 2 files changed, 173 insertions(+), 176 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f0c46e7fb..65e2ffbe5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,7 @@ language: node_js
 node_js:
   - "8.0"
   - "7.2"
-  - "6.9"
-before_install:
-  - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
+  - "6.11"
 install:
   - yarn install
   - yarn run build
diff --git a/yarn.lock b/yarn.lock
index 9c7c9a3089..cccf2d7ee1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,7 +1,5 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 "@ava/babel-plugin-throws-helper@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
@@ -41,13 +39,6 @@
   version "6.0.78"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
 
-JSONStream@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 abab@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -145,7 +136,7 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-html@0.0.7, ansi-html@^0.0.7:
+ansi-html@^0.0.7, ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
@@ -269,14 +260,14 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
+assert-plus@^1.0.0, assert-plus@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -436,7 +427,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@6, babel-core@^6.17.0, babel-core@^6.24.1:
+babel-core@^6.17.0, babel-core@^6.24.1, babel-core@6:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
@@ -1380,7 +1371,15 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
+chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1390,14 +1389,6 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1586,7 +1577,7 @@ command-join@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
 
-commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
+commander@^2.9.0, commander@~2.9.0, commander@2.9.x:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -1825,8 +1816,8 @@ conventional-commits-parser@^1.0.0, conventional-commits-parser@^1.0.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz#e327b53194e1a7ad5dc63479ee9099a52b024865"
   dependencies:
-    JSONStream "^1.0.4"
     is-text-path "^1.0.0"
+    JSONStream "^1.0.4"
     lodash "^4.2.1"
     meow "^3.3.0"
     split2 "^2.0.0"
@@ -2073,7 +2064,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+"cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -2130,7 +2121,13 @@ 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.2.0, debug@~2.2.0:
+debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
+debug@~2.2.0, debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -2142,12 +2139,6 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
 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"
@@ -2215,7 +2206,7 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@1.1.0, depd@~1.1.0:
+depd@~1.1.0, depd@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
@@ -2256,16 +2247,16 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+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"
@@ -2287,7 +2278,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@^1.3.0, domelementtype@1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2295,31 +2286,31 @@ domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  dependencies:
-    domelementtype "1"
-
 domhandler@^2.3.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
   dependencies:
     domelementtype "1"
 
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+domhandler@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1, domutils@^1.5.1:
+domutils@^1.5.1, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+  dependencies:
+    domelementtype "1"
+
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
@@ -2332,14 +2323,14 @@ dot-prop@^4.1.0:
   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"
-
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2446,7 +2437,7 @@ es6-error@^4.0.1, es6-error@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
-es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@2:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
@@ -2475,7 +2466,7 @@ es6-set@~0.1.5:
     es6-symbol "3.1.1"
     event-emitter "~0.3.5"
 
-es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1, es6-symbol@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -2864,7 +2855,7 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
+finalhandler@^1.0.3, finalhandler@~1.0.3, finalhandler@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
   dependencies:
@@ -2951,7 +2942,7 @@ forwarded@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
-fresh@0.5.0, fresh@^0.5.0:
+fresh@^0.5.0, fresh@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
@@ -3285,7 +3276,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@1.1.x, he@^1.1.0:
+he@^1.1.0, he@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
@@ -3410,14 +3401,14 @@ hullabaloo-config-manager@^1.0.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
 iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.17"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
 
+iconv-lite@0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+
 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"
@@ -3473,7 +3464,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.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3485,7 +3476,7 @@ ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@3.0.6, inquirer@^3.0.6:
+inquirer@^3.0.6, inquirer@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
   dependencies:
@@ -3738,14 +3729,14 @@ is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3807,7 +3798,7 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
-jest-diff@19.0.0, jest-diff@^19.0.0:
+jest-diff@^19.0.0, jest-diff@19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
   dependencies:
@@ -3991,6 +3982,13 @@ jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
+JSONStream@^1.0.4:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 jsprim@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
@@ -4114,7 +4112,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
+loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@0.2.x:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -4386,14 +4384,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.27.0"
 
+mime@^1.3.4, mime@1.3.x:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.3.x, mime@^1.3.4:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
-
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -4406,25 +4404,25 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, "minimatch@2 || 3":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist, minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist, minimist@^1.1.3, minimist@^1.2.0, minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@0.0.8, minimist@~0.0.1:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
 minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+minimist@~0.0.1, minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", 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:
@@ -4438,6 +4436,10 @@ moment@^2.6.0:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
+ms@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -4446,10 +4448,6 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-ms@^0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -5396,26 +5394,26 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
 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@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
 q@^1.1.2, q@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
-qs@6.4.0, qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
+qs@~6.4.0, qs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -5427,7 +5425,7 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@0.2.0, querystring@^0.2.0:
+querystring@^0.2.0, querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
@@ -5493,15 +5491,6 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
   version "2.2.11"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
@@ -5514,6 +5503,15 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
+readable-stream@1.0:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -5658,31 +5656,6 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.4:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.0"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    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"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 request@^2.79.0, request@^2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -5710,6 +5683,31 @@ request@^2.79.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    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"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5726,7 +5724,7 @@ require-precompiled@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
 
-require-relative@0.8.7, require-relative@^0.8.7:
+require-relative@^0.8.7, require-relative@0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
 
@@ -5755,16 +5753,16 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-resolve@1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   dependencies:
     path-parse "^1.0.5"
 
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -5778,7 +5776,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
+rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@2:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
@@ -5900,7 +5898,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, "semver@2 || 3 || 4 || 5", semver@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5926,7 +5924,7 @@ serialize-javascript@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
 
-serve-static@1.12.3, serve-static@^1.12.3:
+serve-static@^1.12.3, serve-static@1.12.3:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
   dependencies:
@@ -6013,16 +6011,16 @@ source-map-support@^0.4.0, source-map-support@^0.4.15, source-map-support@^0.4.2
   dependencies:
     source-map "^0.5.6"
 
-source-map@0.5.6, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
 source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.6, source-map@0.5.x:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -6054,18 +6052,18 @@ 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"
 
-split2@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
-  dependencies:
-    through2 "^2.0.2"
-
 split@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.0.tgz#c4395ce683abcd254bc28fe1dabb6e5c27dcffae"
   dependencies:
     through "2"
 
+split2@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
+  dependencies:
+    through2 "^2.0.2"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -6127,6 +6125,16 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
+  dependencies:
+    safe-buffer "~5.0.1"
+
 string-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -6148,16 +6156,6 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
-  dependencies:
-    safe-buffer "~5.0.1"
-
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -6335,6 +6333,10 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+through@^2.3.4, through@^2.3.6, "through@>=2.2.7 <3", through@2:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 through2@^2.0.0, through2@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -6342,10 +6344,6 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -6383,7 +6381,7 @@ toposort@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
 
-tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
+tough-cookie@^2.3.2, tough-cookie@>=2.3.0, tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
@@ -6444,13 +6442,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@3.0.x, uglify-js@^3.0.17:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.17.tgz#d228cd55c2df9b3d2f53f147568cb4cc4a72cc06"
-  dependencies:
-    commander "~2.9.0"
-    source-map "~0.5.1"
-
 uglify-js@^2.6, uglify-js@^2.8.27:
   version "2.8.28"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
@@ -6460,6 +6451,13 @@ uglify-js@^2.6, uglify-js@^2.8.27:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@^3.0.17, uglify-js@3.0.x:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.17.tgz#d228cd55c2df9b3d2f53f147568cb4cc4a72cc06"
+  dependencies:
+    commander "~2.9.0"
+    source-map "~0.5.1"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -6561,7 +6559,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@^0.10.3, util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6838,7 +6836,7 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2, wordwrap@~0.0.2:
+wordwrap@~0.0.2, wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
@@ -6997,3 +6995,4 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+

From fb9b2b5e63fdbd007fd34014cb5f40b1eafffe27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 13:36:03 +0200
Subject: [PATCH 099/236] Lint

---
 bin/nuxt-dev | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index f42e911ba0..229a523355 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -8,7 +8,7 @@ const debug = require('debug')('nuxt:build')
 debug.color = 2 // force green color
 const fs = require('fs')
 const parseArgs = require('minimist')
-const { Nuxt,Server } = require('../')
+const { Nuxt, Server } = require('../')
 const chokidar = require('chokidar')
 const resolve = require('path').resolve
 const without = require('lodash').without
@@ -76,7 +76,7 @@ function listenOnConfigChanges (nuxt, server) {
   const build = _.debounce(() => {
     debug('[nuxt.config.js] changed')
     delete require.cache[nuxtConfigFile]
-    const options = {}
+    let options = {}
     if (fs.existsSync(nuxtConfigFile)) {
       try {
         options = require(nuxtConfigFile)

From 1ff37506a79bec9b5b42bb6367b115182aa1a202 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 16:20:43 +0430
Subject: [PATCH 100/236] simplify webpackBuild()

---
 lib/builder/builder.js | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index cf9b127b71..50ced73699 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -282,36 +282,30 @@ export default class Builder extends Tapable {
 
     // Start Builds
     return parallel(this.compiler.compilers, compiler => new Promise((resolve, reject) => {
-      let _resolved = false
-      const handler = (err, stats) => {
-        /* istanbul ignore if */
-        if (_resolved) {
-          return
-        }
-        _resolved = true
-        if (err) {
-          return reject(err)
-        }
-        if (!this.options.dev) {
-          // Show build stats for production
-          console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
-          if (stats.hasErrors()) {
-            return reject(new Error('Webpack build exited with errors'))
-          }
-        }
-        resolve()
-      }
       if (this.options.dev) {
+        // --- Dev Build ---
         if (compiler.options.name === 'client') {
           // Client watch is started by dev-middleware
           resolve()
         } else {
           // Build and watch for changes
-          compiler.watch(this.options.watchers.webpack, handler)
+          compiler.watch(this.options.watchers.webpack, (err) => {
+            if (err) {
+              return reject(err)
+            }
+            resolve()
+          })
         }
       } else {
-        // Production build
-        compiler.run(handler)
+        // --- Production build ---
+        compiler.run((err, stats) => {
+          // Show build stats for production
+          console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
+          if (stats.hasErrors()) {
+            return reject(new Error('Webpack build exited with errors'))
+          }
+          resolve()
+        })
       }
     }))
   }

From 582e8179f45275f2e7077f7d594b9e85b2ef2aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 15:48:25 +0200
Subject: [PATCH 101/236] remove NUXT_APP_DIR env

---
 index.js            | 19 +++++--------------
 lib/core/options.js |  2 +-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/index.js b/index.js
index c31a643f6f..a3e2b704ee 100644
--- a/index.js
+++ b/index.js
@@ -1,30 +1,21 @@
 /*!
  * Nuxt.js
  * (c) 2016-2017 Chopin Brothers
+ * Core maintainer: Pooya (@pi0)
  * Released under the MIT License.
  */
 
-const path = require('path')
-
-process.noDeprecation = true
-
 // Node Source Map Support
 // https://github.com/evanw/node-source-map-support
 require('source-map-support').install();
 
+// Fix babel flag
+process.noDeprecation = true
+
 // Require Core
 const Core = require('./dist/core.js')
-// Object.assign(exports, Core.default || Core)
 
 // Require Builder
 const Builder = require('./dist/builder')
-// Object.assign(exports, Builder.default || Builder)
 
-// FIXME
-Object.assign(Core.default || Core, Builder.default || Builder)
-module.exports = Core.default || Core
-
-// Use special env flag to specify app dir without modify builder
-if (!process.env.NUXT_APP_DIR) {
-  process.env.NUXT_APP_DIR = path.resolve(__dirname, 'lib/app')
-}
+module.exports = Object.assign(Core, Builder)
diff --git a/lib/core/options.js b/lib/core/options.js
index ae36a265e6..c4e735968e 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -57,7 +57,7 @@ const defaultOptions = {
   dev: (process.env.NODE_ENV !== 'production'),
   runBuild: false,
   buildDir: '.nuxt',
-  nuxtAppDir: process.env.NUXT_APP_DIR || resolve(__dirname, '../lib/app'), // Relative to dist
+  nuxtAppDir: resolve(__dirname, '../lib/app/'), // Relative to dist
   build: {
     analyze: false,
     extractCSS: false,

From 69e645037746ef416d49594521820d12318f2e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 15:49:04 +0200
Subject: [PATCH 102/236] Fix issue #908 and #916

---
 lib/core/renderer.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 8fa9fb0d7a..f9d7114910 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -62,12 +62,12 @@ export default class Renderer extends Tapable {
     // For serving static/ files to /
     this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
 
-    // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
+    // For serving .nuxt/dist/ files
     this.serveStaticNuxt = pify(serveStatic(resolve(this.options.buildDir, 'dist'), {
       maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
     }))
 
-    // gzip middleware for production
+    // GZIP middleware for production
     if (!this.options.dev && this.options.render.gzip) {
       this.gzipMiddleware = pify(compression(this.options.render.gzip))
     }
@@ -179,13 +179,11 @@ export default class Renderer extends Tapable {
       await this.serveStatic(req, res)
 
       // Serve .nuxt/dist/ files (only for production)
-      if (!this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0) {
+      const isValidExtension = (req.url.slice(-3) === '.js') || (req.url.slice(-4) === '.css') || (req.url.slice(-4) === '.map')
+      if (!this.options.dev && isValidExtension) {
         const url = req.url
-        req.url = req.url.replace(this.options.build.publicPath, '/')
-        // Forbid access to sensitive data (#916)
-        if (req.url.includes('server-bundle.json')) {
-          res.statusCode = 404
-          return res.end()
+        if (req.url.indexOf(this.options.build.publicPath) === 0) {
+          req.url = req.url.replace(this.options.build.publicPath, '/')
         }
         await this.serveStaticNuxt(req, res)
         /* istanbul ignore next */

From 5521925668a7a78c9d060aacf927ba2256d9bbb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 17:41:49 +0200
Subject: [PATCH 103/236] Handle error

---
 lib/builder/builder.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 50ced73699..a86fd46568 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -299,6 +299,7 @@ export default class Builder extends Tapable {
       } else {
         // --- Production build ---
         compiler.run((err, stats) => {
+          if (err) return console.error(err) // eslint-disable-line no-console
           // Show build stats for production
           console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
           if (stats.hasErrors()) {

From 59d7e786aa4028ee6ded9fd120dca017621a76a2 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 20:14:01 +0430
Subject: [PATCH 104/236] Fully decouple builder

runBuild flag removed
---
 bin/nuxt-build           | 10 ++---
 bin/nuxt-dev             | 23 ++++++++----
 bin/nuxt-generate        |  9 +++--
 index.js                 |  7 ++++
 lib/builder/builder.js   | 80 ++++++++++++++++++++++------------------
 lib/builder/generator.js | 18 +++++----
 lib/core/nuxt.js         | 53 --------------------------
 lib/core/options.js      |  6 ---
 lib/core/renderer.js     | 19 ++++++----
 lib/core/server.js       |  7 +++-
 10 files changed, 104 insertions(+), 128 deletions(-)

diff --git a/bin/nuxt-build b/bin/nuxt-build
index 5d70258cef..0141ed65fc 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -5,8 +5,7 @@ process.env.DEBUG = 'nuxt:*'
 
 const fs = require('fs')
 const parseArgs = require('minimist')
-const without = require('lodash').without
-const { Nuxt } = require('../')
+const { Nuxt, Builder } = require('../')
 const resolve = require('path').resolve
 const debug = require('debug')('nuxt:build')
 debug.color = 2 // Force green color
@@ -53,7 +52,6 @@ if (typeof options.rootDir !== 'string') {
 }
 // Create production build when calling `nuxt build`
 options.dev = false
-options.runBuild = true // Force doing production build before init
 
 // Analyze option
 options.build = options.build || {}
@@ -62,8 +60,10 @@ if (argv.analyze) {
 }
 
 debug('Building...')
-const nuxt = module.exports = new Nuxt(options)
-nuxt.ready()
+const nuxt = new Nuxt(options)
+const builder = new Builder(nuxt)
+
+builder.build()
   .then(() => {
     debug('Building done')
   })
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 229a523355..b26fcbe623 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -8,10 +8,9 @@ const debug = require('debug')('nuxt:build')
 debug.color = 2 // force green color
 const fs = require('fs')
 const parseArgs = require('minimist')
-const { Nuxt, Server } = require('../')
+const { Nuxt, Server, Builder } = require('../')
 const chokidar = require('chokidar')
 const resolve = require('path').resolve
-const without = require('lodash').without
 
 const argv = parseArgs(process.argv.slice(2), {
   alias: {
@@ -65,18 +64,23 @@ if (typeof options.rootDir !== 'string') {
 options.dev = true
 
 const nuxt = new Nuxt(options)
+const builder = new Builder(nuxt)
+
 const port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
 const host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-const server = new Server(nuxt).listen(port, host)
+const server = new Server(nuxt)
+server.listen(port, host)
 
-listenOnConfigChanges(nuxt, server)
+builder.build().then(() => {
+  listenOnConfigChanges(nuxt, server)
+})
 
 function listenOnConfigChanges (nuxt, server) {
   // Listen on nuxt.config.js changes
   const build = _.debounce(() => {
     debug('[nuxt.config.js] changed')
     delete require.cache[nuxtConfigFile]
-    let options = {}
+    var options = {}
     if (fs.existsSync(nuxtConfigFile)) {
       try {
         options = require(nuxtConfigFile)
@@ -84,13 +88,18 @@ function listenOnConfigChanges (nuxt, server) {
         return console.error(e) // eslint-disable-line no-console
       }
     }
-    options.rootDir = rootDir
+
+    if (typeof options.rootDir !== 'string') {
+      options.rootDir = rootDir
+    }
+
     nuxt.close()
       .then(() => {
         debug('Rebuilding the app...')
         const nuxt = new Nuxt(options)
+        const builder = new Builder(nuxt)
         server.nuxt = nuxt
-        return nuxt.ready()
+        return builder.build()
       })
       .catch((error) => {
         console.error('Error while rebuild the app:', error) // eslint-disable-line no-console
diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index ad7d4da2e0..fd97bc4fde 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -7,7 +7,7 @@ const fs = require('fs')
 const parseArgs = require('minimist')
 const debug = require('debug')('nuxt:generate')
 
-const { Nuxt } = require('../')
+const { Nuxt, Builder, Generator } = require('../')
 const resolve = require('path').resolve
 
 const argv = parseArgs(process.argv.slice(2), {
@@ -49,11 +49,12 @@ if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
 options.dev = false // Force production mode (no webpack middleware called)
-options.runBuild = true // Force doing production build before init
 
 debug('Generating...')
-const nuxt = module.exports = new Nuxt(options)
-nuxt.generate()
+const nuxt = new Nuxt(options)
+const builder = new Builder(nuxt)
+const generator = new Generator(nuxt, builder)
+generator.generate()
   .then(() => {
     debug('Generate done')
     process.exit(0)
diff --git a/index.js b/index.js
index a3e2b704ee..4f1b490c42 100644
--- a/index.js
+++ b/index.js
@@ -14,8 +14,15 @@ process.noDeprecation = true
 
 // Require Core
 const Core = require('./dist/core.js')
+Object.assign(exports, Core.default || Core)
 
 // Require Builder
 const Builder = require('./dist/builder')
+Object.assign(exports, Builder.default || Builder)
+
+// Use special env flag to specify app dir without modify builder
+if (!process.env.NUXT_APP_DIR) {
+  process.env.NUXT_APP_DIR = path.resolve(__dirname, 'lib/app')
+}
 
 module.exports = Object.assign(Core, Builder)
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index a86fd46568..21a55ae45c 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import chokidar from 'chokidar'
-import fs from 'fs-extra'
+import fs, { remove, readFile, writeFile, mkdirp, utimes } from 'fs-extra'
 import hash from 'hash-sum'
 import pify from 'pify'
 import webpack from 'webpack'
@@ -19,11 +19,6 @@ import serverWebpackConfig from './webpack/server.config.js'
 const debug = Debug('nuxt:build')
 debug.color = 2 // Force green color
 
-const remove = pify(fs.remove)
-const readFile = pify(fs.readFile)
-const utimes = pify(fs.utimes)
-const writeFile = pify(fs.writeFile)
-const mkdirp = pify(fs.mkdirp)
 const glob = pify(Glob)
 
 export default class Builder extends Tapable {
@@ -32,8 +27,6 @@ export default class Builder extends Tapable {
     this.nuxt = nuxt
     this.options = nuxt.options
 
-    this._buildStatus = STATUS.INITIAL
-
     // Fields that set on build
     this.compiler = null
     this.webpackDevMiddleware = null
@@ -46,11 +39,13 @@ export default class Builder extends Tapable {
       modules: false,
       colors: true
     }
+
+    this._buildStatus = STATUS.INITIAL
   }
 
   async build () {
-    // Avoid calling this method multiple times
-    if (this._buildStatus === STATUS.BUILD_DONE) {
+    // Avoid calling build() method multiple times when dev:true
+    if (this._buildStatus === STATUS.BUILD_DONE && this.options.dev) {
       return this
     }
     // If building
@@ -63,6 +58,9 @@ export default class Builder extends Tapable {
     }
     this._buildStatus = STATUS.BUILDING
 
+    // Wait for nuxt ready
+    await this.nuxt.ready()
+
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
     if (this._nuxtPages) {
@@ -258,16 +256,27 @@ export default class Builder extends Tapable {
 
     // Simulate webpack multi compiler interface
     // Separate compilers are simpler, safer and faster
-    this.compiler = { cache: {}, compilers: [] }
-    compilersOptions.forEach(compilersOption => {
-      this.compiler.compilers.push(webpack(compilersOption))
-    })
+    this.compiler = { compilers: [] }
     this.compiler.plugin = (...args) => {
       this.compiler.compilers.forEach(compiler => {
         compiler.plugin(...args)
       })
     }
 
+    // Initialize shared FS and Cache
+    const sharedFS = this.options.dev && new MFS()
+    const sharedCache = {}
+
+    // Initialize compilers
+    compilersOptions.forEach(compilersOption => {
+      const compiler = webpack(compilersOption)
+      if (sharedFS) {
+        compiler.outputFileSystem = sharedFS
+      }
+      compiler.cache = sharedCache
+      this.compiler.compilers.push(compiler)
+    })
+
     // Access to compilers with name
     this.compiler.compilers.forEach(compiler => {
       if (compiler.name) {
@@ -275,6 +284,18 @@ export default class Builder extends Tapable {
       }
     })
 
+    // Run after each compile
+    this.compiler.plugin('done', stats => {
+      // Don't reload failed builds
+      if (stats.hasErrors() || stats.hasWarnings()) {
+        return
+      }
+      // Reload renderer if available
+      if (this.nuxt.renderer) {
+        this.nuxt.renderer.loadResources(sharedFS || fs)
+      }
+    })
+
     // Add dev Stuff
     if (this.options.dev) {
       this.webpackDev()
@@ -297,8 +318,11 @@ export default class Builder extends Tapable {
           })
         }
       } else {
-        // --- Production build ---
+        // --- Production Build ---
         compiler.run((err, stats) => {
+          if (err) {
+            return reject(err)
+          }
           if (err) return console.error(err) // eslint-disable-line no-console
           // Show build stats for production
           console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
@@ -312,26 +336,6 @@ export default class Builder extends Tapable {
   }
 
   webpackDev () {
-    // Use shared MFS + Cache for faster builds
-    let mfs = new MFS()
-    this.compiler.compilers.forEach(compiler => {
-      compiler.outputFileSystem = mfs
-      compiler.cache = this.compiler.cache
-    })
-
-    // Run after each compile
-    this.compiler.plugin('done', stats => {
-      // Don't reload failed builds
-      if (stats.hasErrors() || stats.hasWarnings()) {
-        return
-      }
-      // Reload renderer if available
-      if (this.nuxt.renderer) {
-        this.nuxt.renderer.loadResources(mfs)
-      }
-    })
-
-    // Add dev Middleware
     debug('Adding webpack middleware...')
 
     // Create webpack dev middleware
@@ -348,6 +352,12 @@ export default class Builder extends Tapable {
       heartbeat: 2500
     }))
 
+    // Inject to renderer instance
+    if (this.nuxt.renderer) {
+      this.nuxt.renderer.webpackDevMiddleware = this.webpackDevMiddleware
+      this.nuxt.renderer.webpackHotMiddleware = this.webpackHotMiddleware
+    }
+
     // Stop webpack middleware on nuxt.close()
     this.nuxt.plugin('close', () => new Promise(resolve => {
       this.webpackDevMiddleware.close(() => resolve())
diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index e9ac779805..2589134043 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -1,5 +1,5 @@
-import fs from 'fs-extra'
-import pify from 'pify'
+import fs from 'fs'
+import { copy, remove, writeFile, mkdirp } from 'fs-extra'
 import _ from 'lodash'
 import { resolve, join, dirname, sep } from 'path'
 import { minify } from 'html-minifier'
@@ -8,19 +8,16 @@ import { isUrl, promisifyRoute, waitFor, flatRoutes } from 'utils'
 import Debug from 'debug'
 
 const debug = Debug('nuxt:generate')
-const copy = pify(fs.copy)
-const remove = pify(fs.remove)
-const writeFile = pify(fs.writeFile)
-const mkdirp = pify(fs.mkdirp)
 
 export default class Generator extends Tapable {
-  constructor (nuxt) {
+  constructor (nuxt, builder) {
     super()
     this.nuxt = nuxt
     this.options = nuxt.options
+    this.builder = builder
   }
 
-  async generate () {
+  async generate (doBuild = true) {
     const s = Date.now()
     let errors = []
     let generateRoutes = []
@@ -34,6 +31,11 @@ export default class Generator extends Tapable {
     // Wait for nuxt be ready
     await this.nuxt.ready()
 
+    // Start build process
+    if (this.builder && doBuild) {
+      await this.builder.build()
+    }
+
     // Clean destination folder
     await remove(distPath)
     debug('Destination folder cleaned')
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index b07016894c..a6f9ffd510 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -1,12 +1,7 @@
 import Tapable from 'tappable'
-import chalk from 'chalk'
 import ModuleContainer from './module'
 import Renderer from './renderer'
 import Options from './options'
-import Core from './index'
-
-const defaultHost = process.env.HOST || process.env.npm_package_config_nuxt_host || 'localhost'
-const defaultPort = process.env.PORT || process.env.npm_package_config_nuxt_port || '3000'
 
 export default class Nuxt extends Tapable {
   constructor (_options = {}) {
@@ -26,18 +21,6 @@ export default class Nuxt extends Tapable {
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
 
-    // Builder is lazy loaded, so register plugin here
-    this.plugin('init', async () => {
-      // Call to build on dev
-      if (this.options.dev) {
-        this.builder.build().catch(this.errorHandler)
-      }
-      // If explicitly runBuild required
-      if (this.options.runBuild) {
-        await this.builder.build()
-      }
-    })
-
     this._ready = this.ready()
   }
 
@@ -55,26 +38,6 @@ export default class Nuxt extends Tapable {
     return this
   }
 
-  get builder () {
-    if (this._builder) {
-      return this._builder
-    }
-    this._builder = new Core.Builder(this)
-    return this._builder
-  }
-
-  get generator () {
-    if (this._generator) {
-      return this._generator
-    }
-    this._generator = new Core.Generator(this)
-    return this._generator
-  }
-
-  generate () {
-    return this.generator.generate.apply(this.generator, arguments)
-  }
-
   errorHandler () {
     // Silent
     if (this.options.errorHandler === false) {
@@ -90,26 +53,10 @@ export default class Nuxt extends Tapable {
     process.exit(1)
   }
 
-  // Both Renderer & Server depend on this method
-  serverReady ({ host = defaultHost, port = defaultPort } = {}) {
-    let _host = host === '0.0.0.0' ? 'localhost' : host
-
-    // eslint-disable-next-line no-console
-    console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
-
-    return this.applyPluginsAsync('serverReady').catch(this.errorHandler)
-  }
-
   async close (callback) {
     // Call for close
     await this.applyPluginsAsync('close')
 
-    // Remove all references
-    delete this._generator
-    delete this._builder
-
-    this.initialized = false
-
     if (typeof callback === 'function') {
       await callback()
     }
diff --git a/lib/core/options.js b/lib/core/options.js
index c4e735968e..498ec8c30d 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -45,17 +45,11 @@ export default function Options (_options) {
     options.store = true
   }
 
-  // runBuild can not be enabled for dev === true
-  if (options.dev === true) {
-    options.runBuild = false
-  }
-
   return options
 }
 
 const defaultOptions = {
   dev: (process.env.NODE_ENV !== 'production'),
-  runBuild: false,
   buildDir: '.nuxt',
   nuxtAppDir: resolve(__dirname, '../lib/app/'), // Relative to dist
   build: {
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index f9d7114910..b688b25b99 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -33,12 +33,16 @@ export default class Renderer extends Tapable {
     // Will be set by createRenderer
     this.bundleRenderer = null
 
+    // Will be available on dev
+    this.webpackDevMiddleware = null
+    this.webpackHotMiddleware = null
+
     // Renderer runtime resources
     this.resources = {
       clientManifest: null,
       serverBundle: null,
       appTemplate: null,
-      errorTemplate: '<pre>{{ stack }}</pre>' // Will be loaded on ready
+      errorTemplate: parseTemplate('<pre>{{ stack }}</pre>') // Will be loaded on ready
     }
 
     // Initialize
@@ -146,10 +150,6 @@ export default class Renderer extends Tapable {
 
     // Promisify renderToString
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)
-
-    if (!this.options.runBuild) {
-      this.nuxt.serverReady()
-    }
   }
 
   async render (req, res) {
@@ -170,9 +170,12 @@ export default class Renderer extends Tapable {
       }
 
       // Call webpack middleware only in development
-      if (this.options.dev && this.nuxt.builder && this.nuxt.builder.webpackDevMiddleware) {
-        await this.nuxt.builder.webpackDevMiddleware(req, res)
-        await this.nuxt.builder.webpackHotMiddleware(req, res)
+      if (this.webpackDevMiddleware) {
+        await this.webpackDevMiddleware(req, res)
+      }
+
+      if (this.webpackHotMiddleware) {
+        await this.webpackHotMiddleware(req, res)
       }
 
       // Serve static/ files
diff --git a/lib/core/server.js b/lib/core/server.js
index dd27891aca..619f4c879f 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -1,6 +1,7 @@
 import http from 'http'
 import connect from 'connect'
 import path from 'path'
+import chalk from 'chalk'
 
 class Server {
   constructor (nuxt) {
@@ -32,6 +33,7 @@ class Server {
     this.options.serverMiddleware.forEach(m => {
       this.useMiddleware(m)
     })
+
     // Add default render middleware
     this.useMiddleware(this.render.bind(this))
 
@@ -66,8 +68,9 @@ class Server {
     this.nuxt.ready()
       .then(() => {
         this.server.listen(port, host, () => {
-          // Renderer calls showURL when server is really ready
-          // this.nuxt.showURL(host, port)
+          let _host = host === '0.0.0.0' ? 'localhost' : host
+          // eslint-disable-next-line no-console
+          console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
         })
       })
       .catch(this.nuxt.errorHandler)

From 0e5911269a832f489a62cc0d2625b5242899a865 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 20:18:47 +0430
Subject: [PATCH 105/236] remove NUXT_APP_DIR

---
 index.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 4f1b490c42..a075fed972 100644
--- a/index.js
+++ b/index.js
@@ -17,12 +17,8 @@ const Core = require('./dist/core.js')
 Object.assign(exports, Core.default || Core)
 
 // Require Builder
-const Builder = require('./dist/builder')
+// TODO: conditionally do this when builder available
+const Builder = require('./dist/builder.js')
 Object.assign(exports, Builder.default || Builder)
 
-// Use special env flag to specify app dir without modify builder
-if (!process.env.NUXT_APP_DIR) {
-  process.env.NUXT_APP_DIR = path.resolve(__dirname, 'lib/app')
-}
-
 module.exports = Object.assign(Core, Builder)

From 51e603308a851b3dfc1e74d27e103b3bb0b77b56 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 20:22:12 +0430
Subject: [PATCH 106/236] fix index.js

---
 index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/index.js b/index.js
index a075fed972..bfdd8a376b 100644
--- a/index.js
+++ b/index.js
@@ -20,5 +20,3 @@ Object.assign(exports, Core.default || Core)
 // TODO: conditionally do this when builder available
 const Builder = require('./dist/builder.js')
 Object.assign(exports, Builder.default || Builder)
-
-module.exports = Object.assign(Core, Builder)

From 840a6cfe00e7b7a169fca45656fc5423f2ed67d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 19:32:59 +0200
Subject: [PATCH 107/236] Fix small typos

---
 bin/nuxt-start     | 2 +-
 index.js           | 4 ++--
 lib/core/server.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/nuxt-start b/bin/nuxt-start
index c1ad090ba0..97f5818f94 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -57,7 +57,7 @@ options.dev = false // Force production mode (no webpack middleware called)
 
 // Check if project is built for production
 const distDir = join(options.rootDir, options.buildDir || '.nuxt', 'dist' )
-if (!fs.existsSync(join(distDir,'server-bundle.json'))) {
+if (!fs.existsSync(join(distDir, 'server-bundle.json'))) {
   console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
   process.exit(1)
 }
diff --git a/index.js b/index.js
index bfdd8a376b..7fddc57184 100644
--- a/index.js
+++ b/index.js
@@ -14,9 +14,9 @@ process.noDeprecation = true
 
 // Require Core
 const Core = require('./dist/core.js')
-Object.assign(exports, Core.default || Core)
+Object.assign(exports, Core)
 
 // Require Builder
 // TODO: conditionally do this when builder available
 const Builder = require('./dist/builder.js')
-Object.assign(exports, Builder.default || Builder)
+Object.assign(exports, Builder)
diff --git a/lib/core/server.js b/lib/core/server.js
index 619f4c879f..e5f00f7eec 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -70,7 +70,7 @@ class Server {
         this.server.listen(port, host, () => {
           let _host = host === '0.0.0.0' ? 'localhost' : host
           // eslint-disable-next-line no-console
-          console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
+          console.log('\n' + chalk.bold(chalk.bgBlue.white(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
         })
       })
       .catch(this.nuxt.errorHandler)

From c26daa9e8f525bcf087361045212fd7c5f178cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 19:33:23 +0200
Subject: [PATCH 108/236] Fix tests

---
 test/basic.dev.test.js           |  9 ++++-----
 test/basic.fail.generate.test.js |  6 ++++--
 test/basic.generate.test.js      |  6 ++++--
 test/basic.test.js               |  4 ++--
 test/children.test.js            |  4 ++--
 test/dynamic-routes.test.js      |  4 ++--
 test/error.test.js               |  4 ++--
 test/index.test.js               |  7 +++----
 test/module.test.js              |  4 ++--
 test/with-config.test.js         | 14 ++------------
 10 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 5ee3d73025..b0639decd8 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Server } from '../index.js'
+import { Nuxt, Server, Builder } from '../index.js'
 
 const port = 4001
 const url = (route) => 'http://localhost:' + port + route
@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
     dev: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.ready()
+  await new Builder(nuxt).build()
   server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
@@ -37,8 +37,7 @@ test('/_nuxt/test.hot-update.json should returns empty html', async t => {
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
+test.after('Closing server and nuxt.js', async t => {
   server.close()
-  nuxt.close(() => {
-  })
+  await nuxt.close(() => {})
 })
diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js
index 340bf4d253..4a7bed3f51 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/basic.fail.generate.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt } from '../index.js'
+import { Nuxt, Builder, Generator } from '../index.js'
 
 test('Fail with routes() which throw an error', async t => {
   const options = {
@@ -14,7 +14,9 @@ test('Fail with routes() which throw an error', async t => {
     }
   }
   const nuxt = new Nuxt(options)
-  return nuxt.generate()
+  const builder = new Builder(nuxt)
+  const generator = new Generator(nuxt, builder)
+  return generator.generate()
     .catch((e) => {
       t.true(e.message === 'Not today!')
     })
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index e896360ad0..b75e71a4b2 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -4,7 +4,7 @@ import http from 'http'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
-import { Nuxt } from '../index.js'
+import { Nuxt, Builder, Generator } from '../index.js'
 
 const port = 4002
 const url = (route) => 'http://localhost:' + port + route
@@ -20,8 +20,10 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
+  const builder = new Builder(nuxt)
+  const generator = new Generator(nuxt, builder)
   try {
-    await nuxt.generate() // throw an error (of /validate route)
+    await generator.generate() // throw an error (of /validate route)
   } catch (err) {
   }
   const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
diff --git a/test/basic.test.js b/test/basic.test.js
index 49a86d25c4..e1fa0820eb 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -2,7 +2,7 @@ import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
 import stdMocks from 'std-mocks'
-import { Nuxt, Server } from '../index.js'
+import { Nuxt, Server, Builder } from '../index.js'
 
 const port = 4003
 const url = (route) => 'http://localhost:' + port + route
@@ -18,7 +18,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.ready()
+  await new Builder(nuxt).build()
   server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/children.test.js b/test/children.test.js
index 3424a5e15c..6f5629df3b 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Server } from '../index.js'
+import { Nuxt, Server, Builder } from '../index.js'
 
 const port = 4004
 // const url = (route) => 'http://localhost:' + port + route
@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.ready()
+  await new Builder(nuxt).build()
   server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js
index 79618677cd..9ac8eeda2d 100644
--- a/test/dynamic-routes.test.js
+++ b/test/dynamic-routes.test.js
@@ -2,7 +2,7 @@ import test from 'ava'
 import { resolve } from 'path'
 import fs from 'fs'
 import pify from 'pify'
-import { Nuxt } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 const readFile = pify(fs.readFile)
 
@@ -12,7 +12,7 @@ test.before('Init Nuxt.js', async t => {
     dev: false,
     runBuild: true
   })
-  await nuxt.ready()
+  await new Builder(nuxt).build()
 })
 
 test('Check .nuxt/router.js', t => {
diff --git a/test/error.test.js b/test/error.test.js
index 6f1cc7c8e3..7ed40fa136 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Server } from '../index.js'
+import { Nuxt, Server, Builder } from '../index.js'
 
 const port = 4005
 const url = (route) => 'http://localhost:' + port + route
@@ -16,7 +16,7 @@ test.before('Init Nuxt.js', async t => {
     runBuild: true
   }
   nuxt = new Nuxt(options)
-  await nuxt.ready()
+  await new Builder(nuxt).build()
   server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/index.test.js b/test/index.test.js
index b008b1ee04..8e3fbf745e 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 test('Nuxt.js Class', t => {
   t.is(typeof Nuxt, 'function')
@@ -12,7 +12,6 @@ test.serial('Nuxt.js Instance', async t => {
   })
   t.is(typeof nuxt, 'object')
   t.is(nuxt.options.dev, true)
-  t.is(typeof nuxt.generate, 'function')
   t.is(typeof nuxt._ready.then, 'function')
   await nuxt.ready()
   t.is(nuxt.initialized, true)
@@ -24,7 +23,7 @@ test.serial('Fail to build when no pages/ directory but is in the parent', t =>
     runBuild: true,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
   })
-  return nuxt.ready().catch(err => {
+  return new Builder(nuxt).build().catch(err => {
     let s = String(err)
     t.true(s.includes('No `pages` directory found'))
     t.true(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?'))
@@ -37,7 +36,7 @@ test.serial('Fail to build when no pages/ directory', t => {
     runBuild: true,
     rootDir: resolve(__dirname)
   })
-  return nuxt.ready().catch(err => {
+  return new Builder(nuxt).build().catch(err => {
     let s = String(err)
     t.true(s.includes('Couldn\'t find a `pages` directory'))
     t.true(s.includes('Please create one under the project root'))
diff --git a/test/module.test.js b/test/module.test.js
index 331d42943f..6745df79a4 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { resolve, normalize } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Server } from '../index.js'
+import { Nuxt, Server, Builder } from '../index.js'
 
 const port = 4006
 const url = (route) => 'http://localhost:' + port + route
@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.ready()
+  await new Builder(nuxt).build()
   server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
diff --git a/test/with-config.test.js b/test/with-config.test.js
index ae4db48b02..1b5b3169ad 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Server } from '../index.js'
+import { Nuxt, Server, Builder } from '../index.js'
 
 const port = 4007
 const url = (route) => 'http://localhost:' + port + route
@@ -17,7 +17,7 @@ test.before('Init Nuxt.js', async t => {
   config.dev = false
   config.runBuild = true
   nuxt = new Nuxt(config)
-  await nuxt.ready()
+  await new Builder(nuxt).build()
   server = new Server(nuxt)
   server.listen(port, 'localhost')
 })
@@ -104,13 +104,3 @@ test.after('Closing server and nuxt.js', t => {
   server.close()
   nuxt.close()
 })
-
-test.after('Should be able to start Nuxt with build done', async t => {
-  const rootDir = resolve(__dirname, 'fixtures/with-config')
-  let config = require(resolve(rootDir, 'nuxt.config.js'))
-  config.rootDir = rootDir
-  config.dev = false
-  config.runBuild = true
-  nuxt = new Nuxt(config)
-  await nuxt.ready()
-})

From 289c6f221407cb3d53eaa885ab1673b3e7eba9af Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Jun 2017 22:23:01 +0430
Subject: [PATCH 109/236] chalk OPEN color

---
 lib/core/server.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/core/server.js b/lib/core/server.js
index e5f00f7eec..00cdeff0fc 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -1,7 +1,7 @@
-import http from 'http'
-import connect from 'connect'
-import path from 'path'
-import chalk from 'chalk'
+import http from "http";
+import connect from "connect";
+import path from "path";
+import chalk from "chalk";
 
 class Server {
   constructor (nuxt) {
@@ -70,7 +70,7 @@ class Server {
         this.server.listen(port, host, () => {
           let _host = host === '0.0.0.0' ? 'localhost' : host
           // eslint-disable-next-line no-console
-          console.log('\n' + chalk.bold(chalk.bgBlue.white(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
+          console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
         })
       })
       .catch(this.nuxt.errorHandler)

From 87c37ca549a6651df642f09b0521a3d7b7b07b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 20:22:02 +0200
Subject: [PATCH 110/236] Upgrade dependencies

---
 package.json |  21 ++-
 yarn.lock    | 456 ++++++++++++++++++++++++++-------------------------
 2 files changed, 247 insertions(+), 230 deletions(-)

diff --git a/package.json b/package.json
index 2617d3d8b2..655b5fe286 100644
--- a/package.json
+++ b/package.json
@@ -43,10 +43,9 @@
     "nuxt": "./bin/nuxt"
   },
   "nyc": {
-    "exclude": [
-      "test/**",
-      "node_modules/**",
-      "index.js"
+    "include": [
+      "lib/",
+      "dist/"
     ]
   },
   "scripts": {
@@ -69,7 +68,7 @@
   "dependencies": {
     "ansi-html": "^0.0.7",
     "autoprefixer": "^7.1.1",
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-loader": "^7.0.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-vue-app": "^1.2.0",
@@ -80,7 +79,7 @@
     "css-loader": "^0.28.4",
     "debug": "^2.6.8",
     "etag": "^1.8.0",
-    "extract-text-webpack-plugin": "^2.1.0",
+    "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.11.2",
     "fresh": "^0.5.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
@@ -104,13 +103,13 @@
     "tapable": "^0.2.6",
     "tappable": "^1.0.1",
     "url-loader": "^0.5.9",
-    "vue": "~2.3.3",
+    "vue": "~2.3.4",
     "vue-loader": "^12.2.1",
     "vue-meta": "^1.0.4",
-    "vue-router": "^2.5.3",
-    "vue-server-renderer": "~2.3.3",
+    "vue-router": "^2.6.0",
+    "vue-server-renderer": "~2.3.4",
     "vue-ssr-html-stream": "^2.2.0",
-    "vue-template-compiler": "~2.3.3",
+    "vue-template-compiler": "~2.3.4",
     "vuex": "^2.3.1",
     "webpack": "^3.0.0-rc.2",
     "webpack-bundle-analyzer": "^2.8.2",
@@ -150,7 +149,7 @@
     "rollup-plugin-replace": "^1.1.1",
     "rollup-watch": "^4.0.0",
     "std-mocks": "^1.0.1",
-    "uglify-js": "^3.0.17"
+    "uglify-js": "^3.0.18"
   },
   "collective": {
     "type": "opencollective",
diff --git a/yarn.lock b/yarn.lock
index cccf2d7ee1..68be9bcd5f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,5 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+
+
 "@ava/babel-plugin-throws-helper@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
@@ -39,6 +41,13 @@
   version "6.0.78"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
 
+JSONStream@^1.0.4:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abab@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -104,10 +113,12 @@ ajv@^4.7.0, ajv@^4.9.1:
     json-stable-stringify "^1.0.1"
 
 ajv@^5.0.0, ajv@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68"
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
   dependencies:
     co "^4.6.0"
+    fast-deep-equal "^0.1.0"
+    json-schema-traverse "^0.3.0"
     json-stable-stringify "^1.0.1"
 
 align-text@^0.1.1, align-text@^0.1.3:
@@ -136,7 +147,7 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-html@^0.0.7, ansi-html@0.0.7:
+ansi-html@0.0.7, ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
@@ -149,8 +160,8 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
 ansi-styles@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.0.0.tgz#5404e93a544c4fec7f048262977bebfe3155e0c1"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
   dependencies:
     color-convert "^1.0.0"
 
@@ -260,14 +271,14 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert-plus@^1.0.0, assert-plus@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -427,7 +438,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.17.0, babel-core@^6.24.1, babel-core@6:
+babel-core@6, babel-core@^6.17.0, babel-core@^6.24.1, babel-core@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
@@ -1090,10 +1101,14 @@ babylon@^6.1.0, babylon@^6.13.0, babylon@^6.17.0, babylon@^6.17.2:
   version "6.17.3"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.3.tgz#1327d709950b558f204e5352587fd0290f8d8e48"
 
-balanced-match@^0.4.1, balanced-match@^0.4.2:
+balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
+balanced-match@^1.0.0:
+  version "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.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
@@ -1153,10 +1168,10 @@ boxen@^1.0.0:
     widest-line "^1.0.0"
 
 brace-expansion@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
   dependencies:
-    balanced-match "^0.4.1"
+    balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 braces@^1.8.2:
@@ -1236,11 +1251,11 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     electron-to-chromium "^1.2.7"
 
 browserslist@^2.1.2, browserslist@^2.1.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053"
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
   dependencies:
-    caniuse-lite "^1.0.30000670"
-    electron-to-chromium "^1.3.11"
+    caniuse-lite "^1.0.30000684"
+    electron-to-chromium "^1.3.14"
 
 buf-compare@^1.0.0:
   version "1.0.1"
@@ -1345,12 +1360,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.30000683"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000683.tgz#58b57ed1e0bb9da54eaf1462985147bbe16679fa"
+  version "1.0.30000690"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000690.tgz#ee4e0750070f6aae6f40e76477984449bd6cb48a"
 
-caniuse-lite@^1.0.30000670:
-  version "1.0.30000683"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000683.tgz#a7573707cf2acc9217ca6484d1dfbc9f13898364"
+caniuse-lite@^1.0.30000670, caniuse-lite@^1.0.30000684:
+  version "1.0.30000690"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000690.tgz#3b232dbc0cf32bc2a888ec199852a50afa37f5ef"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1371,15 +1386,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.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"
   dependencies:
@@ -1389,6 +1396,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1419,14 +1434,14 @@ circular-json@^0.3.1:
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
 
 clap@^1.0.9:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857"
   dependencies:
     chalk "^1.1.3"
 
 clean-css@4.1.x:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.3.tgz#07cfe8980edb20d455ddc23aadcf1e04c6e509ce"
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.4.tgz#eec8811db27457e0078d8ca921fa81b72fa82bf4"
   dependencies:
     source-map "0.5.x"
 
@@ -1577,7 +1592,7 @@ command-join@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
 
-commander@^2.9.0, commander@~2.9.0, commander@2.9.x:
+commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -1816,8 +1831,8 @@ conventional-commits-parser@^1.0.0, conventional-commits-parser@^1.0.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz#e327b53194e1a7ad5dc63479ee9099a52b024865"
   dependencies:
-    is-text-path "^1.0.0"
     JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
     lodash "^4.2.1"
     meow "^3.3.0"
     split2 "^2.0.0"
@@ -2064,7 +2079,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-"cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x:
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -2121,13 +2136,7 @@ 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.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
-debug@~2.2.0, debug@2.2.0:
+debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -2139,6 +2148,12 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
+debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
 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"
@@ -2160,8 +2175,8 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
 deepmerge@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.4.3.tgz#f8c9ecb11c176b3dbfc8167b58cc5674c5e658bb"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
@@ -2206,7 +2221,7 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@~1.1.0, depd@1.1.0:
+depd@1.1.0, depd@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
 
@@ -2247,16 +2262,16 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+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@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
@@ -2278,7 +2293,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@^1.3.0, domelementtype@1:
+domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2286,23 +2301,16 @@ domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
-domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
-  dependencies:
-    domelementtype "1"
-
 domhandler@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
   dependencies:
     domelementtype "1"
 
-domutils@^1.5.1, domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
   dependencies:
-    dom-serializer "0"
     domelementtype "1"
 
 domutils@1.1:
@@ -2311,6 +2319,20 @@ domutils@1.1:
   dependencies:
     domelementtype "1"
 
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
@@ -2323,14 +2345,14 @@ dot-prop@^4.1.0:
   dependencies:
     is-obj "^1.0.0"
 
-duplexer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2354,7 +2376,7 @@ ejs@^2.3.4, ejs@^2.5.6:
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11:
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
   version "1.3.14"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
 
@@ -2437,7 +2459,7 @@ es6-error@^4.0.1, es6-error@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
-es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@2:
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
@@ -2466,7 +2488,7 @@ es6-set@~0.1.5:
     es6-symbol "3.1.1"
     event-emitter "~0.3.5"
 
-es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1, es6-symbol@3.1.1:
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
@@ -2797,7 +2819,7 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^2.1.0:
+extract-text-webpack-plugin@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
   dependencies:
@@ -2810,6 +2832,10 @@ extsprintf@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
+fast-deep-equal@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
+
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -2855,7 +2881,7 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@^1.0.3, finalhandler@~1.0.3, finalhandler@1.0.3:
+finalhandler@1.0.3, finalhandler@^1.0.3, finalhandler@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.3.tgz#ef47e77950e999780e86022a560e3217e0d0cc89"
   dependencies:
@@ -2942,7 +2968,7 @@ forwarded@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
-fresh@^0.5.0, fresh@0.5.0:
+fresh@0.5.0, fresh@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
@@ -2977,11 +3003,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
   dependencies:
     nan "^2.3.0"
-    node-pre-gyp "^0.6.29"
+    node-pre-gyp "^0.6.36"
 
 fstream-ignore@^1.0.5:
   version "1.0.5"
@@ -3276,7 +3302,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@^1.1.0, he@1.1.x:
+he@1.1.x, he@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
@@ -3401,14 +3427,14 @@ hullabaloo-config-manager@^1.0.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@^0.4.17, iconv-lite@~0.4.13:
-  version "0.4.17"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
-
-iconv-lite@0.4.13:
+iconv-lite@0.4.13, iconv-lite@~0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
+iconv-lite@^0.4.17:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
+
 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"
@@ -3464,7 +3490,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3476,7 +3502,7 @@ ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@^3.0.6, inquirer@3.0.6:
+inquirer@3.0.6, inquirer@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
   dependencies:
@@ -3729,14 +3755,14 @@ is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3798,7 +3824,7 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
-jest-diff@^19.0.0, jest-diff@19.0.0:
+jest-diff@19.0.0, jest-diff@^19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
   dependencies:
@@ -3940,6 +3966,10 @@ json-loader@^0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
 
+json-schema-traverse@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.0.tgz#0016c0b1ca1efe46d44d37541bcdfc19dcfae0db"
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -3982,13 +4012,6 @@ jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
-JSONStream@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 jsprim@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
@@ -4112,7 +4135,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@0.2.x:
+loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -4384,14 +4407,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.27.0"
 
-mime@^1.3.4, mime@1.3.x:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
-
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
+mime@1.3.x, mime@^1.3.4:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -4404,13 +4427,17 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, "minimatch@2 || 3":
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist, minimist@^1.1.3, minimist@^1.2.0, minimist@1.2.0:
+minimist@0.0.8, minimist@~0.0.1:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -4418,11 +4445,7 @@ minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-minimist@~0.0.1, minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, 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:
@@ -4436,11 +4459,7 @@ moment@^2.6.0:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
-ms@^0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
-ms@0.7.1:
+ms@0.7.1, ms@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
@@ -4526,7 +4545,7 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.6.29:
+node-pre-gyp@^0.6.36:
   version "0.6.36"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
   dependencies:
@@ -5285,8 +5304,8 @@ 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.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.2.tgz#5c4fea589f0ac3b00caa75b1cbc3a284195b7e5d"
   dependencies:
     chalk "^1.1.3"
     source-map "^0.5.6"
@@ -5394,26 +5413,26 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-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@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
 q@^1.1.2, q@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
+qs@6.4.0, qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
-qs@~6.4.0, qs@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -5425,7 +5444,7 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@^0.2.0, querystring@0.2.0:
+querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
@@ -5491,6 +5510,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+readable-stream@1.0:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
   version "2.2.11"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
@@ -5503,15 +5531,6 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -5656,6 +5675,31 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.4:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.0"
 
+request@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    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"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 request@^2.79.0, request@^2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -5683,31 +5727,6 @@ request@^2.79.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    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"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5724,7 +5743,7 @@ require-precompiled@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
 
-require-relative@^0.8.7, require-relative@0.8.7:
+require-relative@0.8.7, require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
 
@@ -5753,16 +5772,16 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   dependencies:
     path-parse "^1.0.5"
 
-resolve@1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -5776,7 +5795,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
@@ -5898,7 +5917,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, "semver@2 || 3 || 4 || 5", semver@5.3.0:
+"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5924,7 +5943,7 @@ serialize-javascript@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
 
-serve-static@^1.12.3, serve-static@1.12.3:
+serve-static@1.12.3, serve-static@^1.12.3:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
   dependencies:
@@ -6011,16 +6030,16 @@ source-map-support@^0.4.0, source-map-support@^0.4.15, source-map-support@^0.4.2
   dependencies:
     source-map "^0.5.6"
 
+source-map@0.5.6, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
 source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.6, source-map@0.5.x:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -6052,18 +6071,18 @@ 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"
 
-split@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.0.tgz#c4395ce683abcd254bc28fe1dabb6e5c27dcffae"
-  dependencies:
-    through "2"
-
 split2@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
   dependencies:
     through2 "^2.0.2"
 
+split@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/split/-/split-1.0.0.tgz#c4395ce683abcd254bc28fe1dabb6e5c27dcffae"
+  dependencies:
+    through "2"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -6112,8 +6131,8 @@ stream-browserify@^2.0.1:
     readable-stream "^2.0.2"
 
 stream-http@^2.3.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.1.tgz#546a51741ad5a6b07e9e31b0b10441a917df528a"
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -6125,16 +6144,6 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
-  dependencies:
-    safe-buffer "~5.0.1"
-
 string-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -6156,6 +6165,16 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
+  dependencies:
+    safe-buffer "~5.0.1"
+
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -6333,10 +6352,6 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through@^2.3.4, through@^2.3.6, "through@>=2.2.7 <3", through@2:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 through2@^2.0.0, through2@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -6344,6 +6359,10 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -6381,7 +6400,7 @@ toposort@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
 
-tough-cookie@^2.3.2, tough-cookie@>=2.3.0, tough-cookie@~2.3.0:
+tough-cookie@>=2.3.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
@@ -6442,22 +6461,22 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
+uglify-js@3.0.x, uglify-js@^3.0.18:
+  version "3.0.18"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.18.tgz#d67a3e5a0a08356b787fb1c9bddf3a807630902e"
+  dependencies:
+    commander "~2.9.0"
+    source-map "~0.5.1"
+
 uglify-js@^2.6, uglify-js@^2.8.27:
-  version "2.8.28"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@^3.0.17, uglify-js@3.0.x:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.17.tgz#d228cd55c2df9b3d2f53f147568cb4cc4a72cc06"
-  dependencies:
-    commander "~2.9.0"
-    source-map "~0.5.1"
-
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -6559,7 +6578,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@^0.10.3, util@0.10.3:
+util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6582,8 +6601,8 @@ uuid@^2.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
 uuid@^3.0.0, uuid@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
@@ -6646,11 +6665,11 @@ vue-meta@^1.0.4:
     lodash.isplainobject "^4.0.6"
     object-assign "^4.1.1"
 
-vue-router@^2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.5.3.tgz#073783f564b6aece6c8a59c63e298dc2aabfb51b"
+vue-router@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.6.0.tgz#77b271f6e0ac6d57e8e556da58c6582fce0ab712"
 
-vue-server-renderer@~2.3.3:
+vue-server-renderer@~2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.4.tgz#ce1361eb32bfb84573b9c9b83f2810de8fa606c7"
   dependencies:
@@ -6676,7 +6695,7 @@ vue-style-loader@^3.0.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@~2.3.3:
+vue-template-compiler@~2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.4.tgz#5a88ac2c5e4d5d6218e6aa80e7e221fb7e67894c"
   dependencies:
@@ -6687,7 +6706,7 @@ vue-template-es2015-compiler@^1.2.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
 
-vue@~2.3.3:
+vue@~2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.4.tgz#5ec3b87a191da8090bbef56b7cfabd4158038171"
 
@@ -6836,7 +6855,7 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@~0.0.2, wordwrap@0.0.2:
+wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
@@ -6970,8 +6989,8 @@ yargs@^6.0.0:
     yargs-parser "^4.2.0"
 
 yargs@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.1.tgz#420ef75e840c1457a80adcca9bc6fa3849de51aa"
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -6995,4 +7014,3 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
-

From c8c2084bba43386ed20d08bb799e70cbe0d5a2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 20:27:24 +0200
Subject: [PATCH 111/236] Fix lint

---
 lib/core/server.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/core/server.js b/lib/core/server.js
index 00cdeff0fc..619f4c879f 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -1,7 +1,7 @@
-import http from "http";
-import connect from "connect";
-import path from "path";
-import chalk from "chalk";
+import http from 'http'
+import connect from 'connect'
+import path from 'path'
+import chalk from 'chalk'
 
 class Server {
   constructor (nuxt) {

From e52d414447c37729145c05ac313783fe4b7251aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 18 Jun 2017 20:47:43 +0200
Subject: [PATCH 112/236] Add istanbul ignore

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 7fddc57184..a76dbcf80a 100644
--- a/index.js
+++ b/index.js
@@ -10,6 +10,7 @@
 require('source-map-support').install();
 
 // Fix babel flag
+/* istanbul ignore else */
 process.noDeprecation = true
 
 // Require Core
@@ -17,6 +18,5 @@ const Core = require('./dist/core.js')
 Object.assign(exports, Core)
 
 // Require Builder
-// TODO: conditionally do this when builder available
 const Builder = require('./dist/builder.js')
 Object.assign(exports, Builder)

From e0ea1dd1ee77f68dc19234612684c80ade153aa7 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Jun 2017 19:51:01 +0430
Subject: [PATCH 113/236] fix nyc coverage

using babel-plugin-istanbul
---
 package.json     |  7 ++--
 rollup.config.js | 15 +++++---
 yarn.lock        | 99 ++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 93 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 655b5fe286..57f1760ba1 100644
--- a/package.json
+++ b/package.json
@@ -44,12 +44,11 @@
   },
   "nyc": {
     "include": [
-      "lib/",
-      "dist/"
+      "lib"
     ]
   },
   "scripts": {
-    "test": "npm run lint && nyc ava --verbose --serial test/",
+    "test": "npm run lint && cross-env NODE_ENV=test npm run build && nyc ava --verbose --serial test/ -- && nyc report --reporter=html",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.vue bin lib pages test/*.js --ignore-pattern app",
     "build": "npm run build:core && npm run build:builder",
@@ -121,12 +120,14 @@
     "ava": "^0.19.1",
     "babel-eslint": "^7.2.3",
     "babel-plugin-array-includes": "^2.0.3",
+    "babel-plugin-istanbul": "^4.1.4",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015-rollup": "^3.0.0",
     "babel-preset-stage-2": "^6.24.1",
     "codecov": "^2.2.0",
     "copy-webpack-plugin": "^4.0.1",
+    "cross-env": "^5.0.1",
     "eslint": "^4.0.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-html": "^3.0.0",
diff --git a/rollup.config.js b/rollup.config.js
index 3e53508217..ca5a74c683 100755
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -65,6 +65,10 @@ function genConfig (opts) {
         resolve: ['.js', '.json', '.jsx', '.ts']
       }, aliases, opts.alias)),
 
+      rollupNodeResolve({ main: true, jsnext: true }),
+
+      rollupCommonJS(),
+
       rollupBabel(Object.assign({
         exclude: 'node_modules/**',
         plugins: [
@@ -74,13 +78,14 @@ function genConfig (opts) {
         ],
         presets: [
           'babel-preset-es2015-rollup'
-        ]
+        ],
+        "env": {
+          "test": {
+            "plugins": [ "istanbul" ]
+          }
+        }
       }, opts.babel)),
 
-      rollupNodeResolve({ main: true, jsnext: true }),
-
-      rollupCommonJS(),
-
       rollupReplace({
         __VERSION__: version
       })
diff --git a/yarn.lock b/yarn.lock
index 68be9bcd5f..46506bed45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -56,6 +56,10 @@ abbrev@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
+abbrev@1.0.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+
 accepts@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
@@ -289,7 +293,7 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^1.4.0, async@^1.5.0:
+async@1.x, async@^1.4.0, async@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -648,6 +652,14 @@ babel-plugin-external-helpers@^6.18.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-istanbul@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.4.tgz#18dde84bf3ce329fddf3f4103fae921456d8e587"
+  dependencies:
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.7.2"
+    test-exclude "^4.1.1"
+
 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"
@@ -1940,6 +1952,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+cross-env@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.1.tgz#ff4e72ea43b47da2486b43a7f2043b2609e44913"
+  dependencies:
+    cross-spawn "^5.1.0"
+    is-windows "^1.0.0"
+
 cross-spawn-async@^2.1.1:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
@@ -1954,7 +1973,7 @@ cross-spawn@^4, cross-spawn@^4.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1:
+cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -2512,7 +2531,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@^1.6.1:
+escodegen@1.8.x, escodegen@^1.6.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -2649,7 +2668,7 @@ espree@^3.4.3:
     acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
-esprima@^2.6.0, esprima@^2.7.1:
+esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
@@ -3139,6 +3158,16 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
+glob@^5.0.15:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -3215,7 +3244,7 @@ gzip-size@^3.0.0:
   dependencies:
     duplexer "^0.1.1"
 
-handlebars@^4.0.2, handlebars@^4.0.3:
+handlebars@^4.0.1, handlebars@^4.0.2, handlebars@^4.0.3:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
@@ -3427,11 +3456,11 @@ hullabaloo-config-manager@^1.0.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13, iconv-lite@~0.4.13:
+iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.17:
+iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
 
@@ -3755,6 +3784,10 @@ is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-windows@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -3824,6 +3857,25 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
+istanbul@^0.4.2:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
+  dependencies:
+    abbrev "1.0.x"
+    async "1.x"
+    escodegen "1.8.x"
+    esprima "2.7.x"
+    glob "^5.0.15"
+    handlebars "^4.0.1"
+    js-yaml "3.x"
+    mkdirp "0.5.x"
+    nopt "3.x"
+    once "1.x"
+    resolve "1.1.x"
+    supports-color "^3.1.0"
+    which "^1.1.1"
+    wordwrap "^1.0.0"
+
 jest-diff@19.0.0, jest-diff@^19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
@@ -3906,7 +3958,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@^3.4.3, js-yaml@^3.8.2, js-yaml@^3.8.4:
+js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.8.2, js-yaml@^3.8.4:
   version "3.8.4"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
   dependencies:
@@ -4445,7 +4497,7 @@ minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, 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:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -4559,6 +4611,12 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+nopt@3.x, nopt@~3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -4566,12 +4624,6 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-nopt@~3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
@@ -4725,7 +4777,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@^1.3.0, once@^1.3.3:
+once@1.x, once@^1.3.0, once@^1.3.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -5772,7 +5824,7 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-resolve@1.1.7:
+resolve@1.1.7, resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -5833,6 +5885,13 @@ rollup-plugin-commonjs@^8.0.2:
     resolve "^1.1.7"
     rollup-pluginutils "^2.0.1"
 
+rollup-plugin-istanbul@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-istanbul/-/rollup-plugin-istanbul-1.1.0.tgz#581cf52e47e54a0bbaf782d4f4cde9594d1f01f9"
+  dependencies:
+    istanbul "^0.4.2"
+    rollup-pluginutils "^1.3.1"
+
 rollup-plugin-node-resolve@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
@@ -5850,7 +5909,7 @@ rollup-plugin-replace@^1.1.1:
     minimatch "^3.0.2"
     rollup-pluginutils "^1.5.0"
 
-rollup-pluginutils@^1.5.0:
+rollup-pluginutils@^1.3.1, rollup-pluginutils@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
   dependencies:
@@ -6833,7 +6892,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.4, which@^1.2.8, which@^1.2.9:
+which@^1.1.1, which@^1.2.4, which@^1.2.8, which@^1.2.9:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
@@ -6859,7 +6918,7 @@ wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@~1.0.0:
+wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 

From a594606f857a5dd1c376e709865f847c1e25e08c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Jun 2017 20:17:31 +0430
Subject: [PATCH 114/236] coverage

---
 lib/builder/builder.js               |  5 +++++
 lib/builder/generator.js             |  1 +
 lib/builder/webpack/base.config.js   |  1 +
 lib/builder/webpack/client.config.js |  1 +
 lib/common/utils.js                  |  1 +
 lib/core/module.js                   |  1 +
 lib/core/nuxt.js                     |  2 +-
 lib/core/options.js                  |  1 +
 lib/core/renderer.js                 | 33 ++++++++++++++--------------
 lib/core/server.js                   |  2 ++
 10 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 21a55ae45c..1fcb834c59 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -45,10 +45,12 @@ export default class Builder extends Tapable {
 
   async build () {
     // Avoid calling build() method multiple times when dev:true
+    /* istanbul ignore if */
     if (this._buildStatus === STATUS.BUILD_DONE && this.options.dev) {
       return this
     }
     // If building
+    /* istanbul ignore if */
     if (this._buildStatus === STATUS.BUILDING) {
       return new Promise((resolve) => {
         setTimeout(() => {
@@ -287,6 +289,7 @@ export default class Builder extends Tapable {
     // Run after each compile
     this.compiler.plugin('done', stats => {
       // Don't reload failed builds
+      /* istanbul ignore if */
       if (stats.hasErrors() || stats.hasWarnings()) {
         return
       }
@@ -311,6 +314,7 @@ export default class Builder extends Tapable {
         } else {
           // Build and watch for changes
           compiler.watch(this.options.watchers.webpack, (err) => {
+            /* istanbul ignore if */
             if (err) {
               return reject(err)
             }
@@ -326,6 +330,7 @@ export default class Builder extends Tapable {
           if (err) return console.error(err) // eslint-disable-line no-console
           // Show build stats for production
           console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
+          /* istanbul ignore if */
           if (stats.hasErrors()) {
             return reject(new Error('Webpack build exited with errors'))
           }
diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index 2589134043..081c624f6d 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -41,6 +41,7 @@ export default class Generator extends Tapable {
     debug('Destination folder cleaned')
 
     // Copy static and built files
+    /* istanbul ignore if */
     if (fs.existsSync(srcStaticPath)) {
       await copy(srcStaticPath, distPath)
     }
diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index ce1440d8fa..a5c0402376 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -18,6 +18,7 @@ import { styleLoader, extractStyles } from './helpers'
 export default function webpackBaseConfig ({ isClient, isServer }) {
   const nodeModulesDir = join(__dirname, '..', 'node_modules')
 
+  /* istanbul ignore if */
   if (!Array.isArray(this.options.build.postcss)) {
     this.options.build.postcss = [
       autoprefixer({
diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
index da7e553555..c32348747c 100644
--- a/lib/builder/webpack/client.config.js
+++ b/lib/builder/webpack/client.config.js
@@ -57,6 +57,7 @@ export default function webpackClientConfig () {
   })
 
   // Webpack common plugins
+  /* istanbul ignore if */
   if (!Array.isArray(config.plugins)) {
     config.plugins = []
   }
diff --git a/lib/common/utils.js b/lib/common/utils.js
index fcfe7eba4b..dae71bd461 100644
--- a/lib/common/utils.js
+++ b/lib/common/utils.js
@@ -105,6 +105,7 @@ export function r () {
 export function flatRoutes (router, path = '', routes = []) {
   router.forEach((r) => {
     if (!r.path.includes(':') && !r.path.includes('*')) {
+      /* istanbul ignore if */
       if (r.children) {
         flatRoutes(r.children, path + r.path + '/', routes)
       } else {
diff --git a/lib/core/module.js b/lib/core/module.js
index fdd2746764..e18380ff0f 100755
--- a/lib/core/module.js
+++ b/lib/core/module.js
@@ -38,6 +38,7 @@ export default class ModuleContainer extends Tapable {
     const srcPath = path.parse(src)
     /* istanbul ignore if */
     if (!src || typeof src !== 'string' || !fs.existsSync(src)) {
+      /* istanbul ignore next */
       debug('[nuxt] invalid template', template)
       return
     }
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index a6f9ffd510..4b05742a0c 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -38,7 +38,7 @@ export default class Nuxt extends Tapable {
     return this
   }
 
-  errorHandler () {
+  errorHandler /* istanbul ignore next */ () {
     // Silent
     if (this.options.errorHandler === false) {
       return
diff --git a/lib/core/options.js b/lib/core/options.js
index 498ec8c30d..90e990b3eb 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -36,6 +36,7 @@ export default function Options (_options) {
   }
 
   // Ignore publicPath on dev
+  /* istanbul ignore if */
   if (options.dev && isUrl(options.build.publicPath)) {
     options.build.publicPath = defaultOptions.build.publicPath
   }
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index b688b25b99..a30ebb35b1 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -1,17 +1,16 @@
-import ansiHTML from 'ansi-html'
-import serialize from 'serialize-javascript'
-import generateETag from 'etag'
-import fresh from 'fresh'
-import Tapable from 'tappable'
-import pify from 'pify'
-import serveStatic from 'serve-static'
-import compression from 'compression'
-import _ from 'lodash'
-import { resolve, join } from 'path'
-import fs from 'fs-extra'
-import { createBundleRenderer } from 'vue-server-renderer'
-import { getContext, setAnsiColors, encodeHtml } from 'utils'
-import Debug from 'debug'
+import ansiHTML from "ansi-html";
+import serialize from "serialize-javascript";
+import generateETag from "etag";
+import fresh from "fresh";
+import Tapable from "tappable";
+import pify from "pify";
+import compression from "compression";
+import _ from "lodash";
+import { join, resolve } from "path";
+import fs from "fs-extra";
+import { createBundleRenderer } from "vue-server-renderer";
+import { encodeHtml, getContext, setAnsiColors } from "utils";
+import Debug from "debug";
 
 const debug = Debug('nuxt:render')
 debug.color = 4 // Force blue color
@@ -46,6 +45,7 @@ export default class Renderer extends Tapable {
     }
 
     // Initialize
+    /* istanbul ignore if */
     if (nuxt.initialized) {
       // If nuxt already initialized
       this._ready = this.ready().catch(this.nuxt.errorHandler)
@@ -59,6 +59,7 @@ export default class Renderer extends Tapable {
   }
 
   async ready () {
+    /* istanbul ignore if */
     if (this._ready) {
       return this._ready
     }
@@ -122,6 +123,7 @@ export default class Renderer extends Tapable {
       }
       this.resources[rawKey] = rawData
       data = transform(rawData)
+      /* istanbul ignore if */
       if (!data) {
         return // Invalid data ?
       }
@@ -337,10 +339,9 @@ export default class Renderer extends Tapable {
     const { window } = await jsdom.JSDOM.fromURL(url, options)
     // If Nuxt could not be loaded (error from the server-side)
     const nuxtExists = window.document.body.innerHTML.includes('window.__NUXT__')
+    /* istanbul ignore if */
     if (!nuxtExists) {
-      /* istanbul ignore next */
       let error = new Error('Could not load the nuxt app')
-      /* istanbul ignore next */
       error.body = window.document.body.innerHTML
       throw error
     }
diff --git a/lib/core/server.js b/lib/core/server.js
index 619f4c879f..2d855d073f 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -9,6 +9,7 @@ class Server {
     this.options = nuxt.options
 
     // Initialize
+    /* istanbul ignore if */
     if (nuxt.initialized) {
       // If nuxt already initialized
       this._ready = this.ready().catch(this.nuxt.errorHandler)
@@ -22,6 +23,7 @@ class Server {
   }
 
   async ready () {
+    /* istanbul ignore if */
     if (this._ready) {
       return this._ready
     }

From 4880bc85adfc8ec13a0f693c2ee6dcf9ea776e4e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Jun 2017 20:39:01 +0430
Subject: [PATCH 115/236] lint

---
 lib/core/renderer.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index a30ebb35b1..a04fe58f0b 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -1,16 +1,17 @@
-import ansiHTML from "ansi-html";
-import serialize from "serialize-javascript";
-import generateETag from "etag";
-import fresh from "fresh";
-import Tapable from "tappable";
-import pify from "pify";
-import compression from "compression";
-import _ from "lodash";
-import { join, resolve } from "path";
-import fs from "fs-extra";
-import { createBundleRenderer } from "vue-server-renderer";
-import { encodeHtml, getContext, setAnsiColors } from "utils";
-import Debug from "debug";
+import ansiHTML from 'ansi-html'
+import serialize from 'serialize-javascript'
+import generateETag from 'etag'
+import fresh from 'fresh'
+import Tapable from 'tappable'
+import pify from 'pify'
+import serveStatic from 'serve-static'
+import compression from 'compression'
+import _ from 'lodash'
+import { join, resolve } from 'path'
+import fs from 'fs-extra'
+import { createBundleRenderer } from 'vue-server-renderer'
+import { encodeHtml, getContext, setAnsiColors } from 'utils'
+import Debug from 'debug'
 
 const debug = Debug('nuxt:render')
 debug.color = 4 // Force blue color

From 3a03b573397590f0ccf9d04dbcfaff90280b3bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 19 Jun 2017 20:18:26 +0200
Subject: [PATCH 116/236] Delete dist before build & upgrade webpack 3

---
 package.json |   5 +-
 yarn.lock    | 129 +++++++++++++++++++--------------------------------
 2 files changed, 51 insertions(+), 83 deletions(-)

diff --git a/package.json b/package.json
index 57f1760ba1..c7cb03e8d8 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "test": "npm run lint && cross-env NODE_ENV=test npm run build && nyc ava --verbose --serial test/ -- && nyc report --reporter=html",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.vue bin lib pages test/*.js --ignore-pattern app",
-    "build": "npm run build:core && npm run build:builder",
+    "build": "rimraf dist/ && npm run build:core && npm run build:builder",
     "build:core": "rollup -c rollup.config.js --environment TARGET:core",
     "watch": "npm run build:core -- -w",
     "build:builder": "rollup -c rollup.config.js --environment TARGET:builder",
@@ -110,7 +110,7 @@
     "vue-ssr-html-stream": "^2.2.0",
     "vue-template-compiler": "~2.3.4",
     "vuex": "^2.3.1",
-    "webpack": "^3.0.0-rc.2",
+    "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-dev-middleware": "^1.10.2",
     "webpack-hot-middleware": "^2.18.0",
@@ -142,6 +142,7 @@
     "nyc": "^11.0.2",
     "request": "^2.81.0",
     "request-promise-native": "^1.0.4",
+    "rimraf": "^2.6.1",
     "rollup": "^0.43.0",
     "rollup-plugin-alias": "^1.3.1",
     "rollup-plugin-babel": "^2.7.1",
diff --git a/yarn.lock b/yarn.lock
index 46506bed45..fd27d98524 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -56,10 +56,6 @@ abbrev@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
-abbrev@1.0.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-
 accepts@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
@@ -293,7 +289,7 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@1.x, async@^1.4.0, async@^1.5.0:
+async@^1.4.0, async@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -1110,8 +1106,8 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
     to-fast-properties "^1.0.1"
 
 babylon@^6.1.0, babylon@^6.13.0, babylon@^6.17.0, babylon@^6.17.2:
-  version "6.17.3"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.3.tgz#1327d709950b558f204e5352587fd0290f8d8e48"
+  version "6.17.4"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
 balanced-match@^0.4.2:
   version "0.4.2"
@@ -1372,12 +1368,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.30000690"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000690.tgz#ee4e0750070f6aae6f40e76477984449bd6cb48a"
+  version "1.0.30000692"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000692.tgz#3da9a99353adbcea1e142b99f60ecc6216df47a5"
 
 caniuse-lite@^1.0.30000670, caniuse-lite@^1.0.30000684:
-  version "1.0.30000690"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000690.tgz#3b232dbc0cf32bc2a888ec199852a50afa37f5ef"
+  version "1.0.30000692"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000692.tgz#34600fd7152352d85a47f4662a3b51b02d8b646f"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2194,8 +2190,8 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
 deepmerge@^1.3.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.4.3.tgz#f8c9ecb11c176b3dbfc8167b58cc5674c5e658bb"
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.4.4.tgz#40ef393c91af09d16a887e755337844230ad14c9"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
@@ -2531,7 +2527,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@1.8.x, escodegen@^1.6.1:
+escodegen@^1.6.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -2668,7 +2664,7 @@ espree@^3.4.3:
     acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
-esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
+esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
@@ -3158,16 +3154,6 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob@^5.0.15:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -3244,7 +3230,7 @@ gzip-size@^3.0.0:
   dependencies:
     duplexer "^0.1.1"
 
-handlebars@^4.0.1, handlebars@^4.0.2, handlebars@^4.0.3:
+handlebars@^4.0.2, handlebars@^4.0.3:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
@@ -3519,7 +3505,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, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3857,25 +3843,6 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
-istanbul@^0.4.2:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
-  dependencies:
-    abbrev "1.0.x"
-    async "1.x"
-    escodegen "1.8.x"
-    esprima "2.7.x"
-    glob "^5.0.15"
-    handlebars "^4.0.1"
-    js-yaml "3.x"
-    mkdirp "0.5.x"
-    nopt "3.x"
-    once "1.x"
-    resolve "1.1.x"
-    supports-color "^3.1.0"
-    which "^1.1.1"
-    wordwrap "^1.0.0"
-
 jest-diff@19.0.0, jest-diff@^19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
@@ -3958,7 +3925,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.8.2, js-yaml@^3.8.4:
+js-yaml@^3.4.3, js-yaml@^3.8.2, js-yaml@^3.8.4:
   version "3.8.4"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
   dependencies:
@@ -4411,10 +4378,10 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
 merge-source-map@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.3.tgz#da1415f2722a5119db07b14c4f973410863a2abf"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
   dependencies:
-    source-map "^0.5.3"
+    source-map "^0.5.6"
 
 methods@~1.1.2:
   version "1.1.2"
@@ -4497,7 +4464,7 @@ minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-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 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:
@@ -4611,12 +4578,6 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-nopt@3.x, nopt@~3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -4624,6 +4585,12 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
+nopt@~3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
@@ -4688,8 +4655,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.0"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f"
 
 nyc@^11.0.2:
   version "11.0.2"
@@ -4777,7 +4744,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@1.x, once@^1.3.0, once@^1.3.3:
+once@^1.3.0, once@^1.3.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -5572,14 +5539,14 @@ readable-stream@1.0:
     string_decoder "~0.10.x"
 
 readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
-  version "2.2.11"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.0.tgz#640f5dcda88c91a8dc60787145629170813a1ed2"
   dependencies:
     core-util-is "~1.0.0"
-    inherits "~2.0.1"
+    inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    safe-buffer "~5.0.1"
+    safe-buffer "~5.1.0"
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
@@ -5824,7 +5791,7 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-resolve@1.1.7, resolve@1.1.x:
+resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -5885,13 +5852,6 @@ rollup-plugin-commonjs@^8.0.2:
     resolve "^1.1.7"
     rollup-pluginutils "^2.0.1"
 
-rollup-plugin-istanbul@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-istanbul/-/rollup-plugin-istanbul-1.1.0.tgz#581cf52e47e54a0bbaf782d4f4cde9594d1f01f9"
-  dependencies:
-    istanbul "^0.4.2"
-    rollup-pluginutils "^1.3.1"
-
 rollup-plugin-node-resolve@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
@@ -5909,7 +5869,7 @@ rollup-plugin-replace@^1.1.1:
     minimatch "^3.0.2"
     rollup-pluginutils "^1.5.0"
 
-rollup-pluginutils@^1.3.1, rollup-pluginutils@^1.5.0:
+rollup-pluginutils@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
   dependencies:
@@ -5946,7 +5906,7 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
 
@@ -6527,7 +6487,7 @@ uglify-js@3.0.x, uglify-js@^3.0.18:
     commander "~2.9.0"
     source-map "~0.5.1"
 
-uglify-js@^2.6, uglify-js@^2.8.27:
+uglify-js@^2.6:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -6540,6 +6500,13 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uglifyjs-webpack-plugin@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.4.tgz#7829c50ee5a5b755969d4458357ed5a2dd36fbbd"
+  dependencies:
+    source-map "^0.5.6"
+    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"
@@ -6840,9 +6807,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.0.0-rc.2:
-  version "3.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0-rc.2.tgz#20c903580fa9fba8497bc1c6455810d3d397c958"
+webpack@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -6862,7 +6829,7 @@ webpack@^3.0.0-rc.2:
     source-map "^0.5.3"
     supports-color "^3.1.0"
     tapable "~0.2.5"
-    uglify-js "^2.8.27"
+    uglifyjs-webpack-plugin "^0.4.4"
     watchpack "^1.3.1"
     webpack-sources "^1.0.1"
     yargs "^6.0.0"
@@ -6892,7 +6859,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.1.1, which@^1.2.4, which@^1.2.8, which@^1.2.9:
+which@^1.2.4, which@^1.2.8, which@^1.2.9:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
@@ -6918,7 +6885,7 @@ wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@^1.0.0, wordwrap@~1.0.0:
+wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 

From 4f9684e11779bc5c599c52577e3a7e383ce799b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 19 Jun 2017 20:20:51 +0200
Subject: [PATCH 117/236] Remove ~store & ~router

---
 examples/typescript/tsconfig.json  | 4 +---
 lib/builder/webpack/base.config.js | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/typescript/tsconfig.json b/examples/typescript/tsconfig.json
index e2812a86cd..3a40a830cd 100644
--- a/examples/typescript/tsconfig.json
+++ b/examples/typescript/tsconfig.json
@@ -23,9 +23,7 @@
       "~middleware/*": ["./middleware/*"],
       "~pages/*": ["./pages/*"],
       "~plugins/*": ["./plugins/*"],
-      "~static/*": ["./static/*"],
-      "~store": ["./.nuxt/store"],
-      "~router": ["./.nuxt/router"]
+      "~static/*": ["./static/*"]
     }
   }
 }
diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index a5c0402376..ccb894ebd3 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -54,8 +54,6 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
         'assets': join(this.options.srcDir, 'assets'), // use in template with <img src="~assets/nuxt.png" />
         '~assets': join(this.options.srcDir, 'assets'),
         '~plugins': join(this.options.srcDir, 'plugins'),
-        '~store': join(this.options.buildDir, 'store'),
-        '~router': join(this.options.buildDir, 'router'),
         '~pages': join(this.options.srcDir, 'pages'),
         '~components': join(this.options.srcDir, 'components')
       },

From b6d82a7c5b9655b31fa343dfcc3d036eb590ad9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 19 Jun 2017 20:31:50 +0200
Subject: [PATCH 118/236] No need to use next

---
 examples/typescript/modules/typescript.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/examples/typescript/modules/typescript.js b/examples/typescript/modules/typescript.js
index efa5413d97..ec98f8fd26 100644
--- a/examples/typescript/modules/typescript.js
+++ b/examples/typescript/modules/typescript.js
@@ -1,4 +1,4 @@
-module.exports = function (options, next) {
+module.exports = function (options) {
   // Extend build
   this.extendBuild((config) => {
     // Add TypeScript loader
@@ -13,6 +13,4 @@ module.exports = function (options, next) {
       }
     }
   })
-
-  next()
 }

From 8378a772e5a79f3c8f67e944b2547e1e728282b5 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Jun 2017 23:45:59 +0430
Subject: [PATCH 119/236] webpack3: Scope Hoisting

---
 lib/builder/webpack/base.config.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index ccb894ebd3..e7396fe027 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -1,11 +1,11 @@
-import ExtractTextPlugin from 'extract-text-webpack-plugin'
-import { defaults, cloneDeep } from 'lodash'
-import { join, resolve } from 'path'
-import webpack from 'webpack'
-import { isUrl, urlJoin } from 'utils'
-import autoprefixer from 'autoprefixer'
-import vueLoaderConfig from './vue-loader.config'
-import { styleLoader, extractStyles } from './helpers'
+import ExtractTextPlugin from "extract-text-webpack-plugin";
+import { cloneDeep, defaults } from "lodash";
+import { join, resolve } from "path";
+import webpack from "webpack";
+import { isUrl, urlJoin } from "utils";
+import autoprefixer from "autoprefixer";
+import vueLoaderConfig from "./vue-loader.config";
+import { extractStyles, styleLoader } from "./helpers";
 
 /*
 |--------------------------------------------------------------------------
@@ -136,6 +136,11 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
         minimize: true
       })
     )
+
+    // Scope Hoisting
+    config.plugins.push(
+      new webpack.optimize.ModuleConcatenationPlugin()
+    )
   }
 
   // Clone deep avoid leaking config between Client and Server

From adb43fbc102f2355c4234279670db1984a81d88e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 00:44:13 +0430
Subject: [PATCH 120/236] better production source maps

---
 lib/builder/webpack/base.config.js   | 18 +++++++++---------
 lib/builder/webpack/server.config.js |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index e7396fe027..77592a731a 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -1,11 +1,11 @@
-import ExtractTextPlugin from "extract-text-webpack-plugin";
-import { cloneDeep, defaults } from "lodash";
-import { join, resolve } from "path";
-import webpack from "webpack";
-import { isUrl, urlJoin } from "utils";
-import autoprefixer from "autoprefixer";
-import vueLoaderConfig from "./vue-loader.config";
-import { extractStyles, styleLoader } from "./helpers";
+import ExtractTextPlugin from 'extract-text-webpack-plugin'
+import { defaults, cloneDeep } from 'lodash'
+import { join, resolve } from 'path'
+import webpack from 'webpack'
+import { isUrl, urlJoin } from 'utils'
+import autoprefixer from 'autoprefixer'
+import vueLoaderConfig from './vue-loader.config'
+import { styleLoader, extractStyles } from './helpers'
 
 /*
 |--------------------------------------------------------------------------
@@ -28,7 +28,7 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
   }
 
   const config = {
-    devtool: this.options.dev ? 'cheap-module-source-map' : false,
+    devtool: this.options.dev ? 'cheap-module-source-map' : 'nosources-source-map',
     entry: {
       vendor: ['vue', 'vue-router', 'vue-meta']
     },
diff --git a/lib/builder/webpack/server.config.js b/lib/builder/webpack/server.config.js
index 185a19a0fe..01a2fbf1d0 100644
--- a/lib/builder/webpack/server.config.js
+++ b/lib/builder/webpack/server.config.js
@@ -23,7 +23,8 @@ export default function webpackServerConfig () {
 
   config = Object.assign(config, {
     target: 'node',
-    devtool: (this.options.dev ? 'source-map' : false),
+    node: false,
+    devtool: 'source-map',
     entry: resolve(this.options.buildDir, 'server.js'),
     output: Object.assign({}, config.output, {
       filename: 'server-bundle.js',

From 9fe3f0d334a8579319168d9deca9a08a8dc2e3ad Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 01:15:48 +0430
Subject: [PATCH 121/236] webpack3: temporary disable scope hoisting

Currently it makes trouble with context.require
---
 lib/builder/webpack/base.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index 77592a731a..97e0c4367b 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -138,9 +138,9 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
     )
 
     // Scope Hoisting
-    config.plugins.push(
-      new webpack.optimize.ModuleConcatenationPlugin()
-    )
+    // config.plugins.push(
+    //   new webpack.optimize.ModuleConcatenationPlugin()
+    // )
   }
 
   // Clone deep avoid leaking config between Client and Server

From d9a01c25f16c6759a4e96db5e8a90b62ea19b561 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 01:33:55 +0430
Subject: [PATCH 122/236] deprecated options.build.ssr

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

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index a04fe58f0b..8fce6fb271 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -149,7 +149,11 @@ export default class Renderer extends Tapable {
       clientManifest: this.resources.clientManifest,
       runInNewContext: false,
       basedir: this.options.rootDir
-    }, this.options.render.ssr))
+    }, this.options.render.ssr, this.options.build.ssr))
+
+    if(this.options.build.ssr) {
+      console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `renderer.ssr` instead!')
+    }
 
     // Promisify renderToString
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)

From 664ce126627f9ffe5b773f70f611919c277ff557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 19 Jun 2017 23:30:05 +0200
Subject: [PATCH 123/236] Fix: transition property beeing a function

---
 lib/app/client.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index fb0745b3d1..84eb3d1933 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -14,20 +14,21 @@ let router
 <%= (store ? 'let store' : '') %>
 
 function mapTransitions(Components, to, from) {
-  function componentTransitions(component) {
+  const componentTransitions = (component) => {
     if (!component || !component.options || !component.options.transition) {
       return {}
     }
-    if(typeof component.options.transition === 'function') {
-      return component.options.transition(to, from)
+    let transition = component.options.transition
+    if (typeof transition === 'function') {
+      transition = transition(to, from)
     }
-    return component.options.transition
+    return (typeof transition === 'string' ? { name: transition } : transition)
   }
   return Components.map((Component) => {
     // Clone original object to prevent overrides
     const transitions = Object.assign({}, componentTransitions(Component))
-    // Combine transitions & prefer *leave* transitions of 'from' route
-    if(from && from.matched.length && from.matched[0].components.default) {
+    // Combine transitions & prefer `leave` transitions of 'from' route
+    if (from && from.matched.length && from.matched[0].components.default) {
       const from_transitions = componentTransitions(from.matched[0].components.default)
       Object.keys(from_transitions)
         .filter(key => from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1)

From be8191de6071a2b5b54fce821779d4e17426408d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 02:40:54 +0430
Subject: [PATCH 124/236] protect serving SSR assets in production

---
 lib/core/renderer.js | 54 ++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 8fce6fb271..ab6bdc9402 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -24,6 +24,27 @@ const parseTemplate = templateStr => _.template(templateStr, {
   interpolate: /{{([\s\S]+?)}}/g
 })
 
+const resourceMap = [
+  {
+    key: 'clientManifest',
+    fileName: 'vue-ssr-client-manifest.json',
+    transform: JSON.parse
+  },
+  {
+    key: 'serverBundle',
+    fileName: 'server-bundle.json',
+    transform: JSON.parse
+  },
+  {
+    key: 'appTemplate',
+    fileName: 'index.html',
+    transform: parseTemplate
+  }
+]
+
+// Protector utility against request to SSR bundle files
+const ssrResourceRegex = new RegExp(resourceMap.map(resource => resource.fileName).join('|'), 'i')
+
 export default class Renderer extends Tapable {
   constructor (nuxt) {
     super()
@@ -91,29 +112,15 @@ export default class Renderer extends Tapable {
     return this
   }
 
-  async loadResources (_fs = fs, isServer) {
+  async loadResources (_fs) {
     let distPath = resolve(this.options.buildDir, 'dist')
 
-    const resourceMap = {
-      clientManifest: {
-        path: join(distPath, 'vue-ssr-client-manifest.json'),
-        transform: JSON.parse
-      },
-      serverBundle: {
-        path: join(distPath, 'server-bundle.json'),
-        transform: JSON.parse
-      },
-      appTemplate: {
-        path: join(distPath, 'index.html'),
-        transform: parseTemplate
-      }
-    }
-
     let updated = []
 
-    Object.keys(resourceMap).forEach(resourceKey => {
-      let { path, transform } = resourceMap[resourceKey]
-      let rawKey = '$$' + resourceKey
+    resourceMap.forEach(({ key, fileName, transform }) => {
+      let rawKey = '$$' + key
+      const path = join(distPath, fileName)
+
       let rawData, data
       if (!_fs.existsSync(path)) {
         return // Resource not exists
@@ -128,8 +135,8 @@ export default class Renderer extends Tapable {
       if (!data) {
         return // Invalid data ?
       }
-      this.resources[resourceKey] = data
-      updated.push(resourceKey)
+      this.resources[key] = data
+      updated.push(key)
     })
 
     if (updated.length > 0) {
@@ -151,7 +158,7 @@ export default class Renderer extends Tapable {
       basedir: this.options.rootDir
     }, this.options.render.ssr, this.options.build.ssr))
 
-    if(this.options.build.ssr) {
+    if (this.options.build.ssr) {
       console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `renderer.ssr` instead!')
     }
 
@@ -189,8 +196,7 @@ export default class Renderer extends Tapable {
       await this.serveStatic(req, res)
 
       // Serve .nuxt/dist/ files (only for production)
-      const isValidExtension = (req.url.slice(-3) === '.js') || (req.url.slice(-4) === '.css') || (req.url.slice(-4) === '.map')
-      if (!this.options.dev && isValidExtension) {
+      if (!this.options.dev && !ssrResourceRegex.test(req.url)) {
         const url = req.url
         if (req.url.indexOf(this.options.build.publicPath) === 0) {
           req.url = req.url.replace(this.options.build.publicPath, '/')

From 041d5c37a05b2b31a05fa72254a7f34bc52630a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Tue, 20 Jun 2017 00:34:50 +0200
Subject: [PATCH 125/236] Fix path undefined when refreshing files

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

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 1fcb834c59..751a8a7e7b 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -389,7 +389,7 @@ export default class Builder extends Tapable {
       ignoreInitial: true
     })
     /* istanbul ignore next */
-    const refreshFiles = _.debounce(this.generateRoutesAndFiles, 200)
+    const refreshFiles = _.debounce(() => this.generateRoutesAndFiles(), 200)
 
     // Watch for src Files
     let filesWatcher = chokidar.watch(patterns, options)

From 0c68b67dcd5243b3562c18b8d60ef3fc5446ccfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Tue, 20 Jun 2017 01:04:01 +0200
Subject: [PATCH 126/236] Update maxEntrypointSize

---
 lib/builder/webpack/base.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index ccb894ebd3..9661516302 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -40,7 +40,7 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
         : urlJoin(this.options.router.base, this.options.build.publicPath))
     },
     performance: {
-      maxEntrypointSize: 300000,
+      maxEntrypointSize: 1000000,
       maxAssetSize: 300000,
       hints: this.options.dev ? false : 'warning'
     },

From 4a66a1085def32aa2be4f9e817c3e7e61e4bbf7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Tue, 20 Jun 2017 01:04:23 +0200
Subject: [PATCH 127/236] Update vuetify example

---
 .../vendor/vuetify.styl => assets/app.styl}   |  2 +-
 examples/with-vuetify/css/app.styl            |  2 -
 .../css/vendor/material-icons.styl            | 21 --------
 examples/with-vuetify/layouts/default.vue     | 45 ++++++++++++++++
 examples/with-vuetify/nuxt.config.js          | 30 +++++++----
 examples/with-vuetify/package.json            |  8 ++-
 examples/with-vuetify/pages/about.vue         | 18 +++++++
 examples/with-vuetify/pages/index.vue         | 51 +++----------------
 8 files changed, 95 insertions(+), 82 deletions(-)
 rename examples/with-vuetify/{css/vendor/vuetify.styl => assets/app.styl} (86%)
 delete mode 100644 examples/with-vuetify/css/app.styl
 delete mode 100644 examples/with-vuetify/css/vendor/material-icons.styl
 create mode 100644 examples/with-vuetify/layouts/default.vue
 create mode 100644 examples/with-vuetify/pages/about.vue

diff --git a/examples/with-vuetify/css/vendor/vuetify.styl b/examples/with-vuetify/assets/app.styl
similarity index 86%
rename from examples/with-vuetify/css/vendor/vuetify.styl
rename to examples/with-vuetify/assets/app.styl
index 6865590deb..66d746eb17 100644
--- a/examples/with-vuetify/css/vendor/vuetify.styl
+++ b/examples/with-vuetify/assets/app.styl
@@ -11,4 +11,4 @@ $theme := {
 }
 
 // Import Vuetify styling
-@require '~vuetify/src/stylus/main.styl'
+@require '~vuetify/src/stylus/main.styl'
\ No newline at end of file
diff --git a/examples/with-vuetify/css/app.styl b/examples/with-vuetify/css/app.styl
deleted file mode 100644
index cd1c8f9dc8..0000000000
--- a/examples/with-vuetify/css/app.styl
+++ /dev/null
@@ -1,2 +0,0 @@
-@require './vendor/material-icons.styl'
-@require './vendor/vuetify.styl'
diff --git a/examples/with-vuetify/css/vendor/material-icons.styl b/examples/with-vuetify/css/vendor/material-icons.styl
deleted file mode 100644
index a063664368..0000000000
--- a/examples/with-vuetify/css/vendor/material-icons.styl
+++ /dev/null
@@ -1,21 +0,0 @@
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Material Icons'), local('MaterialIcons-Regular'), url(https://fonts.gstatic.com/s/materialicons/v22/2fcrYFNaTjcS6g4U3t-Y5UEw0lE80llgEseQY3FEmqw.woff2) format('woff2');
-}
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-feature-settings: 'liga';
-  -webkit-font-smoothing: antialiased;
-}
diff --git a/examples/with-vuetify/layouts/default.vue b/examples/with-vuetify/layouts/default.vue
new file mode 100644
index 0000000000..7c8e435f8a
--- /dev/null
+++ b/examples/with-vuetify/layouts/default.vue
@@ -0,0 +1,45 @@
+<template>
+  <v-app>
+    <v-toolbar>
+      <v-toolbar-side-icon @click.native.stop="sidebar = !sidebar" />
+      <v-toolbar-logo>Toolbar</v-toolbar-logo>
+    </v-toolbar>
+    <v-sidebar left fixed drawer v-model="sidebar">
+      <v-list>
+        <v-list-item>
+          <v-list-tile router nuxt href="/">
+            <v-list-tile-title>Home</v-list-tile-title>
+          </v-list-tile>
+        </v-list-item>
+        <v-list-item>
+          <v-list-tile router nuxt href="/about">
+            <v-list-tile-title>About</v-list-tile-title>
+          </v-list-tile>
+        </v-list-item>
+      </v-list>
+    </v-sidebar>
+    <main>
+      <v-content>
+        <v-container fluid>
+          <nuxt/>
+        </v-container>
+      </v-content>
+    </main>
+  </v-app>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      sidebar: false
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .title {
+    padding-left: 20px;
+  }
+</style>
diff --git a/examples/with-vuetify/nuxt.config.js b/examples/with-vuetify/nuxt.config.js
index a01ebf437d..26034324a3 100644
--- a/examples/with-vuetify/nuxt.config.js
+++ b/examples/with-vuetify/nuxt.config.js
@@ -2,16 +2,28 @@
 const { join } = require('path')
 
 module.exports = {
-  build: {
-    vendor: ['vuetify']
-  },
-  plugins: ['~plugins/vuetify.js'],
-  css: [
-    { src: join(__dirname, 'css/app.styl'), lang: 'styl' }
-  ],
+  /*
+  ** Head elements
+  ** Add Roboto font and Material Icons
+  */
   head: {
     link: [
-      { rel: 'preload', as: 'style', href: 'https://fonts.googleapis.com/css?family=Roboto' }
+      { rel: 'stylesheet', type: 'text/css', href: 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' }
     ]
-  }
+  },
+  /*
+  ** Add Vuetify into vendor.bundle.js
+  */
+  build: {
+    vendor: ['vuetify'],
+    extractCSS: true
+  },
+  /*
+  ** Load Vuetify into the app
+  */
+  plugins: ['~plugins/vuetify'],
+  /*
+  ** Load Vuetify CSS globally
+  */
+  css: ['~assets/app.styl']
 }
diff --git a/examples/with-vuetify/package.json b/examples/with-vuetify/package.json
index baa308ca69..646947ae35 100644
--- a/examples/with-vuetify/package.json
+++ b/examples/with-vuetify/package.json
@@ -1,16 +1,14 @@
 {
   "name": "with-vuetify",
   "dependencies": {
-    "nuxt": "^0.10.7",
-    "vuetify": "^0.11.1"
+    "nuxt": "latest",
+    "vuetify": "latest"
   },
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate",
-    "predeploy": "yarn run generate",
-    "deploy": "surge --domain nuxt-with-vuetify-example.surge.sh dist"
+    "generate": "nuxt generate"
   },
   "devDependencies": {
     "stylus": "^0.54.5",
diff --git a/examples/with-vuetify/pages/about.vue b/examples/with-vuetify/pages/about.vue
new file mode 100644
index 0000000000..4a926dad1b
--- /dev/null
+++ b/examples/with-vuetify/pages/about.vue
@@ -0,0 +1,18 @@
+<template>
+  <v-carousel>
+    <v-carousel-item v-for="(src, i) in images" v-bind:src="src" :key="i"></v-carousel-item>
+  </v-carousel>
+</template>
+
+<script>
+export default {
+  data: () => ({
+    images: [
+      'https://vuetifyjs.com/static/doc-images/carousel/squirrel.jpg',
+      'https://vuetifyjs.com/static/doc-images/carousel/sky.jpg',
+      'https://vuetifyjs.com/static/doc-images/carousel/bird.jpg',
+      'https://vuetifyjs.com/static/doc-images/carousel/planet.jpg'
+    ]
+  })
+}
+</script>
\ No newline at end of file
diff --git a/examples/with-vuetify/pages/index.vue b/examples/with-vuetify/pages/index.vue
index 80916b3b54..52573bcb7d 100644
--- a/examples/with-vuetify/pages/index.vue
+++ b/examples/with-vuetify/pages/index.vue
@@ -1,45 +1,8 @@
 <template>
-  <v-app top-toolbar left-fixed-sidebar>
-    <v-toolbar>
-      <v-toolbar-side-icon @click.native.stop="sidebar = !sidebar" />
-      <v-toolbar-logo>Toolbar</v-toolbar-logo>
-    </v-toolbar>
-    <main>
-      <v-sidebar left fixed drawer v-model="sidebar">
-        <v-list>
-          <v-list-item v-for="i in 3" :key="i">
-            <v-list-tile>
-              <v-list-tile-title>Item {{ i }}</v-list-tile-title>
-            </v-list-tile>
-          </v-list-item>
-        </v-list>
-      </v-sidebar>
-      <v-content>
-        <v-container fluid>
-          <div class="title">
-            <h2>Main content</h2>
-            <v-btn primary>Primary button</v-btn>
-            <v-btn secondary>Secondary button</v-btn>
-            <v-btn success>Success button</v-btn>
-          </div>
-        </v-container>
-      </v-content>
-    </main>
-  </v-app>
-</template>
-
-<script>
-  export default {
-    asyncData() {
-      return {
-        sidebar: false
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .title {
-    padding-left: 20px;
-  }
-</style>
+  <div class="title">
+    <h2>Main content</h2>
+    <v-btn primary>Primary button</v-btn>
+    <v-btn secondary>Secondary button</v-btn>
+    <v-btn success>Success button</v-btn>
+  </div>
+</template>
\ No newline at end of file

From 185dfc1ecf5ee77a341ae134df3cd143ad0ff01a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 03:45:57 +0430
Subject: [PATCH 128/236] move serverMiddleware to renderer

---
 lib/core/nuxt.js     |   2 +-
 lib/core/renderer.js | 143 +++++++++++++++++++++++++++----------------
 lib/core/server.js   |  56 +++++------------
 3 files changed, 107 insertions(+), 94 deletions(-)

diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 4b05742a0c..38b98a5775 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -17,7 +17,7 @@ export default class Nuxt extends Tapable {
     this.renderer = new Renderer(this)
 
     // Backward compatibility
-    this.render = this.renderer.render.bind(this.renderer)
+    this.render = (...args) => this.renderer.app(...args)
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
 
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index ab6bdc9402..4e90542632 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -10,8 +10,9 @@ import _ from 'lodash'
 import { join, resolve } from 'path'
 import fs from 'fs-extra'
 import { createBundleRenderer } from 'vue-server-renderer'
-import { encodeHtml, getContext, setAnsiColors } from 'utils'
+import { encodeHtml, getContext, setAnsiColors, isUrl } from 'utils'
 import Debug from 'debug'
+import connect from 'connect'
 
 const debug = Debug('nuxt:render')
 debug.color = 4 // Force blue color
@@ -58,6 +59,9 @@ export default class Renderer extends Tapable {
     this.webpackDevMiddleware = null
     this.webpackHotMiddleware = null
 
+    // Create new connect instance
+    this.app = connect()
+
     // Renderer runtime resources
     this.resources = {
       clientManifest: null,
@@ -86,25 +90,16 @@ export default class Renderer extends Tapable {
       return this._ready
     }
 
-    // For serving static/ files to /
-    this.serveStatic = pify(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
-
-    // For serving .nuxt/dist/ files
-    this.serveStaticNuxt = pify(serveStatic(resolve(this.options.buildDir, 'dist'), {
-      maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
-    }))
-
-    // GZIP middleware for production
-    if (!this.options.dev && this.options.render.gzip) {
-      this.gzipMiddleware = pify(compression(this.options.render.gzip))
-    }
+    // Setup all middleWare
+    this.setupMiddleware()
 
+    // Load error template
     const errorTemplatePath = resolve(this.options.buildDir, 'views/error.html')
     if (fs.existsSync(errorTemplatePath)) {
       this.resources.errorTemplate = parseTemplate(fs.readFileSync(errorTemplatePath, 'utf8'))
     }
 
-    // Load resources from fs
+    // Load SSR resources from fs
     if (!this.options.dev) {
       await this.loadResources()
     }
@@ -166,62 +161,105 @@ export default class Renderer extends Tapable {
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)
   }
 
-  async render (req, res) {
-    // Get context
-    const context = getContext(req, res)
-    res.statusCode = 200
-
-    try {
-      // Gzip middleware for production
-      if (this.gzipMiddleware) {
-        await this.gzipMiddleware(req, res)
+  useMiddleware (m) {
+    // Resolve
+    if (typeof m === 'string') {
+      let src = m
+      // Using ~ or ./ shorthand to resolve from project srcDir
+      if (src.indexOf('~') === 0 || src.indexOf('./') === 0) {
+        src = join(this.nuxt.options.srcDir, src.substr(1))
       }
+      m = require(src)
+    }
+    // Use middleware
+    if (m instanceof Function) {
+      this.app.use(m)
+    } else if (m && m.path && m.handler) {
+      this.app.use(m.path, m.handler)
+    }
+  }
 
+  setupMiddleware () {
+    // Gzip middleware for production
+    if (!this.options.dev && this.options.render.gzip) {
+      this.useMiddleware(compression(this.options.render.gzip))
+    }
+
+    // Add User provided middleware
+    this.options.serverMiddleware.forEach(m => {
+      this.useMiddleware(m)
+    })
+
+    // Common URL checks
+    this.useMiddleware((req, res, next) => {
       // If base in req.url, remove it for the middleware and vue-router
       if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
-        // Compatibility with base url for dev server
         req.url = req.url.replace(this.options.router.base, '/')
       }
-
-      // Call webpack middleware only in development
-      if (this.webpackDevMiddleware) {
-        await this.webpackDevMiddleware(req, res)
-      }
-
-      if (this.webpackHotMiddleware) {
-        await this.webpackHotMiddleware(req, res)
-      }
-
-      // Serve static/ files
-      await this.serveStatic(req, res)
-
-      // Serve .nuxt/dist/ files (only for production)
-      if (!this.options.dev && !ssrResourceRegex.test(req.url)) {
-        const url = req.url
-        if (req.url.indexOf(this.options.build.publicPath) === 0) {
-          req.url = req.url.replace(this.options.build.publicPath, '/')
-        }
-        await this.serveStaticNuxt(req, res)
-        /* istanbul ignore next */
-        req.url = url
-      }
-
-      if (this.options.dev && req.url.indexOf(this.options.build.publicPath) === 0 && req.url.includes('.hot-update.json')) {
+      // Prevent access to SSR resources
+      if (ssrResourceRegex.test(req.url)) {
         res.statusCode = 404
         return res.end()
       }
+      next()
+    })
 
+    // Remove publicPath from requests when it is pointing to CDN
+    if (isUrl(this.options.build.publicPath)) {
+      this.useMiddleware((req, res, next) => {
+        if (req.url.indexOf(this.options.build.publicPath) === 0) {
+          req.url = req.url.replace(this.options.build.publicPath, '/')
+        }
+        next()
+      })
+    }
+
+    // Add webpack middleware only for development
+    if (this.options.dev) {
+      this.useMiddleware(async (req, res, next) => {
+        if (req.url.includes('.hot-update.json')) {
+          res.statusCode = 404
+          return res.end()
+        }
+        if (this.webpackDevMiddleware) {
+          await this.webpackDevMiddleware(req, res)
+        }
+        if (this.webpackHotMiddleware) {
+          await this.webpackHotMiddleware(req, res)
+        }
+        next()
+      })
+    }
+
+    // For serving static/ files to /
+    this.useMiddleware(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
+
+    // Serve .nuxt/dist/ files only for production
+    // For dev they will be served with devMiddleware
+    if (!this.options.dev) {
+      this.useMiddleware(serveStatic(resolve(this.options.buildDir, 'dist'), {
+        maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
+      }))
+    }
+
+    // Finally use nuxtMiddleware
+    this.useMiddleware(this.nuxtMiddleware.bind(this))
+  }
+
+  async nuxtMiddleware (req, res) {
+    // Get context
+    const context = getContext(req, res)
+    res.statusCode = 200
+    try {
       const { html, error, redirected, resourceHints } = await this.renderRoute(req.url, context)
-
       if (redirected) {
         return html
       }
-
       if (error) {
         res.statusCode = context.nuxt.error.statusCode || 500
       }
 
-      // ETag header
+      // Add ETag header
       if (!error && this.options.render.etag) {
         const etag = generateETag(html, this.options.render.etag)
         if (fresh(req.headers, { etag })) {
@@ -263,7 +301,6 @@ export default class Renderer extends Tapable {
       }
       // Render error template
       const html = this.resources.errorTemplate({
-        /* istanbul ignore if */
         error: err,
         stack: ansiHTML(encodeHtml(err.stack))
       })
diff --git a/lib/core/server.js b/lib/core/server.js
index 2d855d073f..f0d71fa051 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -1,6 +1,4 @@
 import http from 'http'
-import connect from 'connect'
-import path from 'path'
 import chalk from 'chalk'
 
 class Server {
@@ -20,6 +18,9 @@ class Server {
         return this._ready
       })
     }
+
+    // Stop server on nuxt.close()
+    this.nuxt.plugin('close', () => this.close())
   }
 
   async ready () {
@@ -28,59 +29,34 @@ class Server {
       return this._ready
     }
 
-    this.app = connect()
-    this.server = http.createServer(this.app)
+    this.render = this.nuxt.renderer.app
+    this.server = http.createServer(this.render)
 
-    // Add Middleware
-    this.options.serverMiddleware.forEach(m => {
-      this.useMiddleware(m)
-    })
-
-    // Add default render middleware
-    this.useMiddleware(this.render.bind(this))
-
-    return this
-  }
-
-  useMiddleware (m) {
-    // Require if needed
-    if (typeof m === 'string') {
-      let src = m
-      // Using ~ or ./ shorthand to resolve from project srcDir
-      if (src.indexOf('~') === 0 || src.indexOf('./') === 0) {
-        src = path.join(this.nuxt.options.srcDir, src.substr(1))
-      }
-      m = require(src)
-    }
-    if (m instanceof Function) {
-      this.app.use(m)
-    } else if (m && m.path && m.handler) {
-      this.app.use(m.path, m.handler)
-    }
-  }
-
-  render (req, res, next) {
-    this.nuxt.render(req, res)
     return this
   }
 
   listen (port, host) {
     host = host || 'localhost'
     port = port || 3000
-    this.nuxt.ready()
+    return this.ready()
       .then(() => {
         this.server.listen(port, host, () => {
           let _host = host === '0.0.0.0' ? 'localhost' : host
           // eslint-disable-next-line no-console
           console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
         })
-      })
-      .catch(this.nuxt.errorHandler)
-    return this
+      }).catch(this.nuxt.errorHandler)
   }
 
-  close (cb) {
-    return this.server.close(cb)
+  close () {
+    return new Promise((resolve, reject) => {
+      this.server.close(err => {
+        if (err) {
+          return reject(err)
+        }
+        resolve()
+      })
+    })
   }
 }
 

From 0ee670c6653c36f5dfeba7829935456d5a35eaca Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 03:53:57 +0430
Subject: [PATCH 129/236] eslint

---
 lib/core/renderer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 4e90542632..7bf6cc3c3c 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -154,6 +154,7 @@ export default class Renderer extends Tapable {
     }, this.options.render.ssr, this.options.build.ssr))
 
     if (this.options.build.ssr) {
+      // eslint-disable-next-line no-console
       console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `renderer.ssr` instead!')
     }
 

From 0b4b46c91e6c0fbe10828754f421db0c8d088192 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 04:00:27 +0430
Subject: [PATCH 130/236] add missing default fs for loadResources

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

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 7bf6cc3c3c..31cd8f3087 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -107,7 +107,7 @@ export default class Renderer extends Tapable {
     return this
   }
 
-  async loadResources (_fs) {
+  async loadResources (_fs = fs) {
     let distPath = resolve(this.options.buildDir, 'dist')
 
     let updated = []

From bf379fc0fd9d27ef2029e562719bbb555cb03497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Tue, 20 Jun 2017 09:13:24 +0200
Subject: [PATCH 131/236] fix: dont serve index.html when url is / and remove
 publicPath in production

---
 lib/core/renderer.js | 7 ++++---
 lib/core/server.js   | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 31cd8f3087..fff8b2ec70 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -10,7 +10,7 @@ import _ from 'lodash'
 import { join, resolve } from 'path'
 import fs from 'fs-extra'
 import { createBundleRenderer } from 'vue-server-renderer'
-import { encodeHtml, getContext, setAnsiColors, isUrl } from 'utils'
+import { encodeHtml, getContext, setAnsiColors } from 'utils'
 import Debug from 'debug'
 import connect from 'connect'
 
@@ -205,8 +205,8 @@ export default class Renderer extends Tapable {
       next()
     })
 
-    // Remove publicPath from requests when it is pointing to CDN
-    if (isUrl(this.options.build.publicPath)) {
+    // Remove publicPath from requests in production mode
+    if (!this.options.dev) {
       this.useMiddleware((req, res, next) => {
         if (req.url.indexOf(this.options.build.publicPath) === 0) {
           req.url = req.url.replace(this.options.build.publicPath, '/')
@@ -239,6 +239,7 @@ export default class Renderer extends Tapable {
     // For dev they will be served with devMiddleware
     if (!this.options.dev) {
       this.useMiddleware(serveStatic(resolve(this.options.buildDir, 'dist'), {
+        index: false, // Don't serve index.html template
         maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
       }))
     }
diff --git a/lib/core/server.js b/lib/core/server.js
index f0d71fa051..cec7a7f3b6 100644
--- a/lib/core/server.js
+++ b/lib/core/server.js
@@ -29,8 +29,7 @@ class Server {
       return this._ready
     }
 
-    this.render = this.nuxt.renderer.app
-    this.server = http.createServer(this.render)
+    this.server = http.createServer(this.nuxt.render)
 
     return this
   }

From daa50e4efbc69e42398fca44c9e8f9a6d80ec097 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 16:14:47 +0430
Subject: [PATCH 132/236] refactor server into nuxt

---
 bin/nuxt-dev                | 110 ++++++++++++++++++------------------
 bin/nuxt-start              |  12 ++--
 lib/core/index.js           |   2 -
 lib/core/nuxt.js            |  34 ++++++++++-
 lib/core/renderer.js        |  50 ++++++++--------
 lib/core/server.js          |  62 --------------------
 test/basic.dev.test.js      |   6 +-
 test/basic.generate.test.js |   2 +-
 test/basic.test.js          |   6 +-
 test/children.test.js       |   6 +-
 test/error.test.js          |   6 +-
 test/module.test.js         |   6 +-
 test/with-config.test.js    |   6 +-
 13 files changed, 139 insertions(+), 169 deletions(-)
 delete mode 100644 lib/core/server.js

diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index b26fcbe623..419fe79a44 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -8,7 +8,7 @@ const debug = require('debug')('nuxt:build')
 debug.color = 2 // force green color
 const fs = require('fs')
 const parseArgs = require('minimist')
-const { Nuxt, Server, Builder } = require('../')
+const { Nuxt, Builder } = require('../')
 const chokidar = require('chokidar')
 const resolve = require('path').resolve
 
@@ -50,64 +50,64 @@ if (argv.help) {
 const rootDir = resolve(argv._[0] || '.')
 const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
-var options = {}
-if (fs.existsSync(nuxtConfigFile)) {
-  options = require(nuxtConfigFile)
-} else if (argv['config-file'] !== 'nuxt.config.js') {
-  console.error(`> Could not load config file ${argv['config-file']}`)
-  process.exit(1)
-}
-if (typeof options.rootDir !== 'string') {
-  options.rootDir = rootDir
-}
-// Force development mode: add hot reloading and watching changes
-options.dev = true
+// Load config once for chokidar
+const nuxtConfig = loadNuxtConfig()
+_.defaultsDeep(nuxtConfig, { watchers: { chokidar: { ignoreInitial: true } } })
 
-const nuxt = new Nuxt(options)
-const builder = new Builder(nuxt)
+// Start dev
+let dev = startDev()
 
-const port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
-const host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-const server = new Server(nuxt)
-server.listen(port, host)
-
-builder.build().then(() => {
-  listenOnConfigChanges(nuxt, server)
-})
-
-function listenOnConfigChanges (nuxt, server) {
-  // Listen on nuxt.config.js changes
-  const build = _.debounce(() => {
+// Start watching for nuxt.config.js changes
+chokidar
+  .watch(nuxtConfigFile, nuxtConfig.watchers.chokidar)
+  .on('all', _.debounce(() => {
     debug('[nuxt.config.js] changed')
-    delete require.cache[nuxtConfigFile]
-    var options = {}
-    if (fs.existsSync(nuxtConfigFile)) {
-      try {
-        options = require(nuxtConfigFile)
-      } catch (e) {
-        return console.error(e) // eslint-disable-line no-console
-      }
-    }
+    debug('Rebuilding the app...')
+    dev = dev.then(startDev)
+  }), 2500)
 
-    if (typeof options.rootDir !== 'string') {
-      options.rootDir = rootDir
-    }
+function startDev (oldNuxt) {
+  // Get latest environment variables
+  const port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
+  const host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
 
-    nuxt.close()
-      .then(() => {
-        debug('Rebuilding the app...')
-        const nuxt = new Nuxt(options)
-        const builder = new Builder(nuxt)
-        server.nuxt = nuxt
-        return builder.build()
-      })
-      .catch((error) => {
-        console.error('Error while rebuild the app:', error) // eslint-disable-line no-console
-        process.exit(1)
-      })
-  }, 200)
-  chokidar.watch(nuxtConfigFile, Object.assign({}, nuxt.options.watchers.chokidar, { ignoreInitial: true }))
-    .on('all', build)
+  // Load options
+  let options = {}
+  try {
+    options = loadNuxtConfig()
+  } catch (err) {
+    console.error(err)
+    return // Wait for next reload
+  }
+
+  // Create nuxt and builder instance
+  const nuxt = new Nuxt(options)
+  const builder = new Builder(nuxt)
+
+  return Promise.resolve()
+    .then(() => builder.build()) // 1- Start build
+    .then(() => oldNuxt ? oldNuxt.close() : Promise.resolve()) // 2- Close old nuxt after successful build
+    .then(() => nuxt.listen(port, host)) // 3- Start listening
+    .then(() => nuxt) // 4- Pass new nuxt to watch chain
 }
 
-module.exports = nuxt
+function loadNuxtConfig () {
+  let options = {}
+
+  if (fs.existsSync(nuxtConfigFile)) {
+    delete require.cache[nuxtConfigFile]
+    options = require(nuxtConfigFile)
+  } else if (argv['config-file'] !== 'nuxt.config.js') {
+    console.error(`> Could not load config file ${argv['config-file']}`)
+    process.exit(1)
+  }
+
+  if (typeof options.rootDir !== 'string') {
+    options.rootDir = rootDir
+  }
+
+  // Force development mode for add hot reloading and watching changes
+  options.dev = true
+
+  return options
+}
diff --git a/bin/nuxt-start b/bin/nuxt-start
index 97f5818f94..13551694aa 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -43,17 +43,21 @@ if (argv.help) {
 const rootDir = resolve(argv._[0] || '.')
 const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 
-var options = {}
+let options = {}
+
 if (fs.existsSync(nuxtConfigFile)) {
   options = require(nuxtConfigFile)
 } else if (argv['config-file'] !== 'nuxt.config.js') {
   console.error(`> Could not load config file ${argv['config-file']}`)
   process.exit(1)
 }
+
 if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
-options.dev = false // Force production mode (no webpack middleware called)
+
+// Force production mode (no webpack middleware called)
+options.dev = false
 
 // Check if project is built for production
 const distDir = join(options.rootDir, options.buildDir || '.nuxt', 'dist' )
@@ -65,6 +69,4 @@ if (!fs.existsSync(join(distDir, 'server-bundle.json'))) {
 const nuxt = new Nuxt(options)
 const port = argv.port || process.env.PORT || process.env.npm_package_config_nuxt_port
 const host = argv.hostname || process.env.HOST || process.env.npm_package_config_nuxt_host
-new Server(nuxt).listen(port, host)
-
-module.exports = nuxt
+nuxt.listen(port, host)
diff --git a/lib/core/index.js b/lib/core/index.js
index 19e55a107e..4bf8a61bf0 100755
--- a/lib/core/index.js
+++ b/lib/core/index.js
@@ -2,7 +2,6 @@ import Options from './options'
 import ModuleContainer from './module'
 import Nuxt from './nuxt'
 import Renderer from './renderer'
-import Server from './server'
 import * as Utils from 'utils'
 
 export default {
@@ -10,6 +9,5 @@ export default {
   ModuleContainer,
   Nuxt,
   Renderer,
-  Server,
   Utils
 }
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 38b98a5775..f8da1adc69 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -1,7 +1,12 @@
 import Tapable from 'tappable'
+import chalk from 'chalk'
 import ModuleContainer from './module'
 import Renderer from './renderer'
 import Options from './options'
+import Debug from 'debug'
+
+const debug = Debug('nuxt:')
+debug.color = 5
 
 export default class Nuxt extends Tapable {
   constructor (_options = {}) {
@@ -38,6 +43,34 @@ export default class Nuxt extends Tapable {
     return this
   }
 
+  listen (port = 3000, host = 'localhost') {
+    return new Promise((resolve, reject) => {
+      const server = this.renderer.app.listen({ port, host, exclusive: false }, err => {
+        if (err) {
+          return reject(err)
+        }
+
+        // Show Open URL
+        let _host = host === '0.0.0.0' ? 'localhost' : host
+        // eslint-disable-next-line no-console
+        console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
+
+        // Close server on nuxt close
+        this.plugin('close', () => new Promise((_resolve, _reject) => {
+          server.close(_err => {
+            debug('server closed')
+            if (_err) {
+              return _reject(err)
+            }
+            _resolve()
+          })
+        }))
+
+        resolve()
+      })
+    })
+  }
+
   errorHandler /* istanbul ignore next */ () {
     // Silent
     if (this.options.errorHandler === false) {
@@ -54,7 +87,6 @@ export default class Nuxt extends Tapable {
   }
 
   async close (callback) {
-    // Call for close
     await this.applyPluginsAsync('close')
 
     if (typeof callback === 'function') {
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index fff8b2ec70..d6352d738d 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -21,31 +21,6 @@ setAnsiColors(ansiHTML)
 
 let jsdom = null
 
-const parseTemplate = templateStr => _.template(templateStr, {
-  interpolate: /{{([\s\S]+?)}}/g
-})
-
-const resourceMap = [
-  {
-    key: 'clientManifest',
-    fileName: 'vue-ssr-client-manifest.json',
-    transform: JSON.parse
-  },
-  {
-    key: 'serverBundle',
-    fileName: 'server-bundle.json',
-    transform: JSON.parse
-  },
-  {
-    key: 'appTemplate',
-    fileName: 'index.html',
-    transform: parseTemplate
-  }
-]
-
-// Protector utility against request to SSR bundle files
-const ssrResourceRegex = new RegExp(resourceMap.map(resource => resource.fileName).join('|'), 'i')
-
 export default class Renderer extends Tapable {
   constructor (nuxt) {
     super()
@@ -403,3 +378,28 @@ export default class Renderer extends Tapable {
     return window
   }
 }
+
+const parseTemplate = templateStr => _.template(templateStr, {
+  interpolate: /{{([\s\S]+?)}}/g
+})
+
+const resourceMap = [
+  {
+    key: 'clientManifest',
+    fileName: 'vue-ssr-client-manifest.json',
+    transform: JSON.parse
+  },
+  {
+    key: 'serverBundle',
+    fileName: 'server-bundle.json',
+    transform: JSON.parse
+  },
+  {
+    key: 'appTemplate',
+    fileName: 'index.html',
+    transform: parseTemplate
+  }
+]
+
+// Protector utility against request to SSR bundle files
+const ssrResourceRegex = new RegExp(resourceMap.map(resource => resource.fileName).join('|'), 'i')
diff --git a/lib/core/server.js b/lib/core/server.js
deleted file mode 100644
index cec7a7f3b6..0000000000
--- a/lib/core/server.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import http from 'http'
-import chalk from 'chalk'
-
-class Server {
-  constructor (nuxt) {
-    this.nuxt = nuxt
-    this.options = nuxt.options
-
-    // Initialize
-    /* istanbul ignore if */
-    if (nuxt.initialized) {
-      // If nuxt already initialized
-      this._ready = this.ready().catch(this.nuxt.errorHandler)
-    } else {
-      // Wait for hook
-      this.nuxt.plugin('afterInit', () => {
-        this._ready = this.ready()
-        return this._ready
-      })
-    }
-
-    // Stop server on nuxt.close()
-    this.nuxt.plugin('close', () => this.close())
-  }
-
-  async ready () {
-    /* istanbul ignore if */
-    if (this._ready) {
-      return this._ready
-    }
-
-    this.server = http.createServer(this.nuxt.render)
-
-    return this
-  }
-
-  listen (port, host) {
-    host = host || 'localhost'
-    port = port || 3000
-    return this.ready()
-      .then(() => {
-        this.server.listen(port, host, () => {
-          let _host = host === '0.0.0.0' ? 'localhost' : host
-          // eslint-disable-next-line no-console
-          console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
-        })
-      }).catch(this.nuxt.errorHandler)
-  }
-
-  close () {
-    return new Promise((resolve, reject) => {
-      this.server.close(err => {
-        if (err) {
-          return reject(err)
-        }
-        resolve()
-      })
-    })
-  }
-}
-
-export default Server
diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index b0639decd8..1ca828d9d1 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Server, Builder } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 const port = 4001
 const url = (route) => 'http://localhost:' + port + route
@@ -17,8 +17,8 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await new Builder(nuxt).build()
-  server = new Server(nuxt)
-  server.listen(port, 'localhost')
+
+  await nuxt.listen(port, 'localhost')
 })
 
 test('/stateless', async t => {
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index b75e71a4b2..3e01db6c8a 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -30,7 +30,7 @@ test.before('Init Nuxt.js', async t => {
   server = http.createServer((req, res) => {
     serve(req, res, finalhandler(req, res))
   })
-  server.listen(port)
+  await nuxt.listen(port)
 })
 
 test('/stateless', async t => {
diff --git a/test/basic.test.js b/test/basic.test.js
index e1fa0820eb..2d3abd389b 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -2,7 +2,7 @@ import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
 import stdMocks from 'std-mocks'
-import { Nuxt, Server, Builder } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 const port = 4003
 const url = (route) => 'http://localhost:' + port + route
@@ -19,8 +19,8 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await new Builder(nuxt).build()
-  server = new Server(nuxt)
-  server.listen(port, 'localhost')
+
+  await nuxt.listen(port, 'localhost')
 })
 
 test('/stateless', async t => {
diff --git a/test/children.test.js b/test/children.test.js
index 6f5629df3b..98fe9d06c8 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Server, Builder } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 const port = 4004
 // const url = (route) => 'http://localhost:' + port + route
@@ -17,8 +17,8 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await new Builder(nuxt).build()
-  server = new Server(nuxt)
-  server.listen(port, 'localhost')
+
+  await nuxt.listen(port, 'localhost')
 })
 
 test('/parent', async t => {
diff --git a/test/error.test.js b/test/error.test.js
index 7ed40fa136..44d7fcffec 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Server, Builder } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 const port = 4005
 const url = (route) => 'http://localhost:' + port + route
@@ -17,8 +17,8 @@ test.before('Init Nuxt.js', async t => {
   }
   nuxt = new Nuxt(options)
   await new Builder(nuxt).build()
-  server = new Server(nuxt)
-  server.listen(port, 'localhost')
+
+  await nuxt.listen(port, 'localhost')
 })
 
 test('/ should display an error', async t => {
diff --git a/test/module.test.js b/test/module.test.js
index 6745df79a4..69a409a7d4 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { resolve, normalize } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Server, Builder } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 const port = 4006
 const url = (route) => 'http://localhost:' + port + route
@@ -18,8 +18,8 @@ test.before('Init Nuxt.js', async t => {
   config.runBuild = true
   nuxt = new Nuxt(config)
   await new Builder(nuxt).build()
-  server = new Server(nuxt)
-  server.listen(port, 'localhost')
+
+  await nuxt.listen(port, 'localhost')
 })
 
 test('Vendor', async t => {
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 1b5b3169ad..2e281bd22f 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Server, Builder } from '../index.js'
+import { Nuxt, Builder } from '../index.js'
 
 const port = 4007
 const url = (route) => 'http://localhost:' + port + route
@@ -18,8 +18,8 @@ test.before('Init Nuxt.js', async t => {
   config.runBuild = true
   nuxt = new Nuxt(config)
   await new Builder(nuxt).build()
-  server = new Server(nuxt)
-  server.listen(port, 'localhost')
+
+  await nuxt.listen(port, 'localhost')
 })
 
 test('/', async t => {

From b6544637e094c47ad9d55f194921c83a61754ad5 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 16:34:20 +0430
Subject: [PATCH 133/236] renderer: errorMiddleware

Catch all middleware errors
---
 lib/core/nuxt.js     |  2 +-
 lib/core/renderer.js | 46 ++++++++++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index f8da1adc69..6d56f5c8fe 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -22,7 +22,7 @@ export default class Nuxt extends Tapable {
     this.renderer = new Renderer(this)
 
     // Backward compatibility
-    this.render = (...args) => this.renderer.app(...args)
+    this.render = this.renderer.app
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
 
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index d6352d738d..c54820eb82 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -45,6 +45,10 @@ export default class Renderer extends Tapable {
       errorTemplate: parseTemplate('<pre>{{ stack }}</pre>') // Will be loaded on ready
     }
 
+    // Bind middleware to this context
+    this.nuxtMiddleware = this.nuxtMiddleware.bind(this)
+    this.errorMiddleware = this.errorMiddleware.bind(this)
+
     // Initialize
     /* istanbul ignore if */
     if (nuxt.initialized) {
@@ -220,10 +224,13 @@ export default class Renderer extends Tapable {
     }
 
     // Finally use nuxtMiddleware
-    this.useMiddleware(this.nuxtMiddleware.bind(this))
+    this.useMiddleware(this.nuxtMiddleware)
+
+    // Error middleware for errors that occurred in middleware that declared above
+    this.useMiddleware(this.errorMiddleware)
   }
 
-  async nuxtMiddleware (req, res) {
+  async nuxtMiddleware (req, res, next) {
     // Get context
     const context = getContext(req, res)
     res.statusCode = 200
@@ -271,23 +278,28 @@ export default class Renderer extends Tapable {
       res.end(html, 'utf8')
       return html
     } catch (err) {
-      /* istanbul ignore if */
-      if (context.redirected) {
-        console.error(err) // eslint-disable-line no-console
-        return err
-      }
-      // Render error template
-      const html = this.resources.errorTemplate({
-        error: err,
-        stack: ansiHTML(encodeHtml(err.stack))
-      })
-      // Send response
-      res.statusCode = 500
-      res.setHeader('Content-Type', 'text/html; charset=utf-8')
-      res.setHeader('Content-Length', Buffer.byteLength(html))
-      res.end(html, 'utf8')
+      next(this.errorMiddleware(err, req, res, next, context))
+    }
+  }
+
+  async errorMiddleware (err, req, res, next, context) {
+    /* istanbul ignore if */
+    if (context && context.redirected) {
+      console.error(err) // eslint-disable-line no-console
       return err
     }
+
+    // Render error template
+    const html = this.resources.errorTemplate({
+      error: err,
+      stack: ansiHTML(encodeHtml(err.stack))
+    })
+    // Send response
+    res.statusCode = 500
+    res.setHeader('Content-Type', 'text/html; charset=utf-8')
+    res.setHeader('Content-Length', Buffer.byteLength(html))
+    res.end(html, 'utf8')
+    return err
   }
 
   async renderRoute (url, context = {}) {

From 5ad640b294abe550e1227ab964192ca8ad3379b6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 16:42:21 +0430
Subject: [PATCH 134/236] use nuxt.js build target

---
 index.js         |  8 +-------
 lib/core/nuxt.js | 10 +++++-----
 lib/index.js     |  4 ++++
 package.json     |  8 ++++----
 rollup.config.js |  4 ++++
 5 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100755 lib/index.js

diff --git a/index.js b/index.js
index a76dbcf80a..c3cdb2cec0 100644
--- a/index.js
+++ b/index.js
@@ -13,10 +13,4 @@ require('source-map-support').install();
 /* istanbul ignore else */
 process.noDeprecation = true
 
-// Require Core
-const Core = require('./dist/core.js')
-Object.assign(exports, Core)
-
-// Require Builder
-const Builder = require('./dist/builder.js')
-Object.assign(exports, Builder)
+module.exports = require('./dist/nuxt')
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 6d56f5c8fe..482c96b210 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -56,13 +56,13 @@ export default class Nuxt extends Tapable {
         console.log('\n' + chalk.bold(chalk.bgBlue.black(' OPEN ') + chalk.blue(` http://${_host}:${port}\n`)))
 
         // Close server on nuxt close
-        this.plugin('close', () => new Promise((_resolve, _reject) => {
-          server.close(_err => {
+        this.plugin('close', () => new Promise((resolve, reject) => {
+          server.close(err => {
             debug('server closed')
-            if (_err) {
-              return _reject(err)
+            if (err) {
+              return reject(err)
             }
-            _resolve()
+            resolve()
           })
         }))
 
diff --git a/lib/index.js b/lib/index.js
new file mode 100755
index 0000000000..bb877e8e7c
--- /dev/null
+++ b/lib/index.js
@@ -0,0 +1,4 @@
+import core from './core'
+import builder from './builder'
+
+export default Object.assign({}, core, builder)
diff --git a/package.json b/package.json
index c7cb03e8d8..73aca5455e 100644
--- a/package.json
+++ b/package.json
@@ -48,14 +48,14 @@
     ]
   },
   "scripts": {
-    "test": "npm run lint && cross-env NODE_ENV=test npm run build && nyc ava --verbose --serial test/ -- && nyc report --reporter=html",
+    "test": "npm run lint && cross-env NODE_ENV=test npm run build:nuxt && nyc ava --verbose --serial test/ -- && nyc report --reporter=html",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.vue bin lib pages test/*.js --ignore-pattern app",
-    "build": "rimraf dist/ && npm run build:core && npm run build:builder",
+    "build": "rimraf dist/ && npm run build:nuxt && npm run build:core && npm run build:builder",
+    "build:nuxt": "rollup -c rollup.config.js --environment TARGET:nuxt",
     "build:core": "rollup -c rollup.config.js --environment TARGET:core",
-    "watch": "npm run build:core -- -w",
     "build:builder": "rollup -c rollup.config.js --environment TARGET:builder",
-    "watch:builder": "npm run build:builder -- -w",
+    "watch": "npm run build:nuxt -- -w",
     "precommit": "npm run lint",
     "prepublish": "npm run build",
     "postinstall": "opencollective postinstall"
diff --git a/rollup.config.js b/rollup.config.js
index ca5a74c683..859ef6c6e8 100755
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -38,6 +38,10 @@ const aliases = {
 // Builds
 // -----------------------------
 const builds = {
+  nuxt: {
+    entry: resolve(libDir, 'index.js'),
+    dest: resolve(distDir, 'nuxt.js')
+  },
   core: {
     entry: resolve(libDir, 'core/index.js'),
     dest: resolve(distDir, 'core.js')

From 0f8530819111b19cd872bf90aa759c8042b96301 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 17:18:25 +0430
Subject: [PATCH 135/236] add render.resourceHints option

#899
---
 lib/core/options.js  |  1 +
 lib/core/renderer.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/core/options.js b/lib/core/options.js
index 90e990b3eb..89c70fac66 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -131,6 +131,7 @@ const defaultOptions = {
   },
   render: {
     ssr: {},
+    resourceHints: true,
     http2: {
       push: false
     },
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index c54820eb82..c2c9324eae 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -328,8 +328,14 @@ export default class Renderer extends Tapable {
     if (this.options._routerBaseSpecified) {
       HEAD += `<base href="${this.options.router.base}">`
     }
-    const resourceHints = context.renderResourceHints()
-    HEAD += resourceHints + context.renderStyles()
+
+    let resourceHints = ''
+    if (this.options.render.resourceHints) {
+      resourceHints = context.renderResourceHints()
+      HEAD += resourceHints
+    }
+
+    HEAD += context.renderStyles()
     APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, { isJSON: true })}</script>`
     APP += context.renderScripts()
 

From d42819ee91e0137d28471ef9909c978c86d605b0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 17:25:52 +0430
Subject: [PATCH 136/236] update tests

---
 test/basic.dev.test.js      | 4 +---
 test/basic.generate.test.js | 2 +-
 test/basic.test.js          | 2 --
 test/children.test.js       | 2 --
 test/error.test.js          | 5 ++---
 test/module.test.js         | 2 --
 test/with-config.test.js    | 2 --
 7 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 1ca828d9d1..4defc787fb 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -7,7 +7,6 @@ const port = 4001
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
-let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
@@ -38,6 +37,5 @@ test('/_nuxt/test.hot-update.json should returns empty html', async t => {
 
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', async t => {
-  server.close()
-  await nuxt.close(() => {})
+  await nuxt.close()
 })
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index 3e01db6c8a..b75e71a4b2 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -30,7 +30,7 @@ test.before('Init Nuxt.js', async t => {
   server = http.createServer((req, res) => {
     serve(req, res, finalhandler(req, res))
   })
-  await nuxt.listen(port)
+  server.listen(port)
 })
 
 test('/stateless', async t => {
diff --git a/test/basic.test.js b/test/basic.test.js
index 2d3abd389b..fe8f306879 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -8,7 +8,6 @@ const port = 4003
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
-let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
@@ -156,6 +155,5 @@ test('ETag Header', async t => {
 
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
-  server.close()
   nuxt.close()
 })
diff --git a/test/children.test.js b/test/children.test.js
index 98fe9d06c8..d6f470b868 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -6,7 +6,6 @@ const port = 4004
 // const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
-let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
@@ -57,6 +56,5 @@ test('/parent/validate-child?key=12345', async t => {
 
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
-  server.close()
   nuxt.close()
 })
diff --git a/test/error.test.js b/test/error.test.js
index 44d7fcffec..4b53f5ad56 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -6,7 +6,6 @@ const port = 4005
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
-let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
@@ -36,11 +35,11 @@ test('/404 should display an error too', async t => {
 
 test('/ with renderAndGetWindow()', async t => {
   const err = await t.throws(nuxt.renderAndGetWindow(url('/')))
-  t.is(err.response.statusCode, 500)
+  t.true(String(err).includes('Error: socket hang up'))
+  // t.is(err.response.statusCode, 500)
 })
 
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
-  server.close()
   nuxt.close()
 })
diff --git a/test/module.test.js b/test/module.test.js
index 69a409a7d4..9f1f7d0b57 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -7,7 +7,6 @@ const port = 4006
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
-let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
@@ -40,6 +39,5 @@ test('Middleware', async t => {
 
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
-  server.close()
   nuxt.close()
 })
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 2e281bd22f..852ed60625 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -7,7 +7,6 @@ const port = 4007
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
-let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
@@ -101,6 +100,5 @@ test('Check /test.txt with custom serve-static options', async t => {
 
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
-  server.close()
   nuxt.close()
 })

From ebc6da4c08fe95f3798081c7864975efa07a78cd Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 20 Jun 2017 15:07:38 +0200
Subject: [PATCH 137/236] Add server-destroy

---
 bin/nuxt-dev     | 5 +++++
 lib/core/nuxt.js | 6 +++++-
 package.json     | 1 +
 yarn.lock        | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 419fe79a44..19e4b9de9f 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -54,6 +54,11 @@ const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 const nuxtConfig = loadNuxtConfig()
 _.defaultsDeep(nuxtConfig, { watchers: { chokidar: { ignoreInitial: true } } })
 
+// Fail if an error happened
+process.on('unhandledRejection', function (err) {
+  throw err
+})
+
 // Start dev
 let dev = startDev()
 
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 482c96b210..6e4c8f534c 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -4,6 +4,7 @@ import ModuleContainer from './module'
 import Renderer from './renderer'
 import Options from './options'
 import Debug from 'debug'
+import enableDestroy from 'server-destroy'
 
 const debug = Debug('nuxt:')
 debug.color = 5
@@ -57,7 +58,8 @@ export default class Nuxt extends Tapable {
 
         // Close server on nuxt close
         this.plugin('close', () => new Promise((resolve, reject) => {
-          server.close(err => {
+          // Destroy server by forcing every connection to be closed
+          server.destroy(err => {
             debug('server closed')
             if (err) {
               return reject(err)
@@ -68,6 +70,8 @@ export default class Nuxt extends Tapable {
 
         resolve()
       })
+      // Add server.destroy(cb) method
+      enableDestroy(server)
     })
   }
 
diff --git a/package.json b/package.json
index 73aca5455e..9217bb6529 100644
--- a/package.json
+++ b/package.json
@@ -150,6 +150,7 @@
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-replace": "^1.1.1",
     "rollup-watch": "^4.0.0",
+    "server-destroy": "^1.0.1",
     "std-mocks": "^1.0.1",
     "uglify-js": "^3.0.18"
   },
diff --git a/yarn.lock b/yarn.lock
index fd27d98524..9ee2f34524 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5971,6 +5971,10 @@ serve-static@1.12.3, serve-static@^1.12.3:
     parseurl "~1.3.1"
     send "0.15.3"
 
+server-destroy@^1.0.1:
+  version "1.0.1"
+  resolved "https://repository.neo9.pro/content/groups/global-npm/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
+
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"

From 2c12b37bf6eec40cf7c1a95fd9a6d6ef76476beb Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 20 Jun 2017 17:42:33 +0430
Subject: [PATCH 138/236] coverage

---
 lib/builder/builder.js | 1 +
 lib/core/nuxt.js       | 3 +++
 lib/core/renderer.js   | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 751a8a7e7b..55cb403eb6 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -324,6 +324,7 @@ export default class Builder extends Tapable {
       } else {
         // --- Production Build ---
         compiler.run((err, stats) => {
+          /* istanbul ignore if */
           if (err) {
             return reject(err)
           }
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 6e4c8f534c..229a647dda 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -47,6 +47,7 @@ export default class Nuxt extends Tapable {
   listen (port = 3000, host = 'localhost') {
     return new Promise((resolve, reject) => {
       const server = this.renderer.app.listen({ port, host, exclusive: false }, err => {
+        /* istanbul ignore if */
         if (err) {
           return reject(err)
         }
@@ -61,6 +62,7 @@ export default class Nuxt extends Tapable {
           // Destroy server by forcing every connection to be closed
           server.destroy(err => {
             debug('server closed')
+            /* istanbul ignore if */
             if (err) {
               return reject(err)
             }
@@ -93,6 +95,7 @@ export default class Nuxt extends Tapable {
   async close (callback) {
     await this.applyPluginsAsync('close')
 
+    /* istanbul ignore if */
     if (typeof callback === 'function') {
       await callback()
     }
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index c2c9324eae..d8f7da331c 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -132,6 +132,7 @@ export default class Renderer extends Tapable {
       basedir: this.options.rootDir
     }, this.options.render.ssr, this.options.build.ssr))
 
+    /* istanbul ignore if */
     if (this.options.build.ssr) {
       // eslint-disable-next-line no-console
       console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `renderer.ssr` instead!')
@@ -176,7 +177,8 @@ export default class Renderer extends Tapable {
       if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
         req.url = req.url.replace(this.options.router.base, '/')
       }
-      // Prevent access to SSR resources
+      // Prevent access to SSR resources (TODO: write tests)
+      /* istanbul ignore if */
       if (ssrResourceRegex.test(req.url)) {
         res.statusCode = 404
         return res.end()

From 365d2d8df60418885a516d0f5b9e046629b7aab2 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 20 Jun 2017 15:20:16 +0200
Subject: [PATCH 139/236] Upgrade babel-laoder

---
 package.json |  2 +-
 yarn.lock    | 48 +++++++++++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 9217bb6529..a905c3a454 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "ansi-html": "^0.0.7",
     "autoprefixer": "^7.1.1",
     "babel-core": "^6.25.0",
-    "babel-loader": "^7.0.0",
+    "babel-loader": "^7.1.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-vue-app": "^1.2.0",
     "chalk": "^1.1.3",
diff --git a/yarn.lock b/yarn.lock
index 9ee2f34524..e00ea04df6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -606,11 +606,11 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
+babel-loader@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144"
   dependencies:
-    find-cache-dir "^0.1.1"
+    find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
 
@@ -2685,24 +2685,20 @@ esquery@^1.0.0:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
   dependencies:
-    estraverse "~4.1.0"
+    estraverse "^4.1.0"
     object-assign "^4.0.1"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
-estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
+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"
 
-estraverse@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
-
 estree-walker@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
@@ -2916,6 +2912,14 @@ find-cache-dir@^0.1.1:
     mkdirp "^0.5.1"
     pkg-dir "^1.0.0"
 
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3303,10 +3307,11 @@ hash-sum@^1.0.2:
   resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.1.tgz#5cb2e796499224e69fd0b00ed01d2d4a16e7a323"
   dependencies:
-    inherits "^2.0.1"
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
 
 hawk@~3.1.3:
   version "3.1.3"
@@ -5349,8 +5354,8 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 pretty-error@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.0.tgz#87f4e9d706a24c87d6cbee9fabec001fcf8c75d8"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
   dependencies:
     renderkid "^2.0.1"
     utila "~0.4"
@@ -5973,7 +5978,7 @@ serve-static@1.12.3, serve-static@^1.12.3:
 
 server-destroy@^1.0.1:
   version "1.0.1"
-  resolved "https://repository.neo9.pro/content/groups/global-npm/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
+  resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -6491,7 +6496,7 @@ uglify-js@3.0.x, uglify-js@^3.0.18:
     commander "~2.9.0"
     source-map "~0.5.1"
 
-uglify-js@^2.6:
+uglify-js@^2.6, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -6505,10 +6510,11 @@ uglify-to-browserify@~1.0.0:
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
 uglifyjs-webpack-plugin@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.4.tgz#7829c50ee5a5b755969d4458357ed5a2dd36fbbd"
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
   dependencies:
     source-map "^0.5.6"
+    uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
 uid-number@^0.0.6:

From fb2eddb78b886537d081cade1980158325a7af96 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 20 Jun 2017 15:32:02 +0200
Subject: [PATCH 140/236] Add applyPlugins for setupMiddleware

---
 lib/core/renderer.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index c2c9324eae..e147522629 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -160,16 +160,14 @@ export default class Renderer extends Tapable {
   }
 
   setupMiddleware () {
+    // Apply setupMiddleware from modules first
+    this.applyPlugins('setupMiddleware', this.app)
+
     // Gzip middleware for production
     if (!this.options.dev && this.options.render.gzip) {
       this.useMiddleware(compression(this.options.render.gzip))
     }
 
-    // Add User provided middleware
-    this.options.serverMiddleware.forEach(m => {
-      this.useMiddleware(m)
-    })
-
     // Common URL checks
     this.useMiddleware((req, res, next) => {
       // If base in req.url, remove it for the middleware and vue-router
@@ -223,6 +221,11 @@ export default class Renderer extends Tapable {
       }))
     }
 
+    // Add User provided middleware
+    this.options.serverMiddleware.forEach(m => {
+      this.useMiddleware(m)
+    })
+
     // Finally use nuxtMiddleware
     this.useMiddleware(this.nuxtMiddleware)
 

From 365d51c0b7517f3f4609632ec879fd0180e11126 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 20 Jun 2017 16:12:55 +0200
Subject: [PATCH 141/236] Simplify publicPath and add test for protected
 resources

---
 lib/core/options.js  |  2 +-
 lib/core/renderer.js | 28 +++++++++++-----------------
 test/basic.test.js   | 14 ++++++++++++--
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/lib/core/options.js b/lib/core/options.js
index 89c70fac66..25b1989ec5 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -49,7 +49,7 @@ export default function Options (_options) {
   return options
 }
 
-const defaultOptions = {
+export const defaultOptions = {
   dev: (process.env.NODE_ENV !== 'production'),
   buildDir: '.nuxt',
   nuxtAppDir: resolve(__dirname, '../lib/app/'), // Relative to dist
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index b949391cce..919504bfb3 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -10,7 +10,8 @@ import _ from 'lodash'
 import { join, resolve } from 'path'
 import fs from 'fs-extra'
 import { createBundleRenderer } from 'vue-server-renderer'
-import { encodeHtml, getContext, setAnsiColors } from 'utils'
+import { encodeHtml, getContext, setAnsiColors, isUrl } from 'utils'
+import { defaultOptions } from './options'
 import Debug from 'debug'
 import connect from 'connect'
 
@@ -175,8 +176,7 @@ export default class Renderer extends Tapable {
       if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
         req.url = req.url.replace(this.options.router.base, '/')
       }
-      // Prevent access to SSR resources (TODO: write tests)
-      /* istanbul ignore if */
+      // Prevent access to SSR resources
       if (ssrResourceRegex.test(req.url)) {
         res.statusCode = 404
         return res.end()
@@ -184,16 +184,6 @@ export default class Renderer extends Tapable {
       next()
     })
 
-    // Remove publicPath from requests in production mode
-    if (!this.options.dev) {
-      this.useMiddleware((req, res, next) => {
-        if (req.url.indexOf(this.options.build.publicPath) === 0) {
-          req.url = req.url.replace(this.options.build.publicPath, '/')
-        }
-        next()
-      })
-    }
-
     // Add webpack middleware only for development
     if (this.options.dev) {
       this.useMiddleware(async (req, res, next) => {
@@ -217,10 +207,14 @@ export default class Renderer extends Tapable {
     // Serve .nuxt/dist/ files only for production
     // For dev they will be served with devMiddleware
     if (!this.options.dev) {
-      this.useMiddleware(serveStatic(resolve(this.options.buildDir, 'dist'), {
-        index: false, // Don't serve index.html template
-        maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
-      }))
+      const distDir = resolve(this.options.buildDir, 'dist')
+      this.useMiddleware({
+        path: isUrl(this.options.build.publicPath) ? defaultOptions.build.publicPath : this.options.build.publicPath,
+        handler: serveStatic(distDir, {
+          index: false, // Don't serve index.html template
+          maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
+        })
+      })
     }
 
     // Add User provided middleware
diff --git a/test/basic.test.js b/test/basic.test.js
index fe8f306879..16146f2e1c 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -145,14 +145,24 @@ test('/redirect2', async t => {
 })
 
 test('ETag Header', async t => {
-  const {headers: {etag}} = await rp(url('/stateless'), {resolveWithFullResponse: true})
+  const { headers: { etag } } = await rp(url('/stateless'), { resolveWithFullResponse: true })
   // Validate etag
   t.regex(etag, /W\/".*"$/)
   // Verify functionality
-  const error = await t.throws(rp(url('/stateless'), {headers: {'If-None-Match': etag}}))
+  const error = await t.throws(rp(url('/stateless'), { headers: { 'If-None-Match': etag } }))
   t.is(error.statusCode, 304)
 })
 
+test('/_nuxt/server-bundle.json should return 404', async t => {
+  const err = await t.throws(rp(url('/_nuxt/server-bundle.json'), { resolveWithFullResponse: true }))
+  t.is(err.statusCode, 404)
+})
+
+test('/_nuxt/ should return 404', async t => {
+  const err = await t.throws(rp(url('/_nuxt/'), { resolveWithFullResponse: true }))
+  t.is(err.statusCode, 404)
+})
+
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
   nuxt.close()

From e1126d799c1c9271ecdd4e4b01c3e7e13921f307 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 20 Jun 2017 19:12:06 +0200
Subject: [PATCH 142/236] Use relative path

---
 lib/app/components/nuxt.vue |  2 +-
 lib/app/router.js           |  2 +-
 lib/builder/builder.js      | 24 ++++++++++++++++--------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/app/components/nuxt.vue b/lib/app/components/nuxt.vue
index b6eb339a31..3c65dae1fd 100644
--- a/lib/app/components/nuxt.vue
+++ b/lib/app/components/nuxt.vue
@@ -6,7 +6,7 @@
 <script>
 import Vue from 'vue'
 import NuxtChild from './nuxt-child'
-import NuxtError from '<%= components.ErrorPage ? components.ErrorPage : "./nuxt-error.vue" %>'
+import NuxtError from '<%= components.ErrorPage ? (components.ErrorPage.includes('~') ? components.ErrorPage : "../" + components.ErrorPage) : "./nuxt-error.vue" %>'
 
 export default {
   name: 'nuxt',
diff --git a/lib/app/router.js b/lib/app/router.js
index 735b6cf2ec..217ee094d5 100644
--- a/lib/app/router.js
+++ b/lib/app/router.js
@@ -23,7 +23,7 @@ function recursiveRoutes(routes, tab, components) {
 var _components = []
 var _routes = recursiveRoutes(router.routes, '\t\t', _components)
 uniqBy(_components, '_name').forEach((route) => { %>
-const <%= route._name %> = () => import('<%= route.component %>' /* webpackChunkName: "pages/<%= route.name %>" */)
+const <%= route._name %> = () => import('<%= relative(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */)
 <% }) %>
 
 <% if (router.scrollBehavior) { %>
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 55cb403eb6..211a46ab0a 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -5,7 +5,7 @@ import hash from 'hash-sum'
 import pify from 'pify'
 import webpack from 'webpack'
 import serialize from 'serialize-javascript'
-import { join, resolve, basename, dirname } from 'path'
+import { join, resolve, basename, dirname, relative } from 'path'
 import Tapable from 'tappable'
 import MFS from 'memory-fs'
 import webpackDevMiddleware from 'webpack-dev-middleware'
@@ -134,10 +134,10 @@ export default class Builder extends Tapable {
       }),
       appPath: './App.vue',
       layouts: Object.assign({}, this.options.layouts),
-      loading: typeof this.options.loading === 'string' ? r(this.options.srcDir, this.options.loading) : this.options.loading,
+      loading: typeof this.options.loading === 'string' ? this.relative(r(this.options.srcDir, this.options.loading)) : this.options.loading,
       transition: this.options.transition,
       components: {
-        ErrorPage: this.options.ErrorPage ? r(this.options.ErrorPage) : null
+        ErrorPage: this.options.ErrorPage ? this.relative(r(this.options.ErrorPage)) : null
       }
     }
 
@@ -147,17 +147,17 @@ export default class Builder extends Tapable {
       layoutsFiles.forEach((file) => {
         let name = file.split('/').slice(-1)[0].replace('.vue', '')
         if (name === 'error') return
-        templateVars.layouts[name] = r(this.options.srcDir, file)
+        templateVars.layouts[name] = this.relative(r(this.options.srcDir, file))
       })
-      if (layoutsFiles.includes('layouts/error.vue')) {
-        templateVars.components.ErrorPage = r(this.options.srcDir, 'layouts/error.vue')
+      if (layoutsFiles.includes('layouts/error.vue') && !templateVars.components.ErrorPage) {
+        templateVars.components.ErrorPage = this.relative(r(this.options.srcDir, 'layouts/error.vue'))
       }
     }
     // If no default layout, create its folder and add the default folder
     if (!templateVars.layouts.default) {
       await mkdirp(r(this.options.buildDir, 'layouts'))
       templatesFiles.push('layouts/default.vue')
-      templateVars.layouts.default = r(this.options.nuxtAppDir, 'layouts', 'default.vue')
+      templateVars.layouts.default = './layouts/default.vue'
     }
 
     // -- Routes --
@@ -224,7 +224,8 @@ export default class Builder extends Tapable {
           serialize,
           hash,
           r,
-          wp
+          wp,
+          relative: this.relative.bind(this)
         }
       })
       const content = template(Object.assign({}, templateVars, {
@@ -407,6 +408,13 @@ export default class Builder extends Tapable {
       customFilesWatcher.close()
     })
   }
+
+  relative(dest) {
+    if (dest && dest.includes('~')) {
+      return dest
+    }
+    return relative(this.options.buildDir, dest)
+  }
 }
 
 const STATUS = {

From e1be5944cd1fe44abda58540569633256a0de8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Tue, 20 Jun 2017 20:19:31 +0200
Subject: [PATCH 143/236] Fix typo

---
 lib/builder/builder.js | 2 +-
 lib/core/renderer.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 211a46ab0a..10ee9f8736 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -409,7 +409,7 @@ export default class Builder extends Tapable {
     })
   }
 
-  relative(dest) {
+  relative (dest) {
     if (dest && dest.includes('~')) {
       return dest
     }
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 919504bfb3..ff653d4f71 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -136,7 +136,7 @@ export default class Renderer extends Tapable {
     /* istanbul ignore if */
     if (this.options.build.ssr) {
       // eslint-disable-next-line no-console
-      console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `renderer.ssr` instead!')
+      console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `render.ssr` instead!')
     }
 
     // Promisify renderToString

From 4cfe70084666fb2aa0ca80175621df95d6c66671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Tue, 20 Jun 2017 20:31:03 +0200
Subject: [PATCH 144/236] Use relative path for plugins paths

---
 lib/app/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index 4972dea315..64300af5ca 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -23,7 +23,7 @@ if (process.browser) {
 
 // Import SSR plugins
 <% plugins.forEach(function (plugin) { if (plugin.ssr)
-{ %>let <%= plugin.name %> = require('<%= r(plugin.src) %>')
+{ %>let <%= plugin.name %> = require('<%= relative(r(plugin.src)) %>')
 <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
 <% }}) %>
 
@@ -132,7 +132,7 @@ async function createApp (ssrContext) {
   }
   <% } else { %>
   if (process.browser) {
-    let <%= plugin.name %> = require('<%= plugin.src %>')
+    let <%= plugin.name %> = require('<%= relative(plugin.src) %>')
     <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
     if (typeof <%= plugin.name %> === 'function') {
       await <%= plugin.name %>(ctx)

From 6a562e1fe73e897a009b9b00cc3a19950892b382 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 21 Jun 2017 01:53:53 +0430
Subject: [PATCH 145/236] fix minor problems with relative

---
 lib/app/index.js       | 2 +-
 lib/builder/builder.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index 64300af5ca..568941ed59 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -23,7 +23,7 @@ if (process.browser) {
 
 // Import SSR plugins
 <% plugins.forEach(function (plugin) { if (plugin.ssr)
-{ %>let <%= plugin.name %> = require('<%= relative(r(plugin.src)) %>')
+{ %>let <%= plugin.name %> = require('<%= relative(plugin.src) %>')
 <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
 <% }}) %>
 
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 10ee9f8736..ebdb2f66e4 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -413,7 +413,11 @@ export default class Builder extends Tapable {
     if (dest && dest.includes('~')) {
       return dest
     }
-    return relative(this.options.buildDir, dest)
+    let rp = relative(this.options.buildDir, dest)
+    if (rp[0] !== '.') {
+      rp = './' + rp
+    }
+    return wp(rp)
   }
 }
 

From 39ee66c6e555cfc56d3ddb4b0818c2ada641bc26 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 21 Jun 2017 21:02:57 +0430
Subject: [PATCH 146/236] nuxt-start

---
 package.json       |  1 +
 start/.gitignore   |  3 ++
 start/README.md    |  3 ++
 start/index.js     | 16 +++++++++++
 start/package.json | 71 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 94 insertions(+)
 create mode 100644 start/.gitignore
 create mode 100644 start/README.md
 create mode 100644 start/index.js
 create mode 100644 start/package.json

diff --git a/package.json b/package.json
index a905c3a454..215af70b32 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
   "files": [
     "bin",
     "dist",
+    "lib",
     "index.d.ts",
     "index.js"
   ],
diff --git a/start/.gitignore b/start/.gitignore
new file mode 100644
index 0000000000..a30fb4eafb
--- /dev/null
+++ b/start/.gitignore
@@ -0,0 +1,3 @@
+bin
+dist
+lib
\ No newline at end of file
diff --git a/start/README.md b/start/README.md
new file mode 100644
index 0000000000..bd8fb9b498
--- /dev/null
+++ b/start/README.md
@@ -0,0 +1,3 @@
+# Nuxt-Start
+
+Runtime Only Build
\ No newline at end of file
diff --git a/start/index.js b/start/index.js
new file mode 100644
index 0000000000..be1eff65b4
--- /dev/null
+++ b/start/index.js
@@ -0,0 +1,16 @@
+/*!
+ * Nuxt.js
+ * (c) 2016-2017 Chopin Brothers
+ * Core maintainer: Pooya (@pi0)
+ * Released under the MIT License.
+ */
+
+// Node Source Map Support
+// https://github.com/evanw/node-source-map-support
+require('source-map-support').install();
+
+// Fix babel flag
+/* istanbul ignore else */
+process.noDeprecation = true
+
+module.exports = require('./dist/core')
diff --git a/start/package.json b/start/package.json
new file mode 100644
index 0000000000..3da5ad2e50
--- /dev/null
+++ b/start/package.json
@@ -0,0 +1,71 @@
+{
+  "name": "nuxt-start",
+  "version": "0.0.0",
+  "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
+  "contributors": [
+    {
+      "name": "Sebastien Chopin (@Atinux)"
+    },
+    {
+      "name": "Alexandre Chopin (@alexchopin)"
+    },
+    {
+      "name": "Pooya Parsa (@pi0)"
+    }
+  ],
+  "main": "./index.js",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nuxt/nuxt.js"
+  },
+  "files": [
+    "bin",
+    "dist",
+    "lib",
+    "index.js"
+  ],
+  "keywords": [
+    "nuxt",
+    "nuxt.js",
+    "nuxtjs",
+    "vue",
+    "vue.js",
+    "vuejs",
+    "vue universal",
+    "vue ssr",
+    "vue isomorphic",
+    "vue versatile"
+  ],
+  "homepage": "https://github.com/nuxt/nuxt.js/start#readme",
+  "bin": {
+    "nuxt": "./bin/nuxt"
+  },
+  "scripts": {
+    "build": "rm -rf bin/* dist/* lib/* && cd .. && npm run build && cp -r bin dist lib start",
+    "prepublish": "npm run build"
+  },
+  "engines": {
+    "node": ">=4.3.0 <5.0.0 || >=5.10",
+    "npm": ">=3.0.0"
+  },
+  "dependencies": {
+    "ansi-html": "^0.0.7",
+    "chalk": "^1.1.3",
+    "compression": "^1.6.2",
+    "connect": "^3.6.2",
+    "debug": "^2.6.8",
+    "etag": "^1.8.0",
+    "fresh": "^0.5.0",
+    "fs-extra": "^3.0.1",
+    "hash-sum": "^1.0.2",
+    "lodash": "^4.17.4",
+    "minimist": "^1.2.0",
+    "pify": "^3.0.0",
+    "serialize-javascript": "^1.3.0",
+    "serve-static": "^1.12.3",
+    "source-map-support": "^0.4.15",
+    "tappable": "^1.0.1",
+    "vue-server-renderer": "~2.3.4"
+  }
+}
\ No newline at end of file

From fd8abe84b3737f16def41dd0728f2afd13cd1c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Wed, 21 Jun 2017 18:57:58 +0200
Subject: [PATCH 147/236] Update readme

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

diff --git a/start/README.md b/start/README.md
index bd8fb9b498..ea4d75d2f8 100644
--- a/start/README.md
+++ b/start/README.md
@@ -1,3 +1,3 @@
 # Nuxt-Start
 
-Runtime Only Build
\ No newline at end of file
+WIP - Serve Nuxt.js Application for production
\ No newline at end of file

From fa71a4640356d98b87250ac678ea45c7f2d5c124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 26 Jun 2017 11:58:55 +0200
Subject: [PATCH 148/236] Update README.md

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

diff --git a/README.md b/README.md
index 7c655d5ebc..5d63377187 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 
 </p>
 
-> Nuxt.js is a framework for server-rendered Vue applications (inspired by [Next.js](https://github.com/zeit/next.js))
+> Nuxt.js is a Versatile Vue.js Framework
 
 ## 🚧 Under active development, [1.0](https://github.com/nuxt/nuxt.js/projects/1) will be released soon :fire:
 

From 53d2acd73353ab2e8ba166b8cda3d40b401dc3ab Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 27 Jun 2017 22:30:03 +0430
Subject: [PATCH 149/236] eslint

---
 index.js       | 2 +-
 start/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index c3cdb2cec0..24e035805e 100644
--- a/index.js
+++ b/index.js
@@ -7,7 +7,7 @@
 
 // Node Source Map Support
 // https://github.com/evanw/node-source-map-support
-require('source-map-support').install();
+require('source-map-support').install()
 
 // Fix babel flag
 /* istanbul ignore else */
diff --git a/start/index.js b/start/index.js
index be1eff65b4..673042912a 100644
--- a/start/index.js
+++ b/start/index.js
@@ -7,7 +7,7 @@
 
 // Node Source Map Support
 // https://github.com/evanw/node-source-map-support
-require('source-map-support').install();
+require('source-map-support').install()
 
 // Fix babel flag
 /* istanbul ignore else */

From f488eda003153a34cd93984ebf985e29535946ce Mon Sep 17 00:00:00 2001
From: Alexandre Chopin <alex@orion.sh>
Date: Thu, 29 Jun 2017 13:34:59 +0200
Subject: [PATCH 150/236] add static 404.html

---
 lib/builder/generator.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index 081c624f6d..ee5ae785a7 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -109,6 +109,7 @@ export default class Generator extends Tapable {
           }
         }
         let path = join(route, sep, 'index.html') // /about -> /about/index.html
+        path = (path === '/404/index.html') ? '/404.html' : path // /404 -> /404.html
         debug('Generate file: ' + path)
         path = join(distPath, path)
         // Make sure the sub folders are created

From 447e85af145d027bc5bdfe33d3f1fa866b590b35 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 29 Jun 2017 21:06:22 +0430
Subject: [PATCH 151/236] depricated ~ in flavour of @ for aliases

---
 lib/app/components/nuxt.vue        |  2 +-
 lib/app/index.js                   |  4 ++--
 lib/app/middleware.js              |  2 +-
 lib/app/router.js                  |  2 +-
 lib/app/store.js                   |  4 ++--
 lib/builder/builder.js             | 28 ++++++++--------------
 lib/builder/webpack/base.config.js | 13 +++++++++--
 lib/common/utils.js                | 37 ++++++++++++++++++++++++++----
 lib/core/module.js                 |  6 +----
 lib/core/nuxt.js                   | 13 +++++++++++
 lib/core/renderer.js               |  7 +-----
 11 files changed, 75 insertions(+), 43 deletions(-)

diff --git a/lib/app/components/nuxt.vue b/lib/app/components/nuxt.vue
index 3c65dae1fd..34502e88bf 100644
--- a/lib/app/components/nuxt.vue
+++ b/lib/app/components/nuxt.vue
@@ -6,7 +6,7 @@
 <script>
 import Vue from 'vue'
 import NuxtChild from './nuxt-child'
-import NuxtError from '<%= components.ErrorPage ? (components.ErrorPage.includes('~') ? components.ErrorPage : "../" + components.ErrorPage) : "./nuxt-error.vue" %>'
+import NuxtError from '<%= components.ErrorPage ? ((components.ErrorPage.includes('~') || components.ErrorPage.includes('@')) ? components.ErrorPage : "../" + components.ErrorPage) : "./nuxt-error.vue" %>'
 
 export default {
   name: 'nuxt',
diff --git a/lib/app/index.js b/lib/app/index.js
index 568941ed59..ddc90451d1 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -23,7 +23,7 @@ if (process.browser) {
 
 // Import SSR plugins
 <% plugins.forEach(function (plugin) { if (plugin.ssr)
-{ %>let <%= plugin.name %> = require('<%= relative(plugin.src) %>')
+{ %>let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
 <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
 <% }}) %>
 
@@ -132,7 +132,7 @@ async function createApp (ssrContext) {
   }
   <% } else { %>
   if (process.browser) {
-    let <%= plugin.name %> = require('<%= relative(plugin.src) %>')
+    let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
     <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
     if (typeof <%= plugin.name %> === 'function') {
       await <%= plugin.name %>(ctx)
diff --git a/lib/app/middleware.js b/lib/app/middleware.js
index 4ef5b98954..57e04073cb 100644
--- a/lib/app/middleware.js
+++ b/lib/app/middleware.js
@@ -1,5 +1,5 @@
 <% if (middleware) { %>
-let files = require.context('~/middleware', false, /^\.\/.*\.(js|ts)$/)
+let files = require.context('@/middleware', false, /^\.\/.*\.(js|ts)$/)
 let filenames = files.keys()
 
 function getModule (filename) {
diff --git a/lib/app/router.js b/lib/app/router.js
index 217ee094d5..8f585fc138 100644
--- a/lib/app/router.js
+++ b/lib/app/router.js
@@ -23,7 +23,7 @@ function recursiveRoutes(routes, tab, components) {
 var _components = []
 var _routes = recursiveRoutes(router.routes, '\t\t', _components)
 uniqBy(_components, '_name').forEach((route) => { %>
-const <%= route._name %> = () => import('<%= relative(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */)
+const <%= route._name %> = () => import('<%= relativeToBuild(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */)
 <% }) %>
 
 <% if (router.scrollBehavior) { %>
diff --git a/lib/app/store.js b/lib/app/store.js
index 4d12f9ecef..7a83566f8f 100644
--- a/lib/app/store.js
+++ b/lib/app/store.js
@@ -3,8 +3,8 @@ import Vuex from 'vuex'
 
 Vue.use(Vuex)
 
-// Recursive find files in ~/store
-const files = require.context('~/store', true, /^\.\/.*\.(js|ts)$/)
+// Recursive find files in {srcDir}/store
+const files = require.context('@/store', true, /^\.\/.*\.(js|ts)$/)
 const filenames = files.keys()
 
 // Store
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index ebdb2f66e4..9d0de14900 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -5,12 +5,12 @@ import hash from 'hash-sum'
 import pify from 'pify'
 import webpack from 'webpack'
 import serialize from 'serialize-javascript'
-import { join, resolve, basename, dirname, relative } from 'path'
+import { join, resolve, basename, dirname } from 'path'
 import Tapable from 'tappable'
 import MFS from 'memory-fs'
 import webpackDevMiddleware from 'webpack-dev-middleware'
 import webpackHotMiddleware from 'webpack-hot-middleware'
-import { r, wp, createRoutes, parallel } from 'utils'
+import { r, wp, createRoutes, parallel, relativeTo } from 'utils'
 import Debug from 'debug'
 import Glob from 'glob'
 import clientWebpackConfig from './webpack/client.config.js'
@@ -40,6 +40,9 @@ export default class Builder extends Tapable {
       colors: true
     }
 
+    // Helper to resolve build paths
+    this.relativeToBuild = (...args) => relativeTo(this.options.buildDir, ...args)
+
     this._buildStatus = STATUS.INITIAL
   }
 
@@ -134,10 +137,10 @@ export default class Builder extends Tapable {
       }),
       appPath: './App.vue',
       layouts: Object.assign({}, this.options.layouts),
-      loading: typeof this.options.loading === 'string' ? this.relative(r(this.options.srcDir, this.options.loading)) : this.options.loading,
+      loading: typeof this.options.loading === 'string' ? this.relativeToBuild(this.options.srcDir, this.options.loading) : this.options.loading,
       transition: this.options.transition,
       components: {
-        ErrorPage: this.options.ErrorPage ? this.relative(r(this.options.ErrorPage)) : null
+        ErrorPage: this.options.ErrorPage ? this.relativeToBuild(this.options.ErrorPage) : null
       }
     }
 
@@ -147,10 +150,10 @@ export default class Builder extends Tapable {
       layoutsFiles.forEach((file) => {
         let name = file.split('/').slice(-1)[0].replace('.vue', '')
         if (name === 'error') return
-        templateVars.layouts[name] = this.relative(r(this.options.srcDir, file))
+        templateVars.layouts[name] = this.relativeToBuild(this.options.srcDir, file)
       })
       if (layoutsFiles.includes('layouts/error.vue') && !templateVars.components.ErrorPage) {
-        templateVars.components.ErrorPage = this.relative(r(this.options.srcDir, 'layouts/error.vue'))
+        templateVars.components.ErrorPage = this.relativeToBuild(this.options.srcDir, 'layouts/error.vue')
       }
     }
     // If no default layout, create its folder and add the default folder
@@ -225,7 +228,7 @@ export default class Builder extends Tapable {
           hash,
           r,
           wp,
-          relative: this.relative.bind(this)
+          relativeToBuild: this.relativeToBuild
         }
       })
       const content = template(Object.assign({}, templateVars, {
@@ -408,17 +411,6 @@ export default class Builder extends Tapable {
       customFilesWatcher.close()
     })
   }
-
-  relative (dest) {
-    if (dest && dest.includes('~')) {
-      return dest
-    }
-    let rp = relative(this.options.buildDir, dest)
-    if (rp[0] !== '.') {
-      rp = './' + rp
-    }
-    return wp(rp)
-  }
 }
 
 const STATUS = {
diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index 9c9010f3b9..48918a60bb 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -46,8 +46,16 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
     },
     resolve: {
       extensions: ['.js', '.json', '.vue', '.ts'],
-      // Disable for now
       alias: {
+        '@@': join(this.options.rootDir),
+        '@': join(this.options.srcDir),
+        '@static': join(this.options.srcDir, 'static'),
+        '@assets': join(this.options.srcDir, 'assets'),
+        '@plugins': join(this.options.srcDir, 'plugins'),
+        '@pages': join(this.options.srcDir, 'pages'),
+        '@components': join(this.options.srcDir, 'components'),
+        '@middleware': join(this.options.srcDir, 'middleware'),
+        // Legacy support
         '~': join(this.options.srcDir),
         'static': join(this.options.srcDir, 'static'), // use in template with <img src="~static/nuxt.png" />
         '~static': join(this.options.srcDir, 'static'),
@@ -55,7 +63,8 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
         '~assets': join(this.options.srcDir, 'assets'),
         '~plugins': join(this.options.srcDir, 'plugins'),
         '~pages': join(this.options.srcDir, 'pages'),
-        '~components': join(this.options.srcDir, 'components')
+        '~components': join(this.options.srcDir, 'components'),
+        '~middleware': join(this.options.srcDir, 'middleware')
       },
       modules: [
         join(this.options.rootDir, 'node_modules'),
diff --git a/lib/common/utils.js b/lib/common/utils.js
index dae71bd461..dbc513d740 100644
--- a/lib/common/utils.js
+++ b/lib/common/utils.js
@@ -1,4 +1,4 @@
-import { resolve, sep } from 'path'
+import { resolve, relative, sep } from 'path'
 import _ from 'lodash'
 
 export function encodeHtml (str) {
@@ -94,12 +94,39 @@ const normalize = string => string.replace(reqSep, sysSep)
 
 export function r () {
   let args = Array.prototype.slice.apply(arguments)
+  let lastArg = _.last(args)
 
-  if (_.last(args).includes('~')) {
-    return wp(_.last(args))
+  if (lastArg.includes('@')) {
+    return wp(lastArg)
   }
-  args = args.map(normalize)
-  return wp(resolve.apply(null, args))
+
+  if (lastArg.includes('~')) {
+    // eslint-disable-next-line no-console
+    console.warn('[nuxt] Aliases using `~` are deprecated, please use `@` instead.', lastArg, '->', lastArg.replace('~', '@'))
+    return wp(lastArg)
+  }
+
+  return wp(resolve(...args.map(normalize)))
+}
+
+export function relativeTo () {
+  let args = Array.prototype.slice.apply(arguments)
+  let dir = args.shift()
+
+  // Resolve path
+  let path = r(...args)
+
+  // Check if path is an alias
+  if (path.includes('@') || path.includes('~')) {
+    return path
+  }
+
+  // Make correct relative path
+  let rp = relative(dir, path)
+  if (rp[0] !== '.') {
+    rp = './' + rp
+  }
+  return wp(rp)
 }
 
 export function flatRoutes (router, path = '', routes = []) {
diff --git a/lib/core/module.js b/lib/core/module.js
index e18380ff0f..4cb9a5bcb5 100755
--- a/lib/core/module.js
+++ b/lib/core/module.js
@@ -100,11 +100,7 @@ export default class ModuleContainer extends Tapable {
     let module = originalSrc
 
     if (typeof module === 'string') {
-      // Using ~ or ./ shorthand modules are resolved from project srcDir
-      if (module.indexOf('~') === 0 || module.indexOf('./') === 0) {
-        module = path.join(this.options.srcDir, module.substr(1))
-      }
-      module = require(module)
+      module = require(this.nuxt.resolvePath(module))
     }
 
     // Validate module
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 229a647dda..b0b9d08bde 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -5,6 +5,7 @@ import Renderer from './renderer'
 import Options from './options'
 import Debug from 'debug'
 import enableDestroy from 'server-destroy'
+import { join, resolve } from 'path'
 
 const debug = Debug('nuxt:')
 debug.color = 5
@@ -92,6 +93,18 @@ export default class Nuxt extends Tapable {
     process.exit(1)
   }
 
+  resolvePath (path) {
+    // Shorthand to resolve from project srcDir
+    if (path.indexOf('@') === 0 || path.indexOf('~') === 0) {
+      if (path.indexOf('~') === 0) {
+        // eslint-disable-next-line no-console
+        console.warn('[nuxt] Aliases using `~` are deprecated, please use `@` instead.', path, '->', path.replace('~', '@'))
+      }
+      return join(this.options.srcDir, path.substr(1))
+    }
+    return resolve(this.options.srcDir, path)
+  }
+
   async close (callback) {
     await this.applyPluginsAsync('close')
 
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index ff653d4f71..56865b26b9 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -146,12 +146,7 @@ export default class Renderer extends Tapable {
   useMiddleware (m) {
     // Resolve
     if (typeof m === 'string') {
-      let src = m
-      // Using ~ or ./ shorthand to resolve from project srcDir
-      if (src.indexOf('~') === 0 || src.indexOf('./') === 0) {
-        src = join(this.nuxt.options.srcDir, src.substr(1))
-      }
-      m = require(src)
+      m = require(this.nuxt.resolvePath(m))
     }
     // Use middleware
     if (m instanceof Function) {

From 29a78741697dec7276fe262edabfd48808d264a4 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 29 Jun 2017 21:30:18 +0430
Subject: [PATCH 152/236] update tests

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 test/fixtures/module/modules/basic/index.js   |   4 ++--
 .../module/modules/middleware/index.js        |   4 ++--
 .../fixtures/module/modules/template/index.js |  14 ++++++------
 test/fixtures/module/nuxt.config.js           |   4 ++--
 test/fixtures/module/router.js                |  20 +++++++++---------
 test/fixtures/with-config/nuxt.config.js      |  11 +++++-----
 test/fixtures/with-config/plugins/offline.js  |   4 ----
 8 files changed, 28 insertions(+), 33 deletions(-)
 create mode 100644 .DS_Store
 delete mode 100644 test/fixtures/with-config/plugins/offline.js

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1ad899dbcdc748036dd701eacb0ec11e243703d4
GIT binary patch
literal 6148
zcmeHKyJ`bL3>+mc4$`<xxxbJ<Sd8-p{sEiBxCu5G?D{HyS3b?72O;L1CXgnKK$=~x
zW{;cVbOK<D)B6iB2Qbhbaq%!UKX;$lLuHIe=N(6Eu*3GeI_@Xc_Y=+?@P-4<*na1K
z9QM1s_dZcsDIf);fE17dQs7q#c<-eRPl<|BKnh5KF9rPj(CCi6a7>I(2Sbbi#2M3J
zT*oXyY@Q(Y!ZDE<nkAK(RI3rglFodqx?VUYCLLD8ht-p<CKQXO^Zpj)u%4(W1*E{O
z0*|?!d;fo>|1kgGlC+ZoQs7@HV6)|Fx!@~RZ=JlH_u58Z)4k@C?#6Xc7@{2$qaAbO
f?f5y0vab1>=e=-D3_9~cC+cUwb&*MdzgFN1-fR_w

literal 0
HcmV?d00001

diff --git a/test/fixtures/module/modules/basic/index.js b/test/fixtures/module/modules/basic/index.js
index 864007865b..2604ae1327 100755
--- a/test/fixtures/module/modules/basic/index.js
+++ b/test/fixtures/module/modules/basic/index.js
@@ -23,8 +23,8 @@ module.exports = function basicModule (options, resolve) {
   })
 
   // Require same module twice
-  this.requireModule('~/modules/empty/index.js')
-  this.requireModule('~/modules/empty/index.js')
+  this.requireModule('@/modules/empty/index.js')
+  this.requireModule('@/modules/empty/index.js')
 
   resolve()
 }
diff --git a/test/fixtures/module/modules/middleware/index.js b/test/fixtures/module/modules/middleware/index.js
index d8e21640ab..d97c71cbef 100755
--- a/test/fixtures/module/modules/middleware/index.js
+++ b/test/fixtures/module/modules/middleware/index.js
@@ -9,14 +9,14 @@ module.exports = function middlewareModule (options) {
       }
     })
     // Add local middleware js
-    this.addServerMiddleware('~/modules/middleware/log.js')
+    this.addServerMiddleware('@modules/middleware/log.js')
     // Add plain middleware
     this.addServerMiddleware((req, res, next) => {
       res.setHeader('x-nuxt', 'hello')
       next()
     })
     // Add file middleware
-    this.addServerMiddleware('~/modules/middleware/midd1')
+    this.addServerMiddleware('@modules/middleware/midd1')
     resolve()
   })
 }
diff --git a/test/fixtures/module/modules/template/index.js b/test/fixtures/module/modules/template/index.js
index 4a2d917897..d68d9546a8 100644
--- a/test/fixtures/module/modules/template/index.js
+++ b/test/fixtures/module/modules/template/index.js
@@ -1,11 +1,11 @@
 const path = require('path')
 
 module.exports = function () {
-    // Disable parsing pages/
-    this.nuxt.options.build.createRoutes = () => {}
-    // Add /api endpoint
-    this.addTemplate({
-        fileName: 'router.js',
-        src: path.resolve(this.options.srcDir, 'router.js')
-    })
+  // Disable parsing pages/
+  this.nuxt.options.build.createRoutes = () => {}
+  // Add /api endpoint
+  this.addTemplate({
+    fileName: 'router.js',
+    src: path.resolve(this.options.srcDir, 'router.js')
+  })
 }
diff --git a/test/fixtures/module/nuxt.config.js b/test/fixtures/module/nuxt.config.js
index 19e591d11d..78090df4ee 100755
--- a/test/fixtures/module/nuxt.config.js
+++ b/test/fixtures/module/nuxt.config.js
@@ -1,9 +1,9 @@
 module.exports = {
   loading: true,
   modules: [
-    '~modules/basic',
+    '~modules/basic', // Use ~ for deprication warning coverage
     {
-      src: '~/modules/middleware',
+      src: '@/modules/middleware',
       options: {
         foo: 'bar'
       }
diff --git a/test/fixtures/module/router.js b/test/fixtures/module/router.js
index 629c9d4ffc..810cb67757 100644
--- a/test/fixtures/module/router.js
+++ b/test/fixtures/module/router.js
@@ -7,16 +7,16 @@ export function createRouter () {
   return new Router({
     mode: 'history',
     routes: [
-  		{
-			path: "/",
-			component: require('~/views/index.vue'),
-			name: "index"
-		},
-		{
-			path: "/about",
-			component: require('~/views/about.vue'),
-			name: "about"
-		}
+      {
+        path: '/',
+        component: require('~/views/index.vue'),
+        name: 'index'
+      },
+      {
+        path: '/about',
+        component: require('~/views/about.vue'),
+        name: 'about'
+      }
     ]
   })
 }
diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js
index 14a13a92b8..cfff7aaa2e 100644
--- a/test/fixtures/with-config/nuxt.config.js
+++ b/test/fixtures/with-config/nuxt.config.js
@@ -7,18 +7,17 @@ module.exports = {
       routes.push({
         name: 'about-bis',
         path: '/about-bis',
-        component: '~pages/about.vue'
+        component: '@pages/about.vue'
       })
     }
   },
   transition: 'test',
   offline: true,
   plugins: [
-    '~plugins/test.js',
-    { src: '~plugins/offline.js', ssr: false },
-    { src: '~plugins/only-client.js', ssr: false }
+    '~plugins/test.js', // Use ~ for deprication warning coverage
+    { src: '@plugins/only-client.js', ssr: false }
   ],
-  loading: '~components/loading',
+  loading: '@components/loading',
   env: {
     bool: true,
     num: 23,
@@ -36,7 +35,7 @@ module.exports = {
     }
   },
   css: [
-    { src: '~/assets/app.css' }
+    { src: '@assets/app.css' }
   ],
   render: {
     http2: {
diff --git a/test/fixtures/with-config/plugins/offline.js b/test/fixtures/with-config/plugins/offline.js
deleted file mode 100644
index bfccf62930..0000000000
--- a/test/fixtures/with-config/plugins/offline.js
+++ /dev/null
@@ -1,4 +0,0 @@
-if (process.env.NODE_ENV === 'production') {
-  var OfflinePlugin = require('offline-plugin/runtime')
-  OfflinePlugin.install()
-}

From 57e75c58d28b1e50c2b58b6cadb97fc60eab706b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 30 Jun 2017 15:49:22 +0430
Subject: [PATCH 153/236] fix(resolvePath): using require.resolve first to
 support scopped module

---
 lib/core/nuxt.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index b0b9d08bde..bc7d8c524c 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -94,6 +94,15 @@ export default class Nuxt extends Tapable {
   }
 
   resolvePath (path) {
+    // Try to resolve using NPM resolve path first
+    // Fixes problems with scopped modules
+    try {
+      let resolvedPath = require.resolve(path)
+      return resolvedPath
+    } catch (e) {
+      // Just continue
+    }
+
     // Shorthand to resolve from project srcDir
     if (path.indexOf('@') === 0 || path.indexOf('~') === 0) {
       if (path.indexOf('~') === 0) {

From b41fb5e88c2414c9a4927e5e30f872bc2d5cb63b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 2 Jul 2017 02:35:07 +0430
Subject: [PATCH 154/236] update @ deprecated warning

---
 lib/common/utils.js | 3 ++-
 lib/core/nuxt.js    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/common/utils.js b/lib/common/utils.js
index dbc513d740..14fb1665b7 100644
--- a/lib/common/utils.js
+++ b/lib/common/utils.js
@@ -102,7 +102,8 @@ export function r () {
 
   if (lastArg.includes('~')) {
     // eslint-disable-next-line no-console
-    console.warn('[nuxt] Aliases using `~` are deprecated, please use `@` instead.', lastArg, '->', lastArg.replace('~', '@'))
+    console.warn('[nuxt] Aliases using `~` are deprecated, please use `@/` instead.',
+      lastArg, '->', lastArg.replace('~/', '@/').replace('~', '@/'))
     return wp(lastArg)
   }
 
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index bc7d8c524c..3b138a5cdd 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -78,7 +78,7 @@ export default class Nuxt extends Tapable {
     })
   }
 
-  errorHandler /* istanbul ignore next */ () {
+  errorHandler /* istanbul ignore next */() {
     // Silent
     if (this.options.errorHandler === false) {
       return
@@ -107,7 +107,8 @@ export default class Nuxt extends Tapable {
     if (path.indexOf('@') === 0 || path.indexOf('~') === 0) {
       if (path.indexOf('~') === 0) {
         // eslint-disable-next-line no-console
-        console.warn('[nuxt] Aliases using `~` are deprecated, please use `@` instead.', path, '->', path.replace('~', '@'))
+        console.warn('[nuxt] Aliases using `~` are deprecated, please use `@/` instead.',
+          path, '->', path.replace('~/', '@/').replace('~', '@/'))
       }
       return join(this.options.srcDir, path.substr(1))
     }

From e4e9149b5473ae081cec0a10f354da26d53e63bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 2 Jul 2017 20:47:01 +0200
Subject: [PATCH 155/236] feat: Add dynamic component injection + example

---
 bin/nuxt-dev                                  |  5 --
 .../dynamic-components/articles/article-1.vue |  7 +++
 .../dynamic-components/articles/article-2.vue |  7 +++
 examples/dynamic-components/package.json      | 11 ++++
 examples/dynamic-components/pages/_slug.vue   | 16 ++++++
 examples/dynamic-components/pages/index.vue   |  9 +++
 examples/global-css/nuxt.config.js            | 18 +++---
 lib/app/client.js                             | 19 +++++--
 lib/app/server.js                             | 55 ++++++++++++++++---
 lib/core/renderer.js                          | 12 ++--
 package.json                                  |  1 +
 yarn.lock                                     |  4 ++
 12 files changed, 131 insertions(+), 33 deletions(-)
 create mode 100644 examples/dynamic-components/articles/article-1.vue
 create mode 100644 examples/dynamic-components/articles/article-2.vue
 create mode 100644 examples/dynamic-components/package.json
 create mode 100644 examples/dynamic-components/pages/_slug.vue
 create mode 100644 examples/dynamic-components/pages/index.vue

diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 19e4b9de9f..419fe79a44 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -54,11 +54,6 @@ const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 const nuxtConfig = loadNuxtConfig()
 _.defaultsDeep(nuxtConfig, { watchers: { chokidar: { ignoreInitial: true } } })
 
-// Fail if an error happened
-process.on('unhandledRejection', function (err) {
-  throw err
-})
-
 // Start dev
 let dev = startDev()
 
diff --git a/examples/dynamic-components/articles/article-1.vue b/examples/dynamic-components/articles/article-1.vue
new file mode 100644
index 0000000000..a957df1a9b
--- /dev/null
+++ b/examples/dynamic-components/articles/article-1.vue
@@ -0,0 +1,7 @@
+<template>
+  <div>
+    <h1>Article 1</h1>
+    <p>Hello I am the first article :)</p>
+    <nuxt-link to="/">Home</nuxt-link>
+  </div>
+</template>
\ No newline at end of file
diff --git a/examples/dynamic-components/articles/article-2.vue b/examples/dynamic-components/articles/article-2.vue
new file mode 100644
index 0000000000..0c5b848e0e
--- /dev/null
+++ b/examples/dynamic-components/articles/article-2.vue
@@ -0,0 +1,7 @@
+<template>
+  <div>
+    <h1>Article 2</h1>
+    <p>Hello I am the second article!</p>
+    <nuxt-link to="/">Home</nuxt-link>
+  </div>
+</template>
\ No newline at end of file
diff --git a/examples/dynamic-components/package.json b/examples/dynamic-components/package.json
new file mode 100644
index 0000000000..ac286a63f4
--- /dev/null
+++ b/examples/dynamic-components/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "dynamic-component-nuxt",
+  "dependencies": {
+    "nuxt": "latest"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt"
+  }
+}
diff --git a/examples/dynamic-components/pages/_slug.vue b/examples/dynamic-components/pages/_slug.vue
new file mode 100644
index 0000000000..328917b95f
--- /dev/null
+++ b/examples/dynamic-components/pages/_slug.vue
@@ -0,0 +1,16 @@
+<template>
+  <BlogArticle/>
+</template>
+
+<script>
+export default {
+  async asyncData({ params, error }) {
+    const slug = params.slug || 'hello'
+    try {
+      this.components.BlogArticle = await import(`~/articles/${slug}.vue`)
+    } catch (e) {
+      error({ statusCode: 404, message: 'Article not found' })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/examples/dynamic-components/pages/index.vue b/examples/dynamic-components/pages/index.vue
new file mode 100644
index 0000000000..30a3e45f32
--- /dev/null
+++ b/examples/dynamic-components/pages/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <div>
+    <h1>Articles</h1>
+    <ul>
+      <li><nuxt-link to="/article-1">Article #1</nuxt-link></li>
+      <li><nuxt-link to="/article-2">Article #2</nuxt-link></li>
+    </ul>
+  </div>
+</template>
\ No newline at end of file
diff --git a/examples/global-css/nuxt.config.js b/examples/global-css/nuxt.config.js
index f5ae0a61d1..17c82e8892 100644
--- a/examples/global-css/nuxt.config.js
+++ b/examples/global-css/nuxt.config.js
@@ -1,12 +1,14 @@
-const { join } = require('path')
-
 module.exports = {
+  head: {
+    titleTemplate: '%s - Nuxt.js',
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      { hid: 'description', name: 'description', content: 'Meta description' }
+    ]
+  },
   css: [
-    'hover.css/css/hover-min.css',
     'bulma/bulma.sass',
-    join(__dirname, 'css/main.css')
-  ],
-  build: {
-    extractCSS: true
-  }
+    '~assets/main.css'
+  ]
 }
diff --git a/lib/app/client.js b/lib/app/client.js
index 84eb3d1933..bdf1032952 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -160,9 +160,11 @@ async function render (to, from, next) {
         return Promise.resolve()
       }
       let promises = []
+      // Create this context for asyncData & fetch (used for dynamic component injection)
+      const _this = { components: {} }
       // asyncData method
       if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
-        var promise = promisify(Component.options.asyncData, context)
+        var promise = promisify(Component.options.asyncData.bind(_this), context)
         promise.then((asyncDataResult) => {
           applyAsyncData(Component, asyncDataResult)
           <%= (loading ? 'this.$loading.increase && this.$loading.increase(30)' : '') %>
@@ -170,12 +172,17 @@ async function render (to, from, next) {
         promises.push(promise)
       }
       if (Component.options.fetch) {
-        var p = Component.options.fetch(context)
+        var p = Component.options.fetch.call(_this, context)
         if (!p || (!(p instanceof Promise) && (typeof p.then !== 'function'))) { p = Promise.resolve(p) }
         <%= (loading ? 'p.then(() => this.$loading.increase && this.$loading.increase(30))' : '') %>
         promises.push(p)
       }
       return Promise.all(promises)
+      .then(() => {
+        Object.keys(_this.components).forEach((name) => {
+          Component.options.components[name] = _this.components[name]
+        })
+      })
     }))
     _lastPaths = Components.map((Component, i) => compile(to.matched[i].path)(to.params))
     <%= (loading ? 'this.$loading.finish && this.$loading.finish()' : '') %>
@@ -332,9 +339,7 @@ function addHotReload ($component, depth) {
 
 // Load vue app
 const NUXT = window.__NUXT__ || {}
-if (!NUXT) {
-  throw new Error('[nuxt.js] cannot find the global variable __NUXT__, make sure the server is working.')
-}
+NUXT.components = window.__COMPONENTS__ || null
 // Get matched components
 const resolveComponents = function (router) {
   const path = getLocation(router.options.base)
@@ -345,6 +350,10 @@ const resolveComponents = function (router) {
           Component = sanitizeComponent(Component)
           if (NUXT.serverRendered) {
             applyAsyncData(Component, NUXT.data[index])
+            if (NUXT.components) {
+              Component.options.components = Object.assign(Component.options.components, NUXT.components[index])
+            }
+            Component._Ctor = Component
           }
           match.components[key] = Component
           resolve(Component)
diff --git a/lib/app/server.js b/lib/app/server.js
index 326fa3dfd6..dbf770840c 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -1,6 +1,7 @@
 'use strict'
 
 import Vue from 'vue'
+import clone from 'clone'
 import { stringify } from 'querystring'
 import { omit } from 'lodash'
 import middleware from './middleware'
@@ -43,6 +44,9 @@ export default async (context) => {
   <%= (store ? 'context.store = store' : '') %>
   // Add route to the context
   context.route = router.currentRoute
+  // Components array (for dynamic components)
+  context.hasDynamicComponents = false
+  context.components = []
   // Nuxt object
   context.nuxt = { layout: 'default', data: [], error: null<%= (store ? ', state: null' : '') %>, serverRendered: true }
   // Add meta infos
@@ -133,8 +137,11 @@ export default async (context) => {
   // Call asyncData & fetch hooks on components matched by the route.
   let asyncDatas = await Promise.all(Components.map((Component) => {
     let promises = []
+    // Create this context for asyncData & fetch (used for dynamic component injection)
+    const _this = { components: {} }
+    // Call asyncData
     if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
-      let promise = promisify(Component.options.asyncData, ctx)
+      let promise = promisify(Component.options.asyncData.bind(_this), ctx)
       // Call asyncData(context)
       promise.then((asyncDataResult) => {
         applyAsyncData(Component, asyncDataResult)
@@ -142,10 +149,26 @@ export default async (context) => {
       })
       promises.push(promise)
     } else promises.push(null)
-    // call fetch(context)
-    if (Component.options.fetch) promises.push(Component.options.fetch(ctx))
+    // Call fetch(context)
+    if (Component.options.fetch) promises.push(Component.options.fetch.call(_this, ctx))
     else promises.push(null)
     return Promise.all(promises)
+    .then((data) => {
+      // If not dyanmic component, return data directly
+      if (Object.keys(_this.components).length === 0) return data
+      // Tell renderer that dynamic components has been added
+      context.hasDynamicComponents = true
+      // Add Component on server side (clone of it)
+      Component.options.components = {
+        ...Component.options.components,
+        ...clone(_this.components) // Clone it to avoid vue to overwrite references
+      }
+      // Add components into __NUXT__ for client-side hydration
+      // We clone it since vue-server-renderer will update the component definition
+      context.components.push(sanitizeDynamicComponents(_this.components))
+      // Return data to server-render them
+      return data
+    })
   }))
   // If no Components found, returns 404
   if (!Components.length) {
@@ -172,10 +195,24 @@ export default async (context) => {
   await _app.loadLayout(layout)
   _app.setLayout(layout)
   return _app
-    // if (typeof error === 'string') {
-    //   error = { statusCode: 500, message: error }
-    // }
-    // context.nuxt.error = context.error(error)
-    // <%= (store ? 'context.nuxt.state = store.state' : '') %>
-    // return _app
 }
+
+function sanitizeDynamicComponents(components) {
+  Object.keys(components).forEach((name) => {
+    const component = components[name]
+    // Remove SSR register hookd
+    if (Array.isArray(component.beforeCreate)) {
+      component.beforeCreate = component.beforeCreate.filter((fn) => fn !== component._ssrRegister)
+      if (!component.beforeCreate.length) delete component.beforeCreate
+    }
+    // Remove SSR & informations properties
+    delete component._ssrRegister
+    delete component.__file
+    if (component.staticRenderFns && !component.staticRenderFns.length) {
+      delete component.staticRenderFns
+    }
+    // Add Component to NUXT.components[i][name]
+    components[name] = component
+  })
+  return clone(components)
+}
\ No newline at end of file
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 56865b26b9..b2c0b0ba51 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -182,10 +182,6 @@ export default class Renderer extends Tapable {
     // Add webpack middleware only for development
     if (this.options.dev) {
       this.useMiddleware(async (req, res, next) => {
-        if (req.url.includes('.hot-update.json')) {
-          res.statusCode = 404
-          return res.end()
-        }
         if (this.webpackDevMiddleware) {
           await this.webpackDevMiddleware(req, res)
         }
@@ -328,9 +324,13 @@ export default class Renderer extends Tapable {
       resourceHints = context.renderResourceHints()
       HEAD += resourceHints
     }
-
     HEAD += context.renderStyles()
-    APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, { isJSON: true })}</script>`
+    APP += `<script type="text/javascript">`
+    APP += `window.__NUXT__=${serialize(context.nuxt, { isJSON: true })};`
+    if (context.hasDynamicComponents) {
+      APP += `window.__COMPONENTS__=${serialize(context.components)};`
+    }
+    APP += `</script>`
     APP += context.renderScripts()
 
     const html = this.resources.appTemplate({
diff --git a/package.json b/package.json
index 215af70b32..8c8337a083 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "babel-preset-vue-app": "^1.2.0",
     "chalk": "^1.1.3",
     "chokidar": "^1.7.0",
+    "clone": "^2.1.1",
     "compression": "^1.6.2",
     "connect": "^3.6.2",
     "css-loader": "^0.28.4",
diff --git a/yarn.lock b/yarn.lock
index e00ea04df6..a9164763c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1506,6 +1506,10 @@ clone@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
+clone@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
+
 cmd-shim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"

From c348d831207aba6622e1b2c7023268bf43804044 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 04:23:19 +0430
Subject: [PATCH 156/236] feat: basic support for ssr:false

---
 lib/builder/webpack/client.config.js |  3 ++-
 lib/core/renderer.js                 | 30 ++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
index c32348747c..c2b92005a4 100644
--- a/lib/builder/webpack/client.config.js
+++ b/lib/builder/webpack/client.config.js
@@ -66,7 +66,8 @@ export default function webpackClientConfig () {
   config.plugins.push(
     new HTMLPlugin({
       template: this.options.appTemplatePath,
-      inject: false
+      inject: this.options.render.ssr === false,
+      chunksSortMode: 'dependency'
     })
   )
 
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index b2c0b0ba51..c3bbe7205f 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -120,7 +120,16 @@ export default class Renderer extends Tapable {
     }
   }
 
+  get noSSR () {
+    return this.options.render.ssr === false
+  }
+
   createRenderer () {
+    // Skip if SSR is disabled
+    if (this.noSSR) {
+      return
+    }
+
     // If resources are not yet provided
     if (!this.resources.serverBundle || !this.resources.clientManifest) {
       return
@@ -294,7 +303,7 @@ export default class Renderer extends Tapable {
 
   async renderRoute (url, context = {}) {
     /* istanbul ignore if */
-    if (!this.bundleRenderer || !this.resources.appTemplate) {
+    if (!(this.noSSR || this.bundleRenderer) || !this.resources.appTemplate) {
       return new Promise(resolve => {
         setTimeout(() => resolve(this.renderRoute(url, context)), 1000)
       })
@@ -307,6 +316,23 @@ export default class Renderer extends Tapable {
     context.url = url
     context.isServer = true
 
+    // Basic response if SSR is disabled
+    if (this.noSSR) {
+      let APP = '<div id="__nuxt"></div>'
+      let HEAD = ''
+
+      let html = this.resources.appTemplate({
+        HTML_ATTRS: '',
+        BODY_ATTRS: '',
+        HEAD,
+        APP
+      })
+
+      return {
+        html
+      }
+    }
+
     // Call renderToString from the bundleRenderer and generate the HTML (will update the context as well)
     let APP = await this.bundleRenderer.renderToString(context)
 
@@ -333,7 +359,7 @@ export default class Renderer extends Tapable {
     APP += `</script>`
     APP += context.renderScripts()
 
-    const html = this.resources.appTemplate({
+    let html = this.resources.appTemplate({
       HTML_ATTRS: 'data-n-head-ssr ' + m.htmlAttrs.text(),
       BODY_ATTRS: m.bodyAttrs.text(),
       HEAD,

From a587b798e4c361435a742af58dac2a768194a08a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 14:41:20 +0430
Subject: [PATCH 157/236] gitignore .DS_Store

---
 .DS_Store  | Bin 6148 -> 0 bytes
 .gitignore |   3 +++
 2 files changed, 3 insertions(+)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 1ad899dbcdc748036dd701eacb0ec11e243703d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyJ`bL3>+mc4$`<xxxbJ<Sd8-p{sEiBxCu5G?D{HyS3b?72O;L1CXgnKK$=~x
zW{;cVbOK<D)B6iB2Qbhbaq%!UKX;$lLuHIe=N(6Eu*3GeI_@Xc_Y=+?@P-4<*na1K
z9QM1s_dZcsDIf);fE17dQs7q#c<-eRPl<|BKnh5KF9rPj(CCi6a7>I(2Sbbi#2M3J
zT*oXyY@Q(Y!ZDE<nkAK(RI3rglFodqx?VUYCLLD8ht-p<CKQXO^Zpj)u%4(W1*E{O
z0*|?!d;fo>|1kgGlC+ZoQs7@HV6)|Fx!@~RZ=JlH_u58Z)4k@C?#6Xc7@{2$qaAbO
f?f5y0vab1>=e=-D3_9~cC+cUwb&*MdzgFN1-fR_w

diff --git a/.gitignore b/.gitignore
index 3395ea12b6..9e3e18df72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@ coverage
 # Intellij idea
 *.iml
 .idea
+
+# Macos
+.DS_Store

From b209c80d2b51203b7a2254402dea855402b55951 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 15:41:40 +0430
Subject: [PATCH 158/236] feat: add tappable hooks

---
 lib/builder/builder.js   | 22 ++++++++++++++++++++--
 lib/builder/generator.js | 34 ++++++++++++++++++++++------------
 lib/core/module.js       | 15 +++++++++++----
 lib/core/nuxt.js         |  9 +++++++--
 lib/core/renderer.js     |  6 +++---
 5 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 9d0de14900..8f9e859e95 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -43,6 +43,9 @@ export default class Builder extends Tapable {
     // Helper to resolve build paths
     this.relativeToBuild = (...args) => relativeTo(this.options.buildDir, ...args)
 
+    // Call builder plugin on parent nuxt to notify all modules of builder existence
+    this.nuxt.applyPluginsAsync('builder', this).catch(this.nuxt.errorHandler)
+
     this._buildStatus = STATUS.INITIAL
   }
 
@@ -66,6 +69,8 @@ export default class Builder extends Tapable {
     // Wait for nuxt ready
     await this.nuxt.ready()
 
+    await this.applyPluginsAsync('build', this)
+
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
     if (this._nuxtPages) {
@@ -95,6 +100,8 @@ export default class Builder extends Tapable {
     // Start webpack build
     await this.webpackBuild()
 
+    await this.applyPluginsAsync('built', this)
+
     // Flag to set that building is done
     this._buildStatus = STATUS.BUILD_DONE
 
@@ -173,6 +180,9 @@ export default class Builder extends Tapable {
     } else {
       templateVars.router.routes = this.options.build.createRoutes(this.options.srcDir)
     }
+
+    await this.applyPluginsAsync('extendRoutes', {routes: templateVars.router.routes, templateVars, r})
+
     // router.extendRoutes method
     if (typeof this.options.router.extendRoutes === 'function') {
       // let the user extend the routes
@@ -216,6 +226,8 @@ export default class Builder extends Tapable {
       }, t)
     }))
 
+    await this.applyPluginsAsync('generate', { builder: this, templatesFiles, templateVars })
+
     // Interpret and move template files to .nuxt/
     await Promise.all(templatesFiles.map(async ({ src, dst, options, custom }) => {
       // Add template to watchers
@@ -246,9 +258,11 @@ export default class Builder extends Tapable {
       const dateFS = Date.now() / 1000 - 1000
       return utimes(path, dateFS, dateFS)
     }))
+
+    await this.applyPluginsAsync('generated', this)
   }
 
-  webpackBuild () {
+  async webpackBuild () {
     debug('Building files...')
     let compilersOptions = []
 
@@ -291,7 +305,7 @@ export default class Builder extends Tapable {
     })
 
     // Run after each compile
-    this.compiler.plugin('done', stats => {
+    this.compiler.plugin('done', async stats => {
       // Don't reload failed builds
       /* istanbul ignore if */
       if (stats.hasErrors() || stats.hasWarnings()) {
@@ -301,6 +315,8 @@ export default class Builder extends Tapable {
       if (this.nuxt.renderer) {
         this.nuxt.renderer.loadResources(sharedFS || fs)
       }
+
+      await this.applyPluginsAsync('compiled', { builder: this, stats })
     })
 
     // Add dev Stuff
@@ -308,6 +324,8 @@ export default class Builder extends Tapable {
       this.webpackDev()
     }
 
+    await this.applyPluginsAsync('compile', { builder: this, compiler: this.compiler })
+
     // Start Builds
     return parallel(this.compiler.compilers, compiler => new Promise((resolve, reject) => {
       if (this.options.dev) {
diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index ee5ae785a7..5eb4bf0c02 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -15,6 +15,15 @@ export default class Generator extends Tapable {
     this.nuxt = nuxt
     this.options = nuxt.options
     this.builder = builder
+
+    // Set variables
+    this.generateRoutes = resolve(this.options.srcDir, 'static')
+    this.srcBuiltPath = resolve(this.options.buildDir, 'dist')
+    this.distPath = resolve(this.options.rootDir, this.options.generate.dir)
+    this.distNuxtPath = join(this.distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
+
+    // Call generator plugin on parent nuxt to notify all modules of generator existence
+    this.nuxt.applyPluginsAsync('generator', this).catch(this.nuxt.errorHandler)
   }
 
   async generate (doBuild = true) {
@@ -22,12 +31,6 @@ export default class Generator extends Tapable {
     let errors = []
     let generateRoutes = []
 
-    // Set variables
-    let srcStaticPath = resolve(this.options.srcDir, 'static')
-    let srcBuiltPath = resolve(this.options.buildDir, 'dist')
-    let distPath = resolve(this.options.rootDir, this.options.generate.dir)
-    let distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
-
     // Wait for nuxt be ready
     await this.nuxt.ready()
 
@@ -36,16 +39,18 @@ export default class Generator extends Tapable {
       await this.builder.build()
     }
 
+    await this.applyPluginsAsync('before-generate', this)
+
     // Clean destination folder
-    await remove(distPath)
+    await remove(this.distPath)
     debug('Destination folder cleaned')
 
     // Copy static and built files
     /* istanbul ignore if */
-    if (fs.existsSync(srcStaticPath)) {
-      await copy(srcStaticPath, distPath)
+    if (fs.existsSync(this.generateRoutes)) {
+      await copy(this.generateRoutes, this.distPath)
     }
-    await copy(srcBuiltPath, distNuxtPath)
+    await copy(this.srcBuiltPath, this.distNuxtPath)
     debug('Static & build files copied')
 
     // Resolve config.generate.routes promises before generating the routes
@@ -53,6 +58,7 @@ export default class Generator extends Tapable {
       try {
         console.log('Generating routes') // eslint-disable-line no-console
         generateRoutes = await promisifyRoute(this.options.generate.routes || [])
+        await this.applyPluginsAsync('generateRoutes', {generator: this, generateRoutes})
       } catch (e) {
         console.error('Could not resolve routes') // eslint-disable-line no-console
         console.error(e) // eslint-disable-line no-console
@@ -85,6 +91,8 @@ export default class Generator extends Tapable {
     let routes = (this.options.router.mode === 'hash') ? ['/'] : flatRoutes(this.options.router.routes)
     routes = decorateWithPayloads(routes)
 
+    await this.applyPluginsAsync('generate', {generator: this, routes})
+
     while (routes.length) {
       let n = 0
       await Promise.all(routes.splice(0, 500).map(async ({ route, payload }) => {
@@ -111,7 +119,7 @@ export default class Generator extends Tapable {
         let path = join(route, sep, 'index.html') // /about -> /about/index.html
         path = (path === '/404/index.html') ? '/404.html' : path // /404 -> /404.html
         debug('Generate file: ' + path)
-        path = join(distPath, path)
+        path = join(this.distPath, path)
         // Make sure the sub folders are created
         await mkdirp(dirname(path))
         await writeFile(path, html, 'utf8')
@@ -120,7 +128,7 @@ export default class Generator extends Tapable {
 
     // Add .nojekyll file to let Github Pages add the _nuxt/ folder
     // https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
-    const nojekyllPath = resolve(distPath, '.nojekyll')
+    const nojekyllPath = resolve(this.distPath, '.nojekyll')
     writeFile(nojekyllPath, '')
     const duration = Math.round((Date.now() - s) / 100) / 10
     debug(`HTML Files generated in ${duration}s`)
@@ -137,6 +145,8 @@ export default class Generator extends Tapable {
       console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
     }
 
+    await this.applyPluginsAsync('generated', this)
+
     return { duration, errors }
   }
 }
diff --git a/lib/core/module.js b/lib/core/module.js
index 4cb9a5bcb5..8876fab3b0 100755
--- a/lib/core/module.js
+++ b/lib/core/module.js
@@ -15,8 +15,9 @@ export default class ModuleContainer extends Tapable {
     this.options = nuxt.options
     this.requiredModules = []
 
-    this.nuxt.plugin('beforeInit', () => {
-      return sequence(this.options.modules, this.addModule.bind(this))
+    this.nuxt.plugin('beforeInit', async () => {
+      await sequence(this.options.modules, this.addModule.bind(this))
+      await this.applyPluginsAsync('ready', this)
     })
   }
 
@@ -81,11 +82,14 @@ export default class ModuleContainer extends Tapable {
     return this.addModule(moduleOpts, true)
   }
 
-  addModule (moduleOpts, requireOnce) {
+  async addModule (moduleOpts, requireOnce) {
     /* istanbul ignore if */
     if (!moduleOpts) {
       return
     }
+
+    await this.applyPluginsAsync('add', {moduleOpts, requireOnce})
+
     // Allow using babel style array options
     if (Array.isArray(moduleOpts)) {
       moduleOpts = {
@@ -93,12 +97,13 @@ export default class ModuleContainer extends Tapable {
         options: moduleOpts[1]
       }
     }
+
     // Allows passing runtime options to each module
     const options = moduleOpts.options || (typeof moduleOpts === 'object' ? moduleOpts : {})
     const originalSrc = moduleOpts.src || moduleOpts
+
     // Resolve module
     let module = originalSrc
-
     if (typeof module === 'string') {
       module = require(this.nuxt.resolvePath(module))
     }
@@ -108,6 +113,7 @@ export default class ModuleContainer extends Tapable {
     if (typeof module !== 'function') {
       throw new Error(`[nuxt] Module ${JSON.stringify(originalSrc)} should export a function`)
     }
+
     // Module meta
     if (!module.meta) {
       module.meta = {}
@@ -121,6 +127,7 @@ export default class ModuleContainer extends Tapable {
         this.requiredModules.push(module.meta.name)
       }
     }
+
     // Call module with `this` context and pass options
     return new Promise((resolve, reject) => {
       const result = module.call(this, options, err => {
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 3b138a5cdd..1c5dfbd95b 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -79,18 +79,23 @@ export default class Nuxt extends Tapable {
   }
 
   errorHandler /* istanbul ignore next */() {
+    // Apply plugins
+    // eslint-disable-next-line no-console
+    this.applyPluginsAsync('error', ...arguments).catch(console.error)
+
     // Silent
     if (this.options.errorHandler === false) {
       return
     }
+
     // Custom errorHandler
     if (typeof this.options.errorHandler === 'function') {
       return this.options.errorHandler.apply(this, arguments)
     }
+
     // Default handler
     // eslint-disable-next-line no-console
-    console.error.apply(this, arguments)
-    process.exit(1)
+    console.error(...arguments)
   }
 
   resolvePath (path) {
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index c3bbe7205f..36338fa055 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -71,7 +71,7 @@ export default class Renderer extends Tapable {
     }
 
     // Setup all middleWare
-    this.setupMiddleware()
+    await this.setupMiddleware()
 
     // Load error template
     const errorTemplatePath = resolve(this.options.buildDir, 'views/error.html')
@@ -165,9 +165,9 @@ export default class Renderer extends Tapable {
     }
   }
 
-  setupMiddleware () {
+  async setupMiddleware () {
     // Apply setupMiddleware from modules first
-    this.applyPlugins('setupMiddleware', this.app)
+    await this.applyPluginsAsync('setupMiddleware', this.app)
 
     // Gzip middleware for production
     if (!this.options.dev && this.options.render.gzip) {

From 205113dfce08682482cc3ef133bea035595f26ef Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 15:47:22 +0430
Subject: [PATCH 159/236] update tests

---
 test/basic.dev.test.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 4defc787fb..61ddaf077e 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -26,14 +26,14 @@ test('/stateless', async t => {
   t.true(html.includes('<h1>My component!</h1>'))
 })
 
-test('/_nuxt/test.hot-update.json should returns empty html', async t => {
-  try {
-    await rp(url('/_nuxt/test.hot-update.json'))
-  } catch (err) {
-    t.is(err.statusCode, 404)
-    t.is(err.response.body, '')
-  }
-})
+// test('/_nuxt/test.hot-update.json should returns empty html', async t => {
+//   try {
+//     await rp(url('/_nuxt/test.hot-update.json'))
+//   } catch (err) {
+//     t.is(err.statusCode, 404)
+//     t.is(err.response.body, '')
+//   }
+// })
 
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', async t => {

From bf1065f438bb3e048f5285941cd92c84c0c6e7c9 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 15:58:10 +0430
Subject: [PATCH 160/236] more webpack friendly tappable hooks

---
 lib/builder/builder.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 8f9e859e95..776fefb37f 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -316,7 +316,7 @@ export default class Builder extends Tapable {
         this.nuxt.renderer.loadResources(sharedFS || fs)
       }
 
-      await this.applyPluginsAsync('compiled', { builder: this, stats })
+      await this.applyPluginsAsync('done', { builder: this, stats })
     })
 
     // Add dev Stuff
@@ -327,7 +327,7 @@ export default class Builder extends Tapable {
     await this.applyPluginsAsync('compile', { builder: this, compiler: this.compiler })
 
     // Start Builds
-    return parallel(this.compiler.compilers, compiler => new Promise((resolve, reject) => {
+    await parallel(this.compiler.compilers, compiler => new Promise((resolve, reject) => {
       if (this.options.dev) {
         // --- Dev Build ---
         if (compiler.options.name === 'client') {
@@ -361,6 +361,8 @@ export default class Builder extends Tapable {
         })
       }
     }))
+
+    await this.applyPluginsAsync('compiled', this)
   }
 
   webpackDev () {

From 14c67f935e35151c760447890f364d6f38b853b5 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 15:58:38 +0430
Subject: [PATCH 161/236] eslint

---
 test/basic.dev.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 61ddaf077e..a415ed4322 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import rp from 'request-promise-native'
+// import rp from 'request-promise-native'
 import { Nuxt, Builder } from '../index.js'
 
 const port = 4001

From d3cacd0e5889ea92b413da97af0c96546c4d653f Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Mon, 3 Jul 2017 13:53:37 +0200
Subject: [PATCH 162/236] Add back error handler on nuxt-dev

---
 bin/nuxt-dev | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 419fe79a44..19e4b9de9f 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -54,6 +54,11 @@ const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 const nuxtConfig = loadNuxtConfig()
 _.defaultsDeep(nuxtConfig, { watchers: { chokidar: { ignoreInitial: true } } })
 
+// Fail if an error happened
+process.on('unhandledRejection', function (err) {
+  throw err
+})
+
 // Start dev
 let dev = startDev()
 

From 825d0e4c8220619c5cea5411ec126cf11df503e4 Mon Sep 17 00:00:00 2001
From: Daniel West <daniel@silverback.is>
Date: Mon, 3 Jul 2017 18:19:29 +0100
Subject: [PATCH 163/236] Configurable key property for transitions

The vue-router component can have a 'key' property which means it's easier to configure transitions between routes with slugs.

With this change in a layout template you can use
```html
<nuxt :routerViewKey="routerViewKey" />
```
And the following for example
```js
    computed: {
      routerViewKey () {
        if (this.$route.name === 'service') {
          return this.$route.name
        } else {
          return this.$route.fullPath
        }
      }
    }
```
This would implement the functionality that @myst729 mentioned here https://github.com/vuejs/vue-router/issues/474 for vue-router - some routes can just switch, but some you may want to transition as though it's a complete new page to an end-user

This is a possible resolution to issue raised here https://github.com/nuxt/nuxt.js/issues/1021
---
 lib/app/components/nuxt.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/app/components/nuxt.vue b/lib/app/components/nuxt.vue
index 34502e88bf..567454a4fb 100644
--- a/lib/app/components/nuxt.vue
+++ b/lib/app/components/nuxt.vue
@@ -1,6 +1,6 @@
 <template>
   <nuxt-error v-if="nuxt.err" :error="nuxt.err"></nuxt-error>
-  <nuxt-child v-else></nuxt-child>
+  <nuxt-child :key="routerViewKey" v-else></nuxt-child>
 </template>
 
 <script>
@@ -10,6 +10,7 @@ import NuxtError from '<%= components.ErrorPage ? ((components.ErrorPage.include
 
 export default {
   name: 'nuxt',
+  props: ['routerViewKey'],
   beforeCreate () {
     Vue.util.defineReactive(this, 'nuxt', this.$root.$options._nuxt)
   },

From 28d20ec2624cbaf154982041e3519bf8f132c00e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 22:49:22 +0430
Subject: [PATCH 164/236] test(ssr): add unique test

---
 test/fixtures/ssr/components/test.vue | 17 ++++++
 test/fixtures/ssr/lib/db.js           |  4 ++
 test/fixtures/ssr/pages/asyncData.vue | 15 +++++
 test/fixtures/ssr/pages/component.vue | 15 +++++
 test/fixtures/ssr/pages/data.vue      | 15 +++++
 test/fixtures/ssr/pages/fetch.vue     | 14 +++++
 test/fixtures/ssr/pages/store.vue     |  5 ++
 test/fixtures/ssr/store/index.js      | 22 +++++++
 test/ssr.test.js                      | 84 +++++++++++++++++++++++++++
 9 files changed, 191 insertions(+)
 create mode 100644 test/fixtures/ssr/components/test.vue
 create mode 100644 test/fixtures/ssr/lib/db.js
 create mode 100644 test/fixtures/ssr/pages/asyncData.vue
 create mode 100644 test/fixtures/ssr/pages/component.vue
 create mode 100644 test/fixtures/ssr/pages/data.vue
 create mode 100644 test/fixtures/ssr/pages/fetch.vue
 create mode 100644 test/fixtures/ssr/pages/store.vue
 create mode 100644 test/fixtures/ssr/store/index.js
 create mode 100755 test/ssr.test.js

diff --git a/test/fixtures/ssr/components/test.vue b/test/fixtures/ssr/components/test.vue
new file mode 100644
index 0000000000..cdc10f9b6f
--- /dev/null
+++ b/test/fixtures/ssr/components/test.vue
@@ -0,0 +1,17 @@
+<template>
+<foobar>
+    {{id}}
+</foobar>
+</template>
+
+<script>
+import { nextId } from '@/lib/db'
+
+export default {
+    data() {
+        return {
+            id: nextId()
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/test/fixtures/ssr/lib/db.js b/test/fixtures/ssr/lib/db.js
new file mode 100644
index 0000000000..9c173807f6
--- /dev/null
+++ b/test/fixtures/ssr/lib/db.js
@@ -0,0 +1,4 @@
+
+let idCtr = 0
+
+export const nextId = () => ++idCtr
diff --git a/test/fixtures/ssr/pages/asyncData.vue b/test/fixtures/ssr/pages/asyncData.vue
new file mode 100644
index 0000000000..5f194666ed
--- /dev/null
+++ b/test/fixtures/ssr/pages/asyncData.vue
@@ -0,0 +1,15 @@
+<template>
+<foobar>{{id}}</foobar>
+</template>
+
+<script>
+import { nextId } from '@/lib/db'
+
+export default {
+    async asyncData() {
+        return {
+            id: nextId()
+        }
+    }
+}
+</script>
diff --git a/test/fixtures/ssr/pages/component.vue b/test/fixtures/ssr/pages/component.vue
new file mode 100644
index 0000000000..316ad6e5ec
--- /dev/null
+++ b/test/fixtures/ssr/pages/component.vue
@@ -0,0 +1,15 @@
+<template>
+<div>
+    <test/>
+</div>
+</template>
+
+<script>
+import test from '@/components/test'
+
+export default {
+    components : {
+        test
+    }
+}
+</script>
\ No newline at end of file
diff --git a/test/fixtures/ssr/pages/data.vue b/test/fixtures/ssr/pages/data.vue
new file mode 100644
index 0000000000..f627b7b373
--- /dev/null
+++ b/test/fixtures/ssr/pages/data.vue
@@ -0,0 +1,15 @@
+<template>
+<foobar>{{id}}</foobar>
+</template>
+
+<script>
+import { nextId } from '@/lib/db'
+
+export default {
+    data() {
+        return {
+            id: nextId()
+        }
+    }
+}
+</script>
diff --git a/test/fixtures/ssr/pages/fetch.vue b/test/fixtures/ssr/pages/fetch.vue
new file mode 100644
index 0000000000..27ed0ec8bc
--- /dev/null
+++ b/test/fixtures/ssr/pages/fetch.vue
@@ -0,0 +1,14 @@
+<template>
+<foobar>{{$store.__id}}</foobar>
+</template>
+
+<script>
+import { nextId } from '@/lib/db'
+
+export default {
+    async fetch({store}) {
+        // We use store just as a shared reference
+        store.__id = nextId()
+    },
+}
+</script>
diff --git a/test/fixtures/ssr/pages/store.vue b/test/fixtures/ssr/pages/store.vue
new file mode 100644
index 0000000000..767e0f3b23
--- /dev/null
+++ b/test/fixtures/ssr/pages/store.vue
@@ -0,0 +1,5 @@
+<template>
+<foobar>
+    {{$store.state[$route.query.onServerInit === '1' ? 'id2': 'id']}}
+</foobar>
+</template>
\ No newline at end of file
diff --git a/test/fixtures/ssr/store/index.js b/test/fixtures/ssr/store/index.js
new file mode 100644
index 0000000000..e98ccc4f5d
--- /dev/null
+++ b/test/fixtures/ssr/store/index.js
@@ -0,0 +1,22 @@
+import { nextId } from '@/lib/db'
+
+export const state = () => {
+  return {
+    id: nextId(),
+    id2: 0
+  }
+}
+
+export const mutations = {
+  setId2 (state, id) {
+    state.id2 = id
+  }
+}
+
+export const actions = {
+  nuxtServerInit ({ commit, state }, { route }) {
+    if (route.query.onServerInit === '1') {
+      commit('setId2', nextId())
+    }
+  }
+}
diff --git a/test/ssr.test.js b/test/ssr.test.js
new file mode 100755
index 0000000000..09a3bc0aa7
--- /dev/null
+++ b/test/ssr.test.js
@@ -0,0 +1,84 @@
+import test from 'ava'
+import { resolve } from 'path'
+import { Nuxt, Builder, Utils } from '..'
+import { uniq } from 'lodash'
+
+const port = 4008
+let nuxt = null
+
+// Utils
+const range = n => [...Array(n).keys()]
+const FOOBAR_REGEX = /<foobar>([\s\S]*)<\/foobar>/
+const match = (regex, text) => (regex.exec(text) || [])[1]
+
+// Init nuxt.js and create server listening on localhost:4000
+test.before('Init Nuxt.js', async t => {
+  const options = {
+    rootDir: resolve(__dirname, 'fixtures/ssr'),
+    dev: false,
+    render: {
+      resourceHints: false
+    },
+    build: {
+      extractCSS: true
+    }
+  }
+  nuxt = new Nuxt(options)
+  await new Builder(nuxt).build()
+  await nuxt.listen(port, 'localhost')
+})
+
+// == Uniq Test ==
+// The idea behind is pages using a shared nextId() which retuns an increamenting id
+// So all responses should strictly be different and length of unique responses should equal to responses
+// We strictly compare <foorbar>{id}</foorbar> section
+// Because other response parts such as window.__NUXT may be different resulting false positive passes.
+const uniqueTest = async (t, url) => {
+  let results = []
+
+  await Utils.parallel(range(20), async () => {
+    let { html } = await nuxt.renderRoute(url)
+    let foobar = match(FOOBAR_REGEX, html)
+    results.push(parseInt(foobar))
+  })
+
+  let isUnique = uniq(results).length === results.length
+
+  if (!isUnique) {
+    /* eslint-disable no-console */
+    console.log(url + '\n' + results.join(', ') + '\n')
+  }
+
+  t.true(isUnique)
+
+  return results
+}
+
+test('unique responses with data()', async t => {
+  await uniqueTest(t, '/data')
+})
+
+test('unique responses with component', async t => {
+  await uniqueTest(t, '/component')
+})
+
+test('unique responses with asyncData()', async t => {
+  await uniqueTest(t, '/asyncData')
+})
+
+test('unique responses with store initial state', async t => {
+  await uniqueTest(t, '/store')
+})
+
+test('unique responses with nuxtServerInit', async t => {
+  await uniqueTest(t, '/store?onServerInit=1')
+})
+
+test('unique responses with fetch', async t => {
+  await uniqueTest(t, '/fetch')
+})
+
+// Close server and ask nuxt to stop listening to file changes
+test.after('Closing server and nuxt.js', t => {
+  nuxt.close()
+})

From bfd8475979e2474aa174ce8dd9a7575574a95f6b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 3 Jul 2017 22:59:38 +0430
Subject: [PATCH 165/236] test(ssr): async components

---
 test/fixtures/ssr/pages/asyncComponent.vue | 18 ++++++++++++++++++
 test/ssr.test.js                           |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100644 test/fixtures/ssr/pages/asyncComponent.vue

diff --git a/test/fixtures/ssr/pages/asyncComponent.vue b/test/fixtures/ssr/pages/asyncComponent.vue
new file mode 100644
index 0000000000..ec29b62d43
--- /dev/null
+++ b/test/fixtures/ssr/pages/asyncComponent.vue
@@ -0,0 +1,18 @@
+<template>
+<div>
+    <async-test/>
+</div>
+</template>
+
+<script>
+
+export default {
+  async asyncData({ error }) {
+    try {
+      this.components.AsyncTest = await import(`@/components/test.vue`)
+    } catch (e) {
+      error({ statusCode: 404, message: 'Can not load test component' })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/test/ssr.test.js b/test/ssr.test.js
index 09a3bc0aa7..e45201fb04 100755
--- a/test/ssr.test.js
+++ b/test/ssr.test.js
@@ -62,6 +62,10 @@ test('unique responses with component', async t => {
   await uniqueTest(t, '/component')
 })
 
+test('unique responses with async components', async t => {
+  await uniqueTest(t, '/asyncComponent')
+})
+
 test('unique responses with asyncData()', async t => {
   await uniqueTest(t, '/asyncData')
 })

From 71faf7cae364bf5821abf2a57785522842676c51 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 4 Jul 2017 15:41:43 +0200
Subject: [PATCH 166/236] IE9: fix issue with Array.find and String.includes

---
 examples/custom-build/pages/index.vue      | 10 ++++++++++
 examples/nested-routes/nuxt.config.js      | 10 ++++++++++
 examples/nested-routes/pages/index/_id.vue |  1 +
 lib/app/store.js                           |  7 ++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/examples/custom-build/pages/index.vue b/examples/custom-build/pages/index.vue
index 5be0248820..163d8e58ea 100644
--- a/examples/custom-build/pages/index.vue
+++ b/examples/custom-build/pages/index.vue
@@ -7,6 +7,16 @@
   </div>
 </template>
 
+<script>
+import img from '@/assets/nuxt.png'
+
+export default {
+  mounted() {
+    console.log('Teub', img)
+  }
+}
+</script>
+
 <style>
 .container {
   font-size: 20px;
diff --git a/examples/nested-routes/nuxt.config.js b/examples/nested-routes/nuxt.config.js
index 7923f1f12d..13030d6852 100644
--- a/examples/nested-routes/nuxt.config.js
+++ b/examples/nested-routes/nuxt.config.js
@@ -14,5 +14,15 @@ module.exports = {
       { id: 5, name: 'Kevin Durant', number: 35 },
       { id: 6, name: 'Kyrie Irving', number: 2 }
     ]
+  },
+  generate: {
+    routes: [
+      '/1',
+      '/2',
+      '/3',
+      '/4',
+      '/5',
+      '/6'
+    ]
   }
 }
diff --git a/examples/nested-routes/pages/index/_id.vue b/examples/nested-routes/pages/index/_id.vue
index 9ad39e30eb..0441f3fedd 100644
--- a/examples/nested-routes/pages/index/_id.vue
+++ b/examples/nested-routes/pages/index/_id.vue
@@ -15,6 +15,7 @@ export default {
     if (!user) {
       return error({ message: 'User not found', statusCode: 404 })
     }
+    console.log(user)
     return user
   }
 }
diff --git a/lib/app/store.js b/lib/app/store.js
index 7a83566f8f..553ad93cac 100644
--- a/lib/app/store.js
+++ b/lib/app/store.js
@@ -11,7 +11,12 @@ const filenames = files.keys()
 let storeData = {}
 
 // Check if store/index.js exists
-const indexFilename = filenames.find((filename) => filename.includes('./index.'))
+let indexFilename
+filenames.forEach((filename) => {
+  if (filename.indexOf('./index.') !== -1) {
+    indexFilename = filename
+  }
+})
 if (indexFilename) {
   storeData = getModule(indexFilename)
 }

From ea1b5ae10fed22037289c6b6f5f93b8fa70e6b90 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 4 Jul 2017 18:51:41 +0430
Subject: [PATCH 167/236] feat: better aliases

---
 lib/builder/webpack/base.config.js | 20 ++++----------------
 lib/common/utils.js                |  9 +--------
 lib/core/nuxt.js                   | 13 ++++---------
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index 48918a60bb..bc3b4b7390 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -47,24 +47,12 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
     resolve: {
       extensions: ['.js', '.json', '.vue', '.ts'],
       alias: {
-        '@@': join(this.options.rootDir),
-        '@': join(this.options.srcDir),
-        '@static': join(this.options.srcDir, 'static'),
-        '@assets': join(this.options.srcDir, 'assets'),
-        '@plugins': join(this.options.srcDir, 'plugins'),
-        '@pages': join(this.options.srcDir, 'pages'),
-        '@components': join(this.options.srcDir, 'components'),
-        '@middleware': join(this.options.srcDir, 'middleware'),
-        // Legacy support
         '~': join(this.options.srcDir),
+        '~~': join(this.options.rootDir),
+        '@': join(this.options.srcDir),
+        '@@': join(this.options.rootDir),
         'static': join(this.options.srcDir, 'static'), // use in template with <img src="~static/nuxt.png" />
-        '~static': join(this.options.srcDir, 'static'),
-        'assets': join(this.options.srcDir, 'assets'), // use in template with <img src="~assets/nuxt.png" />
-        '~assets': join(this.options.srcDir, 'assets'),
-        '~plugins': join(this.options.srcDir, 'plugins'),
-        '~pages': join(this.options.srcDir, 'pages'),
-        '~components': join(this.options.srcDir, 'components'),
-        '~middleware': join(this.options.srcDir, 'middleware')
+        'assets': join(this.options.srcDir, 'assets') // use in template with <img src="~assets/nuxt.png" />
       },
       modules: [
         join(this.options.rootDir, 'node_modules'),
diff --git a/lib/common/utils.js b/lib/common/utils.js
index 14fb1665b7..37dcfadef2 100644
--- a/lib/common/utils.js
+++ b/lib/common/utils.js
@@ -96,14 +96,7 @@ export function r () {
   let args = Array.prototype.slice.apply(arguments)
   let lastArg = _.last(args)
 
-  if (lastArg.includes('@')) {
-    return wp(lastArg)
-  }
-
-  if (lastArg.includes('~')) {
-    // eslint-disable-next-line no-console
-    console.warn('[nuxt] Aliases using `~` are deprecated, please use `@/` instead.',
-      lastArg, '->', lastArg.replace('~/', '@/').replace('~', '@/'))
+  if (lastArg.includes('@') || lastArg.includes('~')) {
     return wp(lastArg)
   }
 
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 1c5dfbd95b..7293e60552 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -100,21 +100,16 @@ export default class Nuxt extends Tapable {
 
   resolvePath (path) {
     // Try to resolve using NPM resolve path first
-    // Fixes problems with scopped modules
     try {
       let resolvedPath = require.resolve(path)
       return resolvedPath
     } catch (e) {
       // Just continue
     }
-
-    // Shorthand to resolve from project srcDir
-    if (path.indexOf('@') === 0 || path.indexOf('~') === 0) {
-      if (path.indexOf('~') === 0) {
-        // eslint-disable-next-line no-console
-        console.warn('[nuxt] Aliases using `~` are deprecated, please use `@/` instead.',
-          path, '->', path.replace('~/', '@/').replace('~', '@/'))
-      }
+    // Shorthand to resolve from project dirs
+    if (path.indexOf('@@') === 0 || path.indexOf('~~') === 0) {
+      return join(this.options.rootDir, path.substr(2))
+    } else if (path.indexOf('@') === 0 || path.indexOf('~') === 0) {
       return join(this.options.srcDir, path.substr(1))
     }
     return resolve(this.options.srcDir, path)

From 70a75f4e425fbee0c153348871c54f024cd79c3f Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 4 Jul 2017 18:30:01 +0200
Subject: [PATCH 168/236] Compatible with IE9+

---
 lib/app/index.js                     |   3 +-
 lib/app/router.js                    |   3 +-
 lib/builder/webpack/client.config.js |  40 +-
 lib/core/options.js                  |   3 +-
 package.json                         |  31 +-
 yarn.lock                            | 526 ++++++++++++++-------------
 6 files changed, 309 insertions(+), 297 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index ddc90451d1..8cbe67c97d 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -1,5 +1,6 @@
 'use strict'
 
+import 'core-js/fn/promise'
 import Vue from 'vue'
 import Meta from 'vue-meta'
 import { createRouter } from './router.js'
@@ -77,7 +78,7 @@ async function createApp (ssrContext) {
     router,
     <%= (store ? 'store,' : '') %>
     _nuxt: {
-      defaultTransition: defaultTransition,
+      defaultTransition,
       transitions: [ defaultTransition ],
       setTransitions (transitions) {
         if (!Array.isArray(transitions)) {
diff --git a/lib/app/router.js b/lib/app/router.js
index 8f585fc138..bb2df26f87 100644
--- a/lib/app/router.js
+++ b/lib/app/router.js
@@ -62,6 +62,7 @@ export function createRouter () {
     scrollBehavior,
     routes: [
   <%= _routes %>
-    ]
+    ],
+    fallback: <%= router.fallback %>
   })
 }
diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
index c2b92005a4..2cf2d1d65b 100644
--- a/lib/builder/webpack/client.config.js
+++ b/lib/builder/webpack/client.config.js
@@ -27,28 +27,26 @@ export default function webpackClientConfig () {
   config.entry.app = resolve(this.options.buildDir, 'client.js')
 
   // Add vendors
-  if (!this.options.dev) {
-    if (this.options.store) {
-      config.entry.vendor.push('vuex')
-    }
-    config.entry.vendor = config.entry.vendor.concat(this.options.build.vendor)
-    // Extract vendor chunks for better caching
-    config.plugins.push(
-      new webpack.optimize.CommonsChunkPlugin({
-        name: 'vendor',
-        filename: this.options.build.filenames.vendor,
-        minChunks (module) {
-          // A module is extracted into the vendor chunk when...
-          return (
-            // If it's inside node_modules
-            /node_modules/.test(module.context) &&
-            // Do not externalize if the request is a CSS file
-            !/\.(css|less|scss|sass|styl|stylus)$/.test(module.request)
-          )
-        }
-      })
-    )
+  if (this.options.store) {
+    config.entry.vendor.push('vuex')
   }
+  config.entry.vendor = config.entry.vendor.concat(this.options.build.vendor)
+  // Extract vendor chunks for better caching
+  config.plugins.push(
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      filename: this.options.build.filenames.vendor,
+      minChunks (module) {
+        // A module is extracted into the vendor chunk when...
+        return (
+          // If it's inside node_modules
+          /node_modules/.test(module.context) &&
+          // Do not externalize if the request is a CSS file
+          !/\.(css|less|scss|sass|styl|stylus)$/.test(module.request)
+        )
+      }
+    })
+  )
 
   // Env object defined in nuxt.config.js
   let env = {}
diff --git a/lib/core/options.js b/lib/core/options.js
index 25b1989ec5..ee7ada1187 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -127,7 +127,8 @@ export const defaultOptions = {
     linkActiveClass: 'nuxt-link-active',
     linkExactActiveClass: 'nuxt-link-exact-active',
     extendRoutes: null,
-    scrollBehavior: null
+    scrollBehavior: null,
+    fallback: false
   },
   render: {
     ssr: {},
diff --git a/package.json b/package.json
index 8c8337a083..507a90ff1c 100644
--- a/package.json
+++ b/package.json
@@ -69,14 +69,15 @@
     "ansi-html": "^0.0.7",
     "autoprefixer": "^7.1.1",
     "babel-core": "^6.25.0",
-    "babel-loader": "^7.1.0",
+    "babel-loader": "^7.1.1",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-vue-app": "^1.2.0",
-    "chalk": "^1.1.3",
+    "chalk": "^2.0.1",
     "chokidar": "^1.7.0",
     "clone": "^2.1.1",
     "compression": "^1.6.2",
     "connect": "^3.6.2",
+    "core-js": "^2.4.1",
     "css-loader": "^0.28.4",
     "debug": "^2.6.8",
     "etag": "^1.8.0",
@@ -88,7 +89,7 @@
     "glob": "^7.1.2",
     "hash-sum": "^1.0.2",
     "html-minifier": "^3.5.2",
-    "html-webpack-plugin": "^2.28.0",
+    "html-webpack-plugin": "^2.29.0",
     "lodash": "^4.17.4",
     "memory-fs": "^0.4.1",
     "minimist": "^1.2.0",
@@ -97,7 +98,7 @@
     "pify": "^3.0.0",
     "preload-webpack-plugin": "^1.2.2",
     "progress-bar-webpack-plugin": "^1.9.3",
-    "script-ext-html-webpack-plugin": "^1.8.1",
+    "script-ext-html-webpack-plugin": "^1.8.3",
     "serialize-javascript": "^1.3.0",
     "serve-static": "^1.12.3",
     "source-map-support": "^0.4.15",
@@ -105,21 +106,21 @@
     "tappable": "^1.0.1",
     "url-loader": "^0.5.9",
     "vue": "~2.3.4",
-    "vue-loader": "^12.2.1",
+    "vue-loader": "^13.0.0",
     "vue-meta": "^1.0.4",
-    "vue-router": "^2.6.0",
+    "vue-router": "^2.7.0",
     "vue-server-renderer": "~2.3.4",
     "vue-ssr-html-stream": "^2.2.0",
     "vue-template-compiler": "~2.3.4",
     "vuex": "^2.3.1",
     "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-dev-middleware": "^1.10.2",
-    "webpack-hot-middleware": "^2.18.0",
+    "webpack-dev-middleware": "^1.11.0",
+    "webpack-hot-middleware": "^2.18.1",
     "webpack-node-externals": "^1.6.0"
   },
   "devDependencies": {
-    "ava": "^0.19.1",
+    "ava": "^0.20.0",
     "babel-eslint": "^7.2.3",
     "babel-plugin-array-includes": "^2.0.3",
     "babel-plugin-istanbul": "^4.1.4",
@@ -130,18 +131,18 @@
     "codecov": "^2.2.0",
     "copy-webpack-plugin": "^4.0.1",
     "cross-env": "^5.0.1",
-    "eslint": "^4.0.0",
+    "eslint": "^4.1.1",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.3.0",
-    "eslint-plugin-node": "^5.0.0",
+    "eslint-plugin-import": "^2.6.1",
+    "eslint-plugin-node": "^5.1.0",
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
     "finalhandler": "^1.0.3",
-    "jsdom": "^11.0.0",
+    "jsdom": "^11.1.0",
     "json-loader": "^0.5.4",
     "lerna": "2.0.0-rc.5",
-    "nyc": "^11.0.2",
+    "nyc": "^11.0.3",
     "request": "^2.81.0",
     "request-promise-native": "^1.0.4",
     "rimraf": "^2.6.1",
@@ -154,7 +155,7 @@
     "rollup-watch": "^4.0.0",
     "server-destroy": "^1.0.1",
     "std-mocks": "^1.0.1",
-    "uglify-js": "^3.0.18"
+    "uglify-js": "^3.0.23"
   },
   "collective": {
     "type": "opencollective",
diff --git a/yarn.lock b/yarn.lock
index a9164763c2..3d2cb3b248 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6,7 +6,7 @@
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
 
-"@ava/babel-preset-stage-4@^1.0.0":
+"@ava/babel-preset-stage-4@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.1.0.tgz#ae60be881a0babf7d35f52aba770d1f6194f76bd"
   dependencies:
@@ -30,16 +30,23 @@
     "@ava/babel-plugin-throws-helper" "^2.0.0"
     babel-plugin-espower "^2.3.2"
 
-"@ava/pretty-format@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ava/pretty-format/-/pretty-format-1.1.0.tgz#d0a57d25eb9aeab9643bdd1a030642b91c123e28"
+"@ava/write-file-atomic@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ava/write-file-atomic/-/write-file-atomic-2.2.0.tgz#d625046f3495f1f5e372135f473909684b429247"
   dependencies:
-    ansi-styles "^2.2.1"
-    esutils "^2.0.2"
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    slide "^1.1.5"
+
+"@concordance/react@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@concordance/react/-/react-1.0.0.tgz#fcf3cad020e5121bfd1c61d05bc3516aac25f734"
+  dependencies:
+    arrify "^1.0.1"
 
 "@types/node@^6.0.46":
-  version "6.0.78"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
+  version "6.0.79"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.79.tgz#5efe7d4a6d8c453c7e9eaf55d931f4a22fac5169"
 
 JSONStream@^1.0.4:
   version "1.3.1"
@@ -147,6 +154,10 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
+ansi-escapes@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
+
 ansi-html@0.0.7, ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -155,11 +166,15 @@ ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 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.0.0:
+ansi-styles@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
   dependencies:
@@ -294,8 +309,8 @@ async@^1.4.0, async@^1.5.0:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
 async@^2.1.2:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
     lodash "^4.14.0"
 
@@ -339,20 +354,22 @@ ava-init@^0.2.0:
     read-pkg-up "^2.0.0"
     write-pkg "^2.0.0"
 
-ava@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/ava/-/ava-0.19.1.tgz#43dd82435ad19b3980ffca2488f05daab940b273"
+ava@^0.20.0:
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/ava/-/ava-0.20.0.tgz#bdc0dd36453d7255e9f733305ab370c248381e41"
   dependencies:
-    "@ava/babel-preset-stage-4" "^1.0.0"
+    "@ava/babel-preset-stage-4" "^1.1.0"
     "@ava/babel-preset-transform-test-files" "^3.0.0"
-    "@ava/pretty-format" "^1.1.0"
+    "@ava/write-file-atomic" "^2.2.0"
+    "@concordance/react" "^1.0.0"
+    ansi-escapes "^2.0.0"
+    ansi-styles "^3.1.0"
     arr-flatten "^1.0.1"
     array-union "^1.0.1"
     array-uniq "^1.0.2"
     arrify "^1.0.0"
     auto-bind "^1.1.0"
     ava-init "^0.2.0"
-    babel-code-frame "^6.16.0"
     babel-core "^6.17.0"
     bluebird "^3.0.0"
     caching-transform "^1.0.0"
@@ -366,12 +383,11 @@ ava@^0.19.1:
     co-with-promise "^4.6.0"
     code-excerpt "^2.1.0"
     common-path-prefix "^1.0.0"
+    concordance "^2.0.0"
     convert-source-map "^1.2.0"
     core-assert "^0.2.0"
     currently-unhandled "^0.4.1"
     debug "^2.2.0"
-    diff "^3.0.1"
-    diff-match-patch "^1.0.0"
     dot-prop "^4.1.0"
     empower-core "^0.6.1"
     equal-length "^1.0.0"
@@ -381,28 +397,27 @@ ava@^0.19.1:
     get-port "^3.0.0"
     globby "^6.0.0"
     has-flag "^2.0.0"
-    hullabaloo-config-manager "^1.0.0"
+    hullabaloo-config-manager "^1.1.0"
     ignore-by-default "^1.0.0"
+    import-local "^0.1.1"
     indent-string "^3.0.0"
     is-ci "^1.0.7"
     is-generator-fn "^1.0.0"
     is-obj "^1.0.0"
     is-observable "^0.2.0"
     is-promise "^2.1.0"
-    jest-diff "19.0.0"
-    jest-snapshot "19.0.2"
     js-yaml "^3.8.2"
     last-line-stream "^1.0.0"
+    lodash.clonedeepwith "^4.5.0"
     lodash.debounce "^4.0.3"
     lodash.difference "^4.3.0"
     lodash.flatten "^4.2.0"
-    lodash.isequal "^4.5.0"
     loud-rejection "^1.2.0"
+    make-dir "^1.0.0"
     matcher "^0.1.1"
     md5-hex "^2.0.0"
     meow "^3.7.0"
-    mkdirp "^0.5.1"
-    ms "^0.7.1"
+    ms "^1.0.0"
     multimatch "^2.1.0"
     observable-to-promise "^0.5.0"
     option-chain "^0.1.0"
@@ -419,6 +434,7 @@ ava@^0.19.1:
     strip-bom-buf "^1.0.0"
     supports-color "^3.2.3"
     time-require "^0.1.2"
+    trim-off-newlines "^1.0.1"
     unique-temp-dir "^1.0.0"
     update-notifier "^2.1.0"
 
@@ -430,7 +446,7 @@ aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
+babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
   dependencies:
@@ -606,9 +622,9 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144"
+babel-loader@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -944,8 +960,8 @@ babel-polyfill@6.23.0:
     regenerator-runtime "^0.10.0"
 
 babel-preset-env@^1.2.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
+  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"
@@ -1105,7 +1121,7 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.1.0, babylon@^6.13.0, babylon@^6.17.0, babylon@^6.17.2:
+babylon@^6.1.0, babylon@^6.17.0, babylon@^6.17.2, babylon@^6.17.4:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
@@ -1118,8 +1134,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.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
@@ -1150,8 +1166,8 @@ bluebird@^3.0.0, bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.4.7:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
+  version "4.11.7"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
 
 boolbase@~1.0.0:
   version "1.0.0"
@@ -1368,12 +1384,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.30000692"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000692.tgz#3da9a99353adbcea1e142b99f60ecc6216df47a5"
+  version "1.0.30000696"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000696.tgz#e71f5c61e1f96c7a3af4e791ac5db55e11737604"
 
 caniuse-lite@^1.0.30000670, caniuse-lite@^1.0.30000684:
-  version "1.0.30000692"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000692.tgz#34600fd7152352d85a47f4662a3b51b02d8b646f"
+  version "1.0.30000696"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000696.tgz#30f2695d2a01a0dfd779a26ab83f4d134b3da5cc"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1412,6 +1428,14 @@ chalk@^0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
+chalk@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1448,8 +1472,8 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 clean-css@4.1.x:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.4.tgz#eec8811db27457e0078d8ca921fa81b72fa82bf4"
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.5.tgz#d09a87a02a5375117589796ae76a063cacdb541a"
   dependencies:
     source-map "0.5.x"
 
@@ -1654,6 +1678,22 @@ concat-stream@^1.4.10, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concordance@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/concordance/-/concordance-2.0.0.tgz#c3c5dbffa83c29537df202bded8fa1d6aa94e805"
+  dependencies:
+    esutils "^2.0.2"
+    fast-diff "^1.1.1"
+    function-name-support "^0.2.0"
+    js-string-escape "^1.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.flattendeep "^4.4.0"
+    lodash.merge "^4.6.0"
+    md5-hex "^2.0.0"
+    moment "^2.18.1"
+    semver "^5.3.0"
+    well-known-symbols "^1.0.0"
+
 config-chain@~1.1.5:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
@@ -1899,7 +1939,7 @@ core-assert@^0.2.0:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
-core-js@^2.0.0, core-js@^2.4.0:
+core-js@^2.0.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
@@ -2155,12 +2195,6 @@ 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.2.0, debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
 debug@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
@@ -2173,6 +2207,12 @@ debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
+debug@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
 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"
@@ -2265,14 +2305,6 @@ detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
 
-diff-match-patch@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
-
-diff@^3.0.0, diff@^3.0.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2396,8 +2428,8 @@ ejs@^2.3.4, ejs@^2.5.6:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
-  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
+  version "1.3.15"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz#08397934891cbcfaebbd18b82a95b5a481138369"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2433,8 +2465,8 @@ encoding@^0.1.11:
     iconv-lite "~0.4.13"
 
 enhanced-resolve@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -2555,19 +2587,18 @@ eslint-config-standard@^10.2.1:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
 
-eslint-import-resolver-node@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
+eslint-import-resolver-node@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.1.tgz#4422574cde66a9a7b099938ee4d508a199e0e3cc"
   dependencies:
-    debug "^2.2.0"
-    object-assign "^4.0.1"
-    resolve "^1.1.6"
+    debug "^2.6.8"
+    resolve "^1.2.0"
 
 eslint-module-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
   dependencies:
-    debug "2.2.0"
+    debug "^2.6.8"
     pkg-dir "^1.0.0"
 
 eslint-plugin-html@^3.0.0:
@@ -2576,24 +2607,24 @@ eslint-plugin-html@^3.0.0:
   dependencies:
     htmlparser2 "^3.8.2"
 
-eslint-plugin-import@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.3.0.tgz#37c801e0ada0e296cbdf20c3f393acb5b52af36b"
+eslint-plugin-import@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.6.1.tgz#f580be62bb809421d46e338372764afcc9f59bf6"
   dependencies:
     builtin-modules "^1.1.1"
     contains-path "^0.1.0"
-    debug "^2.2.0"
+    debug "^2.6.8"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.2.0"
+    eslint-import-resolver-node "^0.3.1"
     eslint-module-utils "^2.0.0"
     has "^1.0.1"
     lodash.cond "^4.3.0"
     minimatch "^3.0.3"
     read-pkg-up "^2.0.0"
 
-eslint-plugin-node@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.0.0.tgz#948b1fb82e3f0a744e86fad19aa4f49537d246cc"
+eslint-plugin-node@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-5.1.0.tgz#bc8cdb85180d0b4d946a2531640e2a4dd7a4e6d4"
   dependencies:
     ignore "^3.3.3"
     minimatch "^3.0.4"
@@ -2615,9 +2646,9 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.0.0.tgz#7277c01437fdf41dccd168d5aa0e49b75ca1f260"
+eslint@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.1.1.tgz#facbdfcfe3e0facd3a8b80dc98c4e6c13ae582df"
   dependencies:
     babel-code-frame "^6.22.0"
     chalk "^1.1.3"
@@ -2641,6 +2672,7 @@ eslint@^4.0.0:
     json-stable-stringify "^1.0.1"
     levn "^0.3.0"
     lodash "^4.17.4"
+    minimatch "^3.0.2"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
@@ -2851,6 +2883,10 @@ fast-deep-equal@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
 
+fast-diff@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.1.tgz#0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b"
+
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -3053,6 +3089,10 @@ function-bind@^1.0.2, function-bind@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
+function-name-support@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/function-name-support/-/function-name-support-0.2.0.tgz#55d3bfaa6eafd505a50f9bc81fdf57564a0bb071"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -3081,8 +3121,8 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
 get-pkg-repo@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.3.0.tgz#43c6b4c048b75dd604fc5388edecde557f6335df"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -3311,8 +3351,8 @@ hash-sum@^1.0.2:
   resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.1.tgz#5cb2e796499224e69fd0b00ed01d2d4a16e7a323"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
@@ -3350,8 +3390,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
@@ -3380,9 +3420,9 @@ html-minifier@^3.2.3, html-minifier@^3.5.2:
     relateurl "0.2.x"
     uglify-js "3.0.x"
 
-html-webpack-plugin@^2.28.0:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
+html-webpack-plugin@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.29.0.tgz#e987f421853d3b6938c8c4c8171842e5fd17af23"
   dependencies:
     bluebird "^3.4.7"
     html-minifier "^3.2.3"
@@ -3432,7 +3472,7 @@ https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
-hullabaloo-config-manager@^1.0.0:
+hullabaloo-config-manager@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz#1d9117813129ad035fd9e8477eaf066911269fe3"
   dependencies:
@@ -3451,11 +3491,11 @@ hullabaloo-config-manager@^1.0.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13:
+iconv-lite@0.4.13, iconv-lite@~0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+iconv-lite@^0.4.17:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
 
@@ -3485,6 +3525,13 @@ import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
 
+import-local@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3563,8 +3610,8 @@ ipaddr.js@1.3.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
 
 irregular-plurals@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.3.0.tgz#7af06931bdf74be33dcf585a13e06fccc16caecf"
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
@@ -3815,15 +3862,15 @@ istanbul-lib-hook@^1.0.7:
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz#6014b03d3470fb77638d5802508c255c06312e56"
+istanbul-lib-instrument@^1.7.2, istanbul-lib-instrument@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.3.tgz#925b239163eabdd68cc4048f52c2fa4f899ecfa7"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
-    babylon "^6.13.0"
+    babylon "^6.17.4"
     istanbul-lib-coverage "^1.1.1"
     semver "^5.3.0"
 
@@ -3852,71 +3899,6 @@ istanbul-reports@^1.1.1:
   dependencies:
     handlebars "^4.0.3"
 
-jest-diff@19.0.0, jest-diff@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-19.0.0.tgz#d1563cfc56c8b60232988fbc05d4d16ed90f063c"
-  dependencies:
-    chalk "^1.1.3"
-    diff "^3.0.0"
-    jest-matcher-utils "^19.0.0"
-    pretty-format "^19.0.0"
-
-jest-file-exists@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8"
-
-jest-matcher-utils@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d"
-  dependencies:
-    chalk "^1.1.3"
-    pretty-format "^19.0.0"
-
-jest-message-util@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-19.0.0.tgz#721796b89c0e4d761606f9ba8cb828a3b6246416"
-  dependencies:
-    chalk "^1.1.1"
-    micromatch "^2.3.11"
-
-jest-mock@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-19.0.0.tgz#67038641e9607ab2ce08ec4a8cb83aabbc899d01"
-
-jest-snapshot@19.0.2:
-  version "19.0.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b"
-  dependencies:
-    chalk "^1.1.3"
-    jest-diff "^19.0.0"
-    jest-file-exists "^19.0.0"
-    jest-matcher-utils "^19.0.0"
-    jest-util "^19.0.2"
-    natural-compare "^1.4.0"
-    pretty-format "^19.0.0"
-
-jest-util@^19.0.2:
-  version "19.0.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41"
-  dependencies:
-    chalk "^1.1.1"
-    graceful-fs "^4.1.6"
-    jest-file-exists "^19.0.0"
-    jest-message-util "^19.0.0"
-    jest-mock "^19.0.0"
-    jest-validate "^19.0.2"
-    leven "^2.0.0"
-    mkdirp "^0.5.1"
-
-jest-validate@^19.0.2:
-  version "19.0.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c"
-  dependencies:
-    chalk "^1.1.1"
-    jest-matcher-utils "^19.0.0"
-    leven "^2.0.0"
-    pretty-format "^19.0.0"
-
 js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
@@ -3930,9 +3912,13 @@ js-beautify@^1.6.3:
     mkdirp "~0.5.0"
     nopt "~3.0.1"
 
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+
 js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
 js-yaml@^3.4.3, js-yaml@^3.8.2, js-yaml@^3.8.4:
   version "3.8.4"
@@ -3956,9 +3942,9 @@ jschardet@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
 
-jsdom@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
+jsdom@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.1.0.tgz#6c48d7a48ffc5c300283c312904d15da8360509b"
   dependencies:
     abab "^1.0.3"
     acorn "^4.0.4"
@@ -3969,7 +3955,7 @@ jsdom@^11.0.0:
     cssstyle ">= 0.2.37 < 0.3.0"
     escodegen "^1.6.1"
     html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
+    nwmatcher "^1.4.1"
     parse5 "^3.0.2"
     pn "^1.0.0"
     request "^2.79.0"
@@ -3979,7 +3965,7 @@ jsdom@^11.0.0:
     tough-cookie "^2.3.2"
     webidl-conversions "^4.0.0"
     whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
+    whatwg-url "^6.1.0"
     xml-name-validator "^2.0.1"
 
 jsesc@^1.3.0:
@@ -3995,8 +3981,8 @@ json-loader@^0.5.4:
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
 
 json-schema-traverse@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.0.tgz#0016c0b1ca1efe46d44d37541bcdfc19dcfae0db"
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
 
 json-schema@0.2.3:
   version "0.2.3"
@@ -4129,10 +4115,6 @@ lerna@2.0.0-rc.5:
     write-pkg "^3.0.1"
     yargs "^8.0.1"
 
-leven@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
-
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4239,6 +4221,10 @@ lodash.merge@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+
 lodash.template@^4.0.2, lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
@@ -4483,11 +4469,11 @@ modify-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
 
-moment@^2.6.0:
+moment@^2.18.1, moment@^2.6.0:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
-ms@0.7.1, ms@^0.7.1:
+ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
@@ -4495,6 +4481,10 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-1.0.0.tgz#59adcd22edc543f7b5381862d31387b1f4bc9473"
+
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -4601,8 +4591,8 @@ nopt@~3.0.1:
     abbrev "1"
 
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -4641,8 +4631,8 @@ npm-run-path@^2.0.0:
     path-key "^2.0.0"
 
 npmlog@^4.0.2, npmlog@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -4663,13 +4653,13 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-"nwmatcher@>= 1.3.9 < 2.0.0":
+nwmatcher@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f"
 
-nyc@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.0.2.tgz#9e592a697186028253b668516c38f079c39c08f3"
+nyc@^11.0.3:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.0.3.tgz#0c28bc669a851621709bf7a08503034bee3812b6"
   dependencies:
     archy "^1.0.0"
     arrify "^1.0.1"
@@ -4683,7 +4673,7 @@ nyc@^11.0.2:
     glob "^7.0.6"
     istanbul-lib-coverage "^1.1.1"
     istanbul-lib-hook "^1.0.7"
-    istanbul-lib-instrument "^1.7.2"
+    istanbul-lib-instrument "^1.7.3"
     istanbul-lib-report "^1.1.1"
     istanbul-lib-source-maps "^1.2.1"
     istanbul-reports "^1.1.1"
@@ -4694,7 +4684,7 @@ nyc@^11.0.2:
     resolve-from "^2.0.0"
     rimraf "^2.5.4"
     signal-exit "^3.0.1"
-    spawn-wrap "^1.3.6"
+    spawn-wrap "^1.3.7"
     test-exclude "^4.1.1"
     yargs "^8.0.1"
     yargs-parser "^5.0.0"
@@ -5322,7 +5312,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
@@ -5332,12 +5322,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.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.2.tgz#5c4fea589f0ac3b00caa75b1cbc3a284195b7e5d"
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.5.tgz#efa34f745ca25bd3b3cbd15aa4e03112b8237f3c"
   dependencies:
-    chalk "^1.1.3"
+    chalk "^2.0.1"
     source-map "^0.5.6"
-    supports-color "^3.2.3"
+    supports-color "^4.1.0"
 
 preload-webpack-plugin@^1.2.2:
   version "1.2.2"
@@ -5364,12 +5354,6 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84"
-  dependencies:
-    ansi-styles "^3.0.0"
-
 pretty-ms@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-0.2.2.tgz#da879a682ff33a37011046f13d627f67c73b84f6"
@@ -5548,15 +5532,15 @@ readable-stream@1.0:
     string_decoder "~0.10.x"
 
 readable-stream@^2.0.1, readable-stream@^2.0.2, 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.2.6:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.0.tgz#640f5dcda88c91a8dc60787145629170813a1ed2"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.0"
-    string_decoder "~1.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
 readdirp@^2.0.0:
@@ -5788,6 +5772,12 @@ resolve-cwd@^1.0.0:
   dependencies:
     resolve-from "^2.0.0"
 
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -5915,17 +5905,17 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
 safe-buffer@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
 sax@^1.2.1, sax@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
 schema-utils@^0.3.0:
   version "0.3.0"
@@ -5933,11 +5923,11 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-script-ext-html-webpack-plugin@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195"
+script-ext-html-webpack-plugin@^1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.3.tgz#04c77e68eb45eb6358bf36554a1a358ca60ca2ed"
   dependencies:
-    debug "^2.6.3"
+    debug "^2.6.8"
 
 semver-diff@^2.0.0:
   version "2.1.0"
@@ -6048,6 +6038,12 @@ sort-keys@^1.0.0, sort-keys@^1.1.1, sort-keys@^1.1.2:
   dependencies:
     is-plain-obj "^1.0.0"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
@@ -6078,9 +6074,9 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
-spawn-wrap@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.6.tgz#ccec4a949d8ce7e2b1a35cf4671d683d2e76a1d1"
+spawn-wrap@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.7.tgz#beb8bf4426d64b2b06871e0d7dee2643f1f8d1bc"
   dependencies:
     foreground-child "^1.5.6"
     mkdirp "^0.5.0"
@@ -6191,21 +6187,21 @@ string-width@^1.0.1, string-width@^1.0.2:
     strip-ansi "^3.0.0"
 
 string-width@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.0.tgz#030664561fc146c9423ec7d978fe2457437fe6d0"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^3.0.0"
+    strip-ansi "^4.0.0"
 
 string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
+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.0.1"
+    safe-buffer "~5.1.0"
 
 stringstream@~0.0.4:
   version "0.0.5"
@@ -6217,6 +6213,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-ansi@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
@@ -6271,6 +6273,12 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^4.0.0, supports-color@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.1.0.tgz#92cc14bb3dad8928ca5656c33e19a19f20af5c7a"
+  dependencies:
+    has-flag "^2.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -6446,7 +6454,7 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
-trim-off-newlines@^1.0.0:
+trim-off-newlines@^1.0.0, trim-off-newlines@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
 
@@ -6493,9 +6501,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@3.0.x, uglify-js@^3.0.18:
-  version "3.0.18"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.18.tgz#d67a3e5a0a08356b787fb1c9bddf3a807630902e"
+uglify-js@3.0.x, uglify-js@^3.0.23:
+  version "3.0.23"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.23.tgz#a58c6b97e6d6763d94dbc265fe8e8c1725e64666"
   dependencies:
     commander "~2.9.0"
     source-map "~0.5.1"
@@ -6679,23 +6687,23 @@ vue-hot-reload-api@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
 
-vue-loader@^12.2.1:
-  version "12.2.1"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-12.2.1.tgz#53f27c0973d386768f5a75156f4129b5efc6ba55"
+vue-loader@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.0.tgz#403135a3fc71b78235d4317f21fe2b0d39938a57"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
     js-beautify "^1.6.3"
     loader-utils "^1.1.0"
     lru-cache "^4.0.1"
-    postcss "^5.0.21"
+    postcss "^6.0.1"
     postcss-load-config "^1.1.0"
     postcss-selector-parser "^2.0.0"
     resolve "^1.3.3"
     source-map "^0.5.6"
     vue-hot-reload-api "^2.1.0"
     vue-style-loader "^3.0.0"
-    vue-template-es2015-compiler "^1.2.2"
+    vue-template-es2015-compiler "^1.5.3"
 
 vue-meta@^1.0.4:
   version "1.0.4"
@@ -6705,9 +6713,9 @@ vue-meta@^1.0.4:
     lodash.isplainobject "^4.0.6"
     object-assign "^4.1.1"
 
-vue-router@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.6.0.tgz#77b271f6e0ac6d57e8e556da58c6582fce0ab712"
+vue-router@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.7.0.tgz#16d424493aa51c3c8cce8b7c7210ea4c3a89aff1"
 
 vue-server-renderer@~2.3.4:
   version "2.3.4"
@@ -6742,9 +6750,9 @@ vue-template-compiler@~2.3.4:
     de-indent "^1.0.2"
     he "^1.1.0"
 
-vue-template-es2015-compiler@^1.2.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
+vue-template-es2015-compiler@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
 vue@~2.3.4:
   version "2.3.4"
@@ -6768,11 +6776,7 @@ wcwidth@^1.0.0:
   dependencies:
     defaults "^1.0.3"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0:
+webidl-conversions@^4.0.0, webidl-conversions@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
 
@@ -6792,21 +6796,22 @@ webpack-bundle-analyzer@^2.8.2:
     opener "^1.4.3"
     ws "^2.3.1"
 
-webpack-dev-middleware@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
+webpack-dev-middleware@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz#09691d0973a30ad1f82ac73a12e2087f0a4754f9"
   dependencies:
     memory-fs "~0.4.1"
     mime "^1.3.4"
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
 
-webpack-hot-middleware@^2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3"
+webpack-hot-middleware@^2.18.1:
+  version "2.18.1"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.1.tgz#8b7f4f17a058974213e5058cc861da281506a8a9"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
+    path-browserify "0.0.0"
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
@@ -6848,18 +6853,23 @@ webpack@^3.0.0:
     webpack-sources "^1.0.1"
     yargs "^6.0.0"
 
+well-known-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-1.0.0.tgz#73c78ae81a7726a8fa598e2880801c8b16225518"
+
 whatwg-encoding@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
   dependencies:
     iconv-lite "0.4.13"
 
-whatwg-url@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+whatwg-url@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.1.0.tgz#5fc8279b93d75483b9ced8b26239854847a18578"
   dependencies:
+    lodash.sortby "^4.7.0"
     tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
+    webidl-conversions "^4.0.1"
 
 whet.extend@~0.9.9:
   version "0.9.9"
@@ -6930,7 +6940,7 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.1.0:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-write-json-file@^2.0.0, write-json-file@^2.1.0:
+write-json-file@^2.0.0, write-json-file@^2.1.0, write-json-file@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
   dependencies:
@@ -6949,11 +6959,11 @@ write-pkg@^2.0.0:
     write-json-file "^2.0.0"
 
 write-pkg@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.0.1.tgz#f95245805be6f6a4eb1d6c31c43b57226815e6e3"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9"
   dependencies:
-    sort-keys "^1.1.2"
-    write-json-file "^2.0.0"
+    sort-keys "^2.0.0"
+    write-json-file "^2.2.0"
 
 write@^0.2.1:
   version "0.2.1"

From 0831f9c5bc4ac14d70698dcedec85f3015d3fd38 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 4 Jul 2017 18:38:09 +0200
Subject: [PATCH 169/236] Use es6-promise instead

---
 lib/app/index.js |  2 +-
 package.json     |  2 +-
 yarn.lock        | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index 8cbe67c97d..2d78288b7a 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import 'core-js/fn/promise'
+import 'es6-promise/auto'
 import Vue from 'vue'
 import Meta from 'vue-meta'
 import { createRouter } from './router.js'
diff --git a/package.json b/package.json
index 507a90ff1c..5285e81346 100644
--- a/package.json
+++ b/package.json
@@ -77,9 +77,9 @@
     "clone": "^2.1.1",
     "compression": "^1.6.2",
     "connect": "^3.6.2",
-    "core-js": "^2.4.1",
     "css-loader": "^0.28.4",
     "debug": "^2.6.8",
+    "es6-promise": "^4.1.1",
     "etag": "^1.8.0",
     "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.11.2",
diff --git a/yarn.lock b/yarn.lock
index 3d2cb3b248..557677c584 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1939,7 +1939,7 @@ core-assert@^0.2.0:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
-core-js@^2.0.0, core-js@^2.4.0, core-js@^2.4.1:
+core-js@^2.0.0, core-js@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
@@ -2529,6 +2529,10 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
+es6-promise@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
+
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -3491,11 +3495,11 @@ hullabaloo-config-manager@^1.1.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13, iconv-lite@~0.4.13:
+iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.17:
+iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
 

From 9475e1c431a2d3b1ce86d77c3193a780de1eb249 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 5 Jul 2017 02:20:43 +0430
Subject: [PATCH 170/236] feat: top level ssr option

---
 lib/builder/webpack/client.config.js |  2 +-
 lib/core/options.js                  |  3 ++-
 lib/core/renderer.js                 | 10 ++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
index 2cf2d1d65b..9e9834fdfd 100644
--- a/lib/builder/webpack/client.config.js
+++ b/lib/builder/webpack/client.config.js
@@ -64,7 +64,7 @@ export default function webpackClientConfig () {
   config.plugins.push(
     new HTMLPlugin({
       template: this.options.appTemplatePath,
-      inject: this.options.render.ssr === false,
+      inject: this.options.ssr === false,
       chunksSortMode: 'dependency'
     })
   )
diff --git a/lib/core/options.js b/lib/core/options.js
index ee7ada1187..c89b9ddea0 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -130,8 +130,9 @@ export const defaultOptions = {
     scrollBehavior: null,
     fallback: false
   },
+  ssr: {},
   render: {
-    ssr: {},
+    bundleRenderer: {},
     resourceHints: true,
     http2: {
       push: false
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 36338fa055..2e36ed2f20 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -121,7 +121,7 @@ export default class Renderer extends Tapable {
   }
 
   get noSSR () {
-    return this.options.render.ssr === false
+    return this.options.ssr === false
   }
 
   createRenderer () {
@@ -140,13 +140,7 @@ export default class Renderer extends Tapable {
       clientManifest: this.resources.clientManifest,
       runInNewContext: false,
       basedir: this.options.rootDir
-    }, this.options.render.ssr, this.options.build.ssr))
-
-    /* istanbul ignore if */
-    if (this.options.build.ssr) {
-      // eslint-disable-next-line no-console
-      console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `render.ssr` instead!')
-    }
+    }, this.options.render.bundleRenderer))
 
     // Promisify renderToString
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)

From 498c6be7a5dae0d521fe70ceba67ea05560a5768 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 5 Jul 2017 02:56:01 +0430
Subject: [PATCH 171/236] feat(generator): refactor generate into functions

---
 lib/builder/generator.js | 152 ++++++++++++++++++++++-----------------
 1 file changed, 86 insertions(+), 66 deletions(-)

diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index 5eb4bf0c02..1f01bea614 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -26,34 +26,27 @@ export default class Generator extends Tapable {
     this.nuxt.applyPluginsAsync('generator', this).catch(this.nuxt.errorHandler)
   }
 
-  async generate (doBuild = true) {
+  async generate ({ build = true, init = true } = {}) {
     const s = Date.now()
     let errors = []
-    let generateRoutes = []
 
     // Wait for nuxt be ready
     await this.nuxt.ready()
 
     // Start build process
-    if (this.builder && doBuild) {
+    if (this.builder && build) {
       await this.builder.build()
     }
 
-    await this.applyPluginsAsync('before-generate', this)
+    await this.applyPluginsAsync('beforeGenerate', this)
 
-    // Clean destination folder
-    await remove(this.distPath)
-    debug('Destination folder cleaned')
-
-    // Copy static and built files
-    /* istanbul ignore if */
-    if (fs.existsSync(this.generateRoutes)) {
-      await copy(this.generateRoutes, this.distPath)
+    // Initialize dist directory
+    if (init) {
+      await this.initDist()
     }
-    await copy(this.srcBuiltPath, this.distNuxtPath)
-    debug('Static & build files copied')
 
     // Resolve config.generate.routes promises before generating the routes
+    let generateRoutes = []
     if (this.options.router.mode !== 'hash') {
       try {
         console.log('Generating routes') // eslint-disable-line no-console
@@ -66,70 +59,21 @@ export default class Generator extends Tapable {
       }
     }
 
-    const decorateWithPayloads = (routes) => {
-      let routeMap = {}
-      // Fill routeMap for known routes
-      routes.forEach((route) => {
-        routeMap[route] = {
-          route,
-          payload: null
-        }
-      })
-      // Fill routeMap with given generate.routes
-      generateRoutes.forEach((route) => {
-        // route is either a string or like {route : "/my_route/1"}
-        const path = _.isString(route) ? route : route.route
-        routeMap[path] = {
-          route: path,
-          payload: route.payload || null
-        }
-      })
-      return _.values(routeMap)
-    }
-
     // Generate only index.html for router.mode = 'hash'
     let routes = (this.options.router.mode === 'hash') ? ['/'] : flatRoutes(this.options.router.routes)
-    routes = decorateWithPayloads(routes)
+    routes = this.decorateWithPayloads(routes, generateRoutes)
 
     await this.applyPluginsAsync('generate', {generator: this, routes})
 
+    // Start generate process
     while (routes.length) {
       let n = 0
       await Promise.all(routes.splice(0, 500).map(async ({ route, payload }) => {
         await waitFor(n++ * this.options.generate.interval)
-        let html
-        try {
-          const res = await this.nuxt.renderer.renderRoute(route, { _generate: true, payload })
-          html = res.html
-          if (res.error) {
-            errors.push({ type: 'handled', route, error: res.error })
-          }
-        } catch (err) {
-          /* istanbul ignore next */
-          return errors.push({ type: 'unhandled', route, error: err })
-        }
-        if (this.options.generate.minify) {
-          try {
-            html = minify(html, this.options.generate.minify)
-          } catch (err) /* istanbul ignore next */ {
-            const minifyErr = new Error(`HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n ${html}`)
-            errors.push({ type: 'unhandled', route, error: minifyErr })
-          }
-        }
-        let path = join(route, sep, 'index.html') // /about -> /about/index.html
-        path = (path === '/404/index.html') ? '/404.html' : path // /404 -> /404.html
-        debug('Generate file: ' + path)
-        path = join(this.distPath, path)
-        // Make sure the sub folders are created
-        await mkdirp(dirname(path))
-        await writeFile(path, html, 'utf8')
+        await this.generateRoute({route, payload, errors})
       }))
     }
 
-    // Add .nojekyll file to let Github Pages add the _nuxt/ folder
-    // https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
-    const nojekyllPath = resolve(this.distPath, '.nojekyll')
-    writeFile(nojekyllPath, '')
     const duration = Math.round((Date.now() - s) / 100) / 10
     debug(`HTML Files generated in ${duration}s`)
 
@@ -149,4 +93,80 @@ export default class Generator extends Tapable {
 
     return { duration, errors }
   }
+
+  async initDist () {
+    // Clean destination folder
+    await remove(this.distPath)
+    debug('Destination folder cleaned')
+
+    // Copy static and built files
+    /* istanbul ignore if */
+    if (fs.existsSync(this.generateRoutes)) {
+      await copy(this.generateRoutes, this.distPath)
+    }
+    await copy(this.srcBuiltPath, this.distNuxtPath)
+
+    // Add .nojekyll file to let Github Pages add the _nuxt/ folder
+    // https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
+    const nojekyllPath = resolve(this.distPath, '.nojekyll')
+    writeFile(nojekyllPath, '')
+
+    debug('Static & build files copied')
+  }
+
+  decorateWithPayloads (routes, generateRoutes) {
+    let routeMap = {}
+    // Fill routeMap for known routes
+    routes.forEach((route) => {
+      routeMap[route] = {
+        route,
+        payload: null
+      }
+    })
+    // Fill routeMap with given generate.routes
+    generateRoutes.forEach((route) => {
+      // route is either a string or like {route : "/my_route/1"}
+      const path = _.isString(route) ? route : route.route
+      routeMap[path] = {
+        route: path,
+        payload: route.payload || null
+      }
+    })
+    return _.values(routeMap)
+  }
+
+  async generateRoute ({route, payload = {}, errors = []}) {
+    let html
+
+    try {
+      const res = await this.nuxt.renderer.renderRoute(route, { _generate: true, payload })
+      html = res.html
+      if (res.error) {
+        errors.push({ type: 'handled', route, error: res.error })
+      }
+    } catch (err) {
+      /* istanbul ignore next */
+      return errors.push({ type: 'unhandled', route, error: err })
+    }
+
+    if (this.options.generate.minify) {
+      try {
+        html = minify(html, this.options.generate.minify)
+      } catch (err) /* istanbul ignore next */ {
+        const minifyErr = new Error(`HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n ${html}`)
+        errors.push({ type: 'unhandled', route, error: minifyErr })
+      }
+    }
+
+    let path = join(route, sep, 'index.html') // /about -> /about/index.html
+    path = (path === '/404/index.html') ? '/404.html' : path // /404 -> /404.html
+    debug('Generate file: ' + path)
+    path = join(this.distPath, path)
+
+    // Make sure the sub folders are created
+    await mkdirp(dirname(path))
+    await writeFile(path, html, 'utf8')
+
+    return true
+  }
 }

From a2f62b3bbd66c74f6626a94969f5c85f4a2f510e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Wed, 5 Jul 2017 02:56:42 +0430
Subject: [PATCH 172/236] fix: support for vue-loader 13.0.0

https://github.com/vuejs/vue-loader/releases/tag/v13.0.0
---
 lib/app/App.vue   | 2 +-
 lib/app/router.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/app/App.vue b/lib/app/App.vue
index fa8ef6d403..e2e2cd4c8d 100644
--- a/lib/app/App.vue
+++ b/lib/app/App.vue
@@ -15,7 +15,7 @@ let layouts = {
 <%
 var layoutsKeys = Object.keys(layouts);
 layoutsKeys.forEach(function (key, i) { %>
-  "_<%= key %>": () => import('<%= layouts[key] %>'  /* webpackChunkName: "layouts/<%= key %>" */)<%= (i + 1) < layoutsKeys.length ? ',' : '' %>
+  "_<%= key %>": () => import('<%= layouts[key] %>'  /* webpackChunkName: "layouts/<%= key %>" */).then(m => m.default || m)<%= (i + 1) < layoutsKeys.length ? ',' : '' %>
 <% }) %>
 }
 
diff --git a/lib/app/router.js b/lib/app/router.js
index bb2df26f87..cbeb5acec7 100644
--- a/lib/app/router.js
+++ b/lib/app/router.js
@@ -23,7 +23,7 @@ function recursiveRoutes(routes, tab, components) {
 var _components = []
 var _routes = recursiveRoutes(router.routes, '\t\t', _components)
 uniqBy(_components, '_name').forEach((route) => { %>
-const <%= route._name %> = () => import('<%= relativeToBuild(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */)
+const <%= route._name %> = () => import('<%= relativeToBuild(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */).then(m => m.default || m)
 <% }) %>
 
 <% if (router.scrollBehavior) { %>

From f30a4f716971f60c3eeba897c1363149741793ff Mon Sep 17 00:00:00 2001
From: Marcello Gesmundo <mgesmundo@yoovant.com>
Date: Thu, 6 Jul 2017 15:02:48 +0200
Subject: [PATCH 173/236] Fix #1039

---
 bin/nuxt-build    | 2 +-
 bin/nuxt-dev      | 2 +-
 bin/nuxt-generate | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/nuxt-build b/bin/nuxt-build
index 0141ed65fc..845c0f4039 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // Show logs
-process.env.DEBUG = 'nuxt:*'
+process.env.DEBUG = process.env.DEBUG || 'nuxt:*'
 
 const fs = require('fs')
 const parseArgs = require('minimist')
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 19e4b9de9f..63a2df52f9 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // Show logs
-process.env.DEBUG = 'nuxt:*'
+process.env.DEBUG = process.env.DEBUG || 'nuxt:*'
 
 const _ = require('lodash')
 const debug = require('debug')('nuxt:build')
diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index fd97bc4fde..8cd5162fc2 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // Show logs
-process.env.DEBUG = 'nuxt:*'
+process.env.DEBUG = process.env.DEBUG || 'nuxt:*'
 
 const fs = require('fs')
 const parseArgs = require('minimist')

From aaf924f49dda07e338a3b8e9df2592c7a4bff5d6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 7 Jul 2017 02:03:11 +0430
Subject: [PATCH 174/236] fix(asyncData): keep results in ssrContext

---
 lib/app/server.js | 5 ++++-
 lib/app/utils.js  | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/app/server.js b/lib/app/server.js
index dbf770840c..ee38ab566a 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -53,6 +53,8 @@ export default async (context) => {
   context.meta = _app.$meta()
   // Error function
   context.error = _app.$options._nuxt.error.bind(_app)
+  // Keep asyncData for each matched component in context
+  context.asyncData = {}
 
   <%= (isDev ? 'const s = isDev && Date.now()' : '') %>
   let ctx = getContext(context, app)
@@ -144,7 +146,8 @@ export default async (context) => {
       let promise = promisify(Component.options.asyncData.bind(_this), ctx)
       // Call asyncData(context)
       promise.then((asyncDataResult) => {
-        applyAsyncData(Component, asyncDataResult)
+        context.asyncData[Component.options.name] = asyncDataResult
+        applyAsyncData(Component)
         return asyncDataResult
       })
       promises.push(promise)
diff --git a/lib/app/utils.js b/lib/app/utils.js
index edd88defb2..8260b383d4 100644
--- a/lib/app/utils.js
+++ b/lib/app/utils.js
@@ -5,8 +5,16 @@ const noopData = () => ({})
 
 export function applyAsyncData (Component, asyncData = {}) {
   const ComponentData = Component.options.data || noopData
+  // Prevent calling this method for each request on SSR context
+  if(!asyncData && Component.options.hasAsyncData) {
+    return
+  }
+  Component.options.hasAsyncData = true
   Component.options.data = function () {
     const data =  ComponentData.call(this)
+    if(this.$ssrContext) {
+      asyncData = this.$ssrContext.asyncData[Component.options.name]
+    }
     return { ...data, ...asyncData }
   }
   if (Component._Ctor && Component._Ctor.options) {

From 9226f606b57bfc03ab1a3ad951b13025e48683d3 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 7 Jul 2017 02:43:35 +0430
Subject: [PATCH 175/236] fix(dynamic components): temporary fix for vue-loader
 13.0.0

---
 lib/app/client.js | 2 ++
 lib/app/server.js | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/lib/app/client.js b/lib/app/client.js
index bdf1032952..4f2d18de10 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -180,6 +180,8 @@ async function render (to, from, next) {
       return Promise.all(promises)
       .then(() => {
         Object.keys(_this.components).forEach((name) => {
+          // Sanetize resolved components (Temporary workaround for vue-loader 13.0.0)
+          _this.components[name] = _this.components[name].default || _this.components[name]
           Component.options.components[name] = _this.components[name]
         })
       })
diff --git a/lib/app/server.js b/lib/app/server.js
index ee38ab566a..fbddf38aa9 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -159,6 +159,10 @@ export default async (context) => {
     .then((data) => {
       // If not dyanmic component, return data directly
       if (Object.keys(_this.components).length === 0) return data
+      // Sanetize resolved components (Temporary workaround for vue-loader 13.0.0)
+      Object.keys(_this.components).forEach(name => {
+        _this.components[name] = _this.components[name].default || _this.components[name]
+      })
       // Tell renderer that dynamic components has been added
       context.hasDynamicComponents = true
       // Add Component on server side (clone of it)

From b02dfc7ebc819ed1d720b814577c4633ebf79687 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 7 Jul 2017 02:57:27 +0430
Subject: [PATCH 176/236] update tests

---
 test/fixtures/module/modules/basic/index.js      |  4 ++--
 test/fixtures/module/modules/middleware/index.js |  5 ++---
 test/fixtures/module/modules/middleware/midd1.js |  6 +++---
 test/fixtures/module/modules/middleware/midd2.js |  6 +++---
 test/fixtures/module/nuxt.config.js              |  4 ++--
 test/fixtures/module/router.js                   |  4 ++--
 test/fixtures/with-config/nuxt.config.js         | 10 +++++-----
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/test/fixtures/module/modules/basic/index.js b/test/fixtures/module/modules/basic/index.js
index 2604ae1327..864007865b 100755
--- a/test/fixtures/module/modules/basic/index.js
+++ b/test/fixtures/module/modules/basic/index.js
@@ -23,8 +23,8 @@ module.exports = function basicModule (options, resolve) {
   })
 
   // Require same module twice
-  this.requireModule('@/modules/empty/index.js')
-  this.requireModule('@/modules/empty/index.js')
+  this.requireModule('~/modules/empty/index.js')
+  this.requireModule('~/modules/empty/index.js')
 
   resolve()
 }
diff --git a/test/fixtures/module/modules/middleware/index.js b/test/fixtures/module/modules/middleware/index.js
index d97c71cbef..4fee13ae84 100755
--- a/test/fixtures/module/modules/middleware/index.js
+++ b/test/fixtures/module/modules/middleware/index.js
@@ -1,4 +1,3 @@
-
 module.exports = function middlewareModule (options) {
   return new Promise((resolve, reject) => {
     // Add /api endpoint
@@ -9,14 +8,14 @@ module.exports = function middlewareModule (options) {
       }
     })
     // Add local middleware js
-    this.addServerMiddleware('@modules/middleware/log.js')
+    this.addServerMiddleware('~/modules/middleware/log.js')
     // Add plain middleware
     this.addServerMiddleware((req, res, next) => {
       res.setHeader('x-nuxt', 'hello')
       next()
     })
     // Add file middleware
-    this.addServerMiddleware('@modules/middleware/midd1')
+    this.addServerMiddleware('~/modules/middleware/midd1')
     resolve()
   })
 }
diff --git a/test/fixtures/module/modules/middleware/midd1.js b/test/fixtures/module/modules/middleware/midd1.js
index 4c109b5637..78ec0d0355 100644
--- a/test/fixtures/module/modules/middleware/midd1.js
+++ b/test/fixtures/module/modules/middleware/midd1.js
@@ -1,4 +1,4 @@
 module.exports = function (req, res, next) {
-    res.setHeader('x-midd-1', 'ok')
-    next()
-}
\ No newline at end of file
+  res.setHeader('x-midd-1', 'ok')
+  next()
+}
diff --git a/test/fixtures/module/modules/middleware/midd2.js b/test/fixtures/module/modules/middleware/midd2.js
index 95ae3940dc..64babff282 100644
--- a/test/fixtures/module/modules/middleware/midd2.js
+++ b/test/fixtures/module/modules/middleware/midd2.js
@@ -1,4 +1,4 @@
 module.exports = function (req, res, next) {
-    res.setHeader('x-midd-2', 'ok')
-    next()
-}
\ No newline at end of file
+  res.setHeader('x-midd-2', 'ok')
+  next()
+}
diff --git a/test/fixtures/module/nuxt.config.js b/test/fixtures/module/nuxt.config.js
index 78090df4ee..26f1351403 100755
--- a/test/fixtures/module/nuxt.config.js
+++ b/test/fixtures/module/nuxt.config.js
@@ -1,9 +1,9 @@
 module.exports = {
   loading: true,
   modules: [
-    '~modules/basic', // Use ~ for deprication warning coverage
+    '~/modules/basic', // Use ~ for deprication warning coverage
     {
-      src: '@/modules/middleware',
+      src: '~/modules/middleware',
       options: {
         foo: 'bar'
       }
diff --git a/test/fixtures/module/router.js b/test/fixtures/module/router.js
index 810cb67757..6fe636aeab 100644
--- a/test/fixtures/module/router.js
+++ b/test/fixtures/module/router.js
@@ -9,12 +9,12 @@ export function createRouter () {
     routes: [
       {
         path: '/',
-        component: require('~/views/index.vue'),
+        component: require('~/views/index.vue').default,
         name: 'index'
       },
       {
         path: '/about',
-        component: require('~/views/about.vue'),
+        component: require('~/views/about.vue').default,
         name: 'about'
       }
     ]
diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js
index cfff7aaa2e..339e770469 100644
--- a/test/fixtures/with-config/nuxt.config.js
+++ b/test/fixtures/with-config/nuxt.config.js
@@ -7,17 +7,17 @@ module.exports = {
       routes.push({
         name: 'about-bis',
         path: '/about-bis',
-        component: '@pages/about.vue'
+        component: '~/pages/about.vue'
       })
     }
   },
   transition: 'test',
   offline: true,
   plugins: [
-    '~plugins/test.js', // Use ~ for deprication warning coverage
-    { src: '@plugins/only-client.js', ssr: false }
+    '~/plugins/test.js', // Use ~ for deprication warning coverage
+    { src: '~/plugins/only-client.js', ssr: false }
   ],
-  loading: '@components/loading',
+  loading: '~/components/loading',
   env: {
     bool: true,
     num: 23,
@@ -35,7 +35,7 @@ module.exports = {
     }
   },
   css: [
-    { src: '@assets/app.css' }
+    { src: '~/assets/app.css' }
   ],
   render: {
     http2: {

From 59d335b6968329119264e51379be4f9cd58a9942 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Fri, 7 Jul 2017 12:25:14 +0200
Subject: [PATCH 177/236] Update CSS example

---
 examples/custom-layouts/layouts/dark.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/custom-layouts/layouts/dark.vue b/examples/custom-layouts/layouts/dark.vue
index 5c3d13f4f4..d3d547c451 100644
--- a/examples/custom-layouts/layouts/dark.vue
+++ b/examples/custom-layouts/layouts/dark.vue
@@ -5,6 +5,9 @@
 </template>
 
 <style>
+body {
+  overflow: hidden;
+}
 .dark {
   position: absolute;
   top: 0;

From a4c4b88de41fd8d4aaaba57891b074732c999c17 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Fri, 7 Jul 2017 15:41:25 +0200
Subject: [PATCH 178/236] Use boolean for ssr option

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

diff --git a/lib/core/options.js b/lib/core/options.js
index c89b9ddea0..2a9f615d6e 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -130,7 +130,7 @@ export const defaultOptions = {
     scrollBehavior: null,
     fallback: false
   },
-  ssr: {},
+  ssr: true,
   render: {
     bundleRenderer: {},
     resourceHints: true,

From b65f4533c63e885213a75a67dd7ac632f25d53c5 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Fri, 7 Jul 2017 15:41:33 +0200
Subject: [PATCH 179/236] Remove console.log

---
 examples/nested-routes/pages/index/_id.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/nested-routes/pages/index/_id.vue b/examples/nested-routes/pages/index/_id.vue
index 0441f3fedd..9ad39e30eb 100644
--- a/examples/nested-routes/pages/index/_id.vue
+++ b/examples/nested-routes/pages/index/_id.vue
@@ -15,7 +15,6 @@ export default {
     if (!user) {
       return error({ message: 'User not found', statusCode: 404 })
     }
-    console.log(user)
     return user
   }
 }

From e5906e5ac4abab3f29038d61339be872f7bf57c8 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Fri, 7 Jul 2017 15:44:04 +0200
Subject: [PATCH 180/236] Avoid loop redirect on server-side

---
 lib/app/server.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/app/server.js b/lib/app/server.js
index fbddf38aa9..7bcc1eb43a 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -32,6 +32,11 @@ export default async (context) => {
     if (opts.path.indexOf('http') !== 0 && ('<%= router.base %>' !== '/' && opts.path.indexOf('<%= router.base %>') !== 0)) {
       opts.path = urlJoin('<%= router.base %>', opts.path)
     }
+    // Avoid loop redirect
+    if (opts.path === context.url) {
+      context.redirected = false
+      return
+    }
     context.res.writeHead(opts.status, {
       'Location': opts.path
     })
@@ -74,12 +79,14 @@ export default async (context) => {
   }
   // nuxtServerInit
   <% if (store) { %>
-    let promise = (store._actions && store._actions.nuxtServerInit ? store.dispatch('nuxtServerInit', omit(getContext(context, app), 'redirect', 'error')) : null)
+    let promise = (store._actions && store._actions.nuxtServerInit ? store.dispatch('nuxtServerInit', getContext(context, app)) : null)
     if (!promise || (!(promise instanceof Promise) && (typeof promise.then !== 'function'))) promise = Promise.resolve()
   <% } else { %>
     let promise = Promise.resolve()
   <% } %>
   await promise
+  // If nuxtServerInit made a redirect
+  if (context.redirected) return _noopApp
   // Call global middleware (nuxt.config.js)
   let midd = <%= serialize(router.middleware, { isJSON: true }) %>
   midd = midd.map((name) => {
@@ -222,4 +229,4 @@ function sanitizeDynamicComponents(components) {
     components[name] = component
   })
   return clone(components)
-}
\ No newline at end of file
+}

From 67939fd0661b854c20b89fbc3444903405d1210a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 17:13:54 +0200
Subject: [PATCH 181/236] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5d63377187..44649e4373 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ Support us with a monthly donation and help us continue our activities. [[Become
 - 📘 Documentation: [https://nuxtjs.org](https://nuxtjs.org)
 - 🎬 Video: [1 minute demo](https://www.youtube.com/watch?v=kmf-p-pTi40)
 - 🐦 Twitter: [@nuxt_js](https://twitter.com/nuxt_js)
+- 👥 [Nuxt.js Community](https://github.com/nuxt-community)
 - 👉 [Play with Nuxt.js online](https://glitch.com/edit/#!/nuxt-hello-world)
 
 ## Getting started

From 5c8ac31b3c40fcf077d1b9457e68b8329bf29051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 18:04:47 +0200
Subject: [PATCH 182/236] Update example to not use a custom server anymore

---
 examples/auth-routes/api/index.js    | 38 +++++++++++++++++++
 examples/auth-routes/nuxt.config.js  | 26 ++++++++++++-
 examples/auth-routes/package.json    |  8 ++--
 examples/auth-routes/pages/index.vue | 25 +++++++------
 examples/auth-routes/server.js       | 56 ----------------------------
 examples/auth-routes/store/index.js  | 28 ++++++--------
 6 files changed, 92 insertions(+), 89 deletions(-)
 create mode 100644 examples/auth-routes/api/index.js
 delete mode 100644 examples/auth-routes/server.js

diff --git a/examples/auth-routes/api/index.js b/examples/auth-routes/api/index.js
new file mode 100644
index 0000000000..6d68c315f8
--- /dev/null
+++ b/examples/auth-routes/api/index.js
@@ -0,0 +1,38 @@
+const express = require('express')
+
+module.exports = function () {
+  // Create express router
+  const router = express.Router()
+
+  var app = express()
+  // Transform req & res to have the same API as express
+  // So we can use res.status() & res.json()
+  router.use((req, res, next) => {
+    Object.setPrototypeOf(req, app.request)
+    Object.setPrototypeOf(res, app.response)
+    req.res = res
+    res.req = req
+    next()
+  })
+
+  // Add POST - /api/login
+  router.post('/login', (req, res) => {
+    if (req.body.username === 'demo' && req.body.password === 'demo') {
+      req.session.authUser = { username: 'demo' }
+      return res.json({ username: 'demo' })
+    }
+    res.status(401).json({ message: 'Bad credentials' })
+  })
+
+  // Add POST - /api/logout
+  router.post('/logout', (req, res) => {
+    delete req.session.authUser
+    res.json({ ok: true })
+  })
+
+  // Add router to /api
+  this.addServerMiddleware({
+    path: '/api',
+    handler: router
+  })
+}
\ No newline at end of file
diff --git a/examples/auth-routes/nuxt.config.js b/examples/auth-routes/nuxt.config.js
index 46832715a6..7a175740a8 100644
--- a/examples/auth-routes/nuxt.config.js
+++ b/examples/auth-routes/nuxt.config.js
@@ -1,3 +1,6 @@
+const bodyParser = require('body-parser')
+const session = require('express-session')
+
 module.exports = {
   head: {
     title: 'Auth Routes',
@@ -9,5 +12,26 @@ module.exports = {
   },
   build: {
     vendor: ['axios']
-  }
+  },
+  /*
+  ** Add server middleware
+  ** Nuxt.js uses `connect` module as server
+  ** So most of express middleware works with nuxt.js server middleware
+  */
+  serverMiddleware: [
+    // body-parser middleware
+    bodyParser.json(),
+    // session middleware
+    session({
+      secret: 'super-secret-key',
+      resave: false,
+      saveUninitialized: false,
+      cookie: { maxAge: 60000 }
+    })
+  ],
+  /*
+  ** Add our custom module
+  ** In this module we add /api/login & /api/logout routes
+  */
+  modules: ['~/api']
 }
diff --git a/examples/auth-routes/package.json b/examples/auth-routes/package.json
index 5b29455533..dd7c4c3926 100644
--- a/examples/auth-routes/package.json
+++ b/examples/auth-routes/package.json
@@ -1,17 +1,15 @@
 {
   "name": "auth-routes",
-  "description": "",
   "dependencies": {
     "axios": "^0.16.1",
     "body-parser": "^1.17.2",
-    "cross-env": "^5.0.0",
     "express": "^4.15.3",
     "express-session": "^1.15.3",
-    "nuxt": "^1.0.0-alpha1"
+    "nuxt": "latest"
   },
   "scripts": {
-    "dev": "node server.js",
+    "dev": "nuxt",
     "build": "nuxt build",
-    "start": "cross-env NODE_ENV=production node server.js"
+    "start": "nuxt start"
   }
 }
diff --git a/examples/auth-routes/pages/index.vue b/examples/auth-routes/pages/index.vue
index b60f3adefe..ebfd771e60 100644
--- a/examples/auth-routes/pages/index.vue
+++ b/examples/auth-routes/pages/index.vue
@@ -28,22 +28,25 @@ export default {
     }
   },
   methods: {
-    login () {
-      this.$store.dispatch('login', {
-        username: this.formUsername,
-        password: this.formPassword
-      })
-      .then(() => {
+    async login () {
+      try {
+        await this.$store.dispatch('login', {
+          username: this.formUsername,
+          password: this.formPassword
+        })
         this.formUsername = ''
         this.formPassword = ''
         this.formError = null
-      })
-      .catch((e) => {
+      } catch(e) {
         this.formError = e.message
-      })
+      }
     },
-    logout () {
-      this.$store.dispatch('logout')
+    async logout () {
+      try {
+        await this.$store.dispatch('logout')
+      } catch (e) {
+        this.formError = e.message
+      }
     }
   }
 }
diff --git a/examples/auth-routes/server.js b/examples/auth-routes/server.js
deleted file mode 100644
index 4d49e7deac..0000000000
--- a/examples/auth-routes/server.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const Nuxt = require('nuxt')
-const bodyParser = require('body-parser')
-const session = require('express-session')
-const app = require('express')()
-
-const host = process.env.HOST || '127.0.0.1'
-const port = process.env.PORT || '3000'
-
-// Body parser, to access req.body
-app.use(bodyParser.json())
-
-// Sessions to create req.session
-app.use(session({
-  secret: 'super-secret-key',
-  resave: false,
-  saveUninitialized: false,
-  cookie: { maxAge: 60000 }
-}))
-
-// POST /api/login to log in the user and add him to the req.session.authUser
-app.post('/api/login', function (req, res) {
-  if (req.body.username === 'demo' && req.body.password === 'demo') {
-    req.session.authUser = { username: 'demo' }
-    return res.json({ username: 'demo' })
-  }
-  res.status(401).json({ message: 'Bad credentials' })
-})
-
-// POST /api/logout to log out the user and remove it from the req.session
-app.post('/api/logout', function (req, res) {
-  delete req.session.authUser
-  res.json({ ok: true })
-})
-
-// Import and Set Nuxt.js options
-let config = require('./nuxt.config.js')
-config.dev = !(process.env.NODE_ENV === 'production')
-
-// Init Nuxt.js
-new Nuxt(config)
-.then((nuxt) => {
-  // nuxt middlware
-  app.use(nuxt.render)
-  // Build only in dev mode
-  if (config.dev) {
-    nuxt.build()
-    .catch((error) => {
-      console.error(error) // eslint-disable-line no-console
-      process.exit(1)
-    })
-  }
-  // Listen the server
-  app.listen(port, host)
-  console.log('Server listening on ' + host + ':' + port) // eslint-disable-line no-console
-})
-
diff --git a/examples/auth-routes/store/index.js b/examples/auth-routes/store/index.js
index 680602d732..c10587a029 100644
--- a/examples/auth-routes/store/index.js
+++ b/examples/auth-routes/store/index.js
@@ -11,31 +11,27 @@ export const mutations = {
 }
 
 export const actions = {
+  // nuxtServerInit is called by Nuxt.js before server-rendering every page
   nuxtServerInit ({ commit }, { req }) {
     if (req.session && req.session.authUser) {
       commit('SET_USER', req.session.authUser)
     }
   },
-  login ({ commit }, { username, password }) {
-    return axios.post('/api/login', {
-      username,
-      password
-    })
-    .then((res) => {
-      commit('SET_USER', res.data)
-    })
-    .catch((error) => {
-      if (error.response.status === 401) {
+  async login ({ commit }, { username, password }) {
+    try {
+      const { data } = await axios.post('/api/login', { username, password })
+      commit('SET_USER', data)
+    } catch (error) {
+      if (error.response && error.response.status === 401) {
         throw new Error('Bad credentials')
       }
-    })
+      throw error
+    }
   },
 
-  logout ({ commit }) {
-    return axios.post('/api/logout')
-    .then(() => {
-      commit('SET_USER', null)
-    })
+  async logout ({ commit }) {
+    await axios.post('/api/logout')
+    commit('SET_USER', null)
   }
 
 }

From 1f7508d033f3857169bc777d73e052856c9ef8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 18:05:44 +0200
Subject: [PATCH 183/236] Update example

---
 examples/async-data/package.json    |  3 +--
 examples/async-data/pages/index.vue | 11 +++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/examples/async-data/package.json b/examples/async-data/package.json
index 5295e05f5b..028496f7fe 100644
--- a/examples/async-data/package.json
+++ b/examples/async-data/package.json
@@ -1,8 +1,7 @@
 {
   "name": "nuxt-async-data",
-  "description": "",
   "dependencies": {
-    "axios": "^0.15.2",
+    "axios": "latest",
     "nuxt": "latest"
   },
   "scripts": {
diff --git a/examples/async-data/pages/index.vue b/examples/async-data/pages/index.vue
index 0dd6050846..577d468358 100644
--- a/examples/async-data/pages/index.vue
+++ b/examples/async-data/pages/index.vue
@@ -9,14 +9,9 @@
 
 <script>
 export default {
-  asyncData ({ req }, callback) {
-    setTimeout(function () {
-      // callback(err, data)
-      callback(null, {
-        userAgent: (req ? req.headers['user-agent'] : navigator.userAgent)
-      })
-    }, 100)
-  }
+  asyncData: ({ req }) => ({
+    userAgent: (req ? req.headers['user-agent'] : navigator.userAgent)
+  })
 }
 </script>
 

From 1d77431db09eed5fccd4ff68dbfd1acf552c72b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 18:09:47 +0200
Subject: [PATCH 184/236] Use serverMiddleware instead of a module

---
 examples/auth-routes/api/index.js   | 60 ++++++++++++++---------------
 examples/auth-routes/nuxt.config.js | 12 +++---
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/examples/auth-routes/api/index.js b/examples/auth-routes/api/index.js
index 6d68c315f8..c1943b789e 100644
--- a/examples/auth-routes/api/index.js
+++ b/examples/auth-routes/api/index.js
@@ -1,38 +1,36 @@
 const express = require('express')
 
-module.exports = function () {
-  // Create express router
-  const router = express.Router()
+// Create express router
+const router = express.Router()
 
-  var app = express()
-  // Transform req & res to have the same API as express
-  // So we can use res.status() & res.json()
-  router.use((req, res, next) => {
-    Object.setPrototypeOf(req, app.request)
-    Object.setPrototypeOf(res, app.response)
-    req.res = res
-    res.req = req
-    next()
-  })
+// Transform req & res to have the same API as express
+// So we can use res.status() & res.json()
+var app = express()
+router.use((req, res, next) => {
+  Object.setPrototypeOf(req, app.request)
+  Object.setPrototypeOf(res, app.response)
+  req.res = res
+  res.req = req
+  next()
+})
 
-  // Add POST - /api/login
-  router.post('/login', (req, res) => {
-    if (req.body.username === 'demo' && req.body.password === 'demo') {
-      req.session.authUser = { username: 'demo' }
-      return res.json({ username: 'demo' })
-    }
-    res.status(401).json({ message: 'Bad credentials' })
-  })
+// Add POST - /api/login
+router.post('/login', (req, res) => {
+  if (req.body.username === 'demo' && req.body.password === 'demo') {
+    req.session.authUser = { username: 'demo' }
+    return res.json({ username: 'demo' })
+  }
+  res.status(401).json({ message: 'Bad credentials' })
+})
 
-  // Add POST - /api/logout
-  router.post('/logout', (req, res) => {
-    delete req.session.authUser
-    res.json({ ok: true })
-  })
+// Add POST - /api/logout
+router.post('/logout', (req, res) => {
+  delete req.session.authUser
+  res.json({ ok: true })
+})
 
-  // Add router to /api
-  this.addServerMiddleware({
-    path: '/api',
-    handler: router
-  })
+// Export the server middleware
+module.exports = {
+  path: '/api',
+  handler: router
 }
\ No newline at end of file
diff --git a/examples/auth-routes/nuxt.config.js b/examples/auth-routes/nuxt.config.js
index 7a175740a8..1fd2ffb91b 100644
--- a/examples/auth-routes/nuxt.config.js
+++ b/examples/auth-routes/nuxt.config.js
@@ -27,11 +27,9 @@ module.exports = {
       resave: false,
       saveUninitialized: false,
       cookie: { maxAge: 60000 }
-    })
-  ],
-  /*
-  ** Add our custom module
-  ** In this module we add /api/login & /api/logout routes
-  */
-  modules: ['~/api']
+    }),
+    // Api middleware
+    // We add /api/login & /api/logout routes
+    '~/api'
+  ]
 }

From a0c470977789d3f4a9b86901cb437f13cb570422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 18:14:40 +0200
Subject: [PATCH 185/236] Fix typo

---
 examples/auth-routes/middleware/auth.js | 4 +---
 examples/auth-routes/pages/secret.vue   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/auth-routes/middleware/auth.js b/examples/auth-routes/middleware/auth.js
index 2aeeafef6b..fa4b73b642 100644
--- a/examples/auth-routes/middleware/auth.js
+++ b/examples/auth-routes/middleware/auth.js
@@ -1,7 +1,5 @@
-export default function ({ store, redirect, error }) {
-  // If user not connected, redirect to /
+export default function ({ store, error }) {
   if (!store.state.authUser) {
-  //   return redirect('/')
     error({
       message: 'You are not connected',
       statusCode: 403
diff --git a/examples/auth-routes/pages/secret.vue b/examples/auth-routes/pages/secret.vue
index c04a37363c..30dff34b4e 100644
--- a/examples/auth-routes/pages/secret.vue
+++ b/examples/auth-routes/pages/secret.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <h1>Super secret page</h1>
-    <p>If you try to access this URL not connected, you will be redirected to the home page (server-side or client-side)</p>
+    <p>If you try to access this URL not connected, you will see the error page telling your that you are not connected.</p>
     <nuxt-link to="/">Back to the home page</nuxt-link>
   </div>
 </template>

From 4098e68983b15b4a3c702ca43285166485a37674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 18:41:10 +0200
Subject: [PATCH 186/236] Use `render.bundleRenderer`

---
 examples/cached-components/nuxt.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/cached-components/nuxt.config.js b/examples/cached-components/nuxt.config.js
index 9ca68847a0..e9f046659f 100644
--- a/examples/cached-components/nuxt.config.js
+++ b/examples/cached-components/nuxt.config.js
@@ -1,6 +1,6 @@
 module.exports = {
-  build: {
-    ssr: {
+  render: {
+    bundleRenderer: {
       cache: require('lru-cache')({
         max: 1000,
         maxAge: 1000 * 60 * 15

From a39b9fe13b1d4028399b2df9861b98dd856ce28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 18:49:37 +0200
Subject: [PATCH 187/236] Fix typo

---
 examples/custom-loading/components/loading.vue | 2 +-
 examples/custom-loading/nuxt.config.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/custom-loading/components/loading.vue b/examples/custom-loading/components/loading.vue
index 9c28022726..8f05f50d9a 100644
--- a/examples/custom-loading/components/loading.vue
+++ b/examples/custom-loading/components/loading.vue
@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div class="loading-page" v-if="loading">
     <p>Loading...</p>
   </div>
diff --git a/examples/custom-loading/nuxt.config.js b/examples/custom-loading/nuxt.config.js
index a8c0a63907..b37861914c 100644
--- a/examples/custom-loading/nuxt.config.js
+++ b/examples/custom-loading/nuxt.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  loading: 'components/loading.vue'
+  loading: '~/components/loading.vue'
 }

From eaf362910f2dea06d37412d14080bc8b7563fd97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 18:52:29 +0200
Subject: [PATCH 188/236] Use async/await

---
 examples/custom-routes/package.json        |  3 +--
 examples/custom-routes/pages/index.vue     |  8 +++-----
 examples/custom-routes/pages/users/_id.vue | 11 ++++++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/examples/custom-routes/package.json b/examples/custom-routes/package.json
index 31c9724fdb..437be36725 100644
--- a/examples/custom-routes/package.json
+++ b/examples/custom-routes/package.json
@@ -1,8 +1,7 @@
 {
   "name": "nuxt-custom-routes",
-  "description": "",
   "dependencies": {
-    "axios": "^0.15.2",
+    "axios": "latest",
     "nuxt": "latest"
   },
   "scripts": {
diff --git a/examples/custom-routes/pages/index.vue b/examples/custom-routes/pages/index.vue
index 30d2c0a289..50444dc07c 100644
--- a/examples/custom-routes/pages/index.vue
+++ b/examples/custom-routes/pages/index.vue
@@ -13,11 +13,9 @@
 import axios from 'axios'
 
 export default {
-  asyncData () {
-    return axios.get('https://jsonplaceholder.typicode.com/users')
-    .then((res) => {
-      return { users: res.data }
-    })
+  async asyncData () {
+    const { data } = await axios.get('https://jsonplaceholder.typicode.com/users')
+    return { users: data }
   }
 }
 </script>
diff --git a/examples/custom-routes/pages/users/_id.vue b/examples/custom-routes/pages/users/_id.vue
index 87b7abee15..63ff27d8e6 100644
--- a/examples/custom-routes/pages/users/_id.vue
+++ b/examples/custom-routes/pages/users/_id.vue
@@ -14,12 +14,13 @@ export default {
   validate ({ params }) {
     return !isNaN(+params.id)
   },
-  asyncData ({ params, error }) {
-    return axios.get(`https://jsonplaceholder.typicode.com/users/${+params.id}`)
-    .then((res) => res.data)
-    .catch(() => {
+  async asyncData ({ params, error }) {
+    try {
+      const { data } = await axios.get(`https://jsonplaceholder.typicode.com/users/${+params.id}`)
+      return data
+    } catch (e) {
       error({ message: 'User not found', statusCode: 404 })
-    })
+    }
   }
 }
 </script>

From 6164c125248e12c5f50f25a1fa482780785bcc0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 19:40:41 +0200
Subject: [PATCH 189/236] Update example

---
 examples/global-css/nuxt.config.js | 5 ++---
 examples/global-css/package.json   | 7 ++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/examples/global-css/nuxt.config.js b/examples/global-css/nuxt.config.js
index 17c82e8892..f916e5a053 100644
--- a/examples/global-css/nuxt.config.js
+++ b/examples/global-css/nuxt.config.js
@@ -1,6 +1,5 @@
 module.exports = {
   head: {
-    titleTemplate: '%s - Nuxt.js',
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
@@ -8,7 +7,7 @@ module.exports = {
     ]
   },
   css: [
-    'bulma/bulma.sass',
-    '~assets/main.css'
+    'bulma/css/bulma.css',
+    '~/css/main.css'
   ]
 }
diff --git a/examples/global-css/package.json b/examples/global-css/package.json
index 9a60d27928..75e5b4647d 100644
--- a/examples/global-css/package.json
+++ b/examples/global-css/package.json
@@ -1,11 +1,8 @@
 {
   "name": "nuxt-global-css",
   "dependencies": {
-    "bulma": "^0.4.0",
-    "hover.css": "^2.2.0",
-    "node-sass": "^4.5.1",
-    "nuxt": "^0.10.0",
-    "sass-loader": "^6.0.3"
+    "bulma": "^0.4.3",
+    "nuxt": "latest"
   },
   "scripts": {
     "dev": "nuxt",

From 1e064ac180f86b067179f42d7e8a58c818c39b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 19:44:05 +0200
Subject: [PATCH 190/236] Fix path

---
 examples/head-elements/pages/about.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/head-elements/pages/about.vue b/examples/head-elements/pages/about.vue
index 4118718f1d..745878904f 100644
--- a/examples/head-elements/pages/about.vue
+++ b/examples/head-elements/pages/about.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import TwitterHeadCard from '~components/twitter-head-card.vue'
+import TwitterHeadCard from '~/components/twitter-head-card.vue'
 
 export default {
   head: {

From 763ca011e9010a8195d61770831f9a61a71cd8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 19:47:23 +0200
Subject: [PATCH 191/236] Update scripts

---
 examples/hello-world/package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
index 87f109c3f9..92325ecf81 100644
--- a/examples/hello-world/package.json
+++ b/examples/hello-world/package.json
@@ -4,6 +4,8 @@
     "nuxt": "latest"
   },
   "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
     "start": "nuxt"
   }
 }

From 6f84f69b7add8177d74dcf3b322f764edd175ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 19:55:39 +0200
Subject: [PATCH 192/236] Fix paths & typo

---
 examples/i18n/middleware/i18n.js | 2 +-
 examples/i18n/nuxt.config.js     | 2 +-
 examples/i18n/package.json       | 4 ++--
 examples/i18n/pages/about.vue    | 2 +-
 examples/i18n/pages/index.vue    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/i18n/middleware/i18n.js b/examples/i18n/middleware/i18n.js
index c787ca808a..55a26bd41e 100644
--- a/examples/i18n/middleware/i18n.js
+++ b/examples/i18n/middleware/i18n.js
@@ -1,5 +1,5 @@
 export default function ({ app, store, route, params, error, redirect, hotReload }) {
-  // Check if middleware called from hot-reloading, ignore
+  // If middleware is called from hot-reloading, ignore it
   if (hotReload) return
   // Get locale from params
   const locale = params.lang || 'en'
diff --git a/examples/i18n/nuxt.config.js b/examples/i18n/nuxt.config.js
index 726c1e7e10..2502c92ba6 100644
--- a/examples/i18n/nuxt.config.js
+++ b/examples/i18n/nuxt.config.js
@@ -6,7 +6,7 @@ module.exports = {
   router: {
     middleware: 'i18n'
   },
-  plugins: ['~plugins/i18n.js',],
+  plugins: ['~/plugins/i18n.js',],
   generate: {
     routes: ['/', '/about', '/fr', '/fr/about']
   }
diff --git a/examples/i18n/package.json b/examples/i18n/package.json
index d4096ad025..5ca4f709ba 100644
--- a/examples/i18n/package.json
+++ b/examples/i18n/package.json
@@ -1,8 +1,8 @@
 {
   "name": "nuxt-i18n",
   "dependencies": {
-    "nuxt": "1.0.0-alpha.3",
-    "vue-i18n": "^7.0.0"
+    "nuxt": "latest",
+    "vue-i18n": "^7.0.5"
   },
   "scripts": {
     "dev": "nuxt",
diff --git a/examples/i18n/pages/about.vue b/examples/i18n/pages/about.vue
index 17031a84c3..b080865661 100644
--- a/examples/i18n/pages/about.vue
+++ b/examples/i18n/pages/about.vue
@@ -1,4 +1,4 @@
 <script>
-import About from '~pages/_lang/about'
+import About from '~/pages/_lang/about'
 export default About
 </script>
diff --git a/examples/i18n/pages/index.vue b/examples/i18n/pages/index.vue
index fab3df9c9c..f0ca25b6f8 100644
--- a/examples/i18n/pages/index.vue
+++ b/examples/i18n/pages/index.vue
@@ -1,4 +1,4 @@
 <script>
-import Index from '~pages/_lang/index'
+import Index from '~/pages/_lang/index'
 export default Index
 </script>

From 1d0493c0c12bdedde0cda8442f211d62cef322d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 19:58:07 +0200
Subject: [PATCH 193/236] Fix paths

---
 examples/middleware/layouts/default.vue | 2 +-
 examples/middleware/store/index.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/middleware/layouts/default.vue b/examples/middleware/layouts/default.vue
index 07f12ba8a8..089ea71ad0 100644
--- a/examples/middleware/layouts/default.vue
+++ b/examples/middleware/layouts/default.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import Visits from '~components/Visits'
+import Visits from '~/components/Visits'
 
 export default {
   components: { Visits }
diff --git a/examples/middleware/store/index.js b/examples/middleware/store/index.js
index 12cdd3f02b..d143305b3c 100644
--- a/examples/middleware/store/index.js
+++ b/examples/middleware/store/index.js
@@ -1,6 +1,6 @@
-export const state = {
+export const state = () => ({
   visits: []
-}
+})
 
 export const mutations = {
   ADD_VISIT (state, path) {

From 5e93befc4413242edb345a716c6231ef6ee30e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 20:01:57 +0200
Subject: [PATCH 194/236] Fix paths

---
 examples/nested-components/pages/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/nested-components/pages/index.vue b/examples/nested-components/pages/index.vue
index 8682528903..0caa0bfd44 100755
--- a/examples/nested-components/pages/index.vue
+++ b/examples/nested-components/pages/index.vue
@@ -22,8 +22,8 @@
 </template>
 
 <script>
-import Post from '~components/post'
-import vP from '~components/paragraph'
+import Post from '~/components/post'
+import vP from '~/components/paragraph'
 const vHr = { render: (h) => h('hr', { class: 'hr' }) }
 
 export default {

From 56272eb5fd42052a1cf9c4d75883ea558b2cca97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 20:05:28 +0200
Subject: [PATCH 195/236] Remove generate routes

---
 examples/nested-routes/nuxt.config.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/examples/nested-routes/nuxt.config.js b/examples/nested-routes/nuxt.config.js
index 13030d6852..7923f1f12d 100644
--- a/examples/nested-routes/nuxt.config.js
+++ b/examples/nested-routes/nuxt.config.js
@@ -14,15 +14,5 @@ module.exports = {
       { id: 5, name: 'Kevin Durant', number: 35 },
       { id: 6, name: 'Kyrie Irving', number: 2 }
     ]
-  },
-  generate: {
-    routes: [
-      '/1',
-      '/2',
-      '/3',
-      '/4',
-      '/5',
-      '/6'
-    ]
   }
 }

From 592f8cc7337cb9e6d95f945d2944ba2936b36dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 20:16:01 +0200
Subject: [PATCH 196/236] Remove offline example

---
 examples/offline-nuxt/nuxt.config.js     |  6 ------
 examples/offline-nuxt/package.json       | 11 -----------
 examples/offline-nuxt/pages/index.vue    |  3 ---
 examples/offline-nuxt/plugins/offline.js | 19 -------------------
 4 files changed, 39 deletions(-)
 delete mode 100644 examples/offline-nuxt/nuxt.config.js
 delete mode 100644 examples/offline-nuxt/package.json
 delete mode 100644 examples/offline-nuxt/pages/index.vue
 delete mode 100644 examples/offline-nuxt/plugins/offline.js

diff --git a/examples/offline-nuxt/nuxt.config.js b/examples/offline-nuxt/nuxt.config.js
deleted file mode 100644
index 915a70f372..0000000000
--- a/examples/offline-nuxt/nuxt.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  offline: true, // true or https://github.com/NekR/offline-plugin/blob/master/docs/options.md
-  plugins: [
-    { src: '~plugins/offline.js', ssr: false }
-  ]
-}
diff --git a/examples/offline-nuxt/package.json b/examples/offline-nuxt/package.json
deleted file mode 100644
index e202ad873a..0000000000
--- a/examples/offline-nuxt/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "offline-config-nuxt",
-  "scripts": {
-    "dev": "nuxt",
-    "build": "nuxt build",
-    "start": "nuxt start"
-  },
-  "dependencies": {
-    "nuxt": "latest"
-  }
-}
diff --git a/examples/offline-nuxt/pages/index.vue b/examples/offline-nuxt/pages/index.vue
deleted file mode 100644
index 5846d84ea3..0000000000
--- a/examples/offline-nuxt/pages/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div>This is offline test</div>
-</template>
diff --git a/examples/offline-nuxt/plugins/offline.js b/examples/offline-nuxt/plugins/offline.js
deleted file mode 100644
index 7224e02c00..0000000000
--- a/examples/offline-nuxt/plugins/offline.js
+++ /dev/null
@@ -1,19 +0,0 @@
-if (process.env.NODE_ENV === 'production') {
-  var OfflinePlugin = require('offline-plugin/runtime')
-  window.onNuxtReady(() => {
-    OfflinePlugin.install({
-      onInstalled: function () {
-        console.log('Offline plugin installed.') // eslint-disable-line no-console
-      },
-      onUpdating: function () {
-
-      },
-      onUpdateReady: function () {
-        OfflinePlugin.applyUpdate()
-      },
-      onUpdated: function () {
-        window.location.reload()
-      }
-    })
-  })
-}

From ebb67243c8583f12bb5ce797e9a53e6ff90b818a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 20:26:11 +0200
Subject: [PATCH 197/236] Fix path and add random image

---
 examples/plugins-vendor/nuxt.config.js  | 2 +-
 examples/plugins-vendor/package.json    | 6 +++---
 examples/plugins-vendor/pages/about.vue | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/examples/plugins-vendor/nuxt.config.js b/examples/plugins-vendor/nuxt.config.js
index 76d693a3a1..f6aac43a42 100644
--- a/examples/plugins-vendor/nuxt.config.js
+++ b/examples/plugins-vendor/nuxt.config.js
@@ -4,6 +4,6 @@ module.exports = {
   },
   plugins: [
     // ssr: false to only include it on client-side
-    { src: '~plugins/vue-notifications.js', ssr: false }
+    { src: '~/plugins/vue-notifications.js', ssr: false }
   ]
 }
diff --git a/examples/plugins-vendor/package.json b/examples/plugins-vendor/package.json
index c0bd19a84f..995af2c330 100644
--- a/examples/plugins-vendor/package.json
+++ b/examples/plugins-vendor/package.json
@@ -1,10 +1,10 @@
 {
   "name": "nuxt-plugins-vendor",
   "dependencies": {
-    "axios": "^0.15.2",
-    "mini-toastr": "^0.3.10",
+    "axios": "^0.16.2",
+    "mini-toastr": "^0.6.5",
     "nuxt": "latest",
-    "vue-notifications": "^0.7.0"
+    "vue-notifications": "^0.8.0"
   },
   "scripts": {
     "dev": "nuxt",
diff --git a/examples/plugins-vendor/pages/about.vue b/examples/plugins-vendor/pages/about.vue
index 1567978005..8e4571fe61 100644
--- a/examples/plugins-vendor/pages/about.vue
+++ b/examples/plugins-vendor/pages/about.vue
@@ -10,7 +10,8 @@ import axios from 'axios'
 
 export default {
   asyncData () {
-    return axios.get('https://jsonplaceholder.typicode.com/photos/4').then(res => res.data)
+    const nb = Math.max(1, Math.round(Math.random() * 10))
+    return axios.get(`https://jsonplaceholder.typicode.com/photos/${nb}`).then(res => res.data)
   }
 }
 </script>

From 51694783b973b9c4e7ecbb6422a9795924b7f16a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 8 Jul 2017 20:31:41 +0200
Subject: [PATCH 198/236] Fix paths & typo

---
 examples/routes-transitions/nuxt.config.js  | 2 +-
 examples/routes-transitions/pages/users.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/routes-transitions/nuxt.config.js b/examples/routes-transitions/nuxt.config.js
index b904282bbc..422d6f68cb 100644
--- a/examples/routes-transitions/nuxt.config.js
+++ b/examples/routes-transitions/nuxt.config.js
@@ -2,6 +2,6 @@ module.exports = {
   build: {
     vendor: ['axios']
   },
-  css: ['assets/main.css'],
+  css: ['~/assets/main.css'],
   loading: false
 }
diff --git a/examples/routes-transitions/pages/users.vue b/examples/routes-transitions/pages/users.vue
index ecf89457ce..e151058127 100644
--- a/examples/routes-transitions/pages/users.vue
+++ b/examples/routes-transitions/pages/users.vue
@@ -25,7 +25,7 @@ export default {
   },
   asyncData ({ query }) {
     const page = +query.page || 1
-    return axios.get('https://reqres.in/api/users?page=' + page)
+    return axios.get(`https://reqres.in/api/users?page=${page}`)
     .then((res) => {
       return {
         page: +res.data.page,

From c7ce0802c9db11c76d6d61e0391a806ed1fb6329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 01:44:59 +0200
Subject: [PATCH 199/236] Updates dynamic examples

---
 .../articles/article-1.vue                    |  0
 .../articles/article-2.vue                    |  0
 examples/component-injection/package.json     | 11 ++++
 .../pages/_slug.vue                           |  0
 examples/component-injection/pages/index.vue  |  9 +++
 examples/dynamic-components/README.md         |  3 +
 .../dynamic-components/components/code.vue    | 20 ++++++
 .../dynamic-components/components/image.vue   | 36 +++++++++++
 .../dynamic-components/components/text.vue    | 17 +++++
 examples/dynamic-components/js/messages.js    | 16 +++++
 examples/dynamic-components/nuxt.config.js    |  9 +++
 examples/dynamic-components/package.json      |  2 +-
 examples/dynamic-components/pages/index.vue   | 63 +++++++++++++++++--
 13 files changed, 181 insertions(+), 5 deletions(-)
 rename examples/{dynamic-components => component-injection}/articles/article-1.vue (100%)
 rename examples/{dynamic-components => component-injection}/articles/article-2.vue (100%)
 create mode 100644 examples/component-injection/package.json
 rename examples/{dynamic-components => component-injection}/pages/_slug.vue (100%)
 create mode 100644 examples/component-injection/pages/index.vue
 create mode 100644 examples/dynamic-components/README.md
 create mode 100644 examples/dynamic-components/components/code.vue
 create mode 100644 examples/dynamic-components/components/image.vue
 create mode 100644 examples/dynamic-components/components/text.vue
 create mode 100644 examples/dynamic-components/js/messages.js
 create mode 100644 examples/dynamic-components/nuxt.config.js
 mode change 100644 => 100755 examples/dynamic-components/pages/index.vue

diff --git a/examples/dynamic-components/articles/article-1.vue b/examples/component-injection/articles/article-1.vue
similarity index 100%
rename from examples/dynamic-components/articles/article-1.vue
rename to examples/component-injection/articles/article-1.vue
diff --git a/examples/dynamic-components/articles/article-2.vue b/examples/component-injection/articles/article-2.vue
similarity index 100%
rename from examples/dynamic-components/articles/article-2.vue
rename to examples/component-injection/articles/article-2.vue
diff --git a/examples/component-injection/package.json b/examples/component-injection/package.json
new file mode 100644
index 0000000000..4aeda9d845
--- /dev/null
+++ b/examples/component-injection/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "components-injection-nuxt",
+  "dependencies": {
+    "nuxt": "latest"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt"
+  }
+}
diff --git a/examples/dynamic-components/pages/_slug.vue b/examples/component-injection/pages/_slug.vue
similarity index 100%
rename from examples/dynamic-components/pages/_slug.vue
rename to examples/component-injection/pages/_slug.vue
diff --git a/examples/component-injection/pages/index.vue b/examples/component-injection/pages/index.vue
new file mode 100644
index 0000000000..30a3e45f32
--- /dev/null
+++ b/examples/component-injection/pages/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <div>
+    <h1>Articles</h1>
+    <ul>
+      <li><nuxt-link to="/article-1">Article #1</nuxt-link></li>
+      <li><nuxt-link to="/article-2">Article #2</nuxt-link></li>
+    </ul>
+  </div>
+</template>
\ No newline at end of file
diff --git a/examples/dynamic-components/README.md b/examples/dynamic-components/README.md
new file mode 100644
index 0000000000..d64ba5270a
--- /dev/null
+++ b/examples/dynamic-components/README.md
@@ -0,0 +1,3 @@
+# Hello World with Nuxt.js
+
+https://nuxtjs.org/examples
diff --git a/examples/dynamic-components/components/code.vue b/examples/dynamic-components/components/code.vue
new file mode 100644
index 0000000000..2a9aa12884
--- /dev/null
+++ b/examples/dynamic-components/components/code.vue
@@ -0,0 +1,20 @@
+<template>
+  <pre>{{ data }}</pre>
+</template>
+
+<script>
+export default {
+  props: {
+    data: String
+  }
+}
+</script>
+
+<style scoped>
+pre {
+    background: #222;
+    color: #eee;
+    margin: 0;
+    padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/examples/dynamic-components/components/image.vue b/examples/dynamic-components/components/image.vue
new file mode 100644
index 0000000000..f60da9a50e
--- /dev/null
+++ b/examples/dynamic-components/components/image.vue
@@ -0,0 +1,36 @@
+<template>
+  <img v-if="loaded" :src="data" alt="image" />
+  <svg v-else width="60px" height="60px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-ring"><rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect><defs><filter id="uil-ring-shadow" x="-100%" y="-100%" width="300%" height="300%"><feOffset result="offOut" in="SourceGraphic" dx="0" dy="0"></feOffset><feGaussianBlur result="blurOut" in="offOut" stdDeviation="0"></feGaussianBlur><feBlend in="SourceGraphic" in2="blurOut" mode="normal"></feBlend></filter></defs><path d="M10,50c0,0,0,0.5,0.1,1.4c0,0.5,0.1,1,0.2,1.7c0,0.3,0.1,0.7,0.1,1.1c0.1,0.4,0.1,0.8,0.2,1.2c0.2,0.8,0.3,1.8,0.5,2.8 c0.3,1,0.6,2.1,0.9,3.2c0.3,1.1,0.9,2.3,1.4,3.5c0.5,1.2,1.2,2.4,1.8,3.7c0.3,0.6,0.8,1.2,1.2,1.9c0.4,0.6,0.8,1.3,1.3,1.9 c1,1.2,1.9,2.6,3.1,3.7c2.2,2.5,5,4.7,7.9,6.7c3,2,6.5,3.4,10.1,4.6c3.6,1.1,7.5,1.5,11.2,1.6c4-0.1,7.7-0.6,11.3-1.6 c3.6-1.2,7-2.6,10-4.6c3-2,5.8-4.2,7.9-6.7c1.2-1.2,2.1-2.5,3.1-3.7c0.5-0.6,0.9-1.3,1.3-1.9c0.4-0.6,0.8-1.3,1.2-1.9 c0.6-1.3,1.3-2.5,1.8-3.7c0.5-1.2,1-2.4,1.4-3.5c0.3-1.1,0.6-2.2,0.9-3.2c0.2-1,0.4-1.9,0.5-2.8c0.1-0.4,0.1-0.8,0.2-1.2 c0-0.4,0.1-0.7,0.1-1.1c0.1-0.7,0.1-1.2,0.2-1.7C90,50.5,90,50,90,50s0,0.5,0,1.4c0,0.5,0,1,0,1.7c0,0.3,0,0.7,0,1.1 c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.9-0.2,1.8-0.4,2.8c-0.2,1-0.5,2.1-0.7,3.3c-0.3,1.2-0.8,2.4-1.2,3.7c-0.2,0.7-0.5,1.3-0.8,1.9 c-0.3,0.7-0.6,1.3-0.9,2c-0.3,0.7-0.7,1.3-1.1,2c-0.4,0.7-0.7,1.4-1.2,2c-1,1.3-1.9,2.7-3.1,4c-2.2,2.7-5,5-8.1,7.1 c-0.8,0.5-1.6,1-2.4,1.5c-0.8,0.5-1.7,0.9-2.6,1.3L66,87.7l-1.4,0.5c-0.9,0.3-1.8,0.7-2.8,1c-3.8,1.1-7.9,1.7-11.8,1.8L47,90.8 c-1,0-2-0.2-3-0.3l-1.5-0.2l-0.7-0.1L41.1,90c-1-0.3-1.9-0.5-2.9-0.7c-0.9-0.3-1.9-0.7-2.8-1L34,87.7l-1.3-0.6 c-0.9-0.4-1.8-0.8-2.6-1.3c-0.8-0.5-1.6-1-2.4-1.5c-3.1-2.1-5.9-4.5-8.1-7.1c-1.2-1.2-2.1-2.7-3.1-4c-0.5-0.6-0.8-1.4-1.2-2 c-0.4-0.7-0.8-1.3-1.1-2c-0.3-0.7-0.6-1.3-0.9-2c-0.3-0.7-0.6-1.3-0.8-1.9c-0.4-1.3-0.9-2.5-1.2-3.7c-0.3-1.2-0.5-2.3-0.7-3.3 c-0.2-1-0.3-2-0.4-2.8c-0.1-0.4-0.1-0.8-0.1-1.2c0-0.4,0-0.7,0-1.1c0-0.7,0-1.2,0-1.7C10,50.5,10,50,10,50z" fill="#59ebff" filter="url(#uil-ring-shadow)"><animateTransform attributeName="transform" type="rotate" from="0 50 50" to="360 50 50" repeatCount="indefinite" dur="1s"></animateTransform></path></svg>
+</template>
+
+<script>
+export default {
+  props: {
+    data: String
+  },
+  data: () => ({
+    loaded: false
+  }),
+  beforeMount () {
+    // Preload image
+    const img = new Image()
+    img.onload = () => {
+      this.loaded = true
+    };
+    img.src = this.data
+  }
+}
+</script>
+
+<style scoped>
+img {
+  width: 100%;
+  vertical-align: middle;
+}
+svg {
+  margin: 20px;
+  margin-left: 50%;
+  position: relative;
+  left: -30px;
+}
+</style>
\ No newline at end of file
diff --git a/examples/dynamic-components/components/text.vue b/examples/dynamic-components/components/text.vue
new file mode 100644
index 0000000000..856ed0f78c
--- /dev/null
+++ b/examples/dynamic-components/components/text.vue
@@ -0,0 +1,17 @@
+<template>
+  <p v-html="data"></p>
+</template>
+
+<script>
+export default {
+  props: {
+    data: String
+  }
+}
+</script>
+
+<style scoped>
+p {
+  padding: 5px 20px;
+}
+</style>
\ No newline at end of file
diff --git a/examples/dynamic-components/js/messages.js b/examples/dynamic-components/js/messages.js
new file mode 100644
index 0000000000..3d826501b3
--- /dev/null
+++ b/examples/dynamic-components/js/messages.js
@@ -0,0 +1,16 @@
+const messages = [
+  { component: 'vText', data: 'Welcome to the <b>Dynamic Component</b> demo!' },
+  { component: 'vText', data: 'Look at this nice picture:' },
+  { component: 'vImage', data: 'https://placeimg.com/350/200/animals' },
+  { component: 'vText', data: 'If you prefer, look at this code component:' },
+  { component: 'vCode', data: 'var a = 1;\nvar b = 2;\nb = a;' },
+  { component: 'vText', data: 'End of demo 🎉' },
+]
+
+function streamMessages (fn, i = 0) {
+  if (i >= messages.length) return
+  fn(messages[i])
+  setTimeout(() => streamMessages(fn, i + 1), 2000)
+}
+
+export default streamMessages
\ No newline at end of file
diff --git a/examples/dynamic-components/nuxt.config.js b/examples/dynamic-components/nuxt.config.js
new file mode 100644
index 0000000000..7656e08270
--- /dev/null
+++ b/examples/dynamic-components/nuxt.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  head: {
+    titleTemplate: 'Nuxt.js - Dynamic Components',
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/examples/dynamic-components/package.json b/examples/dynamic-components/package.json
index ac286a63f4..061ad4c4fb 100644
--- a/examples/dynamic-components/package.json
+++ b/examples/dynamic-components/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "dynamic-component-nuxt",
+  "name": "dynamic-components-nuxt",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/dynamic-components/pages/index.vue b/examples/dynamic-components/pages/index.vue
old mode 100644
new mode 100755
index 30a3e45f32..9435270fd1
--- a/examples/dynamic-components/pages/index.vue
+++ b/examples/dynamic-components/pages/index.vue
@@ -1,9 +1,64 @@
 <template>
   <div>
-    <h1>Articles</h1>
+    <h1>Nuxt Chat</h1>
     <ul>
-      <li><nuxt-link to="/article-1">Article #1</nuxt-link></li>
-      <li><nuxt-link to="/article-2">Article #2</nuxt-link></li>
+      <li v-for="message in messages">
+        <component :is="message.component" :data="message.data"></component>
+      </li>
     </ul>
   </div>
-</template>
\ No newline at end of file
+</template>
+
+<script>
+import streamMessages from '@/js/messages.js'
+// Dynamic components
+const components = {
+  vText: () => import('@/components/text.vue').then(m => m.default),
+  vImage: () => import('@/components/image.vue').then(m => m.default),
+  vCode: () => import('@/components/code.vue').then(m => m.default)
+}
+
+export default {
+  data: () => ({
+    messages: []
+  }),
+  mounted () {
+    setTimeout(() => {
+    // Listen to new messages
+    streamMessages(async (message) => {
+      // Make sure to wait for async chunk to be loaded before adding the message
+      await components[message.component]()
+      // Add the message to the list
+      this.messages.push(message)
+    })
+    }, 1000)
+  },
+  components
+}
+</script>
+
+<style scoped>
+h1 {
+  text-align: center;
+  font-family: Helvetica, Arial, sans-serif;
+}
+ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  with: 100%;
+  max-width: 300px;
+  margin: auto;
+}
+
+ul li {
+  display: block;
+  width: 100%;
+  border-radius: 20px;
+  margin-bottom: 5px;
+  font-family: Helvetica, Arial, sans-serif;
+  background: white;
+  border: 1px #ddd solid;
+  overflow: hidden;
+}
+</style>
\ No newline at end of file

From 2dafa52bc4efd13094595cca41fbbbbcbf54cf8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 01:47:13 +0200
Subject: [PATCH 200/236] Update README

---
 examples/dynamic-components/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/dynamic-components/README.md b/examples/dynamic-components/README.md
index d64ba5270a..48a715ecf0 100644
--- a/examples/dynamic-components/README.md
+++ b/examples/dynamic-components/README.md
@@ -1,3 +1,5 @@
-# Hello World with Nuxt.js
+# Dynamic Components with Nuxt.js
 
-https://nuxtjs.org/examples
+Demo: https://nuxt-chat.surge.sh
+
+Video: https://www.youtube.com/watch?v=HzDea5-PFaw
\ No newline at end of file

From 272ae52c73bfb8731aef9055ee448dfe80297024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 01:50:26 +0200
Subject: [PATCH 201/236] Remove first timeout

---
 examples/dynamic-components/pages/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/examples/dynamic-components/pages/index.vue b/examples/dynamic-components/pages/index.vue
index 9435270fd1..dcacf3cf6a 100755
--- a/examples/dynamic-components/pages/index.vue
+++ b/examples/dynamic-components/pages/index.vue
@@ -23,7 +23,6 @@ export default {
     messages: []
   }),
   mounted () {
-    setTimeout(() => {
     // Listen to new messages
     streamMessages(async (message) => {
       // Make sure to wait for async chunk to be loaded before adding the message
@@ -31,7 +30,6 @@ export default {
       // Add the message to the list
       this.messages.push(message)
     })
-    }, 1000)
   },
   components
 }

From dca165828a305c6826bc4131f4488c6c41725bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 02:09:03 +0200
Subject: [PATCH 202/236] Update README.md

---
 examples/dynamic-components/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/dynamic-components/README.md b/examples/dynamic-components/README.md
index 48a715ecf0..06b42c7783 100644
--- a/examples/dynamic-components/README.md
+++ b/examples/dynamic-components/README.md
@@ -1,5 +1,5 @@
 # Dynamic Components with Nuxt.js
 
-Demo: https://nuxt-chat.surge.sh
+Demo: https://nuxt-chat.now.sh
 
-Video: https://www.youtube.com/watch?v=HzDea5-PFaw
\ No newline at end of file
+Video: https://www.youtube.com/watch?v=HzDea5-PFaw

From 505aed45756a4ad0b05b53570bed15ea127a0cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 02:35:07 +0200
Subject: [PATCH 203/236] =?UTF-8?q?Use=20transitions=20for=20=F0=9F=99=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/dynamic-components/pages/index.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/examples/dynamic-components/pages/index.vue b/examples/dynamic-components/pages/index.vue
index dcacf3cf6a..c66cfacb68 100755
--- a/examples/dynamic-components/pages/index.vue
+++ b/examples/dynamic-components/pages/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <h1>Nuxt Chat</h1>
-    <ul>
-      <li v-for="message in messages">
+    <transition-group name="list" tag="ul">
+      <li v-for="(message, index) in messages" :key="index">
         <component :is="message.component" :data="message.data"></component>
       </li>
-    </ul>
+    </transition-group>
   </div>
 </template>
 
@@ -58,5 +58,13 @@ ul li {
   background: white;
   border: 1px #ddd solid;
   overflow: hidden;
+  opacity: 1;
+}
+.list-enter-active, .list-leave-active {
+  transition: all 0.4s;
+}
+.list-enter, .list-leave-to {
+  opacity: 0;
+  transform: translateY(20px);
 }
 </style>
\ No newline at end of file

From 2a76ff4d2796a6aadb0aabe9e4246824735fbdd3 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 9 Jul 2017 14:10:37 +0430
Subject: [PATCH 204/236] feat: build.devMiddleware and build.hotMiddleware
 options

Closes #1025
---
 lib/builder/builder.js | 8 ++++----
 lib/core/options.js    | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 776fefb37f..08352af0bd 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -369,18 +369,18 @@ export default class Builder extends Tapable {
     debug('Adding webpack middleware...')
 
     // Create webpack dev middleware
-    this.webpackDevMiddleware = pify(webpackDevMiddleware(this.compiler.client, {
+    this.webpackDevMiddleware = pify(webpackDevMiddleware(this.compiler.client, Object.assign({
       publicPath: this.options.build.publicPath,
       stats: this.webpackStats,
       noInfo: true,
       quiet: true,
       watchOptions: this.options.watchers.webpack
-    }))
+    }, this.options.build.devMiddleware)))
 
-    this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, {
+    this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, Object.assign({
       log: false,
       heartbeat: 2500
-    }))
+    }, this.options.build.hotMiddleware)))
 
     // Inject to renderer instance
     if (this.nuxt.renderer) {
diff --git a/lib/core/options.js b/lib/core/options.js
index 2a9f615d6e..3e21abf6c1 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -69,7 +69,9 @@ export const defaultOptions = {
     babel: {},
     postcss: [],
     templates: [],
-    watch: []
+    watch: [],
+    devMiddleware: {},
+    hotMiddleware: {}
   },
   generate: {
     dir: 'dist',

From 270c490a9de2199f3b4c1cc2424a10b4af651914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 12:00:08 +0200
Subject: [PATCH 205/236] Add generate.concurrency option

---
 lib/builder/generator.js | 2 +-
 lib/core/options.js      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index 1f01bea614..1019afafd6 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -68,7 +68,7 @@ export default class Generator extends Tapable {
     // Start generate process
     while (routes.length) {
       let n = 0
-      await Promise.all(routes.splice(0, 500).map(async ({ route, payload }) => {
+      await Promise.all(routes.splice(0, this.options.generate.concurrency).map(async ({ route, payload }) => {
         await waitFor(n++ * this.options.generate.interval)
         await this.generateRoute({route, payload, errors})
       }))
diff --git a/lib/core/options.js b/lib/core/options.js
index 2a9f615d6e..3eb0017b26 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -74,6 +74,7 @@ export const defaultOptions = {
   generate: {
     dir: 'dist',
     routes: [],
+    concurrency: 500,
     interval: 0,
     minify: {
       collapseBooleanAttributes: true,

From f083990dbd9cce75756caee6c3c1067d0bea0ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 12:15:12 +0200
Subject: [PATCH 206/236] Update dependencies

---
 package.json |   1 -
 yarn.lock    | 600 ++++++++-------------------------------------------
 2 files changed, 91 insertions(+), 510 deletions(-)

diff --git a/package.json b/package.json
index 5285e81346..c8ad463b1c 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,6 @@
     "finalhandler": "^1.0.3",
     "jsdom": "^11.1.0",
     "json-loader": "^0.5.4",
-    "lerna": "2.0.0-rc.5",
     "nyc": "^11.0.3",
     "request": "^2.81.0",
     "request-promise-native": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index 557677c584..5e04c53d03 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -48,13 +48,6 @@
   version "6.0.79"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.79.tgz#5efe7d4a6d8c453c7e9eaf55d931f4a22fac5169"
 
-JSONStream@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 abab@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -97,12 +90,8 @@ acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
 acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
-
-add-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
 ajv-keywords@^1.0.0:
   version "1.5.1"
@@ -119,12 +108,12 @@ ajv@^4.7.0, ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.5:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
+ajv@^5.0.0, ajv@^5.1.5, ajv@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.1.tgz#dcd03045175883ba1b636e5ae9ec3df9ab85323a"
   dependencies:
     co "^4.6.0"
-    fast-deep-equal "^0.1.0"
+    fast-deep-equal "^1.0.0"
     json-schema-traverse "^0.3.0"
     json-stable-stringify "^1.0.1"
 
@@ -233,8 +222,8 @@ arr-exclude@^1.0.0:
   resolved "https://registry.yarnpkg.com/arr-exclude/-/arr-exclude-1.0.0.tgz#dfc7c2e552a270723ccda04cf3128c8cbfe5c631"
 
 arr-flatten@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
 array-differ@^1.0.0:
   version "1.0.0"
@@ -252,10 +241,6 @@ array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
 
-array-ify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -304,7 +289,7 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^1.4.0, async@^1.5.0:
+async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -334,14 +319,14 @@ autoprefixer@^6.3.1:
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d"
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.2.tgz#fbeaf07d48fd878e0682bf7cbeeade728adb2b18"
   dependencies:
-    browserslist "^2.1.3"
-    caniuse-lite "^1.0.30000670"
+    browserslist "^2.1.5"
+    caniuse-lite "^1.0.30000697"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.1"
+    postcss "^6.0.6"
     postcss-value-parser "^3.2.3"
 
 ava-init@^0.2.0:
@@ -1274,7 +1259,7 @@ 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, browserslist@^2.1.3:
+browserslist@^2.1.2, browserslist@^2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
   dependencies:
@@ -1305,10 +1290,6 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-
 bytes@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
@@ -1384,12 +1365,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.30000696"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000696.tgz#e71f5c61e1f96c7a3af4e791ac5db55e11737604"
+  version "1.0.30000697"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000697.tgz#20ce6a9ceeef4ef4a15dc8e80f2e8fb9049e8d77"
 
-caniuse-lite@^1.0.30000670, caniuse-lite@^1.0.30000684:
-  version "1.0.30000696"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000696.tgz#30f2695d2a01a0dfd779a26ab83f4d134b3da5cc"
+caniuse-lite@^1.0.30000684, caniuse-lite@^1.0.30000697:
+  version "1.0.30000697"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000697.tgz#125fb00604b63fbb188db96a667ce2922dcd6cdd"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1456,10 +1437,11 @@ ci-info@^1.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
   dependencies:
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 circular-json@^0.3.1:
   version "0.3.1"
@@ -1472,8 +1454,8 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 clean-css@4.1.x:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.5.tgz#d09a87a02a5375117589796ae76a063cacdb541a"
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.6.tgz#5a47beb526994cb4f7bf36188a55ed3b45528f0b"
   dependencies:
     source-map "0.5.x"
 
@@ -1534,13 +1516,6 @@ clone@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
 
-cmd-shim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
-  dependencies:
-    graceful-fs "^4.1.2"
-    mkdirp "~0.5.0"
-
 co-with-promise@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"
@@ -1552,8 +1527,8 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 coa@~1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.3.tgz#1b54a5e1dcf77c990455d4deea98c564416dc893"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
   dependencies:
     q "^1.1.2"
 
@@ -1611,23 +1586,12 @@ colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
-columnify@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
-  dependencies:
-    strip-ansi "^3.0.0"
-    wcwidth "^1.0.0"
-
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
-command-join@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
-
 commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -1642,13 +1606,6 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
-compare-func@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
-  dependencies:
-    array-ify "^1.0.0"
-    dot-prop "^3.0.0"
-
 compressible@~2.0.8:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
@@ -1670,7 +1627,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.4.10, concat-stream@^1.6.0:
+concat-stream@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1757,152 +1714,6 @@ content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
-conventional-changelog-angular@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.3.4.tgz#7d7cdfbd358948312904d02229a61fd6075cf455"
-  dependencies:
-    compare-func "^1.3.1"
-    github-url-from-git "^1.4.0"
-    q "^1.4.1"
-
-conventional-changelog-atom@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.0.tgz#67a47c66a42b2f8909ef1587c9989ae1de730b92"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-cli@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.1.tgz#1cd5a9dbae25ffb5ffe67afef1e136eaceefd2d5"
-  dependencies:
-    add-stream "^1.0.0"
-    conventional-changelog "^1.1.3"
-    lodash "^4.1.0"
-    meow "^3.7.0"
-    tempfile "^1.1.1"
-
-conventional-changelog-codemirror@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz#7577a591dbf9b538e7a150a7ee62f65a2872b334"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-core@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz#de5dfbc091847656508d4a389e35c9a1bc49e7f4"
-  dependencies:
-    conventional-changelog-writer "^1.1.0"
-    conventional-commits-parser "^1.0.0"
-    dateformat "^1.0.12"
-    get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.2.0"
-    git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.2.0"
-    lodash "^4.0.0"
-    normalize-package-data "^2.3.5"
-    q "^1.4.1"
-    read-pkg "^1.1.0"
-    read-pkg-up "^1.0.1"
-    through2 "^2.0.0"
-
-conventional-changelog-ember@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz#8b7355419f5127493c4c562473ab2fc792f1c2b6"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-eslint@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz#a52411e999e0501ce500b856b0a643d0330907e2"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-express@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz#55c6c841c811962036c037bdbd964a54ae310fce"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jquery@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jscs@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jshint@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz#00cab8e9a3317487abd94c4d84671342918d2a07"
-  dependencies:
-    compare-func "^1.3.1"
-    q "^1.4.1"
-
-conventional-changelog-writer@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz#3f4cb4d003ebb56989d30d345893b52a43639c8e"
-  dependencies:
-    compare-func "^1.3.1"
-    conventional-commits-filter "^1.0.0"
-    dateformat "^1.0.11"
-    handlebars "^4.0.2"
-    json-stringify-safe "^5.0.1"
-    lodash "^4.0.0"
-    meow "^3.3.0"
-    semver "^5.0.1"
-    split "^1.0.0"
-    through2 "^2.0.0"
-
-conventional-changelog@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.4.tgz#108bc750c2a317e200e2f9b413caaa1f8c7efa3b"
-  dependencies:
-    conventional-changelog-angular "^1.3.4"
-    conventional-changelog-atom "^0.1.0"
-    conventional-changelog-codemirror "^0.1.0"
-    conventional-changelog-core "^1.9.0"
-    conventional-changelog-ember "^0.2.6"
-    conventional-changelog-eslint "^0.1.0"
-    conventional-changelog-express "^0.1.0"
-    conventional-changelog-jquery "^0.1.0"
-    conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.1.0"
-
-conventional-commits-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz#6fc2a659372bc3f2339cf9ffff7e1b0344b93039"
-  dependencies:
-    is-subset "^0.1.1"
-    modify-values "^1.0.0"
-
-conventional-commits-parser@^1.0.0, conventional-commits-parser@^1.0.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz#e327b53194e1a7ad5dc63479ee9099a52b024865"
-  dependencies:
-    JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
-    lodash "^4.2.1"
-    meow "^3.3.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-    trim-off-newlines "^1.0.0"
-
-conventional-recommended-bump@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.0.0.tgz#6d303a27837ae938b7c68c8ddeed34559b4b0789"
-  dependencies:
-    concat-stream "^1.4.10"
-    conventional-commits-filter "^1.0.0"
-    conventional-commits-parser "^1.0.1"
-    git-raw-commits "^1.2.0"
-    git-semver-tags "^1.2.0"
-    meow "^3.3.0"
-    object-assign "^4.0.1"
-
 convert-source-map@^1.1.0, convert-source-map@^1.2.0, convert-source-map@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -2013,7 +1824,7 @@ cross-spawn@^4, cross-spawn@^4.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -2160,12 +1971,6 @@ d@1:
   dependencies:
     es5-ext "^0.10.9"
 
-dargs@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
-  dependencies:
-    number-is-nan "^1.0.0"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2180,13 +1985,6 @@ date-time@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
 
-dateformat@^1.0.11, dateformat@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
-  dependencies:
-    get-stdin "^4.0.1"
-    meow "^3.3.0"
-
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -2217,10 +2015,6 @@ 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"
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-
 deep-equal@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -2234,8 +2028,8 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
 deepmerge@^1.3.2:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.4.4.tgz#40ef393c91af09d16a887e755337844230ad14c9"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.0.tgz#00bc5b88fd23b8130f9f5049071c3420e07a5465"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
@@ -2243,12 +2037,6 @@ default-require-extensions@^1.0.0:
   dependencies:
     strip-bom "^2.0.0"
 
-defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  dependencies:
-    clone "^1.0.2"
-
 define-properties@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
@@ -2384,12 +2172,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-dot-prop@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
-  dependencies:
-    is-obj "^1.0.0"
-
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
@@ -2464,7 +2246,7 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-enhanced-resolve@^3.0.0:
+enhanced-resolve@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
   dependencies:
@@ -2598,7 +2380,7 @@ eslint-import-resolver-node@^0.3.1:
     debug "^2.6.8"
     resolve "^1.2.0"
 
-eslint-module-utils@^2.0.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"
   dependencies:
@@ -2612,15 +2394,15 @@ eslint-plugin-html@^3.0.0:
     htmlparser2 "^3.8.2"
 
 eslint-plugin-import@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.6.1.tgz#f580be62bb809421d46e338372764afcc9f59bf6"
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz#21de33380b9efb55f5ef6d2e210ec0e07e7fa69f"
   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.0.0"
+    eslint-module-utils "^2.1.1"
     has "^1.0.1"
     lodash.cond "^4.3.0"
     minimatch "^3.0.3"
@@ -2651,9 +2433,10 @@ eslint-scope@^3.7.1:
     estraverse "^4.1.1"
 
 eslint@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.1.1.tgz#facbdfcfe3e0facd3a8b80dc98c4e6c13ae582df"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.2.0.tgz#a2b3184111b198e02e9c7f3cca625a5e01c56b3d"
   dependencies:
+    ajv "^5.2.0"
     babel-code-frame "^6.22.0"
     chalk "^1.1.3"
     concat-stream "^1.6.0"
@@ -2670,7 +2453,6 @@ eslint@^4.1.1:
     ignore "^3.3.3"
     imurmurhash "^0.1.4"
     inquirer "^3.0.6"
-    is-my-json-valid "^2.16.0"
     is-resolvable "^1.0.0"
     js-yaml "^3.8.4"
     json-stable-stringify "^1.0.1"
@@ -2708,9 +2490,9 @@ esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
 espurify@^1.6.0:
   version "1.7.0"
@@ -2795,18 +2577,6 @@ execa@^0.5.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -2883,9 +2653,9 @@ extsprintf@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
-fast-deep-equal@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
+fast-deep-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
 
 fast-diff@^1.1.1:
   version "1.1.1"
@@ -3124,17 +2894,7 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
-get-pkg-repo@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    meow "^3.3.0"
-    normalize-package-data "^2.3.0"
-    parse-github-repo-url "^1.3.0"
-    through2 "^2.0.0"
-
-get-port@^3.0.0, get-port@^3.1.0:
+get-port@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e"
 
@@ -3159,40 +2919,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.2.0.tgz#0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c"
-  dependencies:
-    dargs "^4.0.1"
-    lodash.template "^4.0.2"
-    meow "^3.3.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-
-git-remote-origin-url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
-  dependencies:
-    gitconfiglocal "^1.0.0"
-    pify "^2.3.0"
-
-git-semver-tags@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.0.tgz#b31fd02c8ab578bd6c9b5cacca5e1c64c1177ac1"
-  dependencies:
-    meow "^3.3.0"
-    semver "^5.0.1"
-
-gitconfiglocal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
-  dependencies:
-    ini "^1.3.2"
-
-github-url-from-git@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/github-url-from-git/-/github-url-from-git-1.5.0.tgz#f985fedcc0a9aa579dc88d7aff068d55cc6251a0"
-
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3242,7 +2968,7 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^6.0.0, globby@^6.1.0:
+globby@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
@@ -3282,7 +3008,7 @@ gzip-size@^3.0.0:
   dependencies:
     duplexer "^0.1.1"
 
-handlebars@^4.0.2, handlebars@^4.0.3:
+handlebars@^4.0.3:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
@@ -3495,11 +3221,11 @@ hullabaloo-config-manager@^1.1.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13:
+iconv-lite@0.4.13, iconv-lite@~0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+iconv-lite@^0.4.17:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
 
@@ -3573,7 +3299,7 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
@@ -3641,7 +3367,7 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-ci@^1.0.10, is-ci@^1.0.7:
+is-ci@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies:
@@ -3713,7 +3439,7 @@ is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
 
-is-my-json-valid@^2.12.4, is-my-json-valid@^2.16.0:
+is-my-json-valid@^2.12.4:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
   dependencies:
@@ -3802,22 +3528,12 @@ is-stream@^1.0.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"
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
   dependencies:
     html-comment-regex "^1.1.0"
 
-is-text-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
-  dependencies:
-    text-extensions "^1.0.0"
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -3925,11 +3641,11 @@ js-tokens@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
 js-yaml@^3.4.3, js-yaml@^3.8.2, js-yaml@^3.8.4:
-  version "3.8.4"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"
   dependencies:
     argparse "^1.0.7"
-    esprima "^3.1.1"
+    esprima "^4.0.0"
 
 js-yaml@~3.7.0:
   version "3.7.0"
@@ -3998,7 +3714,7 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
@@ -4013,8 +3729,8 @@ jsonfile@^2.1.0:
     graceful-fs "^4.1.6"
 
 jsonfile@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -4022,10 +3738,6 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -4079,46 +3791,6 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-lerna@2.0.0-rc.5:
-  version "2.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.0.0-rc.5.tgz#b59d168caaac6e3443078c1bce194208c9aa3090"
-  dependencies:
-    async "^1.5.0"
-    chalk "^1.1.1"
-    cmd-shim "^2.0.2"
-    columnify "^1.5.4"
-    command-join "^2.0.0"
-    conventional-changelog-cli "^1.3.1"
-    conventional-recommended-bump "^1.0.0"
-    dedent "^0.7.0"
-    execa "^0.6.3"
-    find-up "^2.1.0"
-    fs-extra "^3.0.1"
-    get-port "^3.1.0"
-    glob "^7.1.2"
-    globby "^6.1.0"
-    graceful-fs "^4.1.11"
-    inquirer "^3.0.6"
-    is-ci "^1.0.10"
-    load-json-file "^2.0.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    npmlog "^4.1.0"
-    p-finally "^1.0.0"
-    path-exists "^3.0.0"
-    read-cmd-shim "^1.0.1"
-    read-pkg "^2.0.0"
-    rimraf "^2.6.1"
-    safe-buffer "^5.0.1"
-    semver "^5.1.0"
-    signal-exit "^3.0.2"
-    strong-log-transformer "^1.0.6"
-    temp-write "^3.3.0"
-    write-file-atomic "^2.1.0"
-    write-json-file "^2.1.0"
-    write-pkg "^3.0.1"
-    yargs "^8.0.1"
-
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4229,7 +3901,7 @@ lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
-lodash.template@^4.0.2, lodash.template@^4.4.0:
+lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
   dependencies:
@@ -4246,7 +3918,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4357,7 +4029,7 @@ memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.3.0, meow@^3.7.0:
+meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
@@ -4459,21 +4131,13 @@ minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
-
 "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:
     minimist "0.0.8"
 
-modify-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
-
-moment@^2.18.1, moment@^2.6.0:
+moment@^2.18.1:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
@@ -4594,7 +4258,7 @@ nopt@~3.0.1:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -4634,7 +4298,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2, npmlog@^4.1.0:
+npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -4896,10 +4560,6 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
-parse-github-repo-url@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz#286c53e2c9962e0641649ee3ac9508fca4dd959c"
-
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -4999,7 +4659,7 @@ performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -5325,9 +4985,9 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.1:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.5.tgz#efa34f745ca25bd3b3cbd15aa4e03112b8237f3c"
+postcss@^6.0.1, postcss@^6.0.6:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd"
   dependencies:
     chalk "^2.0.1"
     source-map "^0.5.6"
@@ -5437,7 +5097,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@^1.1.2, q@^1.4.1:
+q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
@@ -5490,12 +5150,6 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-cmd-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
-  dependencies:
-    graceful-fs "^4.1.2"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -5510,7 +5164,7 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
-read-pkg@^1.0.0, read-pkg@^1.1.0:
+read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
@@ -5939,7 +5593,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -6042,12 +5696,6 @@ sort-keys@^1.0.0, sort-keys@^1.1.1, sort-keys@^1.1.2:
   dependencies:
     is-plain-obj "^1.0.0"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
@@ -6079,8 +5727,8 @@ source-map@~0.2.0:
     amdefine ">=0.0.4"
 
 spawn-wrap@^1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.7.tgz#beb8bf4426d64b2b06871e0d7dee2643f1f8d1bc"
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.8.tgz#fa2a79b990cbb0bb0018dca6748d88367b19ec31"
   dependencies:
     foreground-child "^1.5.6"
     mkdirp "^0.5.0"
@@ -6103,18 +5751,6 @@ 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"
 
-split2@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
-  dependencies:
-    through2 "^2.0.2"
-
-split@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.0.tgz#c4395ce683abcd254bc28fe1dabb6e5c27dcffae"
-  dependencies:
-    through "2"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -6257,16 +5893,6 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-strong-log-transformer@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
-  dependencies:
-    byline "^5.0.0"
-    duplexer "^0.1.1"
-    minimist "^0.1.0"
-    moment "^2.6.0"
-    through "^2.3.4"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -6278,8 +5904,8 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
     has-flag "^1.0.0"
 
 supports-color@^4.0.0, supports-color@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.1.0.tgz#92cc14bb3dad8928ca5656c33e19a19f20af5c7a"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
   dependencies:
     has-flag "^2.0.0"
 
@@ -6350,28 +5976,6 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
-
-temp-write@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.3.0.tgz#c1a96de2b36061342eae81f44ff001aec8f615a9"
-  dependencies:
-    graceful-fs "^4.1.2"
-    is-stream "^1.1.0"
-    make-dir "^1.0.0"
-    pify "^2.2.0"
-    temp-dir "^1.0.0"
-    uuid "^3.0.1"
-
-tempfile@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
-  dependencies:
-    os-tmpdir "^1.0.0"
-    uuid "^2.0.1"
-
 term-size@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
@@ -6388,22 +5992,18 @@ test-exclude@^4.1.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-text-extensions@^1.0.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.5.0.tgz#d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc"
-
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through2@^2.0.0, through2@^2.0.2:
+through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
+through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -6458,7 +6058,7 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
-trim-off-newlines@^1.0.0, trim-off-newlines@^1.0.1:
+trim-off-newlines@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
 
@@ -6506,8 +6106,8 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 uglify-js@3.0.x, uglify-js@^3.0.23:
-  version "3.0.23"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.23.tgz#a58c6b97e6d6763d94dbc265fe8e8c1725e64666"
+  version "3.0.24"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.24.tgz#ee93400ad9857fb7a1671778db83f6a23f033121"
   dependencies:
     commander "~2.9.0"
     source-map "~0.5.1"
@@ -6525,7 +6125,7 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-uglifyjs-webpack-plugin@^0.4.4:
+uglifyjs-webpack-plugin@^0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
   dependencies:
@@ -6648,11 +6248,7 @@ utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
-uuid@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-
-uuid@^3.0.0, uuid@^3.0.1:
+uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
@@ -6774,12 +6370,6 @@ watchpack@^1.3.1:
     chokidar "^1.4.3"
     graceful-fs "^4.1.2"
 
-wcwidth@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  dependencies:
-    defaults "^1.0.3"
-
 webidl-conversions@^4.0.0, webidl-conversions@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
@@ -6810,12 +6400,11 @@ webpack-dev-middleware@^1.11.0:
     range-parser "^1.0.3"
 
 webpack-hot-middleware@^2.18.1:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.1.tgz#8b7f4f17a058974213e5058cc861da281506a8a9"
+  version "2.18.2"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.2.tgz#84dee643f037c3d59c9de142548430371aa8d3b2"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
-    path-browserify "0.0.0"
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
@@ -6831,15 +6420,15 @@ webpack-sources@^1.0.1:
     source-map "~0.5.3"
 
 webpack@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.1.0.tgz#ac0675e500db835f9ab2369d29ba096f51ad0731"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
     ajv "^5.1.5"
     ajv-keywords "^2.0.0"
     async "^2.1.2"
-    enhanced-resolve "^3.0.0"
+    enhanced-resolve "^3.3.0"
     escope "^3.6.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
@@ -6852,7 +6441,7 @@ webpack@^3.0.0:
     source-map "^0.5.3"
     supports-color "^3.1.0"
     tapable "~0.2.5"
-    uglifyjs-webpack-plugin "^0.4.4"
+    uglifyjs-webpack-plugin "^0.4.6"
     watchpack "^1.3.1"
     webpack-sources "^1.0.1"
     yargs "^6.0.0"
@@ -6936,7 +6525,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.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37"
   dependencies:
@@ -6944,7 +6533,7 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.1.0:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-write-json-file@^2.0.0, write-json-file@^2.1.0, write-json-file@^2.2.0:
+write-json-file@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
   dependencies:
@@ -6962,13 +6551,6 @@ write-pkg@^2.0.0:
     sort-keys "^1.1.2"
     write-json-file "^2.0.0"
 
-write-pkg@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9"
-  dependencies:
-    sort-keys "^2.0.0"
-    write-json-file "^2.2.0"
-
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"

From b921191f91f26818ff53b85b5eb8d84d888355c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 12:15:28 +0200
Subject: [PATCH 207/236] Fix typo

---
 examples/custom-build/pages/index.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/examples/custom-build/pages/index.vue b/examples/custom-build/pages/index.vue
index 163d8e58ea..5be0248820 100644
--- a/examples/custom-build/pages/index.vue
+++ b/examples/custom-build/pages/index.vue
@@ -7,16 +7,6 @@
   </div>
 </template>
 
-<script>
-import img from '@/assets/nuxt.png'
-
-export default {
-  mounted() {
-    console.log('Teub', img)
-  }
-}
-</script>
-
 <style>
 .container {
   font-size: 20px;

From a8696376159569f76918187a0ccf8324cfbd1a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 12:23:03 +0200
Subject: [PATCH 208/236] Fix example for v1

---
 examples/routes-transitions/nuxt.config.js  |  3 +--
 examples/routes-transitions/pages/users.vue | 18 ++++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/examples/routes-transitions/nuxt.config.js b/examples/routes-transitions/nuxt.config.js
index 422d6f68cb..c4264e9c56 100644
--- a/examples/routes-transitions/nuxt.config.js
+++ b/examples/routes-transitions/nuxt.config.js
@@ -2,6 +2,5 @@ module.exports = {
   build: {
     vendor: ['axios']
   },
-  css: ['~/assets/main.css'],
-  loading: false
+  css: ['~/assets/main.css']
 }
diff --git a/examples/routes-transitions/pages/users.vue b/examples/routes-transitions/pages/users.vue
index e151058127..ce5c065ba4 100644
--- a/examples/routes-transitions/pages/users.vue
+++ b/examples/routes-transitions/pages/users.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container" :key="page">
+  <div class="container">
     <nuxt-link v-if="page > 1" :to="'?page=' + (page - 1)">&lt; Prev</nuxt-link>
     <a v-else class="disabled">&lt; Prev</a>
     <span>{{ page }}/{{ totalPages }}</span>
@@ -23,16 +23,14 @@ export default {
     if (!from) return 'slide-left'
     return +to.query.page < +from.query.page ? 'slide-right' : 'slide-left'
   },
-  asyncData ({ query }) {
+  async asyncData ({ query }) {
     const page = +query.page || 1
-    return axios.get(`https://reqres.in/api/users?page=${page}`)
-    .then((res) => {
-      return {
-        page: +res.data.page,
-        totalPages: res.data.total_pages,
-        users: res.data.data
-      }
-    })
+    const { data } = await axios.get(`https://reqres.in/api/users?page=${page}`)
+    return {
+      page: +data.page,
+      totalPages: data.total_pages,
+      users: data.data
+    }
   }
 }
 </script>

From a963b566c16666e61560047dd94dd34dd7b60103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 12:23:56 +0200
Subject: [PATCH 209/236] Use nuxtChildKey as computed by default

---
 lib/app/components/nuxt.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/app/components/nuxt.vue b/lib/app/components/nuxt.vue
index 567454a4fb..7a16890942 100644
--- a/lib/app/components/nuxt.vue
+++ b/lib/app/components/nuxt.vue
@@ -1,6 +1,6 @@
 <template>
   <nuxt-error v-if="nuxt.err" :error="nuxt.err"></nuxt-error>
-  <nuxt-child :key="routerViewKey" v-else></nuxt-child>
+  <nuxt-child :key="nuxtChildKey" v-else></nuxt-child>
 </template>
 
 <script>
@@ -46,6 +46,15 @@ export default {
     }
   },
   <% } %>
+  computed: {
+    nuxtChildKey () {
+      // If routerViewKey prop is given or current route has children
+      if (typeof this.routerViewKey !== 'undefined' || this.$route.matched.length > 1) {
+        return this.routerViewKey || ''
+      }
+      return this.$route.fullPath.split('#')[0]
+    }
+  },
   components: {
     NuxtChild,
     NuxtError

From 4bf0a46cb0038f2d13bd3374a0b1a997101c48f6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 9 Jul 2017 16:13:03 +0430
Subject: [PATCH 210/236] chore: polish app/server.js

---
 lib/app/server.js | 202 ++++++++++++++++++++++++++++------------------
 1 file changed, 122 insertions(+), 80 deletions(-)

diff --git a/lib/app/server.js b/lib/app/server.js
index 7bcc1eb43a..703a575b6d 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -1,92 +1,103 @@
-'use strict'
-
 import Vue from 'vue'
 import clone from 'clone'
 import { stringify } from 'querystring'
 import { omit } from 'lodash'
 import middleware from './middleware'
 import { createApp, NuxtError } from './index'
-import { applyAsyncData, sanitizeComponent, getMatchedComponents, getContext, middlewareSeries, promisify, urlJoin } from './utils'
+import { applyAsyncData, sanitizeComponent, getMatchedComponents, getContext, middlewareSeries, promisify, urlJoin} from './utils'
+
 const debug = require('debug')('nuxt:render')
 debug.color = 4 // force blue color
 
 const isDev = <%= isDev %>
 
+const noopApp = () => new Vue({ render: (h) => h('div') })
+
+const createNext = context => opts => {
+  context.redirected = opts
+  // If nuxt generate
+  if (!context.res) {
+    context.nuxt.serverRendered = false
+    return
+  }
+  opts.query = stringify(opts.query)
+  opts.path = opts.path + (opts.query ? '?' + opts.query : '')
+  if (opts.path.indexOf('http') !== 0 && ('<%= router.base %>' !== '/' && opts.path.indexOf('<%= router.base %>') !== 0)) {
+    opts.path = urlJoin('<%= router.base %>', opts.path)
+  }
+  // Avoid loop redirect
+  if (opts.path === context.url) {
+    context.redirected = false
+    return
+  }
+  context.res.writeHead(opts.status, {
+    'Location': opts.path
+  })
+  context.res.end()
+}
+
 // This exported function will be called by `bundleRenderer`.
 // This is where we perform data-prefetching to determine the
 // state of our application before actually rendering it.
 // Since data fetching is async, this function is expected to
 // return a Promise that resolves to the app instance.
-export default async (context) => {
-  // create context.next for simulate next() of beforeEach() when wanted to redirect
+export default async context => {
+  // Create context.next for simulate next() of beforeEach() when wanted to redirect
   context.redirected = false
-  context.next = function (opts) {
-    context.redirected = opts
-    // if nuxt generate
-    if (!context.res) {
-      context.nuxt.serverRendered = false
-      return
-    }
-    opts.query = stringify(opts.query)
-    opts.path = opts.path + (opts.query ? '?' + opts.query : '')
-    if (opts.path.indexOf('http') !== 0 && ('<%= router.base %>' !== '/' && opts.path.indexOf('<%= router.base %>') !== 0)) {
-      opts.path = urlJoin('<%= router.base %>', opts.path)
-    }
-    // Avoid loop redirect
-    if (opts.path === context.url) {
-      context.redirected = false
-      return
-    }
-    context.res.writeHead(opts.status, {
-      'Location': opts.path
-    })
-    context.res.end()
-  }
+  context.next = createNext(context)
+  
   const { app, router<%= (store ? ', store' : '') %> } = await createApp(context)
   const _app = new Vue(app)
-  const _noopApp = new Vue({ render: (h) => h('div') })
+  
   // Add store to the context
   <%= (store ? 'context.store = store' : '') %>
+ 
   // Add route to the context
   context.route = router.currentRoute
+ 
   // Components array (for dynamic components)
   context.hasDynamicComponents = false
   context.components = []
+ 
   // Nuxt object
   context.nuxt = { layout: 'default', data: [], error: null<%= (store ? ', state: null' : '') %>, serverRendered: true }
+ 
   // Add meta infos
   context.meta = _app.$meta()
+ 
   // Error function
   context.error = _app.$options._nuxt.error.bind(_app)
+ 
   // Keep asyncData for each matched component in context
   context.asyncData = {}
 
-  <%= (isDev ? 'const s = isDev && Date.now()' : '') %>
-  let ctx = getContext(context, app)
+  // Create shared ctx
+  const ctx = getContext(context, app)
+
+  <% if (isDev) { %>const s = isDev && Date.now()<% } %>
+ 
+  // Resolve components    
   let Components = []
-  let promises = getMatchedComponents(router.match(context.url)).map((Component) => {
-    return new Promise((resolve, reject) => {
-      if (typeof Component !== 'function' || Component.super === Vue) return resolve(sanitizeComponent(Component))
+  try {
+    Components = await Promise.all(getMatchedComponents(router.match(context.url)).map((Component) => new Promise((resolve, reject) => {
+      if (typeof Component !== 'function' || Component.super === Vue) {
+        return resolve(sanitizeComponent(Component))
+      }
       const _resolve = (Component) => resolve(sanitizeComponent(Component))
       Component().then(_resolve).catch(reject)
-    })
-  })
-  try {
-    Components = await Promise.all(promises)
+    })))
   } catch (err) {
     // Throw back error to renderRoute()
     throw err
   }
-  // nuxtServerInit
-  <% if (store) { %>
-    let promise = (store._actions && store._actions.nuxtServerInit ? store.dispatch('nuxtServerInit', getContext(context, app)) : null)
-    if (!promise || (!(promise instanceof Promise) && (typeof promise.then !== 'function'))) promise = Promise.resolve()
-  <% } else { %>
-    let promise = Promise.resolve()
-  <% } %>
-  await promise
-  // If nuxtServerInit made a redirect
-  if (context.redirected) return _noopApp
+
+  // Dispatch nuxtServerInit
+  if (store._actions && store._actions.nuxtServerInit) {
+    await store.dispatch('nuxtServerInit', ctx)
+  }
+  // ...If there is a redirect
+  if (context.redirected) return noopApp()
+
   // Call global middleware (nuxt.config.js)
   let midd = <%= serialize(router.middleware, { isJSON: true }) %>
   midd = midd.map((name) => {
@@ -98,32 +109,39 @@ export default async (context) => {
   if (!context.nuxt.error) {
     await middlewareSeries(midd, ctx)
   }
-  if (context.redirected) return _noopApp
+  // ...If there is a redirect
+  if (context.redirected) return noopApp()
+
   // Set layout
   let layout = Components.length ? Components[0].options.layout : NuxtError.layout
   if (typeof layout === 'function') layout = layout(ctx)
   await _app.loadLayout(layout)
   layout = _app.setLayout(layout)
-  // Set layout to __NUXT__
+  // ...Set layout to __NUXT__
   context.nuxt.layout = _app.layoutName
+ 
   // Call middleware (layout + pages)
-  midd = []
-  if (layout.middleware) midd = midd.concat(layout.middleware)
-  Components.forEach((Component) => {
-    if (Component.options.middleware) {
-      midd = midd.concat(Component.options.middleware)
-    }
-  })
-  midd = midd.map((name) => {
-    if (typeof middleware[name] !== 'function') {
-      context.nuxt.error = context.error({ statusCode: 500, message: 'Unknown middleware ' + name })
-    }
-    return middleware[name]
-  })
   if (!context.nuxt.error) {
+    midd = []
+    if (layout.middleware) midd = midd.concat(layout.middleware)
+    Components.forEach((Component) => {
+      if (Component.options.middleware) {
+        midd = midd.concat(Component.options.middleware)
+      }
+    })
+    midd = midd.map((name) => {
+      if (typeof middleware[name] !== 'function') {
+        context.nuxt.error = context.error({ statusCode: 500, message: 'Unknown middleware ' + name })
+      }
+      return middleware[name]
+    })
+    
     await middlewareSeries(midd, ctx)
+    
+    // If there is a redirect
+    if (context.redirected) return noopApp()
   }
-  if (context.redirected) return _noopApp
+
   // Call .validate()
   let isValid = true
   Components.forEach((Component) => {
@@ -134,7 +152,7 @@ export default async (context) => {
       query: context.route.query  || {}<%= (store ? ', store: ctx.store' : '') %>
     })
   })
-  // If .validate() returned false
+  // ...If .validate() returned false
   if (!isValid) {
     // Don't server-render the page in generate mode
     if (context._generate) {
@@ -143,71 +161,95 @@ export default async (context) => {
     // Call the 404 error by making the Components array empty
     Components = []
   }
+  
   // Call asyncData & fetch hooks on components matched by the route.
-  let asyncDatas = await Promise.all(Components.map((Component) => {
+  let asyncDatas = await Promise.all(Components.map(Component => {
     let promises = []
+ 
     // Create this context for asyncData & fetch (used for dynamic component injection)
     const _this = { components: {} }
-    // Call asyncData
+ 
+    // Call asyncData(context)
     if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
       let promise = promisify(Component.options.asyncData.bind(_this), ctx)
-      // Call asyncData(context)
-      promise.then((asyncDataResult) => {
+      promise.then(asyncDataResult => {
         context.asyncData[Component.options.name] = asyncDataResult
         applyAsyncData(Component)
         return asyncDataResult
       })
       promises.push(promise)
-    } else promises.push(null)
+    } else {
+      promises.push(null)
+    }
+
     // Call fetch(context)
-    if (Component.options.fetch) promises.push(Component.options.fetch.call(_this, ctx))
-    else promises.push(null)
-    return Promise.all(promises)
-    .then((data) => {
+    if (Component.options.fetch) {
+      promises.push(Component.options.fetch.call(_this, ctx))
+    }
+    else {
+      promises.push(null)
+    }
+
+    return Promise.all(promises).then(data => {
       // If not dyanmic component, return data directly
-      if (Object.keys(_this.components).length === 0) return data
+      if (Object.keys(_this.components).length === 0) {
+        return data
+      }
+
       // Sanetize resolved components (Temporary workaround for vue-loader 13.0.0)
       Object.keys(_this.components).forEach(name => {
         _this.components[name] = _this.components[name].default || _this.components[name]
       })
+ 
       // Tell renderer that dynamic components has been added
       context.hasDynamicComponents = true
+  
       // Add Component on server side (clone of it)
       Component.options.components = {
         ...Component.options.components,
         ...clone(_this.components) // Clone it to avoid vue to overwrite references
       }
+  
       // Add components into __NUXT__ for client-side hydration
       // We clone it since vue-server-renderer will update the component definition
       context.components.push(sanitizeDynamicComponents(_this.components))
+  
       // Return data to server-render them
       return data
     })
   }))
+  
   // If no Components found, returns 404
   if (!Components.length) {
     context.nuxt.error = context.error({ statusCode: 404, message: 'This page could not be found.' })
   }
-  <% if (isDev) { %>
-    if (asyncDatas.length) debug('Data fetching ' + context.url + ': ' + (Date.now() - s) + 'ms')
-  <% } %>
+
+  <% if (isDev) { %>if (asyncDatas.length) debug('Data fetching ' + context.url + ': ' + (Date.now() - s) + 'ms')<% } %>
+
   // datas are the first row of each
-  context.nuxt.data = asyncDatas.map((r) => (r[0] || {}))
+  context.nuxt.data = asyncDatas.map(r => r[0] || {})
+
   // If an error occured in the execution
   if (_app.$options._nuxt.err) {
     context.nuxt.error = _app.$options._nuxt.err
   }
-  <%= (store ? '// Add the state from the vuex store' : '') %>
-  <%= (store ? 'context.nuxt.state = store.state' : '') %>
+
+  <% if (store) { %>
+  // Add the state from the vuex store
+  context.nuxt.state = store.state
+  <% } %>
+
   // If no error, return main app
   if (!context.nuxt.error) {
     return _app
   }
+
   // Load layout for error page
   layout = (typeof NuxtError.layout === 'function' ? NuxtError.layout(ctx) : NuxtError.layout)
   context.nuxt.layout = layout || ''
   await _app.loadLayout(layout)
   _app.setLayout(layout)
+ 
   return _app
 }
 

From 85825d190c37dafec1d9751a374b3b5df62526d5 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 9 Jul 2017 16:13:56 +0430
Subject: [PATCH 211/236] fix: gracefully handle unhandled promises

This prevents nuxt process exiting in dev mode on unhandled promises
---
 bin/nuxt     | 11 +++++++++++
 bin/nuxt-dev |  5 -----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/nuxt b/bin/nuxt
index 04764d440f..42217249cb 100755
--- a/bin/nuxt
+++ b/bin/nuxt
@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+// Node Source Map Support
+// https://github.com/evanw/node-source-map-support
+require('source-map-support').install()
+
 const join = require('path').join
 
 const defaultCommand = 'dev'
@@ -21,4 +25,11 @@ if (commands.has(cmd)) {
 
 const bin = join(__dirname, 'nuxt-' + cmd)
 
+// Console error unhandled promises
+process.on('unhandledRejection', function (err) {
+  /* eslint-disable no-console */
+  console.error(err)
+  console.error('[nuxt] Unhandled promise rejection: ' + err)
+})
+
 require(bin)
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 63a2df52f9..cb50c7397d 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -54,11 +54,6 @@ const nuxtConfigFile = resolve(rootDir, argv['config-file'])
 const nuxtConfig = loadNuxtConfig()
 _.defaultsDeep(nuxtConfig, { watchers: { chokidar: { ignoreInitial: true } } })
 
-// Fail if an error happened
-process.on('unhandledRejection', function (err) {
-  throw err
-})
-
 // Start dev
 let dev = startDev()
 

From db2a5ef75ac990978c24303fc412b56ea6e4bb04 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 9 Jul 2017 16:32:26 +0430
Subject: [PATCH 212/236] update server.js

---
 lib/app/server.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/app/server.js b/lib/app/server.js
index 703a575b6d..e4e3447151 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -49,8 +49,10 @@ export default async context => {
   const { app, router<%= (store ? ', store' : '') %> } = await createApp(context)
   const _app = new Vue(app)
   
+  <% if (store) { %>
   // Add store to the context
-  <%= (store ? 'context.store = store' : '') %>
+  context.store = store
+  <% } %>
  
   // Add route to the context
   context.route = router.currentRoute
@@ -91,12 +93,14 @@ export default async context => {
     throw err
   }
 
-  // Dispatch nuxtServerInit
+  <% if (store) { %>
+  // Dispatch store nuxtServerInit
   if (store._actions && store._actions.nuxtServerInit) {
     await store.dispatch('nuxtServerInit', ctx)
   }
   // ...If there is a redirect
   if (context.redirected) return noopApp()
+  <% } %>
 
   // Call global middleware (nuxt.config.js)
   let midd = <%= serialize(router.middleware, { isJSON: true }) %>

From ad85582f5cb07cf57106b56cc74f9eb1154036e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 16:29:14 +0200
Subject: [PATCH 213/236] Rename routerViewKey to nuxtChildKey

---
 lib/app/components/nuxt.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/app/components/nuxt.vue b/lib/app/components/nuxt.vue
index 7a16890942..01f71cc489 100644
--- a/lib/app/components/nuxt.vue
+++ b/lib/app/components/nuxt.vue
@@ -1,6 +1,6 @@
 <template>
   <nuxt-error v-if="nuxt.err" :error="nuxt.err"></nuxt-error>
-  <nuxt-child :key="nuxtChildKey" v-else></nuxt-child>
+  <nuxt-child :key="routerViewKey" v-else></nuxt-child>
 </template>
 
 <script>
@@ -10,7 +10,7 @@ import NuxtError from '<%= components.ErrorPage ? ((components.ErrorPage.include
 
 export default {
   name: 'nuxt',
-  props: ['routerViewKey'],
+  props: ['nuxtChildKey'],
   beforeCreate () {
     Vue.util.defineReactive(this, 'nuxt', this.$root.$options._nuxt)
   },
@@ -47,10 +47,10 @@ export default {
   },
   <% } %>
   computed: {
-    nuxtChildKey () {
-      // If routerViewKey prop is given or current route has children
-      if (typeof this.routerViewKey !== 'undefined' || this.$route.matched.length > 1) {
-        return this.routerViewKey || ''
+    routerViewKey () {
+      // If nuxtChildKey prop is given or current route has children
+      if (typeof this.nuxtChildKey !== 'undefined' || this.$route.matched.length > 1) {
+        return this.nuxtChildKey || ''
       }
       return this.$route.fullPath.split('#')[0]
     }

From f07d9855b6e9fa7747081968b2730a914fd23c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 16:50:55 +0200
Subject: [PATCH 214/236] Polish app/server.js

---
 lib/app/server.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/app/server.js b/lib/app/server.js
index e4e3447151..67e692bfc6 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -4,7 +4,7 @@ import { stringify } from 'querystring'
 import { omit } from 'lodash'
 import middleware from './middleware'
 import { createApp, NuxtError } from './index'
-import { applyAsyncData, sanitizeComponent, getMatchedComponents, getContext, middlewareSeries, promisify, urlJoin} from './utils'
+import { applyAsyncData, sanitizeComponent, getMatchedComponents, getContext, middlewareSeries, promisify, urlJoin } from './utils'
 
 const debug = require('debug')('nuxt:render')
 debug.color = 4 // force blue color
@@ -153,7 +153,8 @@ export default async context => {
     if (typeof Component.options.validate !== 'function') return
     isValid = Component.options.validate({
       params: context.route.params || {},
-      query: context.route.query  || {}<%= (store ? ', store: ctx.store' : '') %>
+      query: context.route.query  || {},
+      <%= (store ? 'store: ctx.store' : '') %>
     })
   })
   // ...If .validate() returned false
@@ -195,7 +196,7 @@ export default async context => {
     }
 
     return Promise.all(promises).then(data => {
-      // If not dyanmic component, return data directly
+      // If no dynamic component, return data directly
       if (Object.keys(_this.components).length === 0) {
         return data
       }

From 2cc78c0446151f2c41c6cab40e961298f318702a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 9 Jul 2017 23:06:17 +0200
Subject: [PATCH 215/236] Remove dynamic components

---
 lib/app/client.js                          | 13 +----
 lib/app/server.js                          | 61 ++--------------------
 lib/core/renderer.js                       |  7 +--
 test/fixtures/ssr/pages/asyncComponent.vue |  9 ++--
 test/ssr.test.js                           |  7 +--
 5 files changed, 14 insertions(+), 83 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index 4f2d18de10..0099fb40da 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -160,11 +160,9 @@ async function render (to, from, next) {
         return Promise.resolve()
       }
       let promises = []
-      // Create this context for asyncData & fetch (used for dynamic component injection)
-      const _this = { components: {} }
       // asyncData method
       if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
-        var promise = promisify(Component.options.asyncData.bind(_this), context)
+        var promise = promisify(Component.options.asyncData, context)
         promise.then((asyncDataResult) => {
           applyAsyncData(Component, asyncDataResult)
           <%= (loading ? 'this.$loading.increase && this.$loading.increase(30)' : '') %>
@@ -172,19 +170,12 @@ async function render (to, from, next) {
         promises.push(promise)
       }
       if (Component.options.fetch) {
-        var p = Component.options.fetch.call(_this, context)
+        var p = Component.options.fetch(context)
         if (!p || (!(p instanceof Promise) && (typeof p.then !== 'function'))) { p = Promise.resolve(p) }
         <%= (loading ? 'p.then(() => this.$loading.increase && this.$loading.increase(30))' : '') %>
         promises.push(p)
       }
       return Promise.all(promises)
-      .then(() => {
-        Object.keys(_this.components).forEach((name) => {
-          // Sanetize resolved components (Temporary workaround for vue-loader 13.0.0)
-          _this.components[name] = _this.components[name].default || _this.components[name]
-          Component.options.components[name] = _this.components[name]
-        })
-      })
     }))
     _lastPaths = Components.map((Component, i) => compile(to.matched[i].path)(to.params))
     <%= (loading ? 'this.$loading.finish && this.$loading.finish()' : '') %>
diff --git a/lib/app/server.js b/lib/app/server.js
index 67e692bfc6..c6fc4b67f4 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -56,11 +56,7 @@ export default async context => {
  
   // Add route to the context
   context.route = router.currentRoute
- 
-  // Components array (for dynamic components)
-  context.hasDynamicComponents = false
-  context.components = []
- 
+  
   // Nuxt object
   context.nuxt = { layout: 'default', data: [], error: null<%= (store ? ', state: null' : '') %>, serverRendered: true }
  
@@ -171,12 +167,9 @@ export default async context => {
   let asyncDatas = await Promise.all(Components.map(Component => {
     let promises = []
  
-    // Create this context for asyncData & fetch (used for dynamic component injection)
-    const _this = { components: {} }
- 
     // Call asyncData(context)
     if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
-      let promise = promisify(Component.options.asyncData.bind(_this), ctx)
+      let promise = promisify(Component.options.asyncData, ctx)
       promise.then(asyncDataResult => {
         context.asyncData[Component.options.name] = asyncDataResult
         applyAsyncData(Component)
@@ -189,39 +182,13 @@ export default async context => {
 
     // Call fetch(context)
     if (Component.options.fetch) {
-      promises.push(Component.options.fetch.call(_this, ctx))
+      promises.push(Component.options.fetch(ctx))
     }
     else {
       promises.push(null)
     }
 
-    return Promise.all(promises).then(data => {
-      // If no dynamic component, return data directly
-      if (Object.keys(_this.components).length === 0) {
-        return data
-      }
-
-      // Sanetize resolved components (Temporary workaround for vue-loader 13.0.0)
-      Object.keys(_this.components).forEach(name => {
-        _this.components[name] = _this.components[name].default || _this.components[name]
-      })
- 
-      // Tell renderer that dynamic components has been added
-      context.hasDynamicComponents = true
-  
-      // Add Component on server side (clone of it)
-      Component.options.components = {
-        ...Component.options.components,
-        ...clone(_this.components) // Clone it to avoid vue to overwrite references
-      }
-  
-      // Add components into __NUXT__ for client-side hydration
-      // We clone it since vue-server-renderer will update the component definition
-      context.components.push(sanitizeDynamicComponents(_this.components))
-  
-      // Return data to server-render them
-      return data
-    })
+    return Promise.all(promises)
   }))
   
   // If no Components found, returns 404
@@ -257,23 +224,3 @@ export default async context => {
  
   return _app
 }
-
-function sanitizeDynamicComponents(components) {
-  Object.keys(components).forEach((name) => {
-    const component = components[name]
-    // Remove SSR register hookd
-    if (Array.isArray(component.beforeCreate)) {
-      component.beforeCreate = component.beforeCreate.filter((fn) => fn !== component._ssrRegister)
-      if (!component.beforeCreate.length) delete component.beforeCreate
-    }
-    // Remove SSR & informations properties
-    delete component._ssrRegister
-    delete component.__file
-    if (component.staticRenderFns && !component.staticRenderFns.length) {
-      delete component.staticRenderFns
-    }
-    // Add Component to NUXT.components[i][name]
-    components[name] = component
-  })
-  return clone(components)
-}
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 2e36ed2f20..07625b340c 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -345,12 +345,7 @@ export default class Renderer extends Tapable {
       HEAD += resourceHints
     }
     HEAD += context.renderStyles()
-    APP += `<script type="text/javascript">`
-    APP += `window.__NUXT__=${serialize(context.nuxt, { isJSON: true })};`
-    if (context.hasDynamicComponents) {
-      APP += `window.__COMPONENTS__=${serialize(context.components)};`
-    }
-    APP += `</script>`
+    APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, { isJSON: true })};</script>`
     APP += context.renderScripts()
 
     let html = this.resources.appTemplate({
diff --git a/test/fixtures/ssr/pages/asyncComponent.vue b/test/fixtures/ssr/pages/asyncComponent.vue
index ec29b62d43..947aa7994c 100644
--- a/test/fixtures/ssr/pages/asyncComponent.vue
+++ b/test/fixtures/ssr/pages/asyncComponent.vue
@@ -5,14 +5,11 @@
 </template>
 
 <script>
+const AsyncTest = () => import('@/components/test.vue').then((m) => m.default || m)
 
 export default {
-  async asyncData({ error }) {
-    try {
-      this.components.AsyncTest = await import(`@/components/test.vue`)
-    } catch (e) {
-      error({ statusCode: 404, message: 'Can not load test component' })
-    }
+  components:{
+    AsyncTest
   }
 }
 </script>
\ No newline at end of file
diff --git a/test/ssr.test.js b/test/ssr.test.js
index e45201fb04..c3be1a519f 100755
--- a/test/ssr.test.js
+++ b/test/ssr.test.js
@@ -62,9 +62,10 @@ test('unique responses with component', async t => {
   await uniqueTest(t, '/component')
 })
 
-test('unique responses with async components', async t => {
-  await uniqueTest(t, '/asyncComponent')
-})
+test.todo('unique responses with async components (wait Vue 2.4)')
+// test('unique responses with async components', async t => {
+//   await uniqueTest(t, '/asyncComponent')
+// })
 
 test('unique responses with asyncData()', async t => {
   await uniqueTest(t, '/asyncData')

From ddc6369e05a993a28f12e24c225c31728869d1b0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 10 Jul 2017 02:11:04 +0430
Subject: [PATCH 216/236] chore: polish client.js

---
 lib/app/client.js | 420 +++++++++++++++++++++++++++++-----------------
 1 file changed, 267 insertions(+), 153 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index 4f2d18de10..f7ebf95759 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -1,32 +1,61 @@
-'use strict'
-
 import Vue from 'vue'
 import middleware from './middleware'
 import { createApp, NuxtError } from './index'
-import { applyAsyncData, sanitizeComponent, getMatchedComponents, getMatchedComponentsInstances, flatMapComponents, getContext, middlewareSeries, promisify, getLocation, compile } from './utils'
+import { 
+  applyAsyncData,
+  sanitizeComponent,
+  getMatchedComponents, 
+  getMatchedComponentsInstances,
+  flatMapComponents, 
+  getContext, 
+  middlewareSeries,
+  promisify,
+  getLocation,
+  compile
+} from './utils'
+
 const noopData = () => { return {} }
 const noopFetch = () => {}
+
+// Global shared references
 let _lastPaths = []
 let _lastComponentsFiles = []
-
 let app
 let router
-<%= (store ? 'let store' : '') %>
+<% if (store) { %>let store<% } %>
+
+// Try to rehydrate SSR data from window
+const NUXT = window.__NUXT__ || {}
+NUXT.components = window.__COMPONENTS__ || null
+
+// Create and mount App
+createApp()
+.then(mountApp)
+.catch(err => {
+  console.error('[nuxt] Error while initializing app', err)
+})
+
+function componentOption(component, key, ...args) {
+  if (!component || !component.options || !component.options[key]) {
+    return {}
+  }
+  const option = component.options[key]
+  if (typeof option === 'function') {
+    return option(...args)
+  }
+  return option
+}
 
 function mapTransitions(Components, to, from) {
-  const componentTransitions = (component) => {
-    if (!component || !component.options || !component.options.transition) {
-      return {}
-    }
-    let transition = component.options.transition
-    if (typeof transition === 'function') {
-      transition = transition(to, from)
-    }
+  const componentTransitions = component => {
+    const transition = componentOption(component, 'transition', to, from)
     return (typeof transition === 'string' ? { name: transition } : transition)
   }
-  return Components.map((Component) => {
+  
+  return Components.map(Component => {
     // Clone original object to prevent overrides
     const transitions = Object.assign({}, componentTransitions(Component))
+ 
     // Combine transitions & prefer `leave` transitions of 'from' route
     if (from && from.matched.length && from.matched[0].components.default) {
       const from_transitions = componentTransitions(from.matched[0].components.default)
@@ -34,151 +63,229 @@ function mapTransitions(Components, to, from) {
         .filter(key => from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1)
         .forEach(key => { transitions[key] = from_transitions[key] })
     }
+ 
     return transitions
   })
 }
 
-function loadAsyncComponents (to, from, next) {
-  const resolveComponents = flatMapComponents(to, (Component, _, match, key) => {
-    if (typeof Component === 'function' && !Component.options) {
-      return new Promise(function (resolve, reject) {
-        const _resolve = (Component) => {
-          Component = sanitizeComponent(Component)
-          match.components[key] = Component
-          resolve(Component)
-        }
-        Component().then(_resolve).catch(reject)
-      })
-    }
-    Component = sanitizeComponent(Component)
-    match.components[key] = Component
-    return match.components[key]
-  })
+async function loadAsyncComponents (to, from, next) {
+  // Check if route hash changed
   const fromPath = from.fullPath.split('#')[0]
   const toPath = to.fullPath.split('#')[0]
-  this._hashChanged = (fromPath === toPath)
-  if (!this._hashChanged) {
-    <%= (loading ? 'this.$loading.start && this.$loading.start()' : '') %>
+  this._hashChanged = fromPath === toPath
+ 
+  <% if (loading) { %>
+  if (!this._hashChanged && this.$loading.start) {
+      this.$loading.start()
   }
-  Promise.all(resolveComponents)
-  .then(() => next())
-  .catch((err) => {
-    let statusCode = err.statusCode || err.status || (err.response && err.response.status) || 500
-    this.error({ statusCode, message: err.message })
-    next(false)
+  <% } %>
+
+  try {
+    await Promise.all(flatMapComponents(to, (Component, _, match, key) => {
+      // If component already resolved
+      if (typeof Component !== 'function' || Component.options) {
+        const _Component = sanitizeComponent(Component)
+        match.components[key] = _Component
+        return _Component
+      }
+
+      // Resolve component
+      return Component().then(Component => {
+          const _Component = sanitizeComponent(Component)
+          match.components[key] = _Component
+          return _Component
+      })
+    }))
+
+    next()
+  } catch (err) {
+      if (!err) err = {}
+      const statusCode = err.statusCode || err.status || (err.response && err.response.status) || 500
+      this.error({ statusCode, message: err.message })
+      next(false)
+  }
+}
+
+// Get matched components
+function resolveComponents(router) {
+  const path = getLocation(router.options.base)
+  
+  return flatMapComponents(router.match(path), (Component, _, match, key, index) => {
+    // If component already resolved  
+    if (typeof Component !== 'function' || Component.options) {
+      const _Component = sanitizeComponent(Component)
+      match.components[key] = _Component
+      return _Component
+    }
+
+    // Resolve component
+    return Component().then(Component => {
+        const _Component = sanitizeComponent(Component)
+        if (NUXT.serverRendered) {
+          applyAsyncData(_Component, NUXT.data[index])
+          if (NUXT.components) {
+            Component.options.components = Object.assign(_Component.options.components, NUXT.components[index])
+          }
+          _Component._Ctor = _Component
+        }
+        match.components[key] = _Component
+        return _Component
+    })
   })
 }
 
 function callMiddleware (Components, context, layout) {
-  // if layout is undefined, only call global middleware
   let midd = <%= serialize(router.middleware, { isJSON: true }) %>
   let unknownMiddleware = false
+ 
+  // If layout is undefined, only call global middleware
   if (typeof layout !== 'undefined') {
-    midd = [] // exclude global middleware if layout defined (already called before)
+    midd = [] // Exclude global middleware if layout defined (already called before)
     if (layout.middleware) {
       midd = midd.concat(layout.middleware)
     }
-    Components.forEach((Component) => {
+    Components.forEach(Component => {
       if (Component.options.middleware) {
         midd = midd.concat(Component.options.middleware)
       }
     })
   }
-  midd = midd.map((name) => {
+
+  midd = midd.map(name => {
     if (typeof middleware[name] !== 'function') {
       unknownMiddleware = true
       this.error({ statusCode: 500, message: 'Unknown middleware ' + name })
     }
     return middleware[name]
   })
-  if (unknownMiddleware) return
+ 
+  if (unknownMiddleware) return  
   return middlewareSeries(midd, context)
 }
 
 async function render (to, from, next) {
   if (this._hashChanged) return next()
-  let layout
+
+  // nextCalled is true when redirected
   let nextCalled = false
-  const _next = function (path) {
-    <%= (loading ? 'this.$loading.finish && this.$loading.finish()' : '') %>
+  const _next = path => {
+    <% if(loading) { %>if(this.$loading.finish) this.$loading.finish()<% } %>
     if (nextCalled) return
     nextCalled = true
     next(path)
   }
-  let context = getContext({ to<%= (store ? ', store' : '') %>, isClient: true, next: _next.bind(this), error: this.error.bind(this) }, app)
-  let Components = getMatchedComponents(to)
+ 
+  // Update context
+  const context = getContext({ 
+    to,
+    <% if (store) { %>store,<% } %>
+    isClient: true,
+    next: _next.bind(this),
+    error: this.error.bind(this),
+    app
+  })
   this._context = context
   this._dateLastError = this.$options._nuxt.dateErr
   this._hadError = !!this.$options._nuxt.err
+
+  // Get route's matched components
+  const Components = getMatchedComponents(to)
+
+  // If no Components matched, generate 404
   if (!Components.length) {
     // Default layout
     await callMiddleware.call(this, Components, context)
     if (context._redirected) return
+ 
+    // Load layout for error page
     layout = await this.loadLayout(typeof NuxtError.layout === 'function' ? NuxtError.layout(context) : NuxtError.layout)
     await callMiddleware.call(this, Components, context, layout)
     if (context._redirected) return
+    
     this.error({ statusCode: 404, message: 'This page could not be found.' })
     return next()
   }
+ 
   // Update ._data and other properties if hot reloaded
-  Components.forEach(function (Component) {
+  Components.forEach(Component => {
     if (Component._Ctor && Component._Ctor.options) {
       Component.options.asyncData = Component._Ctor.options.asyncData
       Component.options.fetch = Component._Ctor.options.fetch
     }
   })
+
+  // Apply transitions
   this.setTransitions(mapTransitions(Components, to, from))
+
   try {
-    // Set layout
+    // Call middleware
     await callMiddleware.call(this, Components, context)
     if (context._redirected) return
-    layout = Components[0].options.layout
+
+    // Set layout
+    let layout = Components[0].options.layout
     if (typeof layout === 'function') {
       layout = layout(context)
     }
     layout = await this.loadLayout(layout)
+
+    // Call middleware for layout
     await callMiddleware.call(this, Components, context, layout)
     if (context._redirected) return
-    // Pass validation?
+ 
+    // Call .validate()
     let isValid = true
-    Components.forEach((Component) => {
+    Components.forEach(Component => {
       if (!isValid) return
       if (typeof Component.options.validate !== 'function') return
       isValid = Component.options.validate({
         params: to.params || {},
-        query : to.query  || {}<%= (store ? ', store: context.store' : '') %>
+        query : to.query  || {},
+        <% if(store) { %>store: context.store <% } %>
       })
     })
+    // ...If .validate() returned false
     if (!isValid) {
       this.error({ statusCode: 404, message: 'This page could not be found.' })
       return next()
     }
+ 
+    // Call asyncData & fetch hooks on components matched by the route.
     await Promise.all(Components.map((Component, i) => {
       // Check if only children route changed
       Component._path = compile(to.matched[i].path)(to.params)
       if (!this._hadError && Component._path === _lastPaths[i] && (i + 1) !== Components.length) {
         return Promise.resolve()
       }
+
       let promises = []
+
       // Create this context for asyncData & fetch (used for dynamic component injection)
       const _this = { components: {} }
-      // asyncData method
-      if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
-        var promise = promisify(Component.options.asyncData.bind(_this), context)
-        promise.then((asyncDataResult) => {
+
+      const hasAsyncData = Component.options.asyncData && typeof Component.options.asyncData === 'function'
+      const hasFetch = !!Component.options.fetch
+      <% if(loading) { %>const loadingIncrease = (hasAsyncData && hasFetch) ? 30 : 45<% } %> 
+
+      // Call asyncData(context)
+      if (hasAsyncData) {
+        const promise = promisify(Component.options.asyncData.bind(_this), context)
+        .then(asyncDataResult => {
           applyAsyncData(Component, asyncDataResult)
-          <%= (loading ? 'this.$loading.increase && this.$loading.increase(30)' : '') %>
+          <% if(loading) { %>if(this.$loading.increase) this.$loading.increase(loadingIncrease)<% } %>
         })
         promises.push(promise)
       }
-      if (Component.options.fetch) {
-        var p = Component.options.fetch.call(_this, context)
-        if (!p || (!(p instanceof Promise) && (typeof p.then !== 'function'))) { p = Promise.resolve(p) }
-        <%= (loading ? 'p.then(() => this.$loading.increase && this.$loading.increase(30))' : '') %>
-        promises.push(p)
+
+      // Call fetch(context)
+      if (hasFetch) {
+        const promise = Component.options.fetch.call(_this, context).then(fetchResult => {
+          <% if(loading) { %>if(this.$loading.increase) this.$loading.increase(loadingIncrease)<% } %>
+        })
+        promises.push(promise)
       }
-      return Promise.all(promises)
-      .then(() => {
+
+      return Promise.all(promises).then(() => {
         Object.keys(_this.components).forEach((name) => {
           // Sanetize resolved components (Temporary workaround for vue-loader 13.0.0)
           _this.components[name] = _this.components[name].default || _this.components[name]
@@ -186,24 +293,28 @@ async function render (to, from, next) {
         })
       })
     }))
+    
     _lastPaths = Components.map((Component, i) => compile(to.matched[i].path)(to.params))
-    <%= (loading ? 'this.$loading.finish && this.$loading.finish()' : '') %>
+
+    <% if(loading) { %>if(this.$loading.finish) this.$loading.finish()<% } %>
+
     // If not redirected
-    if (!nextCalled) {
-      next()
-    }
+    if (!nextCalled) next()
+
   } catch (error) {
+    if (!error) error = {}
     _lastPaths = []
     error.statusCode = error.statusCode || error.status || (error.response && error.response.status) || 500
+
+    // Load error layout
     let layout = NuxtError.layout
     if (typeof layout === 'function') {
       layout = layout(context)
     }
-    this.loadLayout(layout)
-    .then(() => {
-      this.error(error)
-      next(false)
-    })
+    await this.loadLayout(layout)
+ 
+    this.error(error)
+    next(false)
   }
 }
 
@@ -221,46 +332,72 @@ function normalizeComponents (to, ___) {
 }
 
 // When navigating on a different route but the same component is used, Vue.js
-// will not update the instance data, so we have to update $data ourselves
+// Will not update the instance data, so we have to update $data ourselves
 function fixPrepatch (to, ___) {
   if (this._hashChanged) return
+
   Vue.nextTick(() => {
-    let instances = getMatchedComponentsInstances(to)
+    const instances = getMatchedComponentsInstances(to)
+
     _lastComponentsFiles = instances.map((instance, i) => {
       if (!instance) return '';
+
       if (_lastPaths[i] === instance.constructor._path && typeof instance.constructor.options.data === 'function') {
-        let newData = instance.constructor.options.data.call(instance)
+        const newData = instance.constructor.options.data.call(instance)
         for (let key in newData) {
           Vue.set(instance.$data, key, newData[key])
         }
       }
+
       return instance.constructor.options.__file
     })
-    // hide error component if no error
+
+    // Hide error component if no error
     if (this._hadError && this._dateLastError === this.$options._nuxt.dateErr) {
       this.error()
     }
+
     // Set layout
     let layout = this.$options._nuxt.err ? NuxtError.layout : to.matched[0].components.default.options.layout
     if (typeof layout === 'function') {
       layout = layout(this._context)
     }
     this.setLayout(layout)
-    // hot reloading
+
+    // Hot reloading
     setTimeout(() => hotReloadAPI(this), 100)
   })
 }
 
+function nuxtReady (app) {
+  window._nuxtReadyCbs.forEach((cb) => {
+    if (typeof cb === 'function') {
+      cb(app)
+    }
+  })
+  // Special JSDOM
+  if (typeof window._onNuxtLoaded === 'function') {
+    window._onNuxtLoaded(app)
+  }
+  // Add router hooks
+  router.afterEach(function (to, from) {
+    app.$nuxt.$emit('routeChanged', to, from)
+  })
+}
+
+<% if (isDev) { %>
 // Special hot reload with asyncData(context)
 function hotReloadAPI (_app) {
   if (!module.hot) return
+ 
   let $components = []
   let $nuxt = _app.$nuxt
+ 
   while ($nuxt && $nuxt.$children && $nuxt.$children.length) {
-    $nuxt.$children.forEach(function (child, i) {
+    $nuxt.$children.forEach((child, i) => {
       if (child.$vnode.data.nuxtChild) {
         let hasAlready = false
-        $components.forEach(function (component) {
+        $components.forEach(component => {
           if (component.$options.__file === child.$options.__file) {
             hasAlready = true
           }
@@ -272,13 +409,16 @@ function hotReloadAPI (_app) {
       $nuxt = child
     })
   }
+ 
   $components.forEach(addHotReload.bind(_app))
 }
 
 function addHotReload ($component, depth) {
   if ($component.$vnode.data._hasHotReload) return
   $component.$vnode.data._hasHotReload = true
+
   var _forceUpdate = $component.$forceUpdate.bind($component.$parent)
+
   $component.$vnode.context.$forceUpdate = () => {
     let Components = getMatchedComponents(router.currentRoute)
     let Component = Components[depth]
@@ -338,106 +478,80 @@ function addHotReload ($component, depth) {
     })
   }
 }
+<% } %>
 
-// Load vue app
-const NUXT = window.__NUXT__ || {}
-NUXT.components = window.__COMPONENTS__ || null
-// Get matched components
-const resolveComponents = function (router) {
-  const path = getLocation(router.options.base)
-  return flatMapComponents(router.match(path), (Component, _, match, key, index) => {
-    if (typeof Component === 'function' && !Component.options) {
-      return new Promise(function (resolve, reject) {
-        const _resolve = (Component) => {
-          Component = sanitizeComponent(Component)
-          if (NUXT.serverRendered) {
-            applyAsyncData(Component, NUXT.data[index])
-            if (NUXT.components) {
-              Component.options.components = Object.assign(Component.options.components, NUXT.components[index])
-            }
-            Component._Ctor = Component
-          }
-          match.components[key] = Component
-          resolve(Component)
-        }
-        Component().then(_resolve).catch(reject)
-      })
-    }
-    Component = sanitizeComponent(Component)
-    match.components[key] = Component
-    return Component
-  })
-}
-
-function nuxtReady (app) {
-  window._nuxtReadyCbs.forEach((cb) => {
-    if (typeof cb === 'function') {
-      cb(app)
-    }
-  })
-  // Special JSDOM
-  if (typeof window._onNuxtLoaded === 'function') {
-    window._onNuxtLoaded(app)
-  }
-  // Add router hooks
-  router.afterEach(function (to, from) {
-    app.$nuxt.$emit('routeChanged', to, from)
-  })
-}
-
-createApp()
-.then(async (__app) => {
+async function mountApp(__app) {
+  // Set global variables
   app = __app.app
   router = __app.router
-  <%= (store ? 'store = __app.store' : '') %>
+  <% if (store) { %>store = __app.store <% } %>
+
+  // Resolve route components
   const Components = await Promise.all(resolveComponents(router))
+
+  // Create Vue instance
   const _app = new Vue(app)
+
+  // Load layout
   const layout = NUXT.layout || 'default'
   await _app.loadLayout(layout)
   _app.setLayout(layout)
+
+  // Mounts Vue app to DOM element
   const mountApp = () => {
     _app.$mount('#__nuxt')
+
+    // Listen for first Vue update
     Vue.nextTick(() => {
-      // Hot reloading
-      hotReloadAPI(_app)
       // Call window.onNuxtReady callbacks
       nuxtReady(_app)
+      <% if (isDev) { %>
+      // Enable hot reloading
+      hotReloadAPI(_app)
+      <% } %>
     })
   }
+
+  // Enable transitions
   _app.setTransitions = _app.$options._nuxt.setTransitions.bind(_app)
   if (Components.length) {
     _app.setTransitions(mapTransitions(Components, router.currentRoute))
-    _lastPaths = router.currentRoute.matched.map((route) => compile(route.path)(router.currentRoute.params))
-    _lastComponentsFiles = Components.map((Component) => Component.options.__file)
+    _lastPaths = router.currentRoute.matched.map(route => compile(route.path)(router.currentRoute.params))
+    _lastComponentsFiles = Components.map(Component => Component.options.__file)
   }
+ 
+  // Initialize error handler
   _app.error = _app.$options._nuxt.error.bind(_app)
-  _app.$loading = {} // to avoid error while _app.$nuxt does not exist
+  _app.$loading = {} // To avoid error while _app.$nuxt does not exist
   if (NUXT.error) _app.error(NUXT.error)
+
   // Add router hooks
   router.beforeEach(loadAsyncComponents.bind(_app))
   router.beforeEach(render.bind(_app))
   router.afterEach(normalizeComponents)
   router.afterEach(fixPrepatch.bind(_app))
+  
+  // If page already is server rendered
   if (NUXT.serverRendered) {
     mountApp()
     return
   }
-  render.call(_app, router.currentRoute, router.currentRoute, function (path) {
-    if (path) {
-      let mounted = false
-      router.afterEach(function () {
-        if (mounted) return
-        mounted = true
-        mountApp()
-      })
-      router.push(path)
+
+  render.call(_app, router.currentRoute, router.currentRoute, path => {
+    if (!path) {
+      normalizeComponents(router.currentRoute, router.currentRoute)
+      fixPrepatch.call(_app, router.currentRoute, router.currentRoute)
+      mountApp()
       return
     }
-    normalizeComponents(router.currentRoute, router.currentRoute)
-    fixPrepatch.call(_app, router.currentRoute, router.currentRoute)
-    mountApp()
+
+    // Push the path and then mount app
+    let mounted = false
+    router.afterEach(() => {
+      if (mounted) return
+      mounted = true
+      mountApp()
+    })
+    router.push(path)
   })
-})
-.catch((err) => {
-  console.error('[nuxt.js] Cannot load components', err) // eslint-disable-line no-console
-})
+}
\ No newline at end of file

From f635b73a0bf4c2a889a2a6f5af6ccacc56318e54 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 10 Jul 2017 02:11:44 +0430
Subject: [PATCH 217/236] chore: minor improvements for server.js

---
 lib/app/server.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/app/server.js b/lib/app/server.js
index e4e3447151..ad5c190fe4 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -85,8 +85,7 @@ export default async context => {
       if (typeof Component !== 'function' || Component.super === Vue) {
         return resolve(sanitizeComponent(Component))
       }
-      const _resolve = (Component) => resolve(sanitizeComponent(Component))
-      Component().then(_resolve).catch(reject)
+      return Component().then(Component => sanitizeComponent(Component))
     })))
   } catch (err) {
     // Throw back error to renderRoute()
@@ -175,8 +174,8 @@ export default async context => {
  
     // Call asyncData(context)
     if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
-      let promise = promisify(Component.options.asyncData.bind(_this), ctx)
-      promise.then(asyncDataResult => {
+      const promise = promisify(Component.options.asyncData.bind(_this), ctx)
+      .then(asyncDataResult => {
         context.asyncData[Component.options.name] = asyncDataResult
         applyAsyncData(Component)
         return asyncDataResult

From 5da4e49d560b9c3736c36d56d8907ebd6aea394c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 10 Jul 2017 02:59:27 +0430
Subject: [PATCH 218/236] chore: polish app/index.js

---
 lib/app/index.js | 83 +++++++++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index 2d78288b7a..4f2ceaa11d 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -1,17 +1,14 @@
-'use strict'
-
 import 'es6-promise/auto'
 import Vue from 'vue'
 import Meta from 'vue-meta'
 import { createRouter } from './router.js'
-<% if (store) { %>import { createStore } from './store.js'<% } %>
 import NuxtChild from './components/nuxt-child.js'
 import NuxtLink from './components/nuxt-link.js'
 import NuxtError from '<%= components.ErrorPage ? components.ErrorPage : "./components/nuxt-error.vue" %>'
 import Nuxt from './components/nuxt.vue'
 import App from '<%= appPath %>'
-
 import { getContext } from './utils'
+<% if (store) { %>import { createStore } from './store.js'<% } %>
 
 if (process.browser) {
   // window.onNuxtReady(() => console.log('Ready')) hook
@@ -22,11 +19,24 @@ if (process.browser) {
   }
 }
 
-// Import SSR plugins
-<% plugins.forEach(function (plugin) { if (plugin.ssr)
-{ %>let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
+<% if (plugins.filter(p => p.ssr).length) { %>
+// Require plugins
+<% plugins.filter(p => p.ssr).forEach(plugin => { %>
+let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
 <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
-<% }}) %>
+<% }) %>
+<% } %>
+
+<% if (plugins.filter(p => !p.ssr).length) { %>
+// Require browser-only plugins
+if (process.browser) {
+  <% plugins.filter(p => !p.ssr).forEach(plugin => { %>
+  let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
+  <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
+  <% }) %>
+}
+<% } %>
+
 
 // Component: <nuxt-child>
 Vue.component(NuxtChild.name, NuxtChild)
@@ -48,35 +58,34 @@ const defaultTransition = <%=
   .replace('beforeEnter(', 'function(').replace('enter(', 'function(').replace('afterEnter(', 'function(')
   .replace('enterCancelled(', 'function(').replace('beforeLeave(', 'function(').replace('leave(', 'function(')
   .replace('afterLeave(', 'function(').replace('leaveCancelled(', 'function(')
-  %>
+%>
 
 async function createApp (ssrContext) {
-  <% if (store) { %>
-  const store = createStore()
-  <% } %>
   const router = createRouter()
 
+  <% if (store) { %>const store = createStore()<% } %>
+
   if (process.server && ssrContext && ssrContext.url) {
     await new Promise((resolve, reject) => {
       router.push(ssrContext.url, resolve, reject)
     })
   }
 
+  <% if (store) { %>
   if (process.browser) {
-    <% if (store) { %>
     // Replace store state before calling plugins
     if (window.__NUXT__ && window.__NUXT__.state) {
       store.replaceState(window.__NUXT__.state)
     }
-    <% } %>
   }
+  <% } %>
 
-  // root instance
+  // Create Root instance
   // here we inject the router and store to all child components,
   // making them available everywhere as `this.$router` and `this.$store`.
-  let app = {
+  const app = {
     router,
-    <%= (store ? 'store,' : '') %>
+    <% if(store) { %> store,<%  } %> 
     _nuxt: {
       defaultTransition,
       transitions: [ defaultTransition ],
@@ -113,36 +122,38 @@ async function createApp (ssrContext) {
     ...App
   }
 
-  const next = ssrContext ? ssrContext.next : (location) => app.router.push(location)
+  const next = ssrContext ? ssrContext.next : location => app.router.push(location)
+
   const ctx = getContext({
     isServer: !!ssrContext,
     isClient: !ssrContext,
     route: router.currentRoute,
     next,
     error: app._nuxt.error.bind(app),
-    <%= (store ? 'store,' : '') %>
+    <% if(store) { %> store,<%  } %> 
     req: ssrContext ? ssrContext.req : undefined,
     res: ssrContext ? ssrContext.res : undefined,
   }, app)
 
-  // Inject external plugins
-  <% plugins.forEach(function (plugin) {
-  if (plugin.ssr) { %>
-  if (typeof <%= plugin.name %> === 'function') {
-    await <%= plugin.name %>(ctx)
-  }
-  <% } else { %>
-  if (process.browser) {
-    let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
-    <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
-    if (typeof <%= plugin.name %> === 'function') {
-      await <%= plugin.name %>(ctx)
-    }
-  }
-  <% }
-  }) %>
+  <% if (plugins.filter(p => p.ssr).length) { %>
+  <% plugins.filter(p => p.ssr).forEach(plugin => { %>
+    if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx) 
+  <% }) %>
+  <% } %>
 
-  return { app, router<%= (store ? ', store' : '') %> }
+  <% if (plugins.filter(p => !p.ssr).length) { %>
+  if (process.browser) {
+    <% plugins.filter(p => !p.ssr).forEach(plugin => { %>
+    if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx) 
+    <% }) %>
+  }
+  <% } %>
+
+  return {
+    app,
+    router,
+    <% if(store) { %> store <%  } %> 
+  }
 }
 
 export { createApp, NuxtError }

From a9f2f299a3d54ff2d485f6f560c75e4e34a16c97 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 10 Jul 2017 03:10:09 +0430
Subject: [PATCH 219/236] chore: minor olishes

---
 lib/app/router.js | 23 ++++++++++-------------
 lib/app/utils.js  |  1 -
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/app/router.js b/lib/app/router.js
index cbeb5acec7..55d2a568ca 100644
--- a/lib/app/router.js
+++ b/lib/app/router.js
@@ -1,5 +1,3 @@
-'use strict'
-
 import Vue from 'vue'
 import Router from 'vue-router'
 
@@ -7,7 +5,7 @@ Vue.use(Router)
 
 <%
 function recursiveRoutes(routes, tab, components) {
-  var res = ''
+  let res = ''
   routes.forEach((route, i) => {
     route._name = '_' + hash(route.component)
     components.push({ _name: route._name, component: route.component, name: route.name })
@@ -20,31 +18,30 @@ function recursiveRoutes(routes, tab, components) {
   })
   return res
 }
-var _components = []
-var _routes = recursiveRoutes(router.routes, '\t\t', _components)
-uniqBy(_components, '_name').forEach((route) => { %>
-const <%= route._name %> = () => import('<%= relativeToBuild(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */).then(m => m.default || m)
+const _components = []
+const _routes = recursiveRoutes(router.routes, '\t\t', _components)
+uniqBy(_components, '_name').forEach((route) => { %>const <%= route._name %> = () => import('<%= relativeToBuild(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */).then(m => m.default || m)
 <% }) %>
 
 <% if (router.scrollBehavior) { %>
 const scrollBehavior = <%= serialize(router.scrollBehavior).replace('scrollBehavior(', 'function(') %>
 <% } else { %>
 const scrollBehavior = (to, from, savedPosition) => {
-  // savedPosition is only available for popstate navigations.
+  // SavedPosition is only available for popstate navigations.
   if (savedPosition) {
     return savedPosition
   } else {
     let position = {}
-    // if no children detected
+    // If no children detected
     if (to.matched.length < 2) {
-      // scroll to the top of the page
+      // Scroll to the top of the page
       position = { x: 0, y: 0 }
     }
     else if (to.matched.some((r) => r.components.default.options.scrollToTop)) {
-      // if one of the children has scrollToTop option set to true
+      // If one of the children has scrollToTop option set to true
       position = { x: 0, y: 0 }
     }
-    // if link has anchor,  scroll to anchor by returning the selector
+    // If link has anchor, scroll to anchor by returning the selector
     if (to.hash) {
       position = { selector: to.hash }
     }
@@ -61,7 +58,7 @@ export function createRouter () {
     linkExactActiveClass: '<%= router.linkExactActiveClass %>',
     scrollBehavior,
     routes: [
-  <%= _routes %>
+<%= _routes %>
     ],
     fallback: <%= router.fallback %>
   })
diff --git a/lib/app/utils.js b/lib/app/utils.js
index 8260b383d4..0529c9b9bc 100644
--- a/lib/app/utils.js
+++ b/lib/app/utils.js
@@ -1,4 +1,3 @@
-'use strict'
 import Vue from 'vue'
 
 const noopData = () => ({})

From 518692b2f44c4ef144d2adc12016d20e41d5deef Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 10 Jul 2017 04:27:50 +0430
Subject: [PATCH 220/236] chore: minor fixes

---
 lib/app/client.js | 10 ++++++++--
 lib/app/index.js  |  2 ++
 lib/app/server.js |  6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/app/client.js b/lib/app/client.js
index f7ebf95759..96be5fd992 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -279,10 +279,14 @@ async function render (to, from, next) {
 
       // Call fetch(context)
       if (hasFetch) {
-        const promise = Component.options.fetch.call(_this, context).then(fetchResult => {
+        let p = Component.options.fetch.call(_this, context)
+        if (!p || (!(p instanceof Promise) && (typeof p.then !== 'function'))) {
+            p = Promise.resolve(p) 
+        }
+        p.then(fetchResult => {
           <% if(loading) { %>if(this.$loading.increase) this.$loading.increase(loadingIncrease)<% } %>
         })
-        promises.push(promise)
+        promises.push(p)
       }
 
       return Promise.all(promises).then(() => {
@@ -364,8 +368,10 @@ function fixPrepatch (to, ___) {
     }
     this.setLayout(layout)
 
+    <% if (isDev) { %>
     // Hot reloading
     setTimeout(() => hotReloadAPI(this), 100)
+    <% } %>
   })
 }
 
diff --git a/lib/app/index.js b/lib/app/index.js
index 4f2ceaa11d..09a0cf44a1 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -116,6 +116,8 @@ async function createApp (ssrContext) {
         const _nuxt = this._nuxt || this.$options._nuxt
         _nuxt.dateErr = Date.now()
         _nuxt.err = err
+        console.error(err)
+        console.error('[nuxt] ' + err)
         return err
       }
     },
diff --git a/lib/app/server.js b/lib/app/server.js
index ad5c190fe4..75b69718a4 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -81,12 +81,12 @@ export default async context => {
   // Resolve components    
   let Components = []
   try {
-    Components = await Promise.all(getMatchedComponents(router.match(context.url)).map((Component) => new Promise((resolve, reject) => {
+    Components = await Promise.all(getMatchedComponents(router.match(context.url)).map(Component => {
       if (typeof Component !== 'function' || Component.super === Vue) {
-        return resolve(sanitizeComponent(Component))
+        return sanitizeComponent(Component)
       }
       return Component().then(Component => sanitizeComponent(Component))
-    })))
+    }))
   } catch (err) {
     // Throw back error to renderRoute()
     throw err

From 3e36219a43a9000037f2f19eb02502a09487022d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 10 Jul 2017 08:56:02 +0200
Subject: [PATCH 221/236] Update component injection example

---
 examples/component-injection/pages/_slug.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/examples/component-injection/pages/_slug.vue b/examples/component-injection/pages/_slug.vue
index 328917b95f..f94719fb99 100644
--- a/examples/component-injection/pages/_slug.vue
+++ b/examples/component-injection/pages/_slug.vue
@@ -1,16 +1,19 @@
 <template>
-  <BlogArticle/>
+  <component :is="comp"/>
 </template>
 
 <script>
+const components = {}
+const files = require.context('@/articles', false, /\.vue$/)
+files.keys().forEach((filename) => {
+  const name = filename.replace('./', '').replace('.vue', '')
+  components[name] = () => import('@/articles/' + name + '.vue').then((m) => m.default || m)
+})
+
 export default {
   async asyncData({ params, error }) {
-    const slug = params.slug || 'hello'
-    try {
-      this.components.BlogArticle = await import(`~/articles/${slug}.vue`)
-    } catch (e) {
-      error({ statusCode: 404, message: 'Article not found' })
-    }
-  }
+    return { comp: params.slug }
+  },
+  components
 }
 </script>
\ No newline at end of file

From 74870baa3e25cd54f1bf325e2e1c84ef0fc6ab31 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Mon, 10 Jul 2017 13:52:10 +0200
Subject: [PATCH 222/236] Example ready with Vue 2.4

---
 .../assets/css/common.css                     |  69 ++++
 .../assets/css/index.css                      |  57 ++++
 .../assets/css/post.css                       | 307 ++++++++++++++++++
 .../assets/img/github.png                     | Bin 0 -> 1626 bytes
 .../assets/img/swimmer.jpg                    | Bin 0 -> 142219 bytes
 .../assets/img/twitter.png                    | Bin 0 -> 1545 bytes
 .../layouts/default.vue                       |  15 +
 .../async-component-injection/nuxt.config.js  |  22 ++
 .../package.json                              |   0
 .../async-component-injection/pages/_slug.vue |  21 ++
 .../async-component-injection/pages/index.vue |  22 ++
 .../async-component-injection/posts/404.vue   |   3 +
 .../posts/deep-dive-into-ocean.vue            |  17 +
 .../posts/welcome-to-my-blog.vue              |  10 +
 .../static/favicon.ico                        | Bin 0 -> 1150 bytes
 .../articles/article-1.vue                    |   7 -
 .../articles/article-2.vue                    |   7 -
 examples/component-injection/pages/_slug.vue  |  19 --
 examples/component-injection/pages/index.vue  |   9 -
 19 files changed, 543 insertions(+), 42 deletions(-)
 create mode 100644 examples/async-component-injection/assets/css/common.css
 create mode 100644 examples/async-component-injection/assets/css/index.css
 create mode 100644 examples/async-component-injection/assets/css/post.css
 create mode 100644 examples/async-component-injection/assets/img/github.png
 create mode 100644 examples/async-component-injection/assets/img/swimmer.jpg
 create mode 100644 examples/async-component-injection/assets/img/twitter.png
 create mode 100644 examples/async-component-injection/layouts/default.vue
 create mode 100644 examples/async-component-injection/nuxt.config.js
 rename examples/{component-injection => async-component-injection}/package.json (100%)
 create mode 100644 examples/async-component-injection/pages/_slug.vue
 create mode 100644 examples/async-component-injection/pages/index.vue
 create mode 100644 examples/async-component-injection/posts/404.vue
 create mode 100644 examples/async-component-injection/posts/deep-dive-into-ocean.vue
 create mode 100644 examples/async-component-injection/posts/welcome-to-my-blog.vue
 create mode 100644 examples/async-component-injection/static/favicon.ico
 delete mode 100644 examples/component-injection/articles/article-1.vue
 delete mode 100644 examples/component-injection/articles/article-2.vue
 delete mode 100644 examples/component-injection/pages/_slug.vue
 delete mode 100644 examples/component-injection/pages/index.vue

diff --git a/examples/async-component-injection/assets/css/common.css b/examples/async-component-injection/assets/css/common.css
new file mode 100644
index 0000000000..b4f5ee78bf
--- /dev/null
+++ b/examples/async-component-injection/assets/css/common.css
@@ -0,0 +1,69 @@
+body {
+  font-family: "Roboto", "Helvetica Neue", "Hiragino Sans GB", "LiHei Pro", Arial, serif;
+  text-rendering: optimizelegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-weight: 400;
+  font-size: 16px;
+  word-spacing: 1px;
+  color: #666;
+  margin: 0;
+}
+img {
+  border: none;
+}
+a {
+  color: #666;
+  text-decoration: none;
+  transition: color 0.2s ease, border-color 0.2s ease;
+}
+.header {
+  letter-spacing: 5px;
+  margin: 50px auto 15px;
+  text-align: center;
+}
+.header a {
+  font-size: 15px;
+  color: #444;
+}
+.links {
+  text-align: center;
+  font-family: "Roboto", "Helvetica Neue", "Hiragino Sans GB", "LiHei Pro", Arial, serif;
+  color: #999;
+  font-size: 24px;
+  margin: 0;
+}
+.links a {
+  cursor: pointer;
+  padding: 2px;
+  margin: 0 3px;
+}
+.links img {
+  width: 15px;
+  height: 15px;
+}
+.header,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: "Montserrat", "Helvetica Neue", "Hiragino Sans GB", "LiHei Pro", Arial, sans-serif;
+  font-weight: 400;
+  color: #444;
+}
+.main {
+  max-width: 600px;
+  margin: 50px auto;
+  padding: 0 30px 50px;
+  position: relative;
+}
+@media screen and (max-width: 420px) {
+  .header {
+    margin: 40px auto 10px;
+  }
+  .header a {
+    font-size: 14px;
+  }
+}
diff --git a/examples/async-component-injection/assets/css/index.css b/examples/async-component-injection/assets/css/index.css
new file mode 100644
index 0000000000..25870b834d
--- /dev/null
+++ b/examples/async-component-injection/assets/css/index.css
@@ -0,0 +1,57 @@
+.main > ul {
+  list-style-type: none;
+  padding: 0;
+  padding-top: 4px;
+}
+.main > ul > li {
+  position: relative;
+  padding: 30px 0 30px;
+  border-bottom: 1px solid #e6e6e6;
+}
+.main > ul > li:first-child {
+  margin-top: -30px;
+}
+.main h2,
+.main h3 {
+  letter-spacing: 1px;
+  margin: 0;
+  text-transform: uppercase;
+}
+.main h2 {
+  font-size: 20px;
+  letter-spacing: 1px;
+  margin-left: 120px;
+}
+.main h2 a {
+  color: #444;
+}
+.main h2 a:hover {
+  color: #f33;
+}
+.main h3 {
+  font-size: 13px;
+  color: #999;
+  position: absolute;
+  left: 0;
+  top: 33px;
+}
+@media screen and (max-width: 420px) {
+  .main h2 {
+    font-size: 16px;
+    margin-left: 0;
+  }
+  .main h2 a:hover {
+    color: #f66;
+  }
+  .main h3 {
+    font-size: 11px;
+    position: static;
+    margin-bottom: 10px;
+  }
+  .main ul li {
+    padding: 18px 0 20px;
+  }
+  .main ul li:first-child {
+    margin-top: -35px;
+  }
+}
diff --git a/examples/async-component-injection/assets/css/post.css b/examples/async-component-injection/assets/css/post.css
new file mode 100644
index 0000000000..128b175f70
--- /dev/null
+++ b/examples/async-component-injection/assets/css/post.css
@@ -0,0 +1,307 @@
+.gutter pre {
+  color: #999;
+}
+pre {
+  color: #525252;
+}
+pre .function .keyword,
+pre .constant {
+  color: #0092db;
+}
+pre .keyword,
+pre .attribute {
+  color: #e96900;
+}
+pre .number,
+pre .literal {
+  color: #ae81ff;
+}
+pre .tag,
+pre .tag .title,
+pre .change,
+pre .winutils,
+pre .flow,
+pre .lisp .title,
+pre .clojure .built_in,
+pre .nginx .title,
+pre .tex .special {
+  color: #2973b7;
+}
+pre .class .title {
+  color: #fff;
+}
+pre .symbol,
+pre .symbol .string,
+pre .value,
+pre .regexp {
+  color: #42b983;
+}
+pre .title {
+  color: #a6e22e;
+}
+pre .tag .value,
+pre .string,
+pre .subst,
+pre .haskell .type,
+pre .preprocessor,
+pre .ruby .class .parent,
+pre .built_in,
+pre .sql .aggregate,
+pre .django .template_tag,
+pre .django .variable,
+pre .smalltalk .class,
+pre .javadoc,
+pre .django .filter .argument,
+pre .smalltalk .localvars,
+pre .smalltalk .array,
+pre .attr_selector,
+pre .pseudo,
+pre .addition,
+pre .stream,
+pre .envvar,
+pre .apache .tag,
+pre .apache .cbracket,
+pre .tex .command,
+pre .prompt {
+  color: #42b983;
+}
+pre .comment,
+pre .java .annotation,
+pre .python .decorator,
+pre .template_comment,
+pre .pi,
+pre .doctype,
+pre .deletion,
+pre .shebang,
+pre .apache .sqbracket,
+pre .tex .formula {
+  color: #b3b3b3;
+}
+pre .coffeescript .javascript,
+pre .javascript .xml,
+pre .tex .formula,
+pre .xml .javascript,
+pre .xml .vbscript,
+pre .xml .css,
+pre .xml .cdata {
+  opacity: 0.5;
+}
+.main .post {
+  position: relative;
+  padding-bottom: 30px;
+  margin-bottom: 30px;
+  border-bottom: 1px solid #e6e6e6;
+}
+.main .post h1,
+.main .post h2 {
+  text-transform: uppercase;
+  letter-spacing: 0px;
+}
+.main .post h1 a:hover,
+.main .post h2 a:hover {
+  border-bottom: 3px solid #666;
+}
+.main .post h1 {
+  font-size: 32px;
+  margin: 0 0 45px;
+  letter-spacing: 1px;
+}
+.main .post h2 {
+  font-size: 24px;
+  margin: 60px 0 30px;
+  position: relative;
+}
+.main .post h2:before {
+  content: '';
+  border-left: 5px solid #41b883;
+  position: absolute;
+  left: -15px;
+  height: 75%;
+  top: 12%;
+}
+.main .post h3 {
+  margin: 30px 0 15px;
+}
+.main .post .date {
+  font-family: "Montserrat", "Helvetica Neue", "Hiragino Sans GB", "LiHei Pro", Arial, sans-serif;
+  font-size: 13px;
+  color: #999;
+  margin: 0 0 30px;
+  letter-spacing: 1px;
+  position: initial;
+  text-transform: none;
+}
+.main .post .content {
+  text-align: left;
+  line-height: 1.8em;
+}
+.main .post .content p,
+.main .post .content ul,
+.main .post .content ol {
+  margin: 1em 0 1.5em;
+}
+.main .post .content strong {
+  font-weight: 600;
+  color: #444;
+}
+.main .post .content ol {
+  padding-left: 1.6em;
+}
+.main .post .content ul {
+  padding-left: 15px;
+  list-style-type: none;
+}
+.main .post .content ul li:before {
+  position: absolute;
+  font-weight: 600;
+  content: " · ";
+  margin: 0;
+  left: 0;
+}
+.main .post .content a {
+  color: #41b883;
+  border-bottom: 2px solid transparent;
+}
+.main .post .content a:hover {
+  color: #41b883;
+  border-bottom-color: #41b883;
+}
+.main .post .content .highlight,
+.main .post .content .highlight table {
+  margin: 0;
+  width: 100%;
+}
+.main .post .content .highlight {
+  overflow-x: auto;
+}
+.main .post .content .highlight table,
+.main .post .content .highlight tr,
+.main .post .content .highlight td {
+  padding: 0;
+  border-collapse: collapse;
+}
+.main .post .content code {
+  font-family: "Roboto Mono", "Menlo", "Consolas", monospace;
+  font-size: 13px;
+  background-color: #f6f6f6;
+  padding: 3px 10px;
+  margin: 0 5px;
+  border-radius: 2px;
+}
+.main .post .content pre {
+  font-family: "Roboto Mono", "Menlo", "Consolas", monospace;
+  font-size: 13px;
+  overflow-x: auto;
+  text-align: left;
+  padding: 15px 25px;
+  background-color: #f6f6f6;
+  line-height: 1.5em;
+}
+.main .post .content .code pre {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+.main .post .content .gutter pre {
+  padding: 15px 0 15px 15px;
+  color: #75715e;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+.main .post .content blockquote {
+  margin: 2em 0;
+  padding-left: 30px;
+  border-left: 5px solid #e6e6e6;
+}
+.main .post .content blockquote p {
+  font-size: 17px;
+  font-style: italic;
+  line-height: 1.8em;
+  color: #999;
+}
+.main .post img {
+  display: block;
+  max-width: 100%;
+}
+.blog-nav {
+  position: fixed;
+  bottom: 20px;
+  height: 20px;
+  line-height: 20px;
+  font-family: "Montserrat", "Helvetica Neue", "Hiragino Sans GB", "LiHei Pro", Arial, sans-serif;
+  font-size: 15px;
+  color: #999;
+  text-decoration: none;
+  cursor: pointer;
+  letter-spacing: 1px;
+  border-bottom: 3px solid transparent;
+}
+.blog-nav:hover {
+  color: #333;
+  border-bottom-color: #333;
+}
+#newer {
+  left: 40px;
+}
+#older {
+  right: 40px;
+}
+.show-comments {
+  font-family: "Montserrat", "Helvetica Neue", "Hiragino Sans GB", "LiHei Pro", Arial, sans-serif;
+  text-align: center;
+}
+.show-comments a {
+  color: #999;
+  cursor: pointer;
+}
+.show-comments a:hover {
+  color: #666;
+}
+@media screen and (max-width: 900px) {
+  .main .post {
+    padding-bottom: 80px;
+  }
+  .blog-nav {
+    position: absolute;
+    bottom: 30px;
+  }
+  #newer {
+    left: 0;
+  }
+  #older {
+    right: 0;
+  }
+}
+@media screen and (max-width: 420px) {
+  .main {
+    margin-top: 32px;
+  }
+  .main .post h1 {
+    font-size: 24px;
+    margin: 0 0 30px;
+  }
+  .main .post h2 {
+    font-size: 20px;
+    margin: 30px 0 15px;
+  }
+  .main .post h3 {
+    font-size: 16px;
+    line-height: 1.3em;
+  }
+  .main .post .date {
+    font-size: 12px;
+    margin: 0 0 20px;
+  }
+  .main .post .content {
+    font-size: 15px;
+  }
+  .main .post .content pre {
+    font-size: 12px;
+  }
+  .main .post .content blockquote p {
+    font-size: 16px;
+  }
+  .blog-nav {
+    font-size: 14px;
+    color: #444;
+  }
+}
diff --git a/examples/async-component-injection/assets/img/github.png b/examples/async-component-injection/assets/img/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..3844ec302dc261a390a694d64396bb77d5db9d0d
GIT binary patch
literal 1626
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#md;x+|13y+}X_8#mvyq)!4$q#n{En(bd(-
z#MIK+(G;fFB|o_|H#M&WrZ)wl*9E6uP+G_>0NU)5T9jFqn&MWJpQ`}&vsET;w>aW7
z52`l>w_BWW>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4E0H^pwGXfr06)r;B4q
z#jQ2dqdR;9C61rJ=_cp%*hAAMVG6s=ibBtsnx!#rUdlVCPU<+b=S1!-PSxv*yh^H-
zb3Z$LGRQiY7&Gb6gItf!;Jn@*leA}Z4*sbBdjD3~{ae$Gf3J@J{U(3y-hb6=zrM|{
zRiAk_O;~X)n-25m111J?DvtUmn)NPB^jrSEO;ShFslxmQXIfj$!R-&YG7ftG*;ras
z!xq69*SuNK<*3#{&dSCZz3pnNJ_r_AFItcpe6X}*KBsmKqm0jy^lF7VU5^MBX`zp|
z#fqQBJv<tdbX~<Dta0rFN0y1l6WEhe4$S!JrMqf>L+89c|AS2D|5j~~+@oas#Xmvk
z%tTvPmH*LU948-So|mXqXtmpa`o)dZj;_7t?~I?=A6BT_d|vwd(*=Su#nX3rR%R$l
zguYsqw9T_G@mAaxOQjgzWg4>kjEsAaREflMU9s|Mo^`b`eyLUxcUxg3dzaVeBEfm<
zO}1!P$8_yD^P}xj$Ww!dv%jev%l|R+(QKVVkEgUH^&D#MT7PHSYV9Nuznev0`H$Kw
zyFK(edR_g{`zdWp4Y{ss?epi;X3wqs)*m9+nPjaudCIcqN_P?~--(=_8|1pWU}sL|
zxvmekA7=9Xd{O*B{r&sqXBr3D4sJ}4w^!D!P+fNGuJa?6jHmBE+wjSsZ0GAMy7_*?
zyh*>`x6M%bf0*Z#>NbyMTa`BQ?94CWt4Yq=cXad4W1o4$3|jMy&P813vibLl$t88q
z<21z$*LJfnm|wYPw)g$hpLZ-+a!gUK+;N*=E%&m5<-g75{0#jdaE58~%*)obY`QER
zaZN9Lqt9OTImqHY&&*)@RA)nl6K=n^q$)(ohot5)FSmVqj(gtOO18OQ&o>^e7hEKL
z=-O4GqpJ_PAGUv^Y~!Y>lHxDD=-=cCFXr*_HSmAo{qg1f_Ym3kCy^c7Zdy%eWodbn
u&0WDP);Qg+cK1%#Sb;Mvt>5Dr*%&+?ZeI|8F|H6)+IzbCxvX<aXaWEcuX5r5

literal 0
HcmV?d00001

diff --git a/examples/async-component-injection/assets/img/swimmer.jpg b/examples/async-component-injection/assets/img/swimmer.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e22693d4e693489222f41d86f8fd58a319292655
GIT binary patch
literal 142219
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

literal 0
HcmV?d00001

diff --git a/examples/async-component-injection/assets/img/twitter.png b/examples/async-component-injection/assets/img/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..e84e1b8a28492aa78b796173d52c18b32cf95a92
GIT binary patch
literal 1545
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9
zlv<o$T9gcok2GbNW?<Oiw+N&V=o%~kqD)|<B<8r}Czs}?=9PH5*eU^K^incYtlZ4a
z-3$%QO$^M949qMH4K3Wvj9lG}oSofVjm?ZKEnsF~(`)Q#ZsulUZfWN1VrFRQYHVTQ
zV(en(=<4cZVruE^XbRKonO9trn3tRivo{lHFI2AuUcFY%MX8A;`9&f5`8lu@5Rj2y
zl3$#WU!dR|Y^rCd;G3A7nFkU9MG(ZlE~!PCWvMA{Mftf3;1IUT#OeYgb4znqH%DW0
zQ=sb&9gWPKolOnQ4NXl<9nDP*l%RT3u!NeiBS^2C0ZzU8K*#8Vk_S?9fe8WAAczT1
z{6G#o`=sUp^Gp#ia~xT9-im>N$=uV$F{I+wo9VtDA%P;tXCJhiz|_pC$mvtKSl8*o
z7T?*9r(9Wf29yN1+|*(!7ZW_PrQosG60wCEXS@y_Y&{pST0=szTu@ibB}mOhQ&#Kp
z%ks9*ZP&ltJG1*S4`=Cv<8!O;SAPHh?)uL3nwKTN4%|1mZ?7IB*nRZd6-NV!GgH14
zPhBKFD}i&-hbhnJ>&Dk;X}o&atS{A@_Pb&GhMX0#yyq8QeEKu>h;qla&(&<lR`TC!
z-G7*SM}|VwO8IK7et#~r2P#JdbI-2X$Th$1`zwhyx&A}`58B-01^4qkPigyetK!hJ
z3v1;s1}s<{#T=MjwoLKBis!ly`!{44Pm-))S1vfSbg^+;^+SO>&L*EXPAd=+;ybrJ
zk@wgF%kLUeT>c8b465hk@V`5}<}f$=!)2d5%ReYxk>FZhXMH@%>}ALAhlTT|r>1|?
zT=wl~+{R_UEY=(ly`dAl!ON=mhp9))OP%B?J{G+{(i=7Jtv;!vXTjNh_v*yyhtqCe
zjKAA*RApXU37c2u!#iy;50wQPFA8<-OWbn)-wv_jSN9XRUMa-7Oeomo?$=w_zHOb7
z^5omM{HjE!t+*1@^jT;7Mbqu=b<@jk{$kuayFGC?$3wpAZx2Inc=0?-h<&^@e6nz%
z+{KD}bGZ9%@$HNd-EvUZGn&U;GyEm1OE|Y$^#^9Q2Yqqxjz)1DR6HNKjH^HMZb%Jx
z%5^)3lA{{yx2aZ7J84_(d5!bjt00*+S=;AD>ie6f8}vVT_rG4~chryR49pBON++An
T%zAVUR5*LO`njxgN@xNA_!>g@

literal 0
HcmV?d00001

diff --git a/examples/async-component-injection/layouts/default.vue b/examples/async-component-injection/layouts/default.vue
new file mode 100644
index 0000000000..a904ff90e1
--- /dev/null
+++ b/examples/async-component-injection/layouts/default.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="wrapper">
+    <div class="header">
+      <nuxt-link to="/">NUXT BLOG</nuxt-link>
+    </div>
+    <p class="links">
+      <a href="https://twitter.com/nuxt_js" target="_blank"><img src="~assets/img/twitter.png"></a>
+      <a href="https://github.com/nuxt/nuxt.js" target="_blank"><img src="~assets/img/github.png"></a>
+    </p>
+    <div class="main">
+      <nuxt/>
+    </div>
+  </div>
+</template>
+
diff --git a/examples/async-component-injection/nuxt.config.js b/examples/async-component-injection/nuxt.config.js
new file mode 100644
index 0000000000..569cee3b0b
--- /dev/null
+++ b/examples/async-component-injection/nuxt.config.js
@@ -0,0 +1,22 @@
+module.exports = {
+  head: {
+    title: 'Nuxt Blog',
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' }
+    ],
+    link: [
+      { rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' },
+      { rel: 'stylesheet', href: 'http://fonts.googleapis.com/css?family=Montserrat|Roboto:400,400italic,600|Roboto+Mono', type: 'text/css' }
+    ]
+  },
+  css: [
+    '@/assets/css/common.css'
+  ],
+  generate: {
+    routes: [
+      '/deep-dive-into-ocean',
+      '/welcome-to-my-blog'
+    ]
+  }
+}
diff --git a/examples/component-injection/package.json b/examples/async-component-injection/package.json
similarity index 100%
rename from examples/component-injection/package.json
rename to examples/async-component-injection/package.json
diff --git a/examples/async-component-injection/pages/_slug.vue b/examples/async-component-injection/pages/_slug.vue
new file mode 100644
index 0000000000..10b87643d3
--- /dev/null
+++ b/examples/async-component-injection/pages/_slug.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="post">
+    <component :is="component"/>
+  </div>
+</template>
+
+<script>
+// See https://vuejs.org/v2/guide/components.html#Advanced-Async-Components
+const getPost = (slug) => ({
+  component: import(`@/posts/${slug}`),
+  error: require('@/posts/404')
+})
+
+export default {
+  beforeCreate () {
+    this.component = () => getPost(this.$route.params.slug)
+  }
+}
+</script>
+
+<style src="@/assets/css/post.css"/>
diff --git a/examples/async-component-injection/pages/index.vue b/examples/async-component-injection/pages/index.vue
new file mode 100644
index 0000000000..c14422030b
--- /dev/null
+++ b/examples/async-component-injection/pages/index.vue
@@ -0,0 +1,22 @@
+<template>
+  <ul>
+    <li v-for="(post, index) in posts" :key="index">
+        <h3>{{ post.date }}</h3>
+        <h2><nuxt-link :to="post.link">{{ post.title }}</nuxt-link></h2>
+    </li>
+    <li style="border:none;text-align: center;font-size: 14px;">Design from <a href="http://blog.evanyou.me" target="_blank">EvanYou.me</a></li>
+  </ul>
+</template>
+
+<script>
+export default {
+  data: () => ({
+    posts: [
+      { date: 'Jul 10, 2017', title: 'Deep dive into the Ocean', link: '/deep-dive-into-ocean' },
+      { date: 'Jul 08, 2017', title: 'Welcome to my blog', link: '/welcome-to-my-blog' }
+    ]
+  })
+}
+</script>
+
+<style src="@/assets/css/index.css"/>
diff --git a/examples/async-component-injection/posts/404.vue b/examples/async-component-injection/posts/404.vue
new file mode 100644
index 0000000000..33f884b536
--- /dev/null
+++ b/examples/async-component-injection/posts/404.vue
@@ -0,0 +1,3 @@
+<template>
+  <h1 style="text-align: center;">Article not found</h1>
+</template>
diff --git a/examples/async-component-injection/posts/deep-dive-into-ocean.vue b/examples/async-component-injection/posts/deep-dive-into-ocean.vue
new file mode 100644
index 0000000000..e8c99537ba
--- /dev/null
+++ b/examples/async-component-injection/posts/deep-dive-into-ocean.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <h3 class="date">Jul 10, 2017</h3>
+    <h1>Deep dive into the Ocean</h1>
+    <div class="content">
+      <img src="~assets/img/swimmer.jpg">
+      <h2>Subtitle #1</h2>
+      <p>Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth. Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum decided to leave for the far World of Grammar.</p>
+      <h2>Another subtitle</h2>
+      <ul>
+        <li>Vue.js</li>
+        <li>Nuxt.js</li>
+        <li>= <3</li>
+      </ul>
+    </div>
+  </div>
+</template>
diff --git a/examples/async-component-injection/posts/welcome-to-my-blog.vue b/examples/async-component-injection/posts/welcome-to-my-blog.vue
new file mode 100644
index 0000000000..4283579ce4
--- /dev/null
+++ b/examples/async-component-injection/posts/welcome-to-my-blog.vue
@@ -0,0 +1,10 @@
+<template>
+  <div>
+    <h3 class="date">Jul 08, 2017</h3>
+    <h1>Welcome to my blog</h1>
+    <div class="content">
+      <h2>What is Lorem Ipsum?</h2>
+      <p><b>Lorem Ipsum</b> is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p>
+    </div>
+  </div>
+</template>
diff --git a/examples/async-component-injection/static/favicon.ico b/examples/async-component-injection/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..382fecbbf96d6e1e614e0e2cc8b73e355bd946cc
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI-8)(_-RMWh}@jndLuXgyK
z;A{Fn&J#OMi823Q&|nS5g-td!^Y<rkwCr%a57Q5#^Qx?{>-RSMpI2!G(|^BVz5@p+
zJll3Uhal^3+~)8<DcB6djI<OBnBM;d&9))PaRGG0eq=LBdTmkkC-|HF&##5LyV2$V
zvR)9oV~3-D^A4xK$Y!L*nZwP<%CUs_xxxBxQIm~6x_%J9b*JMDWc}3(?f=Jnnf^}-
zGlRRku)$^~HoYLRp8dWe%{v|6Bb$+(Yxys?1ZsDq&4<c1TTxv4LE<etoC=WjH*a)Y
zSkP$w0u*P3jkbmO^n&E}?{8pf+39#4VusVl?wxL8g^kw9xkXkpX3k7wC8QrD-@L=w
z1EjxohjTHA-|)YIskGI>0K_I1H1Blkn|X#f`-nA@7V7^0XJCNg21cM?f%pJ31V3PB
ZU;yC{{0s~~<bn7;1H)gSdJu-`0RTsU0uulL

literal 0
HcmV?d00001

diff --git a/examples/component-injection/articles/article-1.vue b/examples/component-injection/articles/article-1.vue
deleted file mode 100644
index a957df1a9b..0000000000
--- a/examples/component-injection/articles/article-1.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div>
-    <h1>Article 1</h1>
-    <p>Hello I am the first article :)</p>
-    <nuxt-link to="/">Home</nuxt-link>
-  </div>
-</template>
\ No newline at end of file
diff --git a/examples/component-injection/articles/article-2.vue b/examples/component-injection/articles/article-2.vue
deleted file mode 100644
index 0c5b848e0e..0000000000
--- a/examples/component-injection/articles/article-2.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div>
-    <h1>Article 2</h1>
-    <p>Hello I am the second article!</p>
-    <nuxt-link to="/">Home</nuxt-link>
-  </div>
-</template>
\ No newline at end of file
diff --git a/examples/component-injection/pages/_slug.vue b/examples/component-injection/pages/_slug.vue
deleted file mode 100644
index f94719fb99..0000000000
--- a/examples/component-injection/pages/_slug.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-  <component :is="comp"/>
-</template>
-
-<script>
-const components = {}
-const files = require.context('@/articles', false, /\.vue$/)
-files.keys().forEach((filename) => {
-  const name = filename.replace('./', '').replace('.vue', '')
-  components[name] = () => import('@/articles/' + name + '.vue').then((m) => m.default || m)
-})
-
-export default {
-  async asyncData({ params, error }) {
-    return { comp: params.slug }
-  },
-  components
-}
-</script>
\ No newline at end of file
diff --git a/examples/component-injection/pages/index.vue b/examples/component-injection/pages/index.vue
deleted file mode 100644
index 30a3e45f32..0000000000
--- a/examples/component-injection/pages/index.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <div>
-    <h1>Articles</h1>
-    <ul>
-      <li><nuxt-link to="/article-1">Article #1</nuxt-link></li>
-      <li><nuxt-link to="/article-2">Article #2</nuxt-link></li>
-    </ul>
-  </div>
-</template>
\ No newline at end of file

From 8ac2f3e6b0389da8a20e1b2908e1768e9d238256 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Mon, 10 Jul 2017 13:52:58 +0200
Subject: [PATCH 223/236] Point to example

---
 examples/async-component-injection/layouts/default.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/async-component-injection/layouts/default.vue b/examples/async-component-injection/layouts/default.vue
index a904ff90e1..d3a922c8b4 100644
--- a/examples/async-component-injection/layouts/default.vue
+++ b/examples/async-component-injection/layouts/default.vue
@@ -5,7 +5,7 @@
     </div>
     <p class="links">
       <a href="https://twitter.com/nuxt_js" target="_blank"><img src="~assets/img/twitter.png"></a>
-      <a href="https://github.com/nuxt/nuxt.js" target="_blank"><img src="~assets/img/github.png"></a>
+      <a href="https://github.com/nuxt/nuxt.js/tree/dev/examples/async-component-injection" target="_blank"><img src="~assets/img/github.png"></a>
     </p>
     <div class="main">
       <nuxt/>

From 3ef0d15f6b3ae714f0f9c22cad1b73c69144949b Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 11 Jul 2017 03:23:06 +0430
Subject: [PATCH 224/236] perf: use es6 import for plugins

---
 lib/app/empty.js       |  1 +
 lib/app/index.js       | 51 +++++++++---------------------------------
 lib/app/utils.js       |  9 ++++++++
 lib/builder/builder.js | 37 +++++++++++++++++++++++-------
 4 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 lib/app/empty.js

diff --git a/lib/app/empty.js b/lib/app/empty.js
new file mode 100644
index 0000000000..d96e1063fb
--- /dev/null
+++ b/lib/app/empty.js
@@ -0,0 +1 @@
+// This file is intentially left empty for noop aliases
diff --git a/lib/app/index.js b/lib/app/index.js
index 09a0cf44a1..6a42150fb2 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -9,40 +9,16 @@ import Nuxt from './components/nuxt.vue'
 import App from '<%= appPath %>'
 import { getContext } from './utils'
 <% if (store) { %>import { createStore } from './store.js'<% } %>
-
-if (process.browser) {
-  // window.onNuxtReady(() => console.log('Ready')) hook
-  // Useful for jsdom testing or plugins (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
-  window._nuxtReadyCbs = []
-  window.onNuxtReady = function (cb) {
-    window._nuxtReadyCbs.push(cb)
-  }
-}
-
-<% if (plugins.filter(p => p.ssr).length) { %>
-// Require plugins
-<% plugins.filter(p => p.ssr).forEach(plugin => { %>
-let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
-<%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
+<% plugins.forEach(plugin => { %>import <%= plugin.name %> from '<%= plugin.name %>'
 <% }) %>
-<% } %>
-
-<% if (plugins.filter(p => !p.ssr).length) { %>
-// Require browser-only plugins
-if (process.browser) {
-  <% plugins.filter(p => !p.ssr).forEach(plugin => { %>
-  let <%= plugin.name %> = require('<%= relativeToBuild(plugin.src) %>')
-  <%= plugin.name %> = <%= plugin.name %>.default || <%= plugin.name %>
-  <% }) %>
-}
-<% } %>
-
 
 // Component: <nuxt-child>
 Vue.component(NuxtChild.name, NuxtChild)
+
 // Component: <nuxt-link>
 Vue.component(NuxtLink.name, NuxtLink)
-// Component: <nuxt>
+
+// Component: <nuxt>`
 Vue.component(Nuxt.name, Nuxt)
 
 // vue-meta configuration
@@ -132,24 +108,17 @@ async function createApp (ssrContext) {
     route: router.currentRoute,
     next,
     error: app._nuxt.error.bind(app),
-    <% if(store) { %> store,<%  } %> 
+    <% if(store) { %>store,<%  } %> 
     req: ssrContext ? ssrContext.req : undefined,
     res: ssrContext ? ssrContext.res : undefined,
   }, app)
 
-  <% if (plugins.filter(p => p.ssr).length) { %>
   <% plugins.filter(p => p.ssr).forEach(plugin => { %>
-    if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx) 
-  <% }) %>
-  <% } %>
-
+  if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx)<% }) %>
   <% if (plugins.filter(p => !p.ssr).length) { %>
-  if (process.browser) {
-    <% plugins.filter(p => !p.ssr).forEach(plugin => { %>
-    if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx) 
-    <% }) %>
-  }
-  <% } %>
+  if (process.browser) { <% plugins.filter(p => !p.ssr).forEach(plugin => { %>
+    if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx)<% }) %>
+  }<% } %>
 
   return {
     app,
@@ -158,4 +127,4 @@ async function createApp (ssrContext) {
   }
 }
 
-export { createApp, NuxtError }
+export { createApp, NuxtError }
\ No newline at end of file
diff --git a/lib/app/utils.js b/lib/app/utils.js
index 0529c9b9bc..6771b61686 100644
--- a/lib/app/utils.js
+++ b/lib/app/utils.js
@@ -2,6 +2,15 @@ import Vue from 'vue'
 
 const noopData = () => ({})
 
+// window.onNuxtReady(() => console.log('Ready')) hook
+// Useful for jsdom testing or plugins (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
+if (process.browser) {
+  window._nuxtReadyCbs = []
+  window.onNuxtReady = function (cb) {
+    window._nuxtReadyCbs.push(cb)
+  }
+}
+
 export function applyAsyncData (Component, asyncData = {}) {
   const ComponentData = Component.options.data || noopData
   // Prevent calling this method for each request on SSR context
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 08352af0bd..f6681dd340 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -49,6 +49,14 @@ export default class Builder extends Tapable {
     this._buildStatus = STATUS.INITIAL
   }
 
+  get plugins () {
+    return this.options.plugins.map((p, i) => {
+      if (typeof p === 'string') p = { src: p }
+      p.src = r(this.options.srcDir, p.src)
+      return { src: p.src, ssr: (p.ssr !== false), name: `plugin${i}` }
+    })
+  }
+
   async build () {
     // Avoid calling build() method multiple times when dev:true
     /* istanbul ignore if */
@@ -119,6 +127,7 @@ export default class Builder extends Tapable {
       'router.js',
       'server.js',
       'utils.js',
+      'empty.js',
       'components/nuxt-error.vue',
       'components/nuxt-loading.vue',
       'components/nuxt-child.js',
@@ -137,11 +146,7 @@ export default class Builder extends Tapable {
       middleware: fs.existsSync(join(this.options.srcDir, 'middleware')),
       store: this.options.store,
       css: this.options.css,
-      plugins: this.options.plugins.map((p, i) => {
-        if (typeof p === 'string') p = { src: p }
-        p.src = r(this.options.srcDir, p.src)
-        return { src: p.src, ssr: (p.ssr !== false), name: `plugin${i}` }
-      }),
+      plugins: this.plugins,
       appPath: './App.vue',
       layouts: Object.assign({}, this.options.layouts),
       loading: typeof this.options.loading === 'string' ? this.relativeToBuild(this.options.srcDir, this.options.loading) : this.options.loading,
@@ -264,16 +269,32 @@ export default class Builder extends Tapable {
 
   async webpackBuild () {
     debug('Building files...')
-    let compilersOptions = []
+    const compilersOptions = []
 
     // Client
-    let clientConfig = clientWebpackConfig.call(this)
+    const clientConfig = clientWebpackConfig.call(this)
     compilersOptions.push(clientConfig)
 
     // Server
-    let serverConfig = serverWebpackConfig.call(this)
+    const serverConfig = serverWebpackConfig.call(this)
     compilersOptions.push(serverConfig)
 
+    // Alias plugins to their real path
+    this.plugins.forEach(p => {
+      const src = this.relativeToBuild(p.src)
+
+      // Client config
+      if (!clientConfig.resolve.alias[p.name]) {
+        clientConfig.resolve.alias[p.name] = src
+      }
+
+      // Server config
+      if (!serverConfig.resolve.alias[p.name]) {
+        // Alias to noop for ssr:false plugins
+        serverConfig.resolve.alias[p.name] = p.ssr ? src : './empty.js'
+      }
+    })
+
     // Simulate webpack multi compiler interface
     // Separate compilers are simpler, safer and faster
     this.compiler = { compilers: [] }

From a3be3cfe1bca415846d3e9abdafd3dad906376c6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 11 Jul 2017 04:54:39 +0430
Subject: [PATCH 225/236] feat: mode option

---
 lib/builder/builder.js               |  4 ++-
 lib/builder/webpack/client.config.js | 16 +++++++--
 lib/core/options.js                  | 45 +++++++++++++++++++++++--
 lib/core/renderer.js                 | 49 ++++++++++++++++++++--------
 4 files changed, 95 insertions(+), 19 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index f6681dd340..34e7b24dc6 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -277,7 +277,9 @@ export default class Builder extends Tapable {
 
     // Server
     const serverConfig = serverWebpackConfig.call(this)
-    compilersOptions.push(serverConfig)
+    if (this.options.build.ssr) {
+      compilersOptions.push(serverConfig)
+    }
 
     // Alias plugins to their real path
     this.plugins.forEach(p => {
diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
index 9e9834fdfd..953e51a753 100644
--- a/lib/builder/webpack/client.config.js
+++ b/lib/builder/webpack/client.config.js
@@ -60,11 +60,23 @@ export default function webpackClientConfig () {
     config.plugins = []
   }
 
-  // Generate output HTML
+  // Generate output HTML for SSR
+  if (this.options.build.ssr) {
+    config.plugins.push(
+      new HTMLPlugin({
+        filename: 'index.ssr.html',
+        template: this.options.appTemplatePath,
+        inject: false // Resources will be injected using bundleRenderer
+      })
+    )
+  }
+
+  // Generate output HTML for SPA
   config.plugins.push(
     new HTMLPlugin({
+      filename: 'index.spa.html',
       template: this.options.appTemplatePath,
-      inject: this.options.ssr === false,
+      inject: true,
       chunksSortMode: 'dependency'
     })
   )
diff --git a/lib/core/options.js b/lib/core/options.js
index 2887927622..da54f205f3 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -46,16 +46,57 @@ export default function Options (_options) {
     options.store = true
   }
 
+  // Resolve mode
+  let mode = options.mode
+  if (typeof mode === 'function') {
+    mode = mode()
+  }
+  if (typeof mode === 'string') {
+    mode = Modes[mode]
+  }
+
+  // Apply mode
+  _.defaultsDeep(options, mode)
+
   return options
 }
 
+const Modes = {
+  universal: {
+    build: {
+      ssr: true
+    },
+    render: {
+      ssr: true
+    }
+  },
+  spa: {
+    build: {
+      ssr: false
+    },
+    render: {
+      ssr: false
+    }
+  },
+  static: {
+    build: {
+      ssr: true
+    },
+    render: {
+      ssr: 'static'
+    }
+  }
+}
+
 export const defaultOptions = {
-  dev: (process.env.NODE_ENV !== 'production'),
+  mode: 'universal',
+  dev: process.env.NODE_ENV !== 'production',
   buildDir: '.nuxt',
   nuxtAppDir: resolve(__dirname, '../lib/app/'), // Relative to dist
   build: {
     analyze: false,
     extractCSS: false,
+    ssr: undefined,
     publicPath: '/_nuxt/',
     filenames: {
       css: 'common.[chunkhash].css',
@@ -133,10 +174,10 @@ export const defaultOptions = {
     scrollBehavior: null,
     fallback: false
   },
-  ssr: true,
   render: {
     bundleRenderer: {},
     resourceHints: true,
+    ssr: undefined,
     http2: {
       push: false
     },
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 07625b340c..8de1e42d87 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -42,7 +42,8 @@ export default class Renderer extends Tapable {
     this.resources = {
       clientManifest: null,
       serverBundle: null,
-      appTemplate: null,
+      ssrTemplate: null,
+      spaTemplate: null,
       errorTemplate: parseTemplate('<pre>{{ stack }}</pre>') // Will be loaded on ready
     }
 
@@ -121,7 +122,18 @@ export default class Renderer extends Tapable {
   }
 
   get noSSR () {
-    return this.options.ssr === false
+    return this.options.render.ssr === false
+  }
+
+  get staticSSR () {
+    return this.options.render.ssr === 'static'
+  }
+
+  get isReady () {
+    if (this.noSSR) {
+      return this.resources.spaTemplate
+    }
+    return this.bundleRenderer && this.resources.ssrTemplate
   }
 
   createRenderer () {
@@ -297,7 +309,7 @@ export default class Renderer extends Tapable {
 
   async renderRoute (url, context = {}) {
     /* istanbul ignore if */
-    if (!(this.noSSR || this.bundleRenderer) || !this.resources.appTemplate) {
+    if (!this.isReady) {
       return new Promise(resolve => {
         setTimeout(() => resolve(this.renderRoute(url, context)), 1000)
       })
@@ -315,7 +327,7 @@ export default class Renderer extends Tapable {
       let APP = '<div id="__nuxt"></div>'
       let HEAD = ''
 
-      let html = this.resources.appTemplate({
+      let html = this.resources.spaTemplate({
         HTML_ATTRS: '',
         BODY_ATTRS: '',
         HEAD,
@@ -340,15 +352,19 @@ export default class Renderer extends Tapable {
     }
 
     let resourceHints = ''
-    if (this.options.render.resourceHints) {
-      resourceHints = context.renderResourceHints()
-      HEAD += resourceHints
-    }
-    HEAD += context.renderStyles()
-    APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, { isJSON: true })};</script>`
-    APP += context.renderScripts()
 
-    let html = this.resources.appTemplate({
+    if (!this.staticSSR) {
+      if (this.options.render.resourceHints) {
+        resourceHints = context.renderResourceHints()
+        HEAD += resourceHints
+      }
+      APP += `<script type="text/javascript">window.__NUXT__=${serialize(context.nuxt, { isJSON: true })};</script>`
+      APP += context.renderScripts()
+    }
+
+    HEAD += context.renderStyles()
+
+    let html = this.resources.ssrTemplate({
       HTML_ATTRS: 'data-n-head-ssr ' + m.htmlAttrs.text(),
       BODY_ATTRS: m.bodyAttrs.text(),
       HEAD,
@@ -422,8 +438,13 @@ const resourceMap = [
     transform: JSON.parse
   },
   {
-    key: 'appTemplate',
-    fileName: 'index.html',
+    key: 'ssrTemplate',
+    fileName: 'index.ssr.html',
+    transform: parseTemplate
+  },
+  {
+    key: 'spaTemplate',
+    fileName: 'index.spa.html',
     transform: parseTemplate
   }
 ]

From 107d36c8512cd6b72d4c3fd7d6aad84bb62c071e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 11 Jul 2017 13:33:29 +0430
Subject: [PATCH 226/236] tests: update module fixture

---
 test/fixtures/module/modules/basic/reverse.js | 2 ++
 test/fixtures/module/router.js                | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/module/modules/basic/reverse.js b/test/fixtures/module/modules/basic/reverse.js
index 39e01fba3b..5955969033 100755
--- a/test/fixtures/module/modules/basic/reverse.js
+++ b/test/fixtures/module/modules/basic/reverse.js
@@ -7,3 +7,5 @@ function $reverseStr (str) {
 }
 
 Vue.prototype.$reverseStr = $reverseStr
+
+export default undefined
diff --git a/test/fixtures/module/router.js b/test/fixtures/module/router.js
index 6fe636aeab..4856380eca 100644
--- a/test/fixtures/module/router.js
+++ b/test/fixtures/module/router.js
@@ -3,18 +3,21 @@ import Router from 'vue-router'
 
 Vue.use(Router)
 
+const indexPage = () => import('~/views/index.vue').then(m => m.default || m)
+const aboutPage = () => import('~/views/about.vue').then(m => m.default || m)
+
 export function createRouter () {
   return new Router({
     mode: 'history',
     routes: [
       {
         path: '/',
-        component: require('~/views/index.vue').default,
+        component: indexPage,
         name: 'index'
       },
       {
         path: '/about',
-        component: require('~/views/about.vue').default,
+        component: aboutPage,
         name: 'about'
       }
     ]

From 75d933aac6501dfd777c605a8de08665b32b1946 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 11 Jul 2017 13:40:46 +0430
Subject: [PATCH 227/236] tests: update with-config

Two index files are generated now so increase assets.length by 1
---
 test/with-config.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/with-config.test.js b/test/with-config.test.js
index 852ed60625..83b6747a8e 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -90,7 +90,7 @@ test('/test/about-bis (added with extendRoutes)', async t => {
 
 test('Check stats.json generated by build.analyze', t => {
   const stats = require(resolve(__dirname, 'fixtures/with-config/.nuxt/dist/stats.json'))
-  t.is(stats.assets.length, 26)
+  t.is(stats.assets.length, 27)
 })
 
 test('Check /test.txt with custom serve-static options', async t => {

From f4d61a07b1d14a60d07cfe9ad009af5028f10dcd Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <seb@chopin.io>
Date: Tue, 11 Jul 2017 12:44:58 +0200
Subject: [PATCH 228/236] Remove unused option build.loaders

---
 lib/core/options.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/core/options.js b/lib/core/options.js
index 2887927622..2c41705966 100755
--- a/lib/core/options.js
+++ b/lib/core/options.js
@@ -64,7 +64,6 @@ export const defaultOptions = {
       app: 'nuxt.bundle.[chunkhash].js'
     },
     vendor: [],
-    loaders: [],
     plugins: [],
     babel: {},
     postcss: [],

From 33fb5693d9e1465ff95d974be07dd8ef1a550588 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 13 Jul 2017 13:23:47 +0430
Subject: [PATCH 229/236] chore: upgrade dependencies

---
 package.json |  26 ++++++------
 yarn.lock    | 114 ++++++++++++++++++++++++---------------------------
 2 files changed, 66 insertions(+), 74 deletions(-)

diff --git a/package.json b/package.json
index c8ad463b1c..2612dc516c 100644
--- a/package.json
+++ b/package.json
@@ -75,13 +75,13 @@
     "chalk": "^2.0.1",
     "chokidar": "^1.7.0",
     "clone": "^2.1.1",
-    "compression": "^1.6.2",
+    "compression": "^1.7.0",
     "connect": "^3.6.2",
     "css-loader": "^0.28.4",
     "debug": "^2.6.8",
     "es6-promise": "^4.1.1",
     "etag": "^1.8.0",
-    "extract-text-webpack-plugin": "^2.1.2",
+    "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
     "fresh": "^0.5.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
@@ -93,11 +93,11 @@
     "lodash": "^4.17.4",
     "memory-fs": "^0.4.1",
     "minimist": "^1.2.0",
-    "offline-plugin": "^4.8.1",
+    "offline-plugin": "^4.8.3",
     "opencollective": "^1.0.3",
     "pify": "^3.0.0",
     "preload-webpack-plugin": "^1.2.2",
-    "progress-bar-webpack-plugin": "^1.9.3",
+    "progress-bar-webpack-plugin": "^1.10.0",
     "script-ext-html-webpack-plugin": "^1.8.3",
     "serialize-javascript": "^1.3.0",
     "serve-static": "^1.12.3",
@@ -105,15 +105,15 @@
     "tapable": "^0.2.6",
     "tappable": "^1.0.1",
     "url-loader": "^0.5.9",
-    "vue": "~2.3.4",
-    "vue-loader": "^13.0.0",
+    "vue": "~2.4.1",
+    "vue-loader": "^13.0.1",
     "vue-meta": "^1.0.4",
     "vue-router": "^2.7.0",
-    "vue-server-renderer": "~2.3.4",
+    "vue-server-renderer": "~2.4.1",
     "vue-ssr-html-stream": "^2.2.0",
-    "vue-template-compiler": "~2.3.4",
+    "vue-template-compiler": "~2.4.1",
     "vuex": "^2.3.1",
-    "webpack": "^3.0.0",
+    "webpack": "^3.2.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-dev-middleware": "^1.11.0",
     "webpack-hot-middleware": "^2.18.1",
@@ -131,9 +131,9 @@
     "codecov": "^2.2.0",
     "copy-webpack-plugin": "^4.0.1",
     "cross-env": "^5.0.1",
-    "eslint": "^4.1.1",
+    "eslint": "^4.2.0",
     "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-html": "^3.1.0",
     "eslint-plugin-import": "^2.6.1",
     "eslint-plugin-node": "^5.1.0",
     "eslint-plugin-promise": "^3.5.0",
@@ -145,13 +145,13 @@
     "request": "^2.81.0",
     "request-promise-native": "^1.0.4",
     "rimraf": "^2.6.1",
-    "rollup": "^0.43.0",
+    "rollup": "^0.45.2",
     "rollup-plugin-alias": "^1.3.1",
     "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-replace": "^1.1.1",
-    "rollup-watch": "^4.0.0",
+    "rollup-watch": "^4.3.1",
     "server-destroy": "^1.0.1",
     "std-mocks": "^1.0.1",
     "uglify-js": "^3.0.23"
diff --git a/yarn.lock b/yarn.lock
index 5e04c53d03..1c5eebf4db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -293,7 +293,7 @@ async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2:
+async@^2.1.2, async@^2.4.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
@@ -1290,9 +1290,9 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-bytes@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
+bytes@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.5.0.tgz#4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"
 
 caching-transform@^1.0.0:
   version "1.0.1"
@@ -1606,22 +1606,23 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
-compressible@~2.0.8:
+compressible@~2.0.10:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
   dependencies:
     mime-db ">= 1.27.0 < 2"
 
-compression@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
+compression@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.0.tgz#030c9f198f1643a057d776a738e922da4373012d"
   dependencies:
     accepts "~1.3.3"
-    bytes "2.3.0"
-    compressible "~2.0.8"
-    debug "~2.2.0"
+    bytes "2.5.0"
+    compressible "~2.0.10"
+    debug "2.6.8"
     on-headers "~1.0.1"
-    vary "~1.1.0"
+    safe-buffer "5.1.1"
+    vary "~1.1.1"
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -1999,18 +2000,12 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
+debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
-debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
 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"
@@ -2387,9 +2382,9 @@ eslint-module-utils@^2.1.1:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
-eslint-plugin-html@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.0.0.tgz#2c982a71b9d965654f0f3a52358735821a1a4239"
+eslint-plugin-html@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.1.0.tgz#2eb999b48840b7184edf1c953976a73307151e44"
   dependencies:
     htmlparser2 "^3.8.2"
 
@@ -2432,7 +2427,7 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint@^4.1.1:
+eslint@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.2.0.tgz#a2b3184111b198e02e9c7f3cca625a5e01c56b3d"
   dependencies:
@@ -2640,12 +2635,12 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
+extract-text-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612"
   dependencies:
-    async "^2.1.2"
-    loader-utils "^1.0.2"
+    async "^2.4.1"
+    loader-utils "^1.1.0"
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
@@ -4141,10 +4136,6 @@ moment@^2.18.1:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -4391,9 +4382,9 @@ observable-to-promise@^0.5.0:
     is-observable "^0.2.0"
     symbol-observable "^1.0.4"
 
-offline-plugin@^4.8.1:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.8.1.tgz#1d73457081185777179c29d9d416f71077a0197a"
+offline-plugin@^4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.8.3.tgz#9e95bd342ea2ac836b001b81f204c40638694d6c"
   dependencies:
     deep-extend "^0.4.0"
     ejs "^2.3.4"
@@ -5044,9 +5035,9 @@ process@^0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
-progress-bar-webpack-plugin@^1.9.3:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz#81fb8bd8e38da6edaf9a20beed79bd978dd63c2a"
+progress-bar-webpack-plugin@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.10.0.tgz#e0b1063aa03c79e298a9340598590bb61efef9a4"
   dependencies:
     chalk "^1.1.1"
     object.assign "^4.0.1"
@@ -5540,16 +5531,17 @@ rollup-pluginutils@^2.0.1:
     estree-walker "^0.3.0"
     micromatch "^2.3.11"
 
-rollup-watch@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.0.0.tgz#309051b9403b9e5445c5746c9eba9a466951d39e"
+rollup-watch@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.3.1.tgz#5aa1eaeab787addf368905d102b39d6fc5ce4a8b"
   dependencies:
     chokidar "^1.7.0"
     require-relative "0.8.7"
+    rollup-pluginutils "^2.0.1"
 
-rollup@^0.43.0:
-  version "0.43.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.0.tgz#b36bdb75fa5e0823b6de8aee18ff7b5655520543"
+rollup@^0.45.2:
+  version "0.45.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.45.2.tgz#63a284c2b31234656f24e9e9717fabb6a7f0fa43"
   dependencies:
     source-map-support "^0.4.0"
 
@@ -5563,7 +5555,7 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
@@ -6259,7 +6251,7 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-vary@~1.1.0, vary@~1.1.1:
+vary@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
 
@@ -6287,9 +6279,9 @@ vue-hot-reload-api@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
 
-vue-loader@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.0.tgz#403135a3fc71b78235d4317f21fe2b0d39938a57"
+vue-loader@^13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.1.tgz#265b5c81451079304601e8aff3e95af64fb10c43"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -6317,9 +6309,9 @@ vue-router@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.7.0.tgz#16d424493aa51c3c8cce8b7c7210ea4c3a89aff1"
 
-vue-server-renderer@~2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.4.tgz#ce1361eb32bfb84573b9c9b83f2810de8fa606c7"
+vue-server-renderer@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.4.1.tgz#9a1986c459387eaa319c16ca5c0d0f2ebb2c66c5"
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -6343,9 +6335,9 @@ vue-style-loader@^3.0.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@~2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.4.tgz#5a88ac2c5e4d5d6218e6aa80e7e221fb7e67894c"
+vue-template-compiler@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.1.tgz#20115cf8714f222f9be4111ec75b079a1c9b8197"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -6354,9 +6346,9 @@ vue-template-es2015-compiler@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
-vue@~2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.4.tgz#5ec3b87a191da8090bbef56b7cfabd4158038171"
+vue@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.1.tgz#76e0b8eee614613532216b7bfe784e0b5695b160"
 
 vuex@^2.3.1:
   version "2.3.1"
@@ -6419,9 +6411,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.1.0.tgz#ac0675e500db835f9ab2369d29ba096f51ad0731"
+webpack@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.2.0.tgz#8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"

From 0fece913e5f829932bea266c722fa4ade6f181c4 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 13 Jul 2017 13:29:10 +0430
Subject: [PATCH 230/236] feat(app): hide error logs in production

---
 lib/app/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index 6a42150fb2..8e70820216 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -92,8 +92,10 @@ async function createApp (ssrContext) {
         const _nuxt = this._nuxt || this.$options._nuxt
         _nuxt.dateErr = Date.now()
         _nuxt.err = err
-        console.error(err)
-        console.error('[nuxt] ' + err)
+        if (process.env.NODE_ENV !== 'production' && typeof console !== 'undefined') {
+          console.error(err)
+          console.error('[nuxt] ' + err)
+        }
         return err
       }
     },

From eb595d1952777e254764acf6389cc6eb78dc6f40 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 13 Jul 2017 14:40:12 +0430
Subject: [PATCH 231/236] chore(start): automate start package generate

---
 rollup.config.js => build/rollup.config.js | 16 ++--
 build/start.js                             | 92 ++++++++++++++++++++++
 package.json                               | 11 +--
 start/.gitignore                           |  6 +-
 start/package.json                         | 39 ++++-----
 5 files changed, 127 insertions(+), 37 deletions(-)
 rename rollup.config.js => build/rollup.config.js (90%)
 create mode 100755 build/start.js

diff --git a/rollup.config.js b/build/rollup.config.js
similarity index 90%
rename from rollup.config.js
rename to build/rollup.config.js
index 859ef6c6e8..3a55f6957f 100755
--- a/rollup.config.js
+++ b/build/rollup.config.js
@@ -5,7 +5,7 @@ const rollupAlias = require('rollup-plugin-alias')
 const rollupCommonJS = require('rollup-plugin-commonjs')
 const rollupReplace = require('rollup-plugin-replace')
 const rollupNodeResolve = require('rollup-plugin-node-resolve')
-const packageJson = require('./package.json')
+const packageJson = require('../package.json')
 
 const dependencies = Object.keys(packageJson.dependencies)
 const version = packageJson.version || process.env.VERSION
@@ -22,7 +22,7 @@ const banner =
 // -----------------------------
 // Aliases
 // -----------------------------
-const rootDir = resolve(__dirname)
+const rootDir = resolve(__dirname, '..')
 const libDir = resolve(rootDir, 'lib')
 const distDir = resolve(rootDir, 'dist')
 
@@ -31,7 +31,7 @@ const aliases = {
   builder: resolve(libDir, 'builder/index.js'),
   common: resolve(libDir, 'common/index.js'),
   utils: resolve(libDir, 'common/utils.js'),
-  app: resolve(libDir, 'app'),
+  app: resolve(libDir, 'app')
 }
 
 // -----------------------------
@@ -45,10 +45,6 @@ const builds = {
   core: {
     entry: resolve(libDir, 'core/index.js'),
     dest: resolve(distDir, 'core.js')
-  },
-  builder: {
-    entry: resolve(libDir, 'builder/index.js'),
-    dest: resolve(distDir, 'builder.js')
   }
 }
 
@@ -83,9 +79,9 @@ function genConfig (opts) {
         presets: [
           'babel-preset-es2015-rollup'
         ],
-        "env": {
-          "test": {
-            "plugins": [ "istanbul" ]
+        'env': {
+          'test': {
+            'plugins': [ 'istanbul' ]
           }
         }
       }, opts.babel)),
diff --git a/build/start.js b/build/start.js
new file mode 100755
index 0000000000..91da37ad05
--- /dev/null
+++ b/build/start.js
@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+
+const { readFileSync, readJSONSync, writeFileSync, copySync, removeSync } = require('fs-extra')
+const { resolve, relative } = require('path')
+
+// Dirs
+const rootDir = resolve(__dirname, '..')
+const startDir = resolve(rootDir, 'start')
+
+// Read main package.json
+const packageJSON = readJSONSync(resolve(rootDir, 'package.json'))
+
+// Required and Excluded packages for start
+let requires = [
+  'source-map-support'
+]
+const excludes = [
+  'path',
+  'fs'
+].concat(Object.keys(packageJSON.devDependencies))
+
+// Parse dist/core.js for all external dependencies
+const requireRegex = /require\('([-\w]+)'\)/g
+const rawCore = readFileSync(resolve(rootDir, 'dist/core.js'))
+let match = requireRegex.exec(rawCore)
+while (match) {
+  requires.push(match[1])
+  match = requireRegex.exec(rawCore)
+}
+
+// Apply Excludes
+requires = requires.filter(r => excludes.indexOf(r) === -1)
+
+// Resolve version constrains
+let dependencies = {}
+requires.forEach(r => {
+  if (!packageJSON.dependencies[r]) {
+    console.warn('cannot resolve dependency version for ' + r)
+    return
+  }
+  dependencies[r] = packageJSON.dependencies[r]
+})
+
+// Drop fields
+let drops = ['devDependencies', 'scripts', 'nyc', 'types']
+drops.forEach(k => {
+  delete packageJSON[k]
+})
+
+// Update dependencies
+packageJSON.dependencies = dependencies
+
+// Update package meta
+packageJSON.name = 'nuxt-start'
+packageJSON.description = 'runtime-only build for nuxt'
+
+// Update package.json
+writeFileSync(resolve(startDir, 'package.json'), JSON.stringify(packageJSON, null, 2))
+
+// Copy required files
+const excludeFiles = [
+  'README.md',
+  '.gitignore'
+]
+packageJSON.files.forEach(file => {
+  if (excludeFiles.indexOf(file) !== -1) {
+    return
+  }
+  let src = resolve(rootDir, file)
+  let dst = resolve(startDir, file)
+  // console.log(relative(rootDir, src), '~>', relative(rootDir, dst))
+  removeSync(dst)
+  copySync(src, dst)
+})
+
+// Remove extras
+const extraFiles = [
+  'bin/nuxt-build',
+  'bin/nuxt-generate',
+  'bin/nuxt-dev',
+  'dist/nuxt.js',
+  'dist/nuxt.js.map'
+]
+extraFiles.forEach(file => {
+  removeSync(resolve(startDir, file))
+})
+
+// Patch index.js
+const startIndexjs = resolve(startDir, 'index.js')
+writeFileSync(startIndexjs, String(readFileSync(startIndexjs)).replace('./dist/nuxt', './dist/core'))
+
+console.log('generated ' + packageJSON.name + '@' + packageJSON.version)
diff --git a/package.json b/package.json
index 2612dc516c..a0a8f5e9cd 100644
--- a/package.json
+++ b/package.json
@@ -52,13 +52,14 @@
     "test": "npm run lint && cross-env NODE_ENV=test npm run build:nuxt && nyc ava --verbose --serial test/ -- && nyc report --reporter=html",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.vue bin lib pages test/*.js --ignore-pattern app",
-    "build": "rimraf dist/ && npm run build:nuxt && npm run build:core && npm run build:builder",
-    "build:nuxt": "rollup -c rollup.config.js --environment TARGET:nuxt",
-    "build:core": "rollup -c rollup.config.js --environment TARGET:core",
-    "build:builder": "rollup -c rollup.config.js --environment TARGET:builder",
+    "build": "rimraf dist/ && npm run build:nuxt && npm run build:core",
+    "build:nuxt": "rollup -c build/rollup.config.js --environment TARGET:nuxt",
+    "build:core": "rollup -c build/rollup.config.js --environment TARGET:core",
     "watch": "npm run build:nuxt -- -w",
+    "make-start": "./build/start.js",
     "precommit": "npm run lint",
-    "prepublish": "npm run build",
+    "prepublish": "npm run build && npm run make-start",
+    "postpublish": "cd start && npm publish",
     "postinstall": "opencollective postinstall"
   },
   "engines": {
diff --git a/start/.gitignore b/start/.gitignore
index a30fb4eafb..f0fd204587 100644
--- a/start/.gitignore
+++ b/start/.gitignore
@@ -1,3 +1,3 @@
-bin
-dist
-lib
\ No newline at end of file
+*
+!README.md
+!package.json
\ No newline at end of file
diff --git a/start/package.json b/start/package.json
index 3da5ad2e50..a5f7d60bd4 100644
--- a/start/package.json
+++ b/start/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nuxt-start",
-  "version": "0.0.0",
-  "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
+  "version": "1.0.0-alpha.4",
+  "description": "runtime-only build for nuxt",
   "contributors": [
     {
       "name": "Sebastien Chopin (@Atinux)"
@@ -23,6 +23,7 @@
     "bin",
     "dist",
     "lib",
+    "index.d.ts",
     "index.js"
   ],
   "keywords": [
@@ -37,35 +38,35 @@
     "vue isomorphic",
     "vue versatile"
   ],
-  "homepage": "https://github.com/nuxt/nuxt.js/start#readme",
+  "homepage": "https://github.com/nuxt/nuxt.js#readme",
   "bin": {
     "nuxt": "./bin/nuxt"
   },
-  "scripts": {
-    "build": "rm -rf bin/* dist/* lib/* && cd .. && npm run build && cp -r bin dist lib start",
-    "prepublish": "npm run build"
-  },
   "engines": {
     "node": ">=4.3.0 <5.0.0 || >=5.10",
     "npm": ">=3.0.0"
   },
   "dependencies": {
-    "ansi-html": "^0.0.7",
-    "chalk": "^1.1.3",
-    "compression": "^1.6.2",
-    "connect": "^3.6.2",
+    "source-map-support": "^0.4.15",
+    "lodash": "^4.17.4",
+    "hash-sum": "^1.0.2",
+    "tappable": "^1.0.1",
     "debug": "^2.6.8",
+    "chalk": "^2.0.1",
+    "ansi-html": "^0.0.7",
+    "serialize-javascript": "^1.3.0",
     "etag": "^1.8.0",
     "fresh": "^0.5.0",
-    "fs-extra": "^3.0.1",
-    "hash-sum": "^1.0.2",
-    "lodash": "^4.17.4",
-    "minimist": "^1.2.0",
     "pify": "^3.0.0",
-    "serialize-javascript": "^1.3.0",
     "serve-static": "^1.12.3",
-    "source-map-support": "^0.4.15",
-    "tappable": "^1.0.1",
-    "vue-server-renderer": "~2.3.4"
+    "compression": "^1.7.0",
+    "fs-extra": "^3.0.1",
+    "vue-server-renderer": "~2.4.1",
+    "connect": "^3.6.2"
+  },
+  "collective": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/nuxtjs",
+    "logo": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2"
   }
 }
\ No newline at end of file

From 5ce204c19f0fa61883abe55896ab617c1a5ccfe0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Thu, 13 Jul 2017 14:50:02 +0430
Subject: [PATCH 232/236] fix appveyor

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

diff --git a/package.json b/package.json
index a0a8f5e9cd..03d964e37a 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "build:nuxt": "rollup -c build/rollup.config.js --environment TARGET:nuxt",
     "build:core": "rollup -c build/rollup.config.js --environment TARGET:core",
     "watch": "npm run build:nuxt -- -w",
-    "make-start": "./build/start.js",
+    "make-start": "node ./build/start.js",
     "precommit": "npm run lint",
     "prepublish": "npm run build && npm run make-start",
     "postpublish": "cd start && npm publish",

From e6987d62f0633db3394ea33e4a564a7ef414a7e7 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 17 Jul 2017 22:29:31 +0430
Subject: [PATCH 233/236] chore: remove uncessesarry source-map install

---
 bin/nuxt       | 4 ----
 bin/nuxt-start | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/nuxt b/bin/nuxt
index 42217249cb..35c82cf255 100755
--- a/bin/nuxt
+++ b/bin/nuxt
@@ -1,9 +1,5 @@
 #!/usr/bin/env node
 
-// Node Source Map Support
-// https://github.com/evanw/node-source-map-support
-require('source-map-support').install()
-
 const join = require('path').join
 
 const defaultCommand = 'dev'
diff --git a/bin/nuxt-start b/bin/nuxt-start
index 13551694aa..5e40ebd201 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -2,7 +2,7 @@
 
 const fs = require('fs')
 const parseArgs = require('minimist')
-const { Nuxt, Server } = require('../')
+const { Nuxt } = require('../')
 const { join, resolve } = require('path')
 
 const argv = parseArgs(process.argv.slice(2), {
@@ -60,7 +60,7 @@ if (typeof options.rootDir !== 'string') {
 options.dev = false
 
 // Check if project is built for production
-const distDir = join(options.rootDir, options.buildDir || '.nuxt', 'dist' )
+const distDir = join(options.rootDir, options.buildDir || '.nuxt', 'dist')
 if (!fs.existsSync(join(distDir, 'server-bundle.json'))) {
   console.error('> No build files found, please run `nuxt build` before launching `nuxt start`') // eslint-disable-line no-console
   process.exit(1)

From b5ca6b7975e696704c9995aad6d78d31b5bcf03e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 17 Jul 2017 23:56:41 +0430
Subject: [PATCH 234/236] feat: enhance tapables usage

---
 lib/builder/builder.js   |  5 +----
 lib/builder/generator.js |  5 +----
 lib/core/module.js       |  8 ++++----
 lib/core/nuxt.js         | 10 +++++-----
 lib/core/renderer.js     | 22 ++--------------------
 5 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 34e7b24dc6..f847f4ff12 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -43,9 +43,6 @@ export default class Builder extends Tapable {
     // Helper to resolve build paths
     this.relativeToBuild = (...args) => relativeTo(this.options.buildDir, ...args)
 
-    // Call builder plugin on parent nuxt to notify all modules of builder existence
-    this.nuxt.applyPluginsAsync('builder', this).catch(this.nuxt.errorHandler)
-
     this._buildStatus = STATUS.INITIAL
   }
 
@@ -77,7 +74,7 @@ export default class Builder extends Tapable {
     // Wait for nuxt ready
     await this.nuxt.ready()
 
-    await this.applyPluginsAsync('build', this)
+    await this.nuxt.applyPluginsAsync('build', this)
 
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index 1019afafd6..ed58526cea 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -21,9 +21,6 @@ export default class Generator extends Tapable {
     this.srcBuiltPath = resolve(this.options.buildDir, 'dist')
     this.distPath = resolve(this.options.rootDir, this.options.generate.dir)
     this.distNuxtPath = join(this.distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
-
-    // Call generator plugin on parent nuxt to notify all modules of generator existence
-    this.nuxt.applyPluginsAsync('generator', this).catch(this.nuxt.errorHandler)
   }
 
   async generate ({ build = true, init = true } = {}) {
@@ -38,7 +35,7 @@ export default class Generator extends Tapable {
       await this.builder.build()
     }
 
-    await this.applyPluginsAsync('beforeGenerate', this)
+    await this.nuxt.applyPluginsAsync('generate', this)
 
     // Initialize dist directory
     if (init) {
diff --git a/lib/core/module.js b/lib/core/module.js
index 8876fab3b0..63f835fc6c 100755
--- a/lib/core/module.js
+++ b/lib/core/module.js
@@ -14,11 +14,11 @@ export default class ModuleContainer extends Tapable {
     this.nuxt = nuxt
     this.options = nuxt.options
     this.requiredModules = []
+  }
 
-    this.nuxt.plugin('beforeInit', async () => {
-      await sequence(this.options.modules, this.addModule.bind(this))
-      await this.applyPluginsAsync('ready', this)
-    })
+  async _ready () {
+    await sequence(this.options.modules, this.addModule.bind(this))
+    await this.nuxt.applyPluginsAsync('module', this)
   }
 
   addVendor (vendor) {
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 7293e60552..b0ac429e5f 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -28,7 +28,7 @@ export default class Nuxt extends Tapable {
     this.renderRoute = this.renderer.renderRoute.bind(this.renderer)
     this.renderAndGetWindow = this.renderer.renderAndGetWindow.bind(this.renderer)
 
-    this._ready = this.ready()
+    this._ready = this.ready().catch(this.errorHandler)
   }
 
   async ready () {
@@ -36,10 +36,9 @@ export default class Nuxt extends Tapable {
       return this._ready
     }
 
-    // Wait for all components to be ready
-    await this.applyPluginsAsync('beforeInit') // 1- Modules
-    await this.applyPluginsAsync('init') // 2- Builder
-    await this.applyPluginsAsync('afterInit') // 3- Renderer
+    await this.moduleContainer._ready()
+    await this.applyPluginsAsync('ready')
+    await this.renderer._ready()
 
     this.initialized = true
     return this
@@ -73,6 +72,7 @@ export default class Nuxt extends Tapable {
 
         resolve()
       })
+
       // Add server.destroy(cb) method
       enableDestroy(server)
     })
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 8de1e42d87..f9cd1353bf 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -50,27 +50,9 @@ export default class Renderer extends Tapable {
     // Bind middleware to this context
     this.nuxtMiddleware = this.nuxtMiddleware.bind(this)
     this.errorMiddleware = this.errorMiddleware.bind(this)
-
-    // Initialize
-    /* istanbul ignore if */
-    if (nuxt.initialized) {
-      // If nuxt already initialized
-      this._ready = this.ready().catch(this.nuxt.errorHandler)
-    } else {
-      // Wait for hook
-      this.nuxt.plugin('afterInit', () => {
-        this._ready = this.ready()
-        return this._ready
-      })
-    }
   }
 
-  async ready () {
-    /* istanbul ignore if */
-    if (this._ready) {
-      return this._ready
-    }
-
+  async _ready () {
     // Setup all middleWare
     await this.setupMiddleware()
 
@@ -85,7 +67,7 @@ export default class Renderer extends Tapable {
       await this.loadResources()
     }
 
-    return this
+    await this.nuxt.applyPluginsAsync('renderer', this)
   }
 
   async loadResources (_fs = fs) {

From f317b70fd5be57924195efd028610621cc0eb9bb Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 18 Jul 2017 00:08:02 +0430
Subject: [PATCH 235/236] test(module): add tests for tapable

---
 test/fixtures/module/modules/tapable/index.js  | 18 ++++++++++++++++++
 test/fixtures/module/modules/template/index.js |  1 +
 test/fixtures/module/nuxt.config.js            |  3 ++-
 test/module.test.js                            |  6 ++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/module/modules/tapable/index.js

diff --git a/test/fixtures/module/modules/tapable/index.js b/test/fixtures/module/modules/tapable/index.js
new file mode 100644
index 0000000000..58b879c0fc
--- /dev/null
+++ b/test/fixtures/module/modules/tapable/index.js
@@ -0,0 +1,18 @@
+module.exports = function () {
+  let ctr = 1
+
+  // Add hook for module
+  this.nuxt.plugin('module', async moduleContainer => {
+    this.nuxt.__module_hook = moduleContainer && ctr++
+  })
+
+  // Add hook for renderer
+  this.nuxt.plugin('renderer', async renderer => {
+    this.nuxt.__renderer_hook = renderer && ctr++
+  })
+
+  // Add hook for build
+  this.nuxt.plugin('build', async builder => {
+    this.nuxt.__builder_hook = builder && ctr++
+  })
+}
diff --git a/test/fixtures/module/modules/template/index.js b/test/fixtures/module/modules/template/index.js
index d68d9546a8..6033364d55 100644
--- a/test/fixtures/module/modules/template/index.js
+++ b/test/fixtures/module/modules/template/index.js
@@ -3,6 +3,7 @@ const path = require('path')
 module.exports = function () {
   // Disable parsing pages/
   this.nuxt.options.build.createRoutes = () => {}
+
   // Add /api endpoint
   this.addTemplate({
     fileName: 'router.js',
diff --git a/test/fixtures/module/nuxt.config.js b/test/fixtures/module/nuxt.config.js
index 26f1351403..9b53c2a7d1 100755
--- a/test/fixtures/module/nuxt.config.js
+++ b/test/fixtures/module/nuxt.config.js
@@ -1,7 +1,8 @@
 module.exports = {
   loading: true,
   modules: [
-    '~/modules/basic', // Use ~ for deprication warning coverage
+    '~/modules/basic',
+    '~/modules/tapable',
     {
       src: '~/modules/middleware',
       options: {
diff --git a/test/module.test.js b/test/module.test.js
index 9f1f7d0b57..83f3005c4c 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -37,6 +37,12 @@ test('Middleware', async t => {
   t.is(response, 'It works!', '/api response is correct')
 })
 
+test('Tapable', async t => {
+  t.is(nuxt.__module_hook, 1)
+  t.is(nuxt.__renderer_hook, 2)
+  t.is(nuxt.__builder_hook, 3)
+})
+
 // Close server and ask nuxt to stop listening to file changes
 test.after('Closing server and nuxt.js', t => {
   nuxt.close()

From 054098acf8a1cc7e83bbc7ffeb80cc6af153dbac Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Tue, 18 Jul 2017 02:49:02 +0430
Subject: [PATCH 236/236] > upgrade dependencies

---
 package.json                                  |   8 +-
 test/fixtures/module/modules/tapable/index.js |   6 +-
 yarn.lock                                     | 354 ++++++++++--------
 3 files changed, 197 insertions(+), 171 deletions(-)

diff --git a/package.json b/package.json
index 03d964e37a..2fd4f4b5e2 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "file-loader": "^0.11.2",
     "fresh": "^0.5.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
-    "fs-extra": "^3.0.1",
+    "fs-extra": "^4.0.0",
     "glob": "^7.1.2",
     "hash-sum": "^1.0.2",
     "html-minifier": "^3.5.2",
@@ -104,7 +104,7 @@
     "serve-static": "^1.12.3",
     "source-map-support": "^0.4.15",
     "tapable": "^0.2.6",
-    "tappable": "^1.0.1",
+    "tappable": "^1.1.0",
     "url-loader": "^0.5.9",
     "vue": "~2.4.1",
     "vue-loader": "^13.0.1",
@@ -114,14 +114,14 @@
     "vue-ssr-html-stream": "^2.2.0",
     "vue-template-compiler": "~2.4.1",
     "vuex": "^2.3.1",
-    "webpack": "^3.2.0",
+    "webpack": "^3.3.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-dev-middleware": "^1.11.0",
     "webpack-hot-middleware": "^2.18.1",
     "webpack-node-externals": "^1.6.0"
   },
   "devDependencies": {
-    "ava": "^0.20.0",
+    "ava": "^0.21.0",
     "babel-eslint": "^7.2.3",
     "babel-plugin-array-includes": "^2.0.3",
     "babel-plugin-istanbul": "^4.1.4",
diff --git a/test/fixtures/module/modules/tapable/index.js b/test/fixtures/module/modules/tapable/index.js
index 58b879c0fc..48fc69466f 100644
--- a/test/fixtures/module/modules/tapable/index.js
+++ b/test/fixtures/module/modules/tapable/index.js
@@ -2,17 +2,17 @@ module.exports = function () {
   let ctr = 1
 
   // Add hook for module
-  this.nuxt.plugin('module', async moduleContainer => {
+  this.nuxt.plugin('module', moduleContainer => {
     this.nuxt.__module_hook = moduleContainer && ctr++
   })
 
   // Add hook for renderer
-  this.nuxt.plugin('renderer', async renderer => {
+  this.nuxt.plugin('renderer', renderer => {
     this.nuxt.__renderer_hook = renderer && ctr++
   })
 
   // Add hook for build
-  this.nuxt.plugin('build', async builder => {
+  this.nuxt.plugin('build', builder => {
     this.nuxt.__builder_hook = builder && ctr++
   })
 }
diff --git a/yarn.lock b/yarn.lock
index 1c5eebf4db..3b6b5e7dff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -45,8 +45,8 @@
     arrify "^1.0.1"
 
 "@types/node@^6.0.46":
-  version "6.0.79"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.79.tgz#5efe7d4a6d8c453c7e9eaf55d931f4a22fac5169"
+  version "6.0.84"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
 
 abab@^1.0.3:
   version "1.0.3"
@@ -89,7 +89,7 @@ acorn@^4.0.1, 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.0.1, acorn@^5.0.3:
+acorn@^5.0.0, acorn@^5.0.1, acorn@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
@@ -109,8 +109,8 @@ ajv@^4.7.0, ajv@^4.9.1:
     json-stable-stringify "^1.0.1"
 
 ajv@^5.0.0, ajv@^5.1.5, ajv@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.1.tgz#dcd03045175883ba1b636e5ae9ec3df9ab85323a"
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -330,18 +330,18 @@ autoprefixer@^7.1.1:
     postcss-value-parser "^3.2.3"
 
 ava-init@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.2.0.tgz#9304c8b4c357d66e3dfdae1fbff47b1199d5c55d"
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.2.1.tgz#75ac4c8553326290d2866e63b62fa7035684bd58"
   dependencies:
     arr-exclude "^1.0.0"
-    execa "^0.5.0"
+    execa "^0.7.0"
     has-yarn "^1.0.0"
     read-pkg-up "^2.0.0"
-    write-pkg "^2.0.0"
+    write-pkg "^3.1.0"
 
-ava@^0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/ava/-/ava-0.20.0.tgz#bdc0dd36453d7255e9f733305ab370c248381e41"
+ava@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/ava/-/ava-0.21.0.tgz#cd8d8ea3546f57150dea38548b9f72f8ca583d29"
   dependencies:
     "@ava/babel-preset-stage-4" "^1.1.0"
     "@ava/babel-preset-transform-test-files" "^3.0.0"
@@ -358,7 +358,7 @@ ava@^0.20.0:
     babel-core "^6.17.0"
     bluebird "^3.0.0"
     caching-transform "^1.0.0"
-    chalk "^1.0.0"
+    chalk "^2.0.1"
     chokidar "^1.4.2"
     clean-stack "^1.1.1"
     clean-yaml-object "^0.1.0"
@@ -368,7 +368,7 @@ ava@^0.20.0:
     co-with-promise "^4.6.0"
     code-excerpt "^2.1.0"
     common-path-prefix "^1.0.0"
-    concordance "^2.0.0"
+    concordance "^3.0.0"
     convert-source-map "^1.2.0"
     core-assert "^0.2.0"
     currently-unhandled "^0.4.1"
@@ -377,7 +377,7 @@ ava@^0.20.0:
     empower-core "^0.6.1"
     equal-length "^1.0.0"
     figures "^2.0.0"
-    find-cache-dir "^0.1.1"
+    find-cache-dir "^1.0.0"
     fn-name "^2.0.0"
     get-port "^3.0.0"
     globby "^6.0.0"
@@ -399,25 +399,26 @@ ava@^0.20.0:
     lodash.flatten "^4.2.0"
     loud-rejection "^1.2.0"
     make-dir "^1.0.0"
-    matcher "^0.1.1"
+    matcher "^1.0.0"
     md5-hex "^2.0.0"
     meow "^3.7.0"
-    ms "^1.0.0"
+    ms "^2.0.0"
     multimatch "^2.1.0"
     observable-to-promise "^0.5.0"
-    option-chain "^0.1.0"
+    option-chain "^1.0.0"
     package-hash "^2.0.0"
     pkg-conf "^2.0.0"
     plur "^2.0.0"
     pretty-ms "^2.0.0"
     require-precompiled "^0.1.0"
-    resolve-cwd "^1.0.0"
+    resolve-cwd "^2.0.0"
+    safe-buffer "^5.1.1"
     slash "^1.0.0"
     source-map-support "^0.4.0"
     stack-utils "^1.0.0"
-    strip-ansi "^3.0.1"
+    strip-ansi "^4.0.0"
     strip-bom-buf "^1.0.0"
-    supports-color "^3.2.3"
+    supports-color "^4.0.0"
     time-require "^0.1.2"
     trim-off-newlines "^1.0.1"
     unique-temp-dir "^1.0.0"
@@ -1165,15 +1166,15 @@ boom@2.x.x:
     hoek "2.x.x"
 
 boxen@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.1.0.tgz#b1b69dd522305e807a99deee777dbd6e5167b102"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.0.tgz#03478d84be7fe02189b80904d81d6a80384368f1"
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
-    chalk "^1.1.1"
+    chalk "^2.0.1"
     cli-boxes "^1.0.0"
     string-width "^2.0.0"
-    term-size "^0.1.0"
+    term-size "^1.2.0"
     widest-line "^1.0.0"
 
 brace-expansion@^1.1.7:
@@ -1260,11 +1261,11 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     electron-to-chromium "^1.2.7"
 
 browserslist@^2.1.2, browserslist@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.2.0.tgz#5e35ec993e467c6464b8cb708447386891de9f50"
   dependencies:
-    caniuse-lite "^1.0.30000684"
-    electron-to-chromium "^1.3.14"
+    caniuse-lite "^1.0.30000701"
+    electron-to-chromium "^1.3.15"
 
 buf-compare@^1.0.0:
   version "1.0.1"
@@ -1365,12 +1366,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.30000697"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000697.tgz#20ce6a9ceeef4ef4a15dc8e80f2e8fb9049e8d77"
+  version "1.0.30000701"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000701.tgz#2e32b06993bf3dbd90b43d93f04e26d11afddcba"
 
-caniuse-lite@^1.0.30000684, caniuse-lite@^1.0.30000697:
-  version "1.0.30000697"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000697.tgz#125fb00604b63fbb188db96a667ce2922dcd6cdd"
+caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000701:
+  version "1.0.30000701"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000701.tgz#9d673cf6b74dcb3d5c21d213176b011ac6a45baa"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1409,7 +1410,7 @@ chalk@^0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
-chalk@^2.0.1:
+chalk@^2.0.0, chalk@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
   dependencies:
@@ -1417,7 +1418,7 @@ chalk@^2.0.1:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
-chokidar@^1.4.2, chokidar@^1.4.3, chokidar@^1.7.0:
+chokidar@^1.4.2, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1454,8 +1455,8 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 clean-css@4.1.x:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.6.tgz#5a47beb526994cb4f7bf36188a55ed3b45528f0b"
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.7.tgz#b9aea4f85679889cf3eae8b40349ec4ebdfdd032"
   dependencies:
     source-map "0.5.x"
 
@@ -1557,8 +1558,8 @@ color-convert@^1.0.0, color-convert@^1.3.0:
     color-name "^1.1.1"
 
 color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
 color-string@^0.3.0:
   version "0.3.0"
@@ -1592,12 +1593,16 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.9.x, commander@^2.9.0, commander@~2.9.0:
+commander@2.9.x, commander@~2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
 common-path-prefix@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-1.0.0.tgz#cd52f6f0712e0baab97d6f9732874f22f47752c0"
@@ -1636,10 +1641,11 @@ concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concordance@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/concordance/-/concordance-2.0.0.tgz#c3c5dbffa83c29537df202bded8fa1d6aa94e805"
+concordance@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/concordance/-/concordance-3.0.0.tgz#b2286af54405fc995fc7345b0b106d8dd073cb29"
   dependencies:
+    date-time "^2.1.0"
     esutils "^2.0.2"
     fast-diff "^1.1.1"
     function-name-support "^0.2.0"
@@ -1648,7 +1654,6 @@ concordance@^2.0.0:
     lodash.flattendeep "^4.4.0"
     lodash.merge "^4.6.0"
     md5-hex "^2.0.0"
-    moment "^2.18.1"
     semver "^5.3.0"
     well-known-symbols "^1.0.0"
 
@@ -1811,13 +1816,6 @@ cross-env@^5.0.1:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
 
-cross-spawn-async@^2.1.1:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
-  dependencies:
-    lru-cache "^4.0.0"
-    which "^1.2.8"
-
 cross-spawn@^4, cross-spawn@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
@@ -1825,7 +1823,7 @@ cross-spawn@^4, cross-spawn@^4.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.1.0:
+cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -1840,8 +1838,8 @@ cryptiles@2.x.x:
     boom "2.x.x"
 
 crypto-browserify@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f"
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -1986,6 +1984,12 @@ date-time@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
 
+date-time@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2"
+  dependencies:
+    time-zone "^1.0.0"
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -2204,7 +2208,7 @@ ejs@^2.3.4, ejs@^2.5.6:
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.15:
   version "1.3.15"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz#08397934891cbcfaebbd18b82a95b5a481138369"
 
@@ -2277,8 +2281,8 @@ error-stack-parser@^2.0.0:
     stackframe "^1.0.3"
 
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.23"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
+  version "0.10.24"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.24.tgz#a55877c9924bc0c8d9bd3c2cbe17495ac1709b14"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
@@ -2549,17 +2553,6 @@ evp_bytestokey@^1.0.0:
   dependencies:
     create-hash "^1.1.1"
 
-execa@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"
-  dependencies:
-    cross-spawn-async "^2.1.1"
-    is-stream "^1.1.0"
-    npm-run-path "^1.0.0"
-    object-assign "^4.0.1"
-    path-key "^1.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
@@ -2572,6 +2565,18 @@ execa@^0.5.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -2621,7 +2626,7 @@ extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.1:
+external-editor@^2.0.1, external-editor@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
   dependencies:
@@ -2818,9 +2823,9 @@ fs-extra@^0.26.4:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+fs-extra@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.0.tgz#414fb4ca2d2170ba0014159d3a8aec3303418d9e"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^3.0.0"
@@ -3216,11 +3221,11 @@ hullabaloo-config-manager@^1.1.0:
     resolve-from "^3.0.0"
     safe-buffer "^5.0.1"
 
-iconv-lite@0.4.13, iconv-lite@~0.4.13:
+iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.17:
+iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
 
@@ -3298,7 +3303,7 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@3.0.6, inquirer@^3.0.6:
+inquirer@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
   dependencies:
@@ -3316,6 +3321,25 @@ inquirer@3.0.6, inquirer@^3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@^3.0.6:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.0.tgz#45b44c2160c729d7578c54060b3eed94487bb42b"
+  dependencies:
+    ansi-escapes "^2.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.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:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -3577,9 +3601,9 @@ istanbul-lib-hook@^1.0.7:
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.7.2, istanbul-lib-instrument@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.3.tgz#925b239163eabdd68cc4048f52c2fa4f899ecfa7"
+istanbul-lib-instrument@^1.7.2, istanbul-lib-instrument@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz#e9fd920e4767f3d19edc765e2d6b3f5ccbd0eea8"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -3654,8 +3678,8 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jschardet@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.5.0.tgz#a61f310306a5a71188e1b1acd08add3cfbb08b1e"
 
 jsdom@^11.1.0:
   version "11.1.0"
@@ -3948,7 +3972,7 @@ lru-cache@^3.2.0:
   dependencies:
     pseudomap "^1.0.1"
 
-lru-cache@^4.0.0, lru-cache@^4.0.1:
+lru-cache@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
@@ -3981,9 +4005,9 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
-matcher@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/matcher/-/matcher-0.1.2.tgz#ef20cbde64c24c50cc61af5b83ee0b1b8ff00101"
+matcher@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.0.0.tgz#aaf0c4816eb69b92094674175625f3466b0e3e19"
   dependencies:
     escape-string-regexp "^1.0.4"
 
@@ -4079,8 +4103,8 @@ miller-rabin@^4.0.0:
     brorand "^1.0.1"
 
 "mime-db@>= 1.27.0 < 2":
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.28.0.tgz#fedd349be06d2865b7fc57d837c6de4f17d7ac3c"
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
 
 mime-db@~1.27.0:
   version "1.27.0"
@@ -4118,7 +4142,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8, minimist@~0.0.1:
+minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -4126,24 +4150,20 @@ minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 "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:
     minimist "0.0.8"
 
-moment@^2.18.1:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
-ms@2.0.0:
+ms@2.0.0, ms@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-ms@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-1.0.0.tgz#59adcd22edc543f7b5381862d31387b1f4bc9473"
-
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -4277,12 +4297,6 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-run-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
-  dependencies:
-    path-key "^1.0.0"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -4317,8 +4331,8 @@ nwmatcher@^1.4.1:
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f"
 
 nyc@^11.0.3:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.0.3.tgz#0c28bc669a851621709bf7a08503034bee3812b6"
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.1.0.tgz#d6b3c5e16892a25af63138ba484676aa8a22eda7"
   dependencies:
     archy "^1.0.0"
     arrify "^1.0.1"
@@ -4332,7 +4346,7 @@ nyc@^11.0.3:
     glob "^7.0.6"
     istanbul-lib-coverage "^1.1.1"
     istanbul-lib-hook "^1.0.7"
-    istanbul-lib-instrument "^1.7.3"
+    istanbul-lib-instrument "^1.7.4"
     istanbul-lib-report "^1.1.1"
     istanbul-lib-source-maps "^1.2.1"
     istanbul-reports "^1.1.1"
@@ -4343,7 +4357,7 @@ nyc@^11.0.3:
     resolve-from "^2.0.0"
     rimraf "^2.5.4"
     signal-exit "^3.0.1"
-    spawn-wrap "^1.3.7"
+    spawn-wrap "^1.3.8"
     test-exclude "^4.1.1"
     yargs "^8.0.1"
     yargs-parser "^5.0.0"
@@ -4443,11 +4457,9 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-option-chain@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/option-chain/-/option-chain-0.1.1.tgz#e9b811e006f1c0f54802f28295bfc8970f8dcfbd"
-  dependencies:
-    object-assign "^4.0.1"
+option-chain@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/option-chain/-/option-chain-1.0.0.tgz#938d73bd4e1783f948d34023644ada23669e30f2"
 
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
@@ -4606,10 +4618,6 @@ 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"
 
-path-key@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
-
 path-key@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
@@ -4977,12 +4985,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.1, postcss@^6.0.6:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd"
+  version "6.0.7"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.7.tgz#6a097477c46d13d0560a817d69abc0bae549d0a0"
   dependencies:
     chalk "^2.0.1"
     source-map "^0.5.6"
-    supports-color "^4.1.0"
+    supports-color "^4.2.0"
 
 preload-webpack-plugin@^1.2.2:
   version "1.2.2"
@@ -5415,12 +5423,6 @@ require-uncached@^1.0.3:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
-resolve-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-1.0.0.tgz#4eaeea41ed040d1702457df64a42b2b07d246f9f"
-  dependencies:
-    resolve-from "^2.0.0"
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -5551,11 +5553,21 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+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"
+
 rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
@@ -5574,8 +5586,8 @@ schema-utils@^0.3.0:
     ajv "^5.0.0"
 
 script-ext-html-webpack-plugin@^1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.3.tgz#04c77e68eb45eb6358bf36554a1a358ca60ca2ed"
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.5.tgz#7a408383d7f3329da8f59d503be25cc39a53f3f3"
   dependencies:
     debug "^2.6.8"
 
@@ -5608,8 +5620,8 @@ send@0.15.3:
     statuses "~1.3.1"
 
 serialize-javascript@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
 
 serve-static@1.12.3, serve-static@^1.12.3:
   version "1.12.3"
@@ -5682,12 +5694,18 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-sort-keys@^1.0.0, sort-keys@^1.1.1, sort-keys@^1.1.2:
+sort-keys@^1.0.0, sort-keys@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
   dependencies:
     is-plain-obj "^1.0.0"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
@@ -5718,7 +5736,7 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
-spawn-wrap@^1.3.7:
+spawn-wrap@^1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.8.tgz#fa2a79b990cbb0bb0018dca6748d88367b19ec31"
   dependencies:
@@ -5818,7 +5836,7 @@ 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.0.0, string-width@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.0.tgz#030664561fc146c9423ec7d978fe2457437fe6d0"
   dependencies:
@@ -5895,7 +5913,7 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.1.0:
+supports-color@^4.0.0, supports-color@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
   dependencies:
@@ -5940,9 +5958,9 @@ tapable@^0.2.5, tapable@^0.2.6, tapable@~0.2.5:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
 
-tappable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tappable/-/tappable-1.0.1.tgz#9cda1fdeb73011d30db5edc42bc6cc42c9f3028f"
+tappable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tappable/-/tappable-1.1.0.tgz#521770dea7dc4715d48ddb4c471071afee012025"
   dependencies:
     pify "^3.0.0"
     tapable "^0.2.6"
@@ -5968,11 +5986,11 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-term-size@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
+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.4.0"
+    execa "^0.7.0"
 
 test-exclude@^4.1.1:
   version "4.1.1"
@@ -6008,6 +6026,10 @@ time-require@^0.1.2:
     pretty-ms "^0.2.1"
     text-table "^0.2.0"
 
+time-zone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
+
 timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
@@ -6098,8 +6120,8 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 uglify-js@3.0.x, uglify-js@^3.0.23:
-  version "3.0.24"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.24.tgz#ee93400ad9857fb7a1671778db83f6a23f033121"
+  version "3.0.25"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.25.tgz#3dc190b0ee437497e449bc6f785665b06afbe052"
   dependencies:
     commander "~2.9.0"
     source-map "~0.5.1"
@@ -6280,8 +6302,8 @@ vue-hot-reload-api@^2.1.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
 
 vue-loader@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.1.tgz#265b5c81451079304601e8aff3e95af64fb10c43"
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.2.tgz#78c3e80f69c0520f99a092854dd7d63e3921a28d"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -6354,12 +6376,12 @@ vuex@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.3.1.tgz#cde8e997c1f9957719bc7dea154f9aa691d981a6"
 
-watchpack@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
   dependencies:
     async "^2.1.2"
-    chokidar "^1.4.3"
+    chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
 webidl-conversions@^4.0.0, webidl-conversions@^4.0.1:
@@ -6367,10 +6389,10 @@ webidl-conversions@^4.0.0, webidl-conversions@^4.0.1:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
 
 webpack-bundle-analyzer@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8"
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.3.tgz#8e7b3deb3832698c24b09c84dfe5b43902a83991"
   dependencies:
-    acorn "^5.0.3"
+    acorn "^5.1.1"
     chalk "^1.1.3"
     commander "^2.9.0"
     ejs "^2.5.6"
@@ -6411,9 +6433,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.2.0.tgz#8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"
+webpack@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.3.0.tgz#ce2f9e076566aba91f74887133a883fd7da187bc"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -6434,7 +6456,7 @@ webpack@^3.2.0:
     supports-color "^3.1.0"
     tapable "~0.2.5"
     uglifyjs-webpack-plugin "^0.4.6"
-    watchpack "^1.3.1"
+    watchpack "^1.4.0"
     webpack-sources "^1.0.1"
     yargs "^6.0.0"
 
@@ -6468,7 +6490,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.4, which@^1.2.8, which@^1.2.9:
+which@^1.2.4, which@^1.2.9:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
@@ -6490,10 +6512,14 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2, wordwrap@~0.0.2:
+wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -6525,7 +6551,7 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-write-json-file@^2.0.0:
+write-json-file@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
   dependencies:
@@ -6536,12 +6562,12 @@ write-json-file@^2.0.0:
     sort-keys "^1.1.1"
     write-file-atomic "^2.0.0"
 
-write-pkg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-2.1.0.tgz#353aa44c39c48c21440f5c08ce6abd46141c9c08"
+write-pkg@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9"
   dependencies:
-    sort-keys "^1.1.2"
-    write-json-file "^2.0.0"
+    sort-keys "^2.0.0"
+    write-json-file "^2.2.0"
 
 write@^0.2.1:
   version "0.2.1"