diff --git a/.all-contributorsrc b/.all-contributorsrc
index 04a77f49c5..e5a92c37bc 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6,8 +6,9 @@
   "files": [
     "README.md"
   ],
-  "imageSize": 150,
+  "imageSize": 120,
   "commit": false,
+  "contributorsPerLine": 4,
   "contributors": [
     {
       "login": "Atinux",
@@ -94,6 +95,31 @@
         "review",
         "test"
       ]
+    },
+    {
+      "login": "aldarund",
+      "name": "Dmitry Molotkov",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/571159?v=4",
+      "profile": "https://github.com/aldarund",
+      "contributions": [
+        "question",
+        "bug",
+        "code",
+        "ideas",
+        "review"
+      ]
+    },
+    {
+      "login": "kevinmarrec",
+      "name": "Kevin Marrec",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/25272043?v=4",
+      "profile": "https://github.com/kevinmarrec",
+      "contributions": [
+        "code",
+        "ideas",
+        "platform",
+        "review"
+      ]
     }
   ]
 }
diff --git a/.circleci/config.yml b/.circleci/config.yml
index aad841f786..35c04eb206 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,9 +3,39 @@ version: 2
 defaults: &defaults
   working_directory: ~/project
   docker:
-    - image: banian/node-headless-chrome
+    - image: circleci/node:latest
   environment:
-    - NODE_ENV: test
+    NODE_ENV: test
+    NODE_OPTIONS: --max_old_space_size=4096
+
+release_branches: &release_branches
+  branches:
+    only:
+      - dev
+      - next
+
+release: &release
+  <<: *defaults
+  steps:
+    - checkout
+    - attach_workspace:
+        at: ~/project
+    - run:
+        name: release
+        command: |
+          if [ -z "$COMMIT_MSG" ]; then
+            COMMIT_MSG=$(git --no-pager log --pretty=full -n1 $CIRCLE_SHA1)
+          fi
+          if echo "$COMMIT_MSG" | grep -o "\[release\]"; then
+            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+            echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+            yarn lerna version --yes --no-git-tag-version --no-push
+            PACKAGE_SUFFIX=edge yarn build
+            if [ "$CIRCLE_BRANCH" = "next" ]; then tag="--tag next"; fi
+            ./scripts/workspace-run npm publish $tag -q
+          else
+            echo "Release phase is skipped."
+          fi
 
 jobs:
   # --------------------------------------------------------------------------
@@ -19,7 +49,7 @@ jobs:
 
       # Restore cache
       - restore_cache:
-          key: yarn-{{ checksum "yarn.lock" }}
+          key: lock-{{ checksum "yarn.lock" }}
 
       # Install dependencies
       - run:
@@ -28,7 +58,7 @@ jobs:
 
       # Save cache
       - save_cache:
-          key: yarn-{{ checksum "yarn.lock" }}
+          key: lock-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
             - packages/*/node_modules
@@ -64,7 +94,7 @@ jobs:
           at: ~/project
       - run:
           name: Security Audit
-          command: npm install --package-lock-only && npm audit --audit-level=moderate
+          command: yarn audit
 
   build:
     <<: *defaults
@@ -74,14 +104,24 @@ jobs:
           at: ~/project
       - run:
           name: Build Fixtures
-          command: yarn test:fixtures -w=4 --coverage && yarn coverage
+          command: yarn test:fixtures -i --coverage && yarn coverage
       - persist_to_workspace:
           root: ~/project
           paths:
             - test/fixtures
 
+  lint-app:
+    <<: *defaults
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Lint vue-app templates
+          command: yarn lint:app
+
   # --------------------------------------------------------------------------
-  # Phase 3: Unit and E2E tests
+  # Phase 3: Unit, E2E and types tests
   # --------------------------------------------------------------------------
   test-unit:
     <<: *defaults
@@ -91,10 +131,12 @@ jobs:
           at: ~/project
       - run:
           name: Unit Tests
-          command: yarn test:unit -w=4 --coverage && yarn coverage
+          command: yarn test:unit -w=2 --coverage && yarn coverage
 
   test-e2e:
     <<: *defaults
+    docker:
+      - image: circleci/node:latest-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -103,59 +145,65 @@ jobs:
           name: E2E Tests
           command: yarn test:e2e && yarn coverage
 
-  # --------------------------------------------------------------------------
-  # Phase 4: Release (dev branch only)
-  # --------------------------------------------------------------------------
-  release:
+  test-types:
     <<: *defaults
+    docker:
+      - image: circleci/node:latest-browsers
     steps:
       - checkout
       - attach_workspace:
           at: ~/project
       - run:
-          name: release
-          command: |
-            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-            echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-            yarn release --yes
-            PACKAGE_SUFFIX=edge yarn build
-            ./scripts/workspace-run npm publish -q
+          name: Types Tests
+          command: yarn test:types
+
+  # --------------------------------------------------------------------------
+  # Phase 4: Release (dev branch only)
+  # --------------------------------------------------------------------------
+  release-commit:
+    <<: *release
+
+  release-nightly:
+    <<: *release
+    environment:
+        COMMIT_MSG: '[release]'
 
 # Workflow definition
 workflows:
   version: 2
-  setup-and-test:
+
+  # Build and test after each commit
+  # Manually release on release branches
+  commit:
     jobs:
       - setup
-
-      - lint:
-          requires:
-            - setup
-
-      - audit:
-          requires:
-            - setup
-
-      - build:
-          requires:
-            - setup
-
-      - test-unit:
-          requires:
-            - build
-
-      - test-e2e:
-          requires:
-            - build
-
-      - release:
-          requires:
-            - build
-            - lint
-            - audit
-            - test-unit
-            - test-e2e
+      - lint:       { requires: [setup] }
+      - audit:      { requires: [setup] }
+      - build:      { requires: [setup] }
+      - lint-app:   { requires: [build] }
+      - test-unit:  { requires: [build] }
+      - test-e2e:   { requires: [build] }
+      - test-types: { requires: [build] }
+      - release-commit:
+          requires: [build, lint, lint-app, audit, test-unit, test-e2e, test-types]
           filters:
-            branches:
-              only:
-                - dev
+            <<: *release_branches
+
+  # Release nightly builds on release branches
+  nightly:
+    jobs:
+      - setup
+      - lint:       { requires: [setup] }
+      - audit:      { requires: [setup] }
+      - build:      { requires: [setup] }
+      - lint-app:   { requires: [build] }
+      - test-unit:  { requires: [build] }
+      - test-e2e:   { requires: [build] }
+      - test-types: { requires: [build] }
+      - release-nightly:
+          requires: [build, lint, lint-app, audit, test-unit, test-e2e, test-types]
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            <<: *release_branches
diff --git a/.eslintrc.js b/.eslintrc.js
index 986bfba056..428eefc3b7 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,20 +2,39 @@ module.exports = {
   root: true,
   parserOptions: {
     parser: 'babel-eslint',
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   extends: [
     '@nuxtjs'
   ],
+  "globals": {
+    "BigInt": true
+  },
   overrides: [{
     files: [ 'test/fixtures/*/.nuxt*/**' ],
     rules: {
-      'vue/name-property-casing': ['error', 'kebab-case']
+      'vue/name-property-casing': 'error'
     }
   }, {
-    files: [ 'test/fixtures/*/.nuxt*/**/+(App|index).js' ],
+    files: [
+      'examples/storybook/**',
+      'examples/with-element-ui/**',
+      'examples/with-museui/**',
+      'examples/with-vue-material/**',
+      'examples/with-vuetify/**',
+      'examples/with-vuikit/**',
+      'examples/with-vux/**',
+    ],
     rules: {
-      'import/order': 'ignore'
+      'vue/component-name-in-template-casing': ['warn', 'kebab-case']
+    }
+  }, {
+    files: [ 'test/fixtures/*/.nuxt*/**/+(App|index|server|client).js' ],
+    rules: {
+      'import/order': 'off'
     }
   }, {
     files: [ 'test/fixtures/*/.nuxt*/**/client.js' ],
@@ -31,7 +50,18 @@ module.exports = {
     files: [ 'test/fixtures/*/.nuxt*/**/*.html' ],
     rules: {
       'semi': ['error', 'always', { 'omitLastInOneLineBlock': true }],
-      'no-var': 'warn'
+      'no-var': 'off'
+    }
+  }, {
+    files: [ 'test/fixtures/*/.nuxt*/**/nuxt-error.vue' ],
+    rules: {
+      'vue/singleline-html-element-content-newline': 'off'
+    }
+  }, {
+    // might be removed in the future, see https://github.com/standard/eslint-plugin-standard/issues/27
+    files: [ 'test/fixtures/*/.nuxt*/**/nuxt-link.client.js' ],
+    rules: {
+      'standard/no-callback-literal': 'off'
     }
   }]
 }
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index fbbd84aa65..faba7fff08 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -5,6 +5,7 @@ Please use the following link to create a new issue:
 
 - 🚨 Bug report - https://bug.nuxtjs.org/ 
 - 🙋 Feature request - https://feature.nuxtjs.org/ 
+- 🤔 Help wanted - https://otechie.com/nuxt 
 - ❗️ All other issues - https://cmty.nuxtjs.org/ 
 
 If your issue was not created using the app above, **it will be closed immediately**.
diff --git a/.github/_main.workflow b/.github/_main.workflow
new file mode 100644
index 0000000000..087844ca23
--- /dev/null
+++ b/.github/_main.workflow
@@ -0,0 +1,43 @@
+workflow "Nuxt.js Actions" {
+  on = "push"
+  resolves = ["Audit", "Lint", "Test: Unit", "Test: E2E"]
+}
+
+action "branch-filter" {
+  uses = "actions/bin/filter@master"
+  args = ["branch dev"]
+}
+
+action "Install" {
+  uses = "nuxt/actions-yarn@master"
+  args = "install --frozen-lockfile --non-interactive"
+}
+
+action "Audit" {
+  uses = "nuxt/actions-yarn@master"
+  args = "audit"
+}
+
+action "Lint" {
+  uses = "nuxt/actions-yarn@master"
+  needs = ["Install"]
+  args = "lint"
+}
+
+action "Build" {
+  uses = "nuxt/actions-yarn@master"
+  needs = ["Install"]
+  runs = "yarn test:fixtures --coverage && yarn coverage"
+}
+
+action "Test: Unit" {
+  uses = "nuxt/actions-yarn@master"
+  needs = ["Build"]
+  runs = "yarn test:unit --coverage && yarn coverage"
+}
+
+action "Test: E2E" {
+  uses = "nuxt/actions-yarn@master"
+  args = "test:e2e"
+  needs = ["Build"]
+}
diff --git a/.github/lock.yml b/.github/lock.yml
index 6580ca74ab..4bd5b48a8a 100644
--- a/.github/lock.yml
+++ b/.github/lock.yml
@@ -1,5 +1,6 @@
 # Configuration for lock-threads - https://github.com/dessant/lock-threads
-daysUntilLock: 30
+# disable lock bot for now
+daysUntilLock: 3650
 exemptLabels: []
 lockLabel: false
 lockComment: >
diff --git a/.github/stale.yml b/.github/stale.yml
index d2963a6b8a..fdf753787c 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -4,6 +4,18 @@ daysUntilClose: 7
 staleLabel: stale
 exemptLabels:
   - "cmty:feature-request"
+  - "WIP"
+  - ":clock1:Pending"
+  - "type:discussion"
 markComment: >
+  Thanks for your contribution to Nuxt.js!
+
   This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs.
+
+  If you would like this issue to remain open:
+
+   1. Verify that you can still reproduce the issue in the latest version of nuxt-edge
+   1. Comment the steps to reproduce it
+
+  Issues that are labeled as `🕐Pending` will not be automatically marked as stale.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f9bc524e5..d71f6d7176 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,212 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* $nuxt is used instead of globalName ([#4743](https://github.com/nuxt/nuxt.js/issues/4743)) ([fe57a5a](https://github.com/nuxt/nuxt.js/commit/fe57a5a))
+* add iron browser as modern ([#4775](https://github.com/nuxt/nuxt.js/issues/4775)) ([9eab558](https://github.com/nuxt/nuxt.js/commit/9eab558))
+* add option to rewatch on path after raw fs event ([#4717](https://github.com/nuxt/nuxt.js/issues/4717)) ([9c6df49](https://github.com/nuxt/nuxt.js/commit/9c6df49))
+* allow keepAliveProps for nuxt component ([#4610](https://github.com/nuxt/nuxt.js/issues/4610)) ([8dc15d0](https://github.com/nuxt/nuxt.js/commit/8dc15d0))
+* allow pcss ending for webpack loader ([#4530](https://github.com/nuxt/nuxt.js/issues/4530)) ([8e0b508](https://github.com/nuxt/nuxt.js/commit/8e0b508))
+* apply store HMR to whole store ([#4589](https://github.com/nuxt/nuxt.js/issues/4589)) ([81cf09c](https://github.com/nuxt/nuxt.js/commit/81cf09c))
+* correct renderer.noSSR name ([6990efc](https://github.com/nuxt/nuxt.js/commit/6990efc))
+* csp SHA hashes accumulate when using custom script-src rules ([#4519](https://github.com/nuxt/nuxt.js/issues/4519)) ([683dbba](https://github.com/nuxt/nuxt.js/commit/683dbba))
+* detect plugin without extension ([#4579](https://github.com/nuxt/nuxt.js/issues/4579)) ([e7df65b](https://github.com/nuxt/nuxt.js/commit/e7df65b))
+* hotfix for vuex hmr ([#4801](https://github.com/nuxt/nuxt.js/issues/4801)) ([5f0b34f](https://github.com/nuxt/nuxt.js/commit/5f0b34f))
+* **rollup:** temporary ignore rollup-plugin-license deprecated warns ([49a7d0c](https://github.com/nuxt/nuxt.js/commit/49a7d0c))
+* empty error message in dev mode ([3d990fe](https://github.com/nuxt/nuxt.js/commit/3d990fe))
+* enable FriendlyErrorsPlugin when build.friendlyErrors is true ([30fef5d](https://github.com/nuxt/nuxt.js/commit/30fef5d))
+* exit with proper error code on errors ([#4806](https://github.com/nuxt/nuxt.js/issues/4806)) ([a7ba73e](https://github.com/nuxt/nuxt.js/commit/a7ba73e))
+* fall back to default value when `publicPath` is falsy ([#4365](https://github.com/nuxt/nuxt.js/issues/4365)) ([e0537d5](https://github.com/nuxt/nuxt.js/commit/e0537d5))
+* hmr in modern mode ([#4623](https://github.com/nuxt/nuxt.js/issues/4623)) ([df9b32a](https://github.com/nuxt/nuxt.js/commit/df9b32a))
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* invalid plugin mode warning for all ([9b3e7be](https://github.com/nuxt/nuxt.js/commit/9b3e7be))
+* keepAliveProps broken in <nuxt-child> ([#4521](https://github.com/nuxt/nuxt.js/issues/4521)) ([431cc15](https://github.com/nuxt/nuxt.js/commit/431cc15))
+* loading.throttle can not be 0 ([2d74804](https://github.com/nuxt/nuxt.js/commit/2d74804))
+* match subdir under node_module  in transpile ([#4850](https://github.com/nuxt/nuxt.js/issues/4850)) ([43ce8e9](https://github.com/nuxt/nuxt.js/commit/43ce8e9))
+* merge route.meta into options.meta ([#4479](https://github.com/nuxt/nuxt.js/issues/4479)) ([5a8e6e4](https://github.com/nuxt/nuxt.js/commit/5a8e6e4))
+* modern=true or false not work as expected ([#4378](https://github.com/nuxt/nuxt.js/issues/4378)) ([4c27088](https://github.com/nuxt/nuxt.js/commit/4c27088))
+* nested-components example ([#4535](https://github.com/nuxt/nuxt.js/issues/4535)) ([6315bd7](https://github.com/nuxt/nuxt.js/commit/6315bd7))
+* no false positives for plugins with index.js ([#4714](https://github.com/nuxt/nuxt.js/issues/4714)) ([eef2af3](https://github.com/nuxt/nuxt.js/commit/eef2af3)), closes [#4713](https://github.com/nuxt/nuxt.js/issues/4713)
+* No need to use process.client here ([be5e057](https://github.com/nuxt/nuxt.js/commit/be5e057))
+* **builder:** add lodash inside templates ([#4368](https://github.com/nuxt/nuxt.js/issues/4368)) ([27e79be](https://github.com/nuxt/nuxt.js/commit/27e79be))
+* **builder:** js layout ([#4701](https://github.com/nuxt/nuxt.js/issues/4701)) ([af76e07](https://github.com/nuxt/nuxt.js/commit/af76e07))
+* **builder:** layouts condition ([#4641](https://github.com/nuxt/nuxt.js/issues/4641)) ([6436e3b](https://github.com/nuxt/nuxt.js/commit/6436e3b))
+* **builder, module:** addLayout and nuxt.config precedence over auto-scanned layouts ([#4702](https://github.com/nuxt/nuxt.js/issues/4702)) ([f85ac94](https://github.com/nuxt/nuxt.js/commit/f85ac94))
+* **ci:** [release] manually does not work ([052512e](https://github.com/nuxt/nuxt.js/commit/052512e))
+* **ci:** deprecated --skip-git has been replaced by --no-git-tag-version --no-push ([056704f](https://github.com/nuxt/nuxt.js/commit/056704f))
+* **ci:** env can not be in workflow ([0e9eca2](https://github.com/nuxt/nuxt.js/commit/0e9eca2))
+* **ci:** env in circle is not executable [release] ([a4c503b](https://github.com/nuxt/nuxt.js/commit/a4c503b))
+* **ci:** reduce jest workers i CircleCI ([5ec0c8d](https://github.com/nuxt/nuxt.js/commit/5ec0c8d))
+* **ci:** release edge with push and tag ([678b4ab](https://github.com/nuxt/nuxt.js/commit/678b4ab))
+* **ci:** release is ignored in all commits ([d7bd99e](https://github.com/nuxt/nuxt.js/commit/d7bd99e))
+* **ci:** release is ignored in all commits ([b3ff7a1](https://github.com/nuxt/nuxt.js/commit/b3ff7a1))
+* **ci:** run in bound for now ([89f097e](https://github.com/nuxt/nuxt.js/commit/89f097e))
+* **ci:** setupFilesAfterEnv is array ([6d8da0e](https://github.com/nuxt/nuxt.js/commit/6d8da0e))
+* **ci:** support skip release in commit body ([4eff50f](https://github.com/nuxt/nuxt.js/commit/4eff50f))
+* **ci:** swap COMMIT_MSG between commit and nightly release ([d455408](https://github.com/nuxt/nuxt.js/commit/d455408))
+* **ci:** typo ([#4400](https://github.com/nuxt/nuxt.js/issues/4400)) ([b6b7c43](https://github.com/nuxt/nuxt.js/commit/b6b7c43))
+* **ci:** use full message for COMMIT_MSG ([cc358b5](https://github.com/nuxt/nuxt.js/commit/cc358b5))
+* **ci:** use skip-git for edge release ([5235471](https://github.com/nuxt/nuxt.js/commit/5235471))
+* **circleci:** keep using --forceExit ([085ff82](https://github.com/nuxt/nuxt.js/commit/085ff82))
+* **cli:** disable lerna commit and tag ([955b5d4](https://github.com/nuxt/nuxt.js/commit/955b5d4))
+* **common:** remove extra [@nuxt](https://github.com/nuxt)/config dependency ([a2d4270](https://github.com/nuxt/nuxt.js/commit/a2d4270))
+* **config:** define once default nuxt config filename ([#4814](https://github.com/nuxt/nuxt.js/issues/4814)) ([06a18ca](https://github.com/nuxt/nuxt.js/commit/06a18ca))
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* **deps:** update dependency vue-no-ssr to ^1.1.0 ([#4372](https://github.com/nuxt/nuxt.js/issues/4372)) ([e731250](https://github.com/nuxt/nuxt.js/commit/e731250))
+* **dev:** Show correct path when webpack watched files changed ([25dea5f](https://github.com/nuxt/nuxt.js/commit/25dea5f))
+* **dist:** use -edge suffix to require cli ([98c1922](https://github.com/nuxt/nuxt.js/commit/98c1922))
+* **edge, next:** -t ~> --tag ([2b46d3e](https://github.com/nuxt/nuxt.js/commit/2b46d3e))
+* **eslint:** amp tags not support pascal case ([6a4808f](https://github.com/nuxt/nuxt.js/commit/6a4808f))
+* **example:** lint error ([ccf3264](https://github.com/nuxt/nuxt.js/commit/ccf3264))
+* **examples:** add pug dependencies ([#4824](https://github.com/nuxt/nuxt.js/issues/4824)) ([4b32144](https://github.com/nuxt/nuxt.js/commit/4b32144))
+* **examples:** deps [skip ci] ([#4782](https://github.com/nuxt/nuxt.js/issues/4782)) ([f70610b](https://github.com/nuxt/nuxt.js/commit/f70610b))
+* **examples:** deps [skip ci] ([#4827](https://github.com/nuxt/nuxt.js/issues/4827)) ([6542dff](https://github.com/nuxt/nuxt.js/commit/6542dff))
+* **examples:** fix deps on codesandbox ([#4828](https://github.com/nuxt/nuxt.js/issues/4828)) ([ee7ad77](https://github.com/nuxt/nuxt.js/commit/ee7ad77))
+* **examples:** Ugrade `vue-property-decorator` in typescript examples ([#4767](https://github.com/nuxt/nuxt.js/issues/4767)) ([73507b8](https://github.com/nuxt/nuxt.js/commit/73507b8))
+* **examples:** Update config for better mobile handling ([3b7ac3c](https://github.com/nuxt/nuxt.js/commit/3b7ac3c))
+* **examples:** use testURL and module names ([#4777](https://github.com/nuxt/nuxt.js/issues/4777)) ([c83bcb0](https://github.com/nuxt/nuxt.js/commit/c83bcb0))
+* **exmaple:** typescript example ([7cf9f80](https://github.com/nuxt/nuxt.js/commit/7cf9f80))
+* **layout-middleware:** Fix issue [#4724](https://github.com/nuxt/nuxt.js/issues/4724) ([521ac20](https://github.com/nuxt/nuxt.js/commit/521ac20))
+* **nuxt-start:** include all vue-app dependencies to prevent breaking changes ([c664e3d](https://github.com/nuxt/nuxt.js/commit/c664e3d))
+* **pkg:** add serialize-javascript to common/package.json ([#4565](https://github.com/nuxt/nuxt.js/issues/4565)) ([6b95eff](https://github.com/nuxt/nuxt.js/commit/6b95eff))
+* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([f680e36](https://github.com/nuxt/nuxt.js/commit/f680e36))
+* **pkg:** preferConst -> output.preferConst ([7fc4ba2](https://github.com/nuxt/nuxt.js/commit/7fc4ba2))
+* **pkg:** skip invalid workspace packages ([ba50d3b](https://github.com/nuxt/nuxt.js/commit/ba50d3b))
+* **progress-bar:** allow 0 for values and remove duplicate defaults ([#4397](https://github.com/nuxt/nuxt.js/issues/4397)) ([ecdc7bc](https://github.com/nuxt/nuxt.js/commit/ecdc7bc))
+* **renderer:** ignore invalid sourcemaps ([4b643b9](https://github.com/nuxt/nuxt.js/commit/4b643b9))
+* **resolver:** resolve dir if no index found [#4568](https://github.com/nuxt/nuxt.js/issues/4568) ([#4569](https://github.com/nuxt/nuxt.js/issues/4569)) ([85b5359](https://github.com/nuxt/nuxt.js/commit/85b5359))
+* **resolver:** resolvedPath/index.[ext] resolution ([#4548](https://github.com/nuxt/nuxt.js/issues/4548)) ([b413bc1](https://github.com/nuxt/nuxt.js/commit/b413bc1))
+* **rollup:** set correct output options ([fc1ab1e](https://github.com/nuxt/nuxt.js/commit/fc1ab1e))
+* **scrollBehavior:** emit triggerScroll event after changing layer ([#4399](https://github.com/nuxt/nuxt.js/issues/4399)) ([330301c](https://github.com/nuxt/nuxt.js/commit/330301c)), closes [#4080](https://github.com/nuxt/nuxt.js/issues/4080)
+* **server:** allow listening on number 0 port ([#4781](https://github.com/nuxt/nuxt.js/issues/4781)) ([602cf12](https://github.com/nuxt/nuxt.js/commit/602cf12))
+* **server:** allow rendering urls with unicode characters ([#4512](https://github.com/nuxt/nuxt.js/issues/4512)) ([c3128ea](https://github.com/nuxt/nuxt.js/commit/c3128ea))
+* **server:** Cannot read property client of null when webpackHMR & restarting Nuxt ([8a200f7](https://github.com/nuxt/nuxt.js/commit/8a200f7))
+* **server:** delete all non-js assets ([6589670](https://github.com/nuxt/nuxt.js/commit/6589670))
+* **server:** process browser version with non semver versions ([#4673](https://github.com/nuxt/nuxt.js/issues/4673)) ([d3b9396](https://github.com/nuxt/nuxt.js/commit/d3b9396))
+* **server, jsdom:** fix timeout error message ([#4412](https://github.com/nuxt/nuxt.js/issues/4412)) ([ab6367b](https://github.com/nuxt/nuxt.js/commit/ab6367b))
+* **server, vue-app:** allow unicode page names ([#4402](https://github.com/nuxt/nuxt.js/issues/4402)) ([949785f](https://github.com/nuxt/nuxt.js/commit/949785f))
+* **test:** downgrade jest to 23 ([d88e448](https://github.com/nuxt/nuxt.js/commit/d88e448))
+* **test:** fallback to config if no config.default ([2f2ec7a](https://github.com/nuxt/nuxt.js/commit/2f2ec7a))
+* **test:** jest describe.skip does not work fine ([d0aadd4](https://github.com/nuxt/nuxt.js/commit/d0aadd4))
+* **test:** remove local paths ([d02eb2f](https://github.com/nuxt/nuxt.js/commit/d02eb2f))
+* **test:** typescirpt modern mode only check once ([70775e1](https://github.com/nuxt/nuxt.js/commit/70775e1))
+* **test:** wrong route in error-handler-object test ([#4363](https://github.com/nuxt/nuxt.js/issues/4363)) ([0db1f26](https://github.com/nuxt/nuxt.js/commit/0db1f26))
+* **test/utils:** check both ts and js for nuxt.config ([5b66afc](https://github.com/nuxt/nuxt.js/commit/5b66afc))
+* **ts:** Add missing `loading` property to Component options ([#4786](https://github.com/nuxt/nuxt.js/issues/4786)) ([db4001d](https://github.com/nuxt/nuxt.js/commit/db4001d))
+* **ts:** better `tsconfig.json` handling & improve tests ([#4856](https://github.com/nuxt/nuxt.js/issues/4856)) ([f18ce4e](https://github.com/nuxt/nuxt.js/commit/f18ce4e))
+* **ts:** fix `$nuxt.$loading` typedefs ([#4778](https://github.com/nuxt/nuxt.js/issues/4778)) ([6694cf7](https://github.com/nuxt/nuxt.js/commit/6694cf7))
+* **ts:** fix default `tsconfig.json` ([#4842](https://github.com/nuxt/nuxt.js/issues/4842)) ([c39cf84](https://github.com/nuxt/nuxt.js/commit/c39cf84))
+* **ts:** fix missing process type definitions and refactor types tests ([#4798](https://github.com/nuxt/nuxt.js/issues/4798)) ([45afc3f](https://github.com/nuxt/nuxt.js/commit/45afc3f))
+* **ts:** fix nuxt-ts binary when running nuxt commands ([#4844](https://github.com/nuxt/nuxt.js/issues/4844)) ([6e60aa4](https://github.com/nuxt/nuxt.js/commit/6e60aa4))
+* **ts:** keep baseUrl property in generated tsconfig.json ([#4843](https://github.com/nuxt/nuxt.js/issues/4843)) ([55dc7f4](https://github.com/nuxt/nuxt.js/commit/55dc7f4))
+* thread-loader slow building ([4fb220c](https://github.com/nuxt/nuxt.js/commit/4fb220c))
+* **ts:** missing `tsconfig.json` on npm published version ([#4840](https://github.com/nuxt/nuxt.js/issues/4840)) ([e57c20a](https://github.com/nuxt/nuxt.js/commit/e57c20a))
+* **ts:** prevent checking types twice in modern mode & use consola as logger ([#4803](https://github.com/nuxt/nuxt.js/issues/4803)) ([b202361](https://github.com/nuxt/nuxt.js/commit/b202361))
+* **ts:** set ts-node register compilerOptions.module to 'commonjs' ([#4752](https://github.com/nuxt/nuxt.js/issues/4752)) ([e22e14b](https://github.com/nuxt/nuxt.js/commit/e22e14b))
+* watch custom patterns only when it exists ([#4823](https://github.com/nuxt/nuxt.js/issues/4823)) ([3966b26](https://github.com/nuxt/nuxt.js/commit/3966b26))
+* **ts:** switch from babel preset to ts-loader ([#4563](https://github.com/nuxt/nuxt.js/issues/4563)) ([75e3df6](https://github.com/nuxt/nuxt.js/commit/75e3df6))
+* **vue-app:** add type definition for `ComponentOptions.middleware` ([#4531](https://github.com/nuxt/nuxt.js/issues/4531)) ([da0a379](https://github.com/nuxt/nuxt.js/commit/da0a379))
+* **vue-app:** allow passing custom props to error function ([#4462](https://github.com/nuxt/nuxt.js/issues/4462)) ([a6fed0a](https://github.com/nuxt/nuxt.js/commit/a6fed0a)), closes [#4460](https://github.com/nuxt/nuxt.js/issues/4460)
+* require serverMiddleware object with path and handler ([#4656](https://github.com/nuxt/nuxt.js/issues/4656)) ([8786ff7](https://github.com/nuxt/nuxt.js/commit/8786ff7))
+* **vue-app:** Call Vue.config.errorHandler instead of simply logging the error ([6c4280f](https://github.com/nuxt/nuxt.js/commit/6c4280f))
+* **vue-app:** Fix default error handler in production ([96892c5](https://github.com/nuxt/nuxt.js/commit/96892c5))
+* **vue-app:** Fix route meta to handle order ([45be638](https://github.com/nuxt/nuxt.js/commit/45be638))
+* **vue-app:** Fix test on size-limit ([4a77de8](https://github.com/nuxt/nuxt.js/commit/4a77de8))
+* **vue-app:** Fix Vuex HMR & refactor for better modules usage ([#4791](https://github.com/nuxt/nuxt.js/issues/4791)) ([deadc48](https://github.com/nuxt/nuxt.js/commit/deadc48))
+* **vue-app:** router.meta is null on extendRoutes([#4478](https://github.com/nuxt/nuxt.js/issues/4478)) ([e2ab1b4](https://github.com/nuxt/nuxt.js/commit/e2ab1b4)), closes [#4154](https://github.com/nuxt/nuxt.js/issues/4154)
+* Vue.component(RouterLink) is undefined in vue-router 3.0.0 ([#4668](https://github.com/nuxt/nuxt.js/issues/4668)) ([7ff4058](https://github.com/nuxt/nuxt.js/commit/7ff4058))
+* **vue-app:** Set window. equals to window.{globalName} when defined ([951e745](https://github.com/nuxt/nuxt.js/commit/951e745))
+* **vue-renderer:** improve ready handling ([#4511](https://github.com/nuxt/nuxt.js/issues/4511)) ([f0cb654](https://github.com/nuxt/nuxt.js/commit/f0cb654))
+* **vue-renderer:** parse JSON values before passing to bundle-renderer ([c0721c0](https://github.com/nuxt/nuxt.js/commit/c0721c0)), closes [#4439](https://github.com/nuxt/nuxt.js/issues/4439)
+* server build failed in dev mode ([89f8866](https://github.com/nuxt/nuxt.js/commit/89f8866))
+* **webpack:** allow changing devtool with extend ([#4515](https://github.com/nuxt/nuxt.js/issues/4515)) ([33edef2](https://github.com/nuxt/nuxt.js/commit/33edef2))
+* not use deprecated option esm in resolver ([5f6361f](https://github.com/nuxt/nuxt.js/commit/5f6361f))
+* offer a new port and listen if already used, use consola on server error ([#4428](https://github.com/nuxt/nuxt.js/issues/4428)) ([1d78027](https://github.com/nuxt/nuxt.js/commit/1d78027))
+* plugins for modern mode ([#4659](https://github.com/nuxt/nuxt.js/issues/4659)) ([867e8e1](https://github.com/nuxt/nuxt.js/commit/867e8e1))
+* prevent matching native statements in serializeFunction ([#4585](https://github.com/nuxt/nuxt.js/issues/4585)) ([5b58272](https://github.com/nuxt/nuxt.js/commit/5b58272))
+* properly serialize head functions ([#4558](https://github.com/nuxt/nuxt.js/issues/4558)) ([7831e57](https://github.com/nuxt/nuxt.js/commit/7831e57)), closes [#4079](https://github.com/nuxt/nuxt.js/issues/4079)
+* remove unnecessary isDev in template/server ([a51ba8d](https://github.com/nuxt/nuxt.js/commit/a51ba8d))
+* replace nuxtDir with module.paths ([#4448](https://github.com/nuxt/nuxt.js/issues/4448)) ([d66e1ec](https://github.com/nuxt/nuxt.js/commit/d66e1ec))
+* require postcss module via resolver ([#4737](https://github.com/nuxt/nuxt.js/issues/4737)) ([4b9e8e7](https://github.com/nuxt/nuxt.js/commit/4b9e8e7))
+* router Expected "0" to be defined ([#4394](https://github.com/nuxt/nuxt.js/issues/4394)) ([39b1b8e](https://github.com/nuxt/nuxt.js/commit/39b1b8e))
+* SafariFix is not injected in client modern mode ([ecf76d9](https://github.com/nuxt/nuxt.js/commit/ecf76d9))
+* tests failed in windows ([8163a9e](https://github.com/nuxt/nuxt.js/commit/8163a9e))
+* thread-loader memory leak ([d34a9e2](https://github.com/nuxt/nuxt.js/commit/d34a9e2))
+* undefined script in modern mode ([0a21d4b](https://github.com/nuxt/nuxt.js/commit/0a21d4b))
+* **webpack:** deepClone before calling extendConfig ([#4464](https://github.com/nuxt/nuxt.js/issues/4464)) ([06ddfbb](https://github.com/nuxt/nuxt.js/commit/06ddfbb))
+* **webpack:** prevent terser mangling html/vue reserved tags ([#4821](https://github.com/nuxt/nuxt.js/issues/4821)) ([6a68f4e](https://github.com/nuxt/nuxt.js/commit/6a68f4e))
+* use case insensitive regex for webpack loader rules ([#4728](https://github.com/nuxt/nuxt.js/issues/4728)) ([68d8d54](https://github.com/nuxt/nuxt.js/commit/68d8d54))
+* use triple equals in loading.throttle [release] ([e77c2db](https://github.com/nuxt/nuxt.js/commit/e77c2db))
+* wait error hook ([36ca945](https://github.com/nuxt/nuxt.js/commit/36ca945))
+* wrong devMiddleware in non-modern dev mode ([3515115](https://github.com/nuxt/nuxt.js/commit/3515115))
+* wrong type checking for loading.duration ([0c15b29](https://github.com/nuxt/nuxt.js/commit/0c15b29))
+
+
+### Features
+
+* **builder:** optional typescript support ([#4557](https://github.com/nuxt/nuxt.js/issues/4557)) ([7145c1a](https://github.com/nuxt/nuxt.js/commit/7145c1a))
+* **builder:** validate vue-app dependencies and suggest fix ([#4669](https://github.com/nuxt/nuxt.js/issues/4669)) ([7dd33fe](https://github.com/nuxt/nuxt.js/commit/7dd33fe))
+* **ci:** disable lock bot ([8a11bb8](https://github.com/nuxt/nuxt.js/commit/8a11bb8))
+* **ci:** edge@next ([#4477](https://github.com/nuxt/nuxt.js/issues/4477)) ([76c9d58](https://github.com/nuxt/nuxt.js/commit/76c9d58))
+* **ci:** test typescript types ([#4802](https://github.com/nuxt/nuxt.js/issues/4802)) ([25fd1d8](https://github.com/nuxt/nuxt.js/commit/25fd1d8))
+* **circleci:** add nightly build and manual releases ([ec99922](https://github.com/nuxt/nuxt.js/commit/ec99922))
+* **cli:** add `--devtools` option for build and generate ([#4357](https://github.com/nuxt/nuxt.js/issues/4357)) ([e6f73b5](https://github.com/nuxt/nuxt.js/commit/e6f73b5))
+* **cli:** improvements and external commands ([#4314](https://github.com/nuxt/nuxt.js/issues/4314)) ([0145551](https://github.com/nuxt/nuxt.js/commit/0145551))
+* **common:** add yandex and vivaldi to modern browsers ([#4516](https://github.com/nuxt/nuxt.js/issues/4516)) ([51e4488](https://github.com/nuxt/nuxt.js/commit/51e4488))
+* **modern:** auto detect modern mode ([#4422](https://github.com/nuxt/nuxt.js/issues/4422)) ([fe492d8](https://github.com/nuxt/nuxt.js/commit/fe492d8))
+* **nuxt-link:** Smart prefetching and $nuxt.isOffline ([#4574](https://github.com/nuxt/nuxt.js/issues/4574)) ([f319033](https://github.com/nuxt/nuxt.js/commit/f319033))
+* **nuxt-ts:** typescript support improvements ([#4750](https://github.com/nuxt/nuxt.js/issues/4750)) ([dfaffc0](https://github.com/nuxt/nuxt.js/commit/dfaffc0))
+* **router:** custom route name splitter ([#4598](https://github.com/nuxt/nuxt.js/issues/4598)) ([add8000](https://github.com/nuxt/nuxt.js/commit/add8000))
+* **server:** export Listener ([#4577](https://github.com/nuxt/nuxt.js/issues/4577)) ([2f0ed85](https://github.com/nuxt/nuxt.js/commit/2f0ed85))
+* **server:** timing option for `Server-Timing` header ([#4800](https://github.com/nuxt/nuxt.js/issues/4800)) ([b23f5c9](https://github.com/nuxt/nuxt.js/commit/b23f5c9))
+* **test:** unit tests for core/config module ([#4760](https://github.com/nuxt/nuxt.js/issues/4760)) ([a616c09](https://github.com/nuxt/nuxt.js/commit/a616c09))
+* **ts:** add TSX support ([#4613](https://github.com/nuxt/nuxt.js/issues/4613)) ([4d52742](https://github.com/nuxt/nuxt.js/commit/4d52742))
+* **ts:** auto generate tsconfig.json ([#4776](https://github.com/nuxt/nuxt.js/issues/4776)) ([2a1ee96](https://github.com/nuxt/nuxt.js/commit/2a1ee96))
+* **ts:** provide type checking through `fork-ts-checker-webpack-plugin` ([#4611](https://github.com/nuxt/nuxt.js/issues/4611)) ([f1377a7](https://github.com/nuxt/nuxt.js/commit/f1377a7))
+* **ts:** provide type definitions ([#4164](https://github.com/nuxt/nuxt.js/issues/4164)) ([d5716eb](https://github.com/nuxt/nuxt.js/commit/d5716eb))
+* **ts:** typescript examples + improve `vue-app` typings ([#4695](https://github.com/nuxt/nuxt.js/issues/4695)) ([b38e0aa](https://github.com/nuxt/nuxt.js/commit/b38e0aa))
+* **vue-app:** <n-link> and <n-child> component aliases ([#4525](https://github.com/nuxt/nuxt.js/issues/4525)) ([1505197](https://github.com/nuxt/nuxt.js/commit/1505197))
+* **vue-app:** Add deprecating for classic mode and handle mutations/actions HMR to store/index.js ([c8b920a](https://github.com/nuxt/nuxt.js/commit/c8b920a))
+* **vue-app:** add vetur helpers for components auto-complete on VS Code ([#4524](https://github.com/nuxt/nuxt.js/issues/4524)) ([59aee74](https://github.com/nuxt/nuxt.js/commit/59aee74))
+* **vue-app:** support named views ([#4410](https://github.com/nuxt/nuxt.js/issues/4410)) ([b1b9e0b](https://github.com/nuxt/nuxt.js/commit/b1b9e0b))
+* **vue-app, vue-renderer:** support meta `headAttrs` ([#4536](https://github.com/nuxt/nuxt.js/issues/4536)) ([9961453](https://github.com/nuxt/nuxt.js/commit/9961453))
+* **webpack:** add experimental HardSourceWebpackPlugin support ([#4527](https://github.com/nuxt/nuxt.js/issues/4527)) ([c6d820a](https://github.com/nuxt/nuxt.js/commit/c6d820a))
+* use runInNewContext: true for nuxt dev ([#4508](https://github.com/nuxt/nuxt.js/issues/4508)) ([1162f2d](https://github.com/nuxt/nuxt.js/commit/1162f2d))
+* **webpack:** options.build.loaders.vueStyle ([#4837](https://github.com/nuxt/nuxt.js/issues/4837)) ([762305b](https://github.com/nuxt/nuxt.js/commit/762305b))
+* add an option to disable FriendlyErrorsWebpackPlugin ([#4498](https://github.com/nuxt/nuxt.js/issues/4498)) ([f1b2ca3](https://github.com/nuxt/nuxt.js/commit/f1b2ca3))
+* add exclude regex array for generated pages ([#4754](https://github.com/nuxt/nuxt.js/issues/4754)) ([ec17804](https://github.com/nuxt/nuxt.js/commit/ec17804))
+* add process.modern ([#4532](https://github.com/nuxt/nuxt.js/issues/4532)) ([f1ff634](https://github.com/nuxt/nuxt.js/commit/f1ff634))
+* add store module HMR ([#4582](https://github.com/nuxt/nuxt.js/issues/4582)) ([b2eee17](https://github.com/nuxt/nuxt.js/commit/b2eee17))
+* add styleExtensions ([#4671](https://github.com/nuxt/nuxt.js/issues/4671)) ([471a32a](https://github.com/nuxt/nuxt.js/commit/471a32a))
+* allow `lang="postcss"` in Vue SFCs ([#4417](https://github.com/nuxt/nuxt.js/issues/4417)) ([71136fc](https://github.com/nuxt/nuxt.js/commit/71136fc))
+* allow scrollToTop to be explicitly disabled ([#4564](https://github.com/nuxt/nuxt.js/issues/4564)) ([669fecc](https://github.com/nuxt/nuxt.js/commit/669fecc))
+* attach ts-loader options on build.loaders.ts ([#4572](https://github.com/nuxt/nuxt.js/issues/4572)) ([d723e49](https://github.com/nuxt/nuxt.js/commit/d723e49))
+* better stack traces for SSR error, show error with correct URL and use eventsource-polyfill ([#4600](https://github.com/nuxt/nuxt.js/issues/4600)) ([498c4f1](https://github.com/nuxt/nuxt.js/commit/498c4f1))
+* check modern build file in modern mode ([#4467](https://github.com/nuxt/nuxt.js/issues/4467)) ([14fe679](https://github.com/nuxt/nuxt.js/commit/14fe679))
+* disable compressor if set to false/undefined ([#4381](https://github.com/nuxt/nuxt.js/issues/4381)) ([e4140ce](https://github.com/nuxt/nuxt.js/commit/e4140ce))
+* improve SSR bundle ([#4439](https://github.com/nuxt/nuxt.js/issues/4439)) ([0f104aa](https://github.com/nuxt/nuxt.js/commit/0f104aa)), closes [#4225](https://github.com/nuxt/nuxt.js/issues/4225) [#3465](https://github.com/nuxt/nuxt.js/issues/3465) [#1728](https://github.com/nuxt/nuxt.js/issues/1728) [#1601](https://github.com/nuxt/nuxt.js/issues/1601) [#1481](https://github.com/nuxt/nuxt.js/issues/1481)
+* mode for plugins ([#4592](https://github.com/nuxt/nuxt.js/issues/4592)) ([e71c455](https://github.com/nuxt/nuxt.js/commit/e71c455))
+* nuxt-ts ([#4658](https://github.com/nuxt/nuxt.js/issues/4658)) ([ee0096b](https://github.com/nuxt/nuxt.js/commit/ee0096b))
+* **webpack:** support `build.hotMiddleware.client` ([#4796](https://github.com/nuxt/nuxt.js/issues/4796)) ([dcdbaba](https://github.com/nuxt/nuxt.js/commit/dcdbaba))
+* **webpack,cli:** standalone build mode ([#4661](https://github.com/nuxt/nuxt.js/issues/4661)) ([bdb6791](https://github.com/nuxt/nuxt.js/commit/bdb6791))
+* preload and push modern resources in modern mode ([#4362](https://github.com/nuxt/nuxt.js/issues/4362)) ([701190d](https://github.com/nuxt/nuxt.js/commit/701190d))
+* replace babel-plugin-transform-vue-jsx with [@vue](https://github.com/vue)/babel-preset-jsx ([#4740](https://github.com/nuxt/nuxt.js/issues/4740)) ([da8a3d8](https://github.com/nuxt/nuxt.js/commit/da8a3d8))
+* upgrade css loader to v2 ([#4503](https://github.com/nuxt/nuxt.js/issues/4503)) ([af9b30c](https://github.com/nuxt/nuxt.js/commit/af9b30c))
+
+
+### Performance Improvements
+
+* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([d7851b3](https://github.com/nuxt/nuxt.js/commit/d7851b3))
+* **ssr:** remove extra imprts from server.js ([6178c47](https://github.com/nuxt/nuxt.js/commit/6178c47))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..71e46feb1c
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# Contributing to Nuxt
+
+Want to contribute to Nuxt? We provide a **[Contribution Guide](https://nuxtjs.org/guide/contribution-guide)** to help you get started.
diff --git a/README.md b/README.md
index a6526bc339..ce940cac15 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@
   <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/nuxtjs/tiers/sponsors/badge.svg" /></a>
   <a href="#backers" alt="Backers on Open Collective"><img src="https://opencollective.com/nuxtjs/tiers/backers/badge.svg" /></a>
   <a href="https://oc.nuxtjs.org/"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
-
+</p>
+<p align="center">
+  <a href="https://otechie.com/nuxt?ref=badge"><img src="https://api.otechie.com/consultancy/nuxt/badge.svg" alt="Hire Nuxt"></a>
 </p>
 
 > Vue.js Meta Framework to create complex, fast & universal web applications *quickly*.
@@ -38,9 +40,14 @@
 - Custom layouts with the `layouts/` directory
 - Middleware
 - Code splitting for every `pages/`
+- Loading just the critical CSS (page-level)
 
 Learn more at [nuxtjs.org](https://nuxtjs.org).
 
+## Consulting from the Nuxt team
+
+Get help with that tough bug or make sure your Nuxt app is ready to deploy. For $200 an hour, get technical support, advice, code reviews, and development from the Nuxt core team: [Hire Nuxt on Otechie](https://otechie.com/nuxt?ref=readme)
+
 ## Professional support with TideLift
 
 Professionally supported Nuxt.js is now available!
@@ -70,43 +77,10 @@ Support us with a monthly donation and help us continue our activities. [[Become
 ## Getting started
 
 ```
-$ npm install nuxt
+$ npx create-nuxt-app <project-name>
 ```
 
-Add a script to your package.json like this:
-
-```json
-{
-  "scripts": {
-    "start": "nuxt"
-  }
-}
-```
-
-After that, the file-system is the main API. Every .vue file becomes a route that gets automatically processed and rendered.
-
-Populate `./pages/index.vue` inside your project:
-
-```html
-<template>
-  <h1>Hello {{ name }}!</h1>
-</template>
-
-<script>
-export default {
-  data: () => {
-    return { name: 'world' }
-  }
-}
-</script>
-```
-
-And then run:
-```bash
-npm start
-```
-
-Go to [http://localhost:3000](http://localhost:3000)
+It's as simple as that!
 
 ## Templates
 
@@ -207,8 +181,9 @@ Note: we recommend putting `.nuxt` in `.npmignore` or `.gitignore`.
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-| [<img src="https://avatars2.githubusercontent.com/u/904724?v=4" width="150px;"/><br /><sub><b>Sébastien Chopin</b></sub>](https://github.com/atinux)<br />[📝](#blog-Atinux "Blogposts") [🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3AAtinux "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=Atinux "Code") [🎨](#design-Atinux "Design") [📖](https://github.com/Atinux/Nuxt.js/commits?author=Atinux "Documentation") [💬](#question-Atinux "Answering Questions") [👀](#review-Atinux "Reviewed Pull Requests") [📢](#talk-Atinux "Talks") | [<img src="https://avatars2.githubusercontent.com/u/4084277?v=4" width="150px;"/><br /><sub><b>Alexandre Chopin</b></sub>](https://github.com/alexchopin)<br />[🎨](#design-alexchopin "Design") [📖](https://github.com/Atinux/Nuxt.js/commits?author=alexchopin "Documentation") [📋](#eventOrganizing-alexchopin "Event Organizing") [📦](#platform-alexchopin "Packaging/porting to new platform") [💬](#question-alexchopin "Answering Questions") [📢](#talk-alexchopin "Talks") | [<img src="https://avatars0.githubusercontent.com/u/5158436?v=4" width="150px;"/><br /><sub><b>Pooya Parsa</b></sub>](https://github.com/pi0)<br />[🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3Api0 "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=pi0 "Code") [🔌](#plugin-pi0 "Plugin/utility libraries") [💬](#question-pi0 "Answering Questions") [👀](#review-pi0 "Reviewed Pull Requests") [🔧](#tool-pi0 "Tools") | [<img src="https://avatars3.githubusercontent.com/u/4312154?v=4" width="150px;"/><br /><sub><b>Clark Du</b></sub>](https://github.com/clarkdo)<br />[🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3Aclarkdo "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=clarkdo "Code") [💡](#example-clarkdo "Examples") [👀](#review-clarkdo "Reviewed Pull Requests") [⚠️](https://github.com/Atinux/Nuxt.js/commits?author=clarkdo "Tests") [🔧](#tool-clarkdo "Tools") | [<img src="https://avatars0.githubusercontent.com/u/640208?s=460&v=4" width="150px;"/><br /><sub><b>Alexander Lichter</b></sub>](https://github.com/manniL)<br />[💬](#question-manniL "Answering Questions") [🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3AmanniL "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=manniL "Code") [💡](#example-manniL "Examples") [👀](#review-manniL "Reviewed Pull Requests") [⚠️](https://github.com/Atinux/Nuxt.js/commits?author=manniL "Tests") | [<img src="https://avatars1.githubusercontent.com/u/12291?s=460&v=4" width="150px;"/><br /><sub><b>Jonas Galvez</b></sub>](https://github.com/galvez)<br />[💬](#question-galvez "Answering Questions") [🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3Agalvez "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=galvez "Code") [💡](#example-galvez "Examples") [👀](#review-galvez "Reviewed Pull Requests") [⚠️](https://github.com/Atinux/Nuxt.js/commits?author=galvez "Tests") |
-| :---: | :---: | :---: | :---: | :---: | :---: |
+| [<img src="https://avatars2.githubusercontent.com/u/904724?v=4" width="120px;"/><br /><sub><b>Sébastien Chopin</b></sub>](https://github.com/atinux)<br />[📝](#blog-Atinux "Blogposts") [🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3AAtinux "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=Atinux "Code") [🎨](#design-Atinux "Design") [📖](https://github.com/Atinux/Nuxt.js/commits?author=Atinux "Documentation") [💬](#question-Atinux "Answering Questions") [👀](#review-Atinux "Reviewed Pull Requests") [📢](#talk-Atinux "Talks") | [<img src="https://avatars2.githubusercontent.com/u/4084277?v=4" width="120px;"/><br /><sub><b>Alexandre Chopin</b></sub>](https://github.com/alexchopin)<br />[🎨](#design-alexchopin "Design") [📖](https://github.com/Atinux/Nuxt.js/commits?author=alexchopin "Documentation") [📋](#eventOrganizing-alexchopin "Event Organizing") [📦](#platform-alexchopin "Packaging/porting to new platform") [💬](#question-alexchopin "Answering Questions") [📢](#talk-alexchopin "Talks") | [<img src="https://avatars0.githubusercontent.com/u/5158436?v=4" width="120px;"/><br /><sub><b>Pooya Parsa</b></sub>](https://github.com/pi0)<br />[🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3Api0 "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=pi0 "Code") [🔌](#plugin-pi0 "Plugin/utility libraries") [💬](#question-pi0 "Answering Questions") [👀](#review-pi0 "Reviewed Pull Requests") [🔧](#tool-pi0 "Tools") | [<img src="https://avatars3.githubusercontent.com/u/4312154?v=4" width="120px;"/><br /><sub><b>Clark Du</b></sub>](https://github.com/clarkdo)<br />[🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3Aclarkdo "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=clarkdo "Code") [💡](#example-clarkdo "Examples") [👀](#review-clarkdo "Reviewed Pull Requests") [⚠️](https://github.com/Atinux/Nuxt.js/commits?author=clarkdo "Tests") [🔧](#tool-clarkdo "Tools") |
+| :---: | :---: | :---: | :---: |
+| [<img src="https://avatars0.githubusercontent.com/u/640208?s=460&v=4" width="120px;"/><br /><sub><b>Alexander Lichter</b></sub>](https://github.com/manniL)<br />[💬](#question-manniL "Answering Questions") [🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3AmanniL "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=manniL "Code") [💡](#example-manniL "Examples") [👀](#review-manniL "Reviewed Pull Requests") [⚠️](https://github.com/Atinux/Nuxt.js/commits?author=manniL "Tests") | [<img src="https://avatars1.githubusercontent.com/u/12291?s=460&v=4" width="120px;"/><br /><sub><b>Jonas Galvez</b></sub>](https://github.com/galvez)<br />[💬](#question-galvez "Answering Questions") [🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3Agalvez "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=galvez "Code") [💡](#example-galvez "Examples") [👀](#review-galvez "Reviewed Pull Requests") [⚠️](https://github.com/Atinux/Nuxt.js/commits?author=galvez "Tests") | [<img src="https://avatars2.githubusercontent.com/u/571159?v=4" width="120px;"/><br /><sub><b>Dmitry Molotkov</b></sub>](https://github.com/aldarund)<br />[💬](#question-aldarund "Answering Questions") [🐛](https://github.com/Atinux/Nuxt.js/issues?q=author%3Aaldarund "Bug reports") [💻](https://github.com/Atinux/Nuxt.js/commits?author=aldarund "Code") [🤔](#ideas-aldarund "Ideas, Planning, & Feedback") [👀](#review-aldarund "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/25272043?v=4" width="120px;"/><br /><sub><b>Kevin Marrec</b></sub>](https://github.com/kevinmarrec)<br />[💻](https://github.com/Atinux/Nuxt.js/commits?author=kevinmarrec "Code") [🤔](#ideas-kevinmarrec "Ideas, Planning, & Feedback") [📦](#platform-kevinmarrec "Packaging/porting to new platform") [👀](#review-kevinmarrec "Reviewed Pull Requests") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ## Contributors
@@ -227,6 +202,11 @@ Thanks to BrowserStack!
 
 <a href="http://browserstack.com"><img height="70" src="https://p3.zdusercontent.com/attachment/1015988/PWfFdN71Aung2evRkIVQuKJpE?token=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..aUrNFb8clSXsFwgw5BUTcg.IJr5piuCen7PmSSBHSrOnqM9K5YZfxX3lvbp-5LCqoKOi4CjjgdA419iqjofs0nLtm26FMURvZ8JRTuKB4iHer6lGu5f8dXHtIkYAHjP5fXDWkl044Yg2mSdrhF6uPy62GdlBYoYxwvgkNrac8nN_In8GY-qOC7bYmlZyJT7tsTZUTYbNMQiXS86YA5LgdCEWzWreMvc3C6cvZtVXIrcVgpkroIhvsTQPm4vQA-Uq6iCbTPA4oX5cpEtMtrlg4jYBnnAE4BTw5UwU_dY83ep5g.7wpc1IKv0rSRGsvqCG_q3g" alt="BrowserStack"></a>
 
+
+## Security
+
+If you discover a security vulnerability regarding Nuxt.js, please send an e-mail to the team via security@nuxtjs.org! All security vulnerabilities will be promptly addressed.
+
 ## License
 
 [MIT](https://github.com/nuxt/nuxt.js/blob/dev/LICENSE)
diff --git a/RELEASE_PLAN.md b/RELEASE_PLAN.md
new file mode 100644
index 0000000000..843f05f733
--- /dev/null
+++ b/RELEASE_PLAN.md
@@ -0,0 +1,49 @@
+## Release Plan
+
+Starting with version `v2.4`, Nuxt will adhere to a formalized release plan (as good as possible).
+Also, an end of life for older major versions is defined with this document
+
+### Major versions (3.x -> 4.0)
+
+Nuxt major releases are planned every **6 months**. This depends on a few factors though:
+
+* If there are no breaking changes waiting for a release, no new major version will be published. Instead, another minor one will be released. 
+* In case of unexpected major updates of important dependencies like Vue, Webpack, and so on, major versions might be released *earlier* than planned.
+
+The goal is to provide a **migration guide** for each major version as well, as escape hatches, so existing code
+won't "just break".
+
+### Minor versions (2.1 -> 2.2)
+
+The release cycle for Nuxt.js minor versions is roughly **4 weeks**. 
+
+Three of the four weeks will be used for actual **feature implementations** while the last week will be used for 
+**testing, fixing bugs and thorough audits**.
+
+That also means a *feature freeze* for the next minor version after these three weeks.
+Features that aren't ready will be moved to the next cycle. "Waiting" for features 
+(for a longer time) will be avoided as good as possible to keep releases lean, concise, predictable and digestible.
+
+### Patch releases (2.2.3 -> 2.2.4)
+
+The last patch releases were mostly *bundled* fixes or single *hotfixes*. 
+In the future, fixes will be released **as soon as possible** after the actual PR/commit so people won't have to switch to `nuxt-edge` for bugfixes. This should improve the stability of Nuxt
+
+Fixes can or will include:
+
+* Updates of dependencies (for various reasons, like a "faulty/buggy" dependency or an newer versions that works better with the Nuxt.js code)
+* Fixes for our code
+
+Bugfixes for upcoming features won't be ported of course.
+
+### Edge Release Channel
+
+After experimenting with `nuxt-edge` releases in the last time, the decisiion to do **nightly releases** for now instead of 
+releasing a version after *each commit* was made.
+
+## End of Life
+
+Starting with `v2.4`, every major Nuxt.js version will have an **End of Life**.
+Previous releases will receive security updates and bugfixes **for one year and two weeks**, counted from the first release on. 
+As Nuxt majors are approximately released once every 6 months, this will allow developers to "skip one major version" without being stuck with a broken or unsecure Nuxt.js dependency.
+The EOL also applies to the documentation.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 168b259462..f20e5abe31 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,11 +20,11 @@ steps:
   displayName: 'Install dependencies'
 
 - script: |
-    set JEST_JUNIT_OUTPUT=test-fixtures-junit.xml&& yarn test:fixtures -w=2
+    set JEST_JUNIT_OUTPUT=test-fixtures-junit.xml && set NODE_OPTIONS=--max_old_space_size=4096 && yarn test:fixtures -i
   displayName: 'Test: Build Fixtures'
 
 - script: |
-    set JEST_JUNIT_OUTPUT=test-unit-junit.xml&& yarn test:unit -w=2
+    set JEST_JUNIT_OUTPUT=test-unit-junit.xml && set NODE_OPTIONS=--max_old_space_size=4096 && yarn test:unit -w=2
   displayName: 'Test: Run unit tests'
 
 - task: PublishTestResults@2
diff --git a/benchmarks/pages/stateless-big.vue b/benchmarks/pages/stateless-big.vue
index 2d2418027b..4a3d2d7de3 100644
--- a/benchmarks/pages/stateless-big.vue
+++ b/benchmarks/pages/stateless-big.vue
@@ -1,5 +1,7 @@
 <template>
   <ul>
-    <li v-for="n in 10000" :key="n">This is row {{ n + 1 }}</li>
+    <li v-for="n in 10000" :key="n">
+      This is row {{ n + 1 }}
+    </li>
   </ul>
 </template>
diff --git a/distributions/nuxt-legacy/CHANGELOG.md b/distributions/nuxt-legacy/CHANGELOG.md
index aaa1417a42..bec4f68f7d 100644
--- a/distributions/nuxt-legacy/CHANGELOG.md
+++ b/distributions/nuxt-legacy/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **dist:** use -edge suffix to require cli ([98c1922](https://github.com/nuxt/nuxt.js/commit/98c1922))
+* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([f680e36](https://github.com/nuxt/nuxt.js/commit/f680e36))
+* exit with proper error code on errors ([#4806](https://github.com/nuxt/nuxt.js/issues/4806)) ([a7ba73e](https://github.com/nuxt/nuxt.js/commit/a7ba73e))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/distributions/nuxt-legacy/bin/nuxt-legacy.js b/distributions/nuxt-legacy/bin/nuxt-legacy.js
index 741e63bb38..04043f2f23 100755
--- a/distributions/nuxt-legacy/bin/nuxt-legacy.js
+++ b/distributions/nuxt-legacy/bin/nuxt-legacy.js
@@ -1,10 +1,8 @@
 #!/usr/bin/env node
 
-const register = require('@babel/register')
-
 require('@babel/polyfill')
 
-register({
+require('@babel/register')({
   presets: [
     [ '@babel/env', { targets: { node: 'current' } } ]
   ],
@@ -24,4 +22,9 @@ register({
   ]
 })
 
-require('@nuxt/cli').run()
+const suffix = require('../package.json').name.includes('-edge') ? '-edge' : ''
+require('@nuxt/cli' + suffix).run()
+  .catch((error) => {
+    require('consola').fatal(error)
+    process.exit(2)
+  })
diff --git a/distributions/nuxt-legacy/package.js b/distributions/nuxt-legacy/package.js
index 1548ca75c3..7ec679a347 100644
--- a/distributions/nuxt-legacy/package.js
+++ b/distributions/nuxt-legacy/package.js
@@ -1,11 +1,11 @@
 export default {
   build: false,
-  extend(pkg, { load }) {
-    pkg.on('build:done', () => {
-      const mono = load('../..')
-      const nuxt = load('../nuxt')
+  hooks: {
+    async 'build:done'(pkg) {
+      const mono = pkg.load('../..')
+      const nuxt = pkg.load('../nuxt')
 
-      pkg.copyFilesFrom(mono, [
+      await pkg.copyFilesFrom(mono, [
         'LICENSE'
       ])
 
@@ -17,7 +17,7 @@ export default {
         'collective'
       ])
 
-      pkg.writePackage()
-    })
+      await pkg.writePackage()
+    }
   }
 }
diff --git a/distributions/nuxt-legacy/package.json b/distributions/nuxt-legacy/package.json
index 56c5249199..dcc12b31f2 100644
--- a/distributions/nuxt-legacy/package.json
+++ b/distributions/nuxt-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-legacy",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "Legacy build of Nuxt.js for Node.js < 8.0.0",
   "keywords": [
     "nuxt",
@@ -37,6 +37,12 @@
     },
     {
       "name": "Alexander Lichter (@manniL)"
+    },
+    {
+      "name": "Dmitry Molotkov (@aldarund)"
+    },
+    {
+      "name": "Kevin Marrec (@kevinmarrec)"
     }
   ],
   "files": [
@@ -44,17 +50,16 @@
   ],
   "bin": "bin/nuxt-legacy.js",
   "dependencies": {
-    "@babel/core": "^7.1.6",
-    "@babel/polyfill": "^7.0.0",
-    "@babel/preset-env": "^7.1.6",
+    "@babel/core": "^7.2.2",
+    "@babel/polyfill": "^7.2.5",
+    "@babel/preset-env": "^7.3.1",
     "@babel/register": "^7.0.0",
-    "@nuxt/builder": "2.3.4",
-    "@nuxt/cli": "2.3.4",
-    "@nuxt/common": "2.3.4",
-    "@nuxt/core": "2.3.4",
-    "@nuxt/generator": "2.3.4",
-    "@nuxt/webpack": "2.3.4",
-    "@nuxtjs/opencollective": "^0.2.0"
+    "@nuxt/builder": "2.4.0",
+    "@nuxt/cli": "2.4.0",
+    "@nuxt/core": "2.4.0",
+    "@nuxt/generator": "2.4.0",
+    "@nuxt/opencollective": "^0.2.1",
+    "@nuxt/webpack": "2.4.0"
   },
   "engines": {
     "node": ">=6.0.0",
diff --git a/distributions/nuxt-start/CHANGELOG.md b/distributions/nuxt-start/CHANGELOG.md
index c388535083..f977ecec9a 100644
--- a/distributions/nuxt-start/CHANGELOG.md
+++ b/distributions/nuxt-start/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **dist:** use -edge suffix to require cli ([98c1922](https://github.com/nuxt/nuxt.js/commit/98c1922))
+* **nuxt-start:** include all vue-app dependencies to prevent breaking changes ([c664e3d](https://github.com/nuxt/nuxt.js/commit/c664e3d))
+* exit with proper error code on errors ([#4806](https://github.com/nuxt/nuxt.js/issues/4806)) ([a7ba73e](https://github.com/nuxt/nuxt.js/commit/a7ba73e))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 **Note:** Version bump only for package nuxt-start
diff --git a/distributions/nuxt-start/bin/nuxt-start.js b/distributions/nuxt-start/bin/nuxt-start.js
index ad9b96e59e..d3b7f83011 100755
--- a/distributions/nuxt-start/bin/nuxt-start.js
+++ b/distributions/nuxt-start/bin/nuxt-start.js
@@ -1,8 +1,12 @@
 #!/usr/bin/env node
-const { name } = require('../package.json')
-const isEdge = name.indexOf('-edge') !== -1
-const cli = require(isEdge ? '@nuxt/cli-edge' : '@nuxt/cli')
+
 if (process.argv[2] !== 'start') {
   process.argv.splice(2, 0, 'start')
 }
-cli.run()
+
+const suffix = require('../package.json').name.includes('-edge') ? '-edge' : ''
+require('@nuxt/cli' + suffix).run()
+  .catch((error) => {
+    require('consola').fatal(error)
+    process.exit(2)
+  })
diff --git a/distributions/nuxt-start/package.js b/distributions/nuxt-start/package.js
index d8ece1e73e..2142a3cbe2 100644
--- a/distributions/nuxt-start/package.js
+++ b/distributions/nuxt-start/package.js
@@ -1,11 +1,11 @@
 export default {
   build: true,
-  extend(pkg, { load }) {
-    pkg.on('build:done', () => {
-      const mono = load('../..')
-      const nuxt = load('../nuxt')
+  hooks: {
+    async 'build:done'(pkg) {
+      const mono = pkg.load('../..')
+      const nuxt = pkg.load('../nuxt')
 
-      pkg.copyFilesFrom(mono, [
+      await pkg.copyFilesFrom(mono, [
         'LICENSE'
       ])
 
@@ -17,7 +17,7 @@ export default {
         'engines'
       ])
 
-      pkg.writePackage()
-    })
+      await pkg.writePackage()
+    }
   }
 }
diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json
index ece97ea7c9..38642a2911 100644
--- a/distributions/nuxt-start/package.json
+++ b/distributions/nuxt-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-start",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "Starts Nuxt.js Application in production mode",
   "keywords": [
     "nuxt",
@@ -37,6 +37,12 @@
     },
     {
       "name": "Alexander Lichter (@manniL)"
+    },
+    {
+      "name": "Dmitry Molotkov (@aldarund)"
+    },
+    {
+      "name": "Kevin Marrec (@kevinmarrec)"
     }
   ],
   "files": [
@@ -46,9 +52,13 @@
   "main": "dist/nuxt-start.js",
   "bin": "bin/nuxt-start.js",
   "dependencies": {
-    "@nuxt/cli": "2.3.4",
-    "@nuxt/common": "2.3.4",
-    "@nuxt/core": "2.3.4"
+    "@nuxt/cli": "2.4.0",
+    "@nuxt/core": "2.4.0",
+    "vue": "^2.5.22",
+    "vue-meta": "^1.5.8",
+    "vue-no-ssr": "^1.1.1",
+    "vue-router": "^3.0.2",
+    "vuex": "^3.1.0"
   },
   "engines": {
     "node": ">=8.0.0",
diff --git a/distributions/nuxt-ts/CHANGELOG.md b/distributions/nuxt-ts/CHANGELOG.md
new file mode 100644
index 0000000000..3f900f5c8c
--- /dev/null
+++ b/distributions/nuxt-ts/CHANGELOG.md
@@ -0,0 +1,21 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **dist:** use -edge suffix to require cli ([98c1922](https://github.com/nuxt/nuxt.js/commit/98c1922))
+* exit with proper error code on errors ([#4806](https://github.com/nuxt/nuxt.js/issues/4806)) ([a7ba73e](https://github.com/nuxt/nuxt.js/commit/a7ba73e))
+* **ts:** better `tsconfig.json` handling & improve tests ([#4856](https://github.com/nuxt/nuxt.js/issues/4856)) ([f18ce4e](https://github.com/nuxt/nuxt.js/commit/f18ce4e))
+* **ts:** fix nuxt-ts binary when running nuxt commands ([#4844](https://github.com/nuxt/nuxt.js/issues/4844)) ([6e60aa4](https://github.com/nuxt/nuxt.js/commit/6e60aa4))
+* **ts:** set ts-node register compilerOptions.module to 'commonjs' ([#4752](https://github.com/nuxt/nuxt.js/issues/4752)) ([e22e14b](https://github.com/nuxt/nuxt.js/commit/e22e14b))
+
+
+### Features
+
+* nuxt-ts ([#4658](https://github.com/nuxt/nuxt.js/issues/4658)) ([ee0096b](https://github.com/nuxt/nuxt.js/commit/ee0096b))
+* **ts:** auto generate tsconfig.json ([#4776](https://github.com/nuxt/nuxt.js/issues/4776)) ([2a1ee96](https://github.com/nuxt/nuxt.js/commit/2a1ee96))
diff --git a/distributions/nuxt-ts/README.md b/distributions/nuxt-ts/README.md
new file mode 100644
index 0000000000..21a22a2ec4
--- /dev/null
+++ b/distributions/nuxt-ts/README.md
@@ -0,0 +1,3 @@
+# nuxt-ts
+
+> Nuxt With Runtime Typescript Support
diff --git a/distributions/nuxt-ts/bin/nuxt-ts.js b/distributions/nuxt-ts/bin/nuxt-ts.js
new file mode 100755
index 0000000000..8c736ed77d
--- /dev/null
+++ b/distributions/nuxt-ts/bin/nuxt-ts.js
@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+
+const { resolve } = require('path')
+
+// Globally indicate we are running in ts mode
+process.env.NUXT_TS = 'true'
+
+const nuxtCommands = ['dev', 'build', 'generate', 'start']
+const rootDir = (process.argv[2] && !nuxtCommands.includes(process.argv[2])) ? process.argv[2] : process.cwd()
+const tsConfigPath = resolve(rootDir, 'tsconfig.json')
+
+const suffix = require('../package.json').name.includes('-edge') ? '-edge' : ''
+
+require('@nuxt/typescript' + suffix).setup(tsConfigPath).then(() => {
+  require('@nuxt/cli' + suffix).run()
+}).catch((error) => {
+  require('consola').fatal(error)
+  process.exit(2)
+})
diff --git a/distributions/nuxt-ts/package.js b/distributions/nuxt-ts/package.js
new file mode 100644
index 0000000000..7ec679a347
--- /dev/null
+++ b/distributions/nuxt-ts/package.js
@@ -0,0 +1,23 @@
+export default {
+  build: false,
+  hooks: {
+    async 'build:done'(pkg) {
+      const mono = pkg.load('../..')
+      const nuxt = pkg.load('../nuxt')
+
+      await pkg.copyFilesFrom(mono, [
+        'LICENSE'
+      ])
+
+      pkg.copyFieldsFrom(nuxt, [
+        'license',
+        'repository',
+        'contributors',
+        'keywords',
+        'collective'
+      ])
+
+      await pkg.writePackage()
+    }
+  }
+}
diff --git a/distributions/nuxt-ts/package.json b/distributions/nuxt-ts/package.json
new file mode 100644
index 0000000000..dee318d1a8
--- /dev/null
+++ b/distributions/nuxt-ts/package.json
@@ -0,0 +1,75 @@
+{
+  "name": "nuxt-ts",
+  "version": "2.4.0",
+  "description": "Nuxt With Runtime Typescript Support",
+  "keywords": [
+    "nuxt",
+    "nuxt-ts",
+    "nuxt.js",
+    "nuxt.ts",
+    "nuxtjs",
+    "nuxts",
+    "ssr",
+    "vue",
+    "vue isomorphic",
+    "vue server side",
+    "vue ssr",
+    "vue universal",
+    "vue versatile",
+    "vue.js",
+    "vuejs"
+  ],
+  "homepage": "https://github.com/nuxt/nuxt.js#readme",
+  "repository": "nuxt/nuxt.js",
+  "license": "MIT",
+  "contributors": [
+    {
+      "name": "Sebastien Chopin (@Atinux)"
+    },
+    {
+      "name": "Alexandre Chopin (@alexchopin)"
+    },
+    {
+      "name": "Pooya Parsa (@pi0)"
+    },
+    {
+      "name": "Clark Du (@clarkdo)"
+    },
+    {
+      "name": "Jonas Galvez (@galvez)"
+    },
+    {
+      "name": "Alexander Lichter (@manniL)"
+    },
+    {
+      "name": "Dmitry Molotkov (@aldarund)"
+    },
+    {
+      "name": "Kevin Marrec (@kevinmarrec)"
+    }
+  ],
+  "files": [
+    "bin"
+  ],
+  "bin": {
+    "nuxt-ts": "bin/nuxt-ts.js",
+    "nuxts": "bin/nuxt-ts.js"
+  },
+  "dependencies": {
+    "@nuxt/builder": "2.4.0",
+    "@nuxt/cli": "2.4.0",
+    "@nuxt/core": "2.4.0",
+    "@nuxt/generator": "2.4.0",
+    "@nuxt/opencollective": "^0.2.1",
+    "@nuxt/typescript": "2.4.0",
+    "@nuxt/webpack": "2.4.0"
+  },
+  "engines": {
+    "node": ">=6.0.0",
+    "npm": ">=3.0.0"
+  },
+  "collective": {
+    "url": "https://opencollective.com/nuxtjs",
+    "logoUrl": "https://opencollective.com/nuxtjs/logo.txt?reverse=true&variant=variant2"
+  }
+}
diff --git a/distributions/nuxt/CHANGELOG.md b/distributions/nuxt/CHANGELOG.md
index aaa1417a42..bec4f68f7d 100644
--- a/distributions/nuxt/CHANGELOG.md
+++ b/distributions/nuxt/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **dist:** use -edge suffix to require cli ([98c1922](https://github.com/nuxt/nuxt.js/commit/98c1922))
+* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([f680e36](https://github.com/nuxt/nuxt.js/commit/f680e36))
+* exit with proper error code on errors ([#4806](https://github.com/nuxt/nuxt.js/issues/4806)) ([a7ba73e](https://github.com/nuxt/nuxt.js/commit/a7ba73e))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/distributions/nuxt/README.md b/distributions/nuxt/README.md
index a6526bc339..779bc99103 100644
--- a/distributions/nuxt/README.md
+++ b/distributions/nuxt/README.md
@@ -38,6 +38,7 @@
 - Custom layouts with the `layouts/` directory
 - Middleware
 - Code splitting for every `pages/`
+- Loading just the critical CSS (page-level)
 
 Learn more at [nuxtjs.org](https://nuxtjs.org).
 
@@ -70,43 +71,10 @@ Support us with a monthly donation and help us continue our activities. [[Become
 ## Getting started
 
 ```
-$ npm install nuxt
+$ npx create-nuxt-app <project-name>
 ```
 
-Add a script to your package.json like this:
-
-```json
-{
-  "scripts": {
-    "start": "nuxt"
-  }
-}
-```
-
-After that, the file-system is the main API. Every .vue file becomes a route that gets automatically processed and rendered.
-
-Populate `./pages/index.vue` inside your project:
-
-```html
-<template>
-  <h1>Hello {{ name }}!</h1>
-</template>
-
-<script>
-export default {
-  data: () => {
-    return { name: 'world' }
-  }
-}
-</script>
-```
-
-And then run:
-```bash
-npm start
-```
-
-Go to [http://localhost:3000](http://localhost:3000)
+It's as simple as that!
 
 ## Templates
 
@@ -227,6 +195,11 @@ Thanks to BrowserStack!
 
 <a href="http://browserstack.com"><img height="70" src="https://p3.zdusercontent.com/attachment/1015988/PWfFdN71Aung2evRkIVQuKJpE?token=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..aUrNFb8clSXsFwgw5BUTcg.IJr5piuCen7PmSSBHSrOnqM9K5YZfxX3lvbp-5LCqoKOi4CjjgdA419iqjofs0nLtm26FMURvZ8JRTuKB4iHer6lGu5f8dXHtIkYAHjP5fXDWkl044Yg2mSdrhF6uPy62GdlBYoYxwvgkNrac8nN_In8GY-qOC7bYmlZyJT7tsTZUTYbNMQiXS86YA5LgdCEWzWreMvc3C6cvZtVXIrcVgpkroIhvsTQPm4vQA-Uq6iCbTPA4oX5cpEtMtrlg4jYBnnAE4BTw5UwU_dY83ep5g.7wpc1IKv0rSRGsvqCG_q3g" alt="BrowserStack"></a>
 
+
+## Security
+
+If you discover a security vulnerability regarding Nuxt.js, please send an e-mail to the team via security@nuxtjs.org! All security vulnerabilities will be promptly addressed.
+
 ## License
 
 [MIT](https://github.com/nuxt/nuxt.js/blob/dev/LICENSE)
diff --git a/distributions/nuxt/bin/nuxt.js b/distributions/nuxt/bin/nuxt.js
index 6496c3d2b2..25ea739baf 100755
--- a/distributions/nuxt/bin/nuxt.js
+++ b/distributions/nuxt/bin/nuxt.js
@@ -1,5 +1,8 @@
 #!/usr/bin/env node
-const { name } = require('../package.json')
-const isEdge = name.indexOf('-edge') !== -1
-const cli = require(isEdge ? '@nuxt/cli-edge' : '@nuxt/cli')
-cli.run()
+
+const suffix = require('../package.json').name.includes('-edge') ? '-edge' : ''
+require('@nuxt/cli' + suffix).run()
+  .catch((error) => {
+    require('consola').fatal(error)
+    process.exit(2)
+  })
diff --git a/distributions/nuxt/package.js b/distributions/nuxt/package.js
index 2171515e51..53aeeab1ec 100644
--- a/distributions/nuxt/package.js
+++ b/distributions/nuxt/package.js
@@ -1,13 +1,13 @@
 export default {
   build: true,
-  extend(pkg, { load }) {
-    pkg.on('build:done', () => {
-      const mono = load('../..')
+  hooks: {
+    async 'build:done'(pkg) {
+      const mono = pkg.load('../..')
 
-      pkg.copyFilesFrom(mono, [
+      await pkg.copyFilesFrom(mono, [
         'LICENSE',
         'README.md'
       ])
-    })
+    }
   }
 }
diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json
index 1a6164d06d..4dc9b6b7a5 100644
--- a/distributions/nuxt/package.json
+++ b/distributions/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "keywords": [
     "nuxt",
@@ -36,6 +36,12 @@
     },
     {
       "name": "Alexander Lichter (@manniL)"
+    },
+    {
+      "name": "Dmitry Molotkov (@aldarund)"
+    },
+    {
+      "name": "Kevin Marrec (@kevinmarrec)"
     }
   ],
   "files": [
@@ -48,13 +54,12 @@
     "postinstall": "opencollective || exit 0"
   },
   "dependencies": {
-    "@nuxt/builder": "2.3.4",
-    "@nuxt/cli": "2.3.4",
-    "@nuxt/common": "2.3.4",
-    "@nuxt/core": "2.3.4",
-    "@nuxt/generator": "2.3.4",
-    "@nuxt/webpack": "2.3.4",
-    "@nuxtjs/opencollective": "^0.2.0"
+    "@nuxt/builder": "2.4.0",
+    "@nuxt/cli": "2.4.0",
+    "@nuxt/core": "2.4.0",
+    "@nuxt/generator": "2.4.0",
+    "@nuxt/opencollective": "^0.2.1",
+    "@nuxt/webpack": "2.4.0"
   },
   "engines": {
     "node": ">=8.0.0",
diff --git a/examples/async-component-injection/layouts/default.vue b/examples/async-component-injection/layouts/default.vue
index 82bfa911c9..ceba7c02fe 100644
--- a/examples/async-component-injection/layouts/default.vue
+++ b/examples/async-component-injection/layouts/default.vue
@@ -1,14 +1,20 @@
 <template>
   <div class="wrapper">
     <div class="header">
-      <nuxt-link to="/">NUXT BLOG</nuxt-link>
+      <NuxtLink to="/">
+        NUXT BLOG
+      </NuxtLink>
     </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/tree/dev/examples/async-component-injection" target="_blank"><img src="~/assets/img/github.png"></a>
+      <a href="https://twitter.com/nuxt_js" target="_blank">
+        <img src="~/assets/img/twitter.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 />
+      <Nuxt />
     </div>
   </div>
 </template>
diff --git a/examples/async-component-injection/package.json b/examples/async-component-injection/package.json
index 2b99de1c0e..7d3f4896f7 100644
--- a/examples/async-component-injection/package.json
+++ b/examples/async-component-injection/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt"
+    "start": "nuxt",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/async-component-injection/pages/_slug.vue b/examples/async-component-injection/pages/_slug.vue
index 73ff71e4a9..9ac714694a 100644
--- a/examples/async-component-injection/pages/_slug.vue
+++ b/examples/async-component-injection/pages/_slug.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="post">
-    <component :is="component" />
+    <Component :is="component" />
   </div>
 </template>
 
diff --git a/examples/async-component-injection/pages/index.vue b/examples/async-component-injection/pages/index.vue
index 13636fe492..24525fd6e5 100644
--- a/examples/async-component-injection/pages/index.vue
+++ b/examples/async-component-injection/pages/index.vue
@@ -2,9 +2,17 @@
   <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>
+      <h2>
+        <NuxtLink :to="post.link">
+          {{ post.title }}
+        </NuxtLink>
+      </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>
-    <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>
 
diff --git a/examples/async-component-injection/posts/404.vue b/examples/async-component-injection/posts/404.vue
index 33f884b536..4965d77953 100644
--- a/examples/async-component-injection/posts/404.vue
+++ b/examples/async-component-injection/posts/404.vue
@@ -1,3 +1,5 @@
 <template>
-  <h1 style="text-align: center;">Article not found</h1>
+  <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
index c8023966d6..3cc9c61b90 100644
--- a/examples/async-component-injection/posts/deep-dive-into-ocean.vue
+++ b/examples/async-component-injection/posts/deep-dive-into-ocean.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <h3 class="date">Jul 10, 2017</h3>
+    <h3 class="date">
+      Jul 10, 2017
+    </h3>
     <h1>Deep dive into the Ocean</h1>
     <div class="content">
       <img src="~/assets/img/swimmer.jpg">
diff --git a/examples/async-component-injection/posts/welcome-to-my-blog.vue b/examples/async-component-injection/posts/welcome-to-my-blog.vue
index 4283579ce4..cf22f0db1f 100644
--- a/examples/async-component-injection/posts/welcome-to-my-blog.vue
+++ b/examples/async-component-injection/posts/welcome-to-my-blog.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <h3 class="date">Jul 08, 2017</h3>
+    <h3 class="date">
+      Jul 08, 2017
+    </h3>
     <h1>Welcome to my blog</h1>
     <div class="content">
       <h2>What is Lorem Ipsum?</h2>
diff --git a/examples/async-data/package.json b/examples/async-data/package.json
index 80a9d99b57..29bd404f16 100644
--- a/examples/async-data/package.json
+++ b/examples/async-data/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/async-data/pages/index.vue b/examples/async-data/pages/index.vue
index ffe79c271f..3fcf2a8b0e 100644
--- a/examples/async-data/pages/index.vue
+++ b/examples/async-data/pages/index.vue
@@ -3,7 +3,11 @@
   <div class="container">
     <h1>User Agent</h1>
     <p>{{ userAgent }}</p>
-    <p><nuxt-link to="/posts">Blog</nuxt-link></p>
+    <p>
+      <NuxtLink to="/posts">
+        Blog
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/async-data/pages/posts/_id.vue b/examples/async-data/pages/posts/_id.vue
index c444d48c5e..c7deb9f3da 100644
--- a/examples/async-data/pages/posts/_id.vue
+++ b/examples/async-data/pages/posts/_id.vue
@@ -3,7 +3,11 @@
   <div class="container">
     <h1>{{ post.title }}</h1>
     <pre>{{ post.body }}</pre>
-    <p><nuxt-link to="/posts">Back to the list</nuxt-link></p>
+    <p>
+      <NuxtLink to="/posts">
+        Back to the list
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/async-data/pages/posts/index.vue b/examples/async-data/pages/posts/index.vue
index 1015972fa8..7a375b422e 100644
--- a/examples/async-data/pages/posts/index.vue
+++ b/examples/async-data/pages/posts/index.vue
@@ -4,10 +4,16 @@
     <h1>Blog</h1>
     <ul>
       <li v-for="(post, index) in posts" :key="index">
-        <nuxt-link :to="{ name: 'posts-id', params: { id: post.id } }">{{ post.title }}</nuxt-link>
+        <NuxtLink :to="{ name: 'posts-id', params: { id: post.id } }">
+          {{ post.title }}
+        </NuxtLink>
       </li>
     </ul>
-    <p><nuxt-link to="/">Back to home page</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        Back to home page
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/auth-jwt/package.json b/examples/auth-jwt/package.json
index daec5e9859..863bd2810d 100644
--- a/examples/auth-jwt/package.json
+++ b/examples/auth-jwt/package.json
@@ -8,6 +8,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/auth-jwt/pages/index.vue b/examples/auth-jwt/pages/index.vue
index 8884d93a82..a45edb3063 100644
--- a/examples/auth-jwt/pages/index.vue
+++ b/examples/auth-jwt/pages/index.vue
@@ -1,13 +1,21 @@
 <template>
   <div>
     <div v-if="$store.state.auth">
-      <p>You are authenticated. You can see the
-        <nuxt-link to="/secret">secret page</nuxt-link>!
+      <p>
+        You are authenticated. You can see the
+        <NuxtLink to="/secret">
+          secret page
+        </NuxtLink>!
       </p>
-      <button @click="logout">Logout</button>
+      <button @click="logout">
+        Logout
+      </button>
     </div>
-    <p v-else>Please
-      <nuxt-link to="/login">login</nuxt-link>.
+    <p v-else>
+      Please
+      <NuxtLink to="/login">
+        login
+      </NuxtLink>.
     </p>
   </div>
 </template>
diff --git a/examples/auth-jwt/pages/login.vue b/examples/auth-jwt/pages/login.vue
index e39cee8082..5a64ecb8c8 100644
--- a/examples/auth-jwt/pages/login.vue
+++ b/examples/auth-jwt/pages/login.vue
@@ -8,7 +8,9 @@
       <label for="password">
         <input id="password" type="password" value="test">
       </label>
-      <button @click="postLogin">login</button>
+      <button @click="postLogin">
+        login
+      </button>
       <p>The credentials are not verified for the example purpose.</p>
     </div>
   </div>
diff --git a/examples/auth-jwt/pages/secret.vue b/examples/auth-jwt/pages/secret.vue
index 9f2aacd528..26cfe81019 100644
--- a/examples/auth-jwt/pages/secret.vue
+++ b/examples/auth-jwt/pages/secret.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <h1>This is secret page.</h1>
-    <nuxt-link to="/">Back home</nuxt-link>
+    <NuxtLink to="/">
+      Back home
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/auth-routes/package.json b/examples/auth-routes/package.json
index c5a1cf23d7..8dacdc7bc6 100644
--- a/examples/auth-routes/package.json
+++ b/examples/auth-routes/package.json
@@ -10,6 +10,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/auth-routes/pages/index.vue b/examples/auth-routes/pages/index.vue
index 401db4150d..a050695b0b 100644
--- a/examples/auth-routes/pages/index.vue
+++ b/examples/auth-routes/pages/index.vue
@@ -2,19 +2,29 @@
   <div class="container">
     <h1>Please login to see the secret content</h1>
     <form v-if="!$store.state.authUser" @submit.prevent="login">
-      <p v-if="formError" class="error">{{ formError }}</p>
+      <p v-if="formError" class="error">
+        {{ formError }}
+      </p>
       <p><i>To login, use <b>demo</b> as username and <b>demo</b> as password.</i></p>
       <p>Username: <input v-model="formUsername" type="text" name="username"></p>
       <p>Password: <input v-model="formPassword" type="password" name="password"></p>
-      <button type="submit">Login</button>
+      <button type="submit">
+        Login
+      </button>
     </form>
     <div v-else>
       Hello {{ $store.state.authUser.username }}!
       <pre>I am the secret content, I am shown only when the use is connected.</pre>
       <p><i>You can also refresh this page, you'll still be connected!</i></p>
-      <button @click="logout">Logout</button>
+      <button @click="logout">
+        Logout
+      </button>
     </div>
-    <p><nuxt-link to="/secret">Super secret page</nuxt-link></p>
+    <p>
+      <NuxtLink to="/secret">
+        Super secret page
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/auth-routes/pages/secret.vue b/examples/auth-routes/pages/secret.vue
index 30dff34b4e..a004006193 100644
--- a/examples/auth-routes/pages/secret.vue
+++ b/examples/auth-routes/pages/secret.vue
@@ -2,7 +2,9 @@
   <div>
     <h1>Super secret page</h1>
     <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>
+    <NuxtLink to="/">
+      Back to the home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/axios/package.json b/examples/axios/package.json
index ee2db40cd9..d4fc578194 100644
--- a/examples/axios/package.json
+++ b/examples/axios/package.json
@@ -9,6 +9,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/cached-components/package.json b/examples/cached-components/package.json
index 9fc387b9bd..b6ae221185 100644
--- a/examples/cached-components/package.json
+++ b/examples/cached-components/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/coffeescript/layouts/default.vue b/examples/coffeescript/layouts/default.vue
index acfe1d2cf0..e94a758025 100644
--- a/examples/coffeescript/layouts/default.vue
+++ b/examples/coffeescript/layouts/default.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/coffeescript/package.json b/examples/coffeescript/package.json
index df84c75844..8516dd52e1 100644
--- a/examples/coffeescript/package.json
+++ b/examples/coffeescript/package.json
@@ -7,7 +7,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "nuxt-edge": "latest"
diff --git a/examples/custom-build/package.json b/examples/custom-build/package.json
index 80ced97849..86f1499dab 100644
--- a/examples/custom-build/package.json
+++ b/examples/custom-build/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/custom-layouts/layouts/dark.vue b/examples/custom-layouts/layouts/dark.vue
index f25b4c2459..5c414543b7 100644
--- a/examples/custom-layouts/layouts/dark.vue
+++ b/examples/custom-layouts/layouts/dark.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dark">
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/custom-layouts/layouts/default.vue b/examples/custom-layouts/layouts/default.vue
index 2b4d5a87f3..1aea542319 100644
--- a/examples/custom-layouts/layouts/default.vue
+++ b/examples/custom-layouts/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <img src="logo.png">
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/custom-layouts/layouts/error.vue b/examples/custom-layouts/layouts/error.vue
index 126edd0af2..b30b3c7912 100644
--- a/examples/custom-layouts/layouts/error.vue
+++ b/examples/custom-layouts/layouts/error.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="container">
-    <h1 v-if="error.statusCode === 404">Page not found</h1>
-    <h1 v-else>An error occurred</h1>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <h1 v-if="error.statusCode === 404">
+      Page not found
+    </h1>
+    <h1 v-else>
+      An error occurred
+    </h1>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/custom-layouts/package.json b/examples/custom-layouts/package.json
index 09ba1dc997..23c29f0bb4 100644
--- a/examples/custom-layouts/package.json
+++ b/examples/custom-layouts/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/custom-layouts/pages/about.vue b/examples/custom-layouts/pages/about.vue
index 7f3c014c14..3e88d8577d 100644
--- a/examples/custom-layouts/pages/about.vue
+++ b/examples/custom-layouts/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <p>Hi from {{ name }}</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/custom-layouts/pages/index.vue b/examples/custom-layouts/pages/index.vue
index bb96d34c35..658ac5ac1d 100644
--- a/examples/custom-layouts/pages/index.vue
+++ b/examples/custom-layouts/pages/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="container">
     <h1>Welcome!</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
diff --git a/examples/custom-loading/package.json b/examples/custom-loading/package.json
index 13ddb7b82c..a2571cdf6a 100644
--- a/examples/custom-loading/package.json
+++ b/examples/custom-loading/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/custom-loading/pages/about.vue b/examples/custom-loading/pages/about.vue
index c7b8c03f71..504a1b2b0f 100644
--- a/examples/custom-loading/pages/about.vue
+++ b/examples/custom-loading/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <p>About Page</p>
-    <nuxt-link to="/">Go to /</nuxt-link>
+    <NuxtLink to="/">
+      Go to /
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/custom-loading/pages/index.vue b/examples/custom-loading/pages/index.vue
index 43561ba5db..b45f391a70 100644
--- a/examples/custom-loading/pages/index.vue
+++ b/examples/custom-loading/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <p>Hello {{ name }}!</p>
-    <nuxt-link to="/about">Go to /about</nuxt-link>
+    <NuxtLink to="/about">
+      Go to /about
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/custom-page-loading/package.json b/examples/custom-page-loading/package.json
index d4c36bd54c..33a5faf2a0 100644
--- a/examples/custom-page-loading/package.json
+++ b/examples/custom-page-loading/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/custom-page-loading/pages/about.vue b/examples/custom-page-loading/pages/about.vue
index 5b9a59be92..ff0d185ed6 100644
--- a/examples/custom-page-loading/pages/about.vue
+++ b/examples/custom-page-loading/pages/about.vue
@@ -2,8 +2,12 @@
   <div class="container">
     <p>About Page</p>
     <p>It should take 5 seconds for the loader to disappear</p>
-    <p>It should take 5 seconds for the route to change after you
-      <span class="link" @click="goToFinal">click here</span></p>
+    <p>
+      It should take 5 seconds for the route to change after you
+      <span class="link" @click="goToFinal">
+        click here
+      </span>
+    </p>
   </div>
 </template>
 
diff --git a/examples/custom-page-loading/pages/final.vue b/examples/custom-page-loading/pages/final.vue
index 08b5f7d0e1..fca5638c28 100644
--- a/examples/custom-page-loading/pages/final.vue
+++ b/examples/custom-page-loading/pages/final.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <p>Final Page</p>
-    <nuxt-link to="/">Go to /</nuxt-link>
+    <NuxtLink to="/">
+      Go to /
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/custom-page-loading/pages/index.vue b/examples/custom-page-loading/pages/index.vue
index 43561ba5db..b45f391a70 100644
--- a/examples/custom-page-loading/pages/index.vue
+++ b/examples/custom-page-loading/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <p>Hello {{ name }}!</p>
-    <nuxt-link to="/about">Go to /about</nuxt-link>
+    <NuxtLink to="/about">
+      Go to /about
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/custom-port-host/package.json b/examples/custom-port-host/package.json
index 740a116363..e5b1f7971d 100644
--- a/examples/custom-port-host/package.json
+++ b/examples/custom-port-host/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/custom-routes/package.json b/examples/custom-routes/package.json
index 94d8fe8272..38d678a47c 100644
--- a/examples/custom-routes/package.json
+++ b/examples/custom-routes/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/custom-routes/pages/index.vue b/examples/custom-routes/pages/index.vue
index 889363ca7c..f70020e355 100644
--- a/examples/custom-routes/pages/index.vue
+++ b/examples/custom-routes/pages/index.vue
@@ -3,7 +3,9 @@
     <h2>Users</h2>
     <ul class="users">
       <li v-for="user in users" :key="user.id">
-        <nuxt-link :to="'/users/'+user.id">{{ user.name }}</nuxt-link>
+        <NuxtLink :to="'/users/'+user.id">
+          {{ user.name }}
+        </NuxtLink>
       </li>
     </ul>
   </div>
diff --git a/examples/custom-routes/pages/users/_id.vue b/examples/custom-routes/pages/users/_id.vue
index f09c9bffc7..05b24b7bf7 100644
--- a/examples/custom-routes/pages/users/_id.vue
+++ b/examples/custom-routes/pages/users/_id.vue
@@ -3,7 +3,11 @@
     <h3>{{ name }}</h3>
     <h4>@{{ username }}</h4>
     <p>Email : {{ email }}</p>
-    <p><nuxt-link to="/">List of users</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        List of users
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/custom-server/package.json b/examples/custom-server/package.json
index 39ade9acb7..ca15a00e35 100644
--- a/examples/custom-server/package.json
+++ b/examples/custom-server/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "node server.js",
     "build": "nuxt build",
-    "start": "NODE_ENV=production node server.js"
+    "start": "NODE_ENV=production node server.js",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/custom-server/pages/index.vue b/examples/custom-server/pages/index.vue
index 58494d6520..b8f045cab6 100644
--- a/examples/custom-server/pages/index.vue
+++ b/examples/custom-server/pages/index.vue
@@ -1,3 +1,7 @@
 <template>
-  <p>Please look at <code>server.js</code> to see how to use <a href="https://nuxtjs.org">Nuxt.js</a> programmatically.</p>
+  <p>
+    Please look at <code>server.js</code> to see how to use <a href="https://nuxtjs.org">
+      Nuxt.js
+    </a> programmatically.
+  </p>
 </template>
diff --git a/examples/dynamic-components/components/image.vue b/examples/dynamic-components/components/image.vue
index 9c7cd98ff6..58c2623704 100644
--- a/examples/dynamic-components/components/image.vue
+++ b/examples/dynamic-components/components/image.vue
@@ -9,21 +9,29 @@
       viewBox="0 0 100 100"
       preserveAspectRatio="xMidYMid"
       class="uil-ring"
-    ><rect
-      x="0"
-      y="0"
-      width="100"
-      height="100"
-      fill="none"
-      class="bk"
-    /><defs><filter id="uil-ring-shadow" x="-100%" y="-100%" width="300%" height="300%"><feOffset result="offOut" in="SourceGraphic" dx="0" dy="0" /><feGaussianBlur result="blurOut" in="offOut" stdDeviation="0" /><feBlend in="SourceGraphic" in2="blurOut" mode="normal" /></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"
-    /></path></svg>
+    >
+      <rect
+        x="0"
+        y="0"
+        width="100"
+        height="100"
+        fill="none"
+        class="bk"
+      /><defs>
+        <filter id="uil-ring-shadow" x="-100%" y="-100%" width="300%" height="300%">
+          <feOffset result="offOut" in="SourceGraphic" dx="0" dy="0" /><feGaussianBlur result="blurOut" in="offOut" stdDeviation="0" /><feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
+        </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"
+        />
+      </path>
+    </svg>
   </div>
 </template>
 
diff --git a/examples/dynamic-components/package.json b/examples/dynamic-components/package.json
index a98a3a8d66..992ca12416 100644
--- a/examples/dynamic-components/package.json
+++ b/examples/dynamic-components/package.json
@@ -9,6 +9,7 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate"
+    "generate": "nuxt generate",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/dynamic-components/pages/index.vue b/examples/dynamic-components/pages/index.vue
index f1c198626f..87fe2e7df0 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>
-    <transition-group name="list" tag="ul">
+    <TransitionGroup name="list" tag="ul">
       <li v-for="(message, index) in messages" :key="index">
-        <component :is="message.component" :data="message.data" />
+        <Component :is="message.component" :data="message.data" />
       </li>
-    </transition-group>
+    </TransitionGroup>
   </div>
 </template>
 
diff --git a/examples/dynamic-components/pages/ssr.vue b/examples/dynamic-components/pages/ssr.vue
index 237eca9773..8ed67f6296 100644
--- a/examples/dynamic-components/pages/ssr.vue
+++ b/examples/dynamic-components/pages/ssr.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <h1>Nuxt Chat</h1>
-    <transition-group name="list" tag="ul">
+    <TransitionGroup name="list" tag="ul">
       <li v-for="(message, index) in messages" :key="index">
-        <component :is="message.component" :data="message.data" />
+        <Component :is="message.component" :data="message.data" />
       </li>
-    </transition-group>
+    </TransitionGroup>
   </div>
 </template>
 
diff --git a/examples/dynamic-layouts/layouts/error.vue b/examples/dynamic-layouts/layouts/error.vue
index aa064f32ec..d18a9a7db3 100644
--- a/examples/dynamic-layouts/layouts/error.vue
+++ b/examples/dynamic-layouts/layouts/error.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="container">
-    <h1 v-if="error.statusCode === 404">Page not found</h1>
-    <h1 v-else>An error occurred</h1>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <h1 v-if="error.statusCode === 404">
+      Page not found
+    </h1>
+    <h1 v-else>
+      An error occurred
+    </h1>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/dynamic-layouts/layouts/mobile.vue b/examples/dynamic-layouts/layouts/mobile.vue
index dbdde9274c..2acd7ccee3 100644
--- a/examples/dynamic-layouts/layouts/mobile.vue
+++ b/examples/dynamic-layouts/layouts/mobile.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="dark">
-    <div class="mobile-banner">Mobile website</div>
-    <nuxt />
+    <div class="mobile-banner">
+      Mobile website
+    </div>
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/dynamic-layouts/package.json b/examples/dynamic-layouts/package.json
index d0ed3f9f74..dea7619e05 100644
--- a/examples/dynamic-layouts/package.json
+++ b/examples/dynamic-layouts/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/dynamic-layouts/pages/about.vue b/examples/dynamic-layouts/pages/about.vue
index 18d0789771..56bd22bb8b 100644
--- a/examples/dynamic-layouts/pages/about.vue
+++ b/examples/dynamic-layouts/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <p>Hi from {{ name }}</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/dynamic-layouts/pages/index.vue b/examples/dynamic-layouts/pages/index.vue
index 81b96a923b..fe2bc2d659 100644
--- a/examples/dynamic-layouts/pages/index.vue
+++ b/examples/dynamic-layouts/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <h1>Welcome!</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/global-css/package.json b/examples/global-css/package.json
index 7ad2d61c10..73de465f6c 100644
--- a/examples/global-css/package.json
+++ b/examples/global-css/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/global-css/pages/about.vue b/examples/global-css/pages/about.vue
index 33c5802721..ea7a8d6d7f 100644
--- a/examples/global-css/pages/about.vue
+++ b/examples/global-css/pages/about.vue
@@ -1,7 +1,17 @@
 <template>
   <div class="content">
-    <h1 class="title">Another Page</h1>
-    <p><nuxt-link to="/" class="button is-medium is-info hvr-wobble-vertical">Another button</nuxt-link></p>
-    <p><nuxt-link to="/">Back home</nuxt-link></p>
+    <h1 class="title">
+      Another Page
+    </h1>
+    <p>
+      <NuxtLink to="/" class="button is-medium is-info hvr-wobble-vertical">
+        Another button
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/">
+        Back home
+      </NuxtLink>
+    </p>
   </div>
 </template>
diff --git a/examples/global-css/pages/index.vue b/examples/global-css/pages/index.vue
index 97df0b1c22..4ee0a090b8 100644
--- a/examples/global-css/pages/index.vue
+++ b/examples/global-css/pages/index.vue
@@ -1,7 +1,17 @@
 <template>
   <div class="content">
-    <h1 class="title">Custom CSS!</h1>
-    <p><nuxt-link to="/about" class="button is-medium is-primary hvr-float-shadow">I am a button</nuxt-link></p>
-    <p><nuxt-link to="/about">About page</nuxt-link></p>
+    <h1 class="title">
+      Custom CSS!
+    </h1>
+    <p>
+      <NuxtLink to="/about" class="button is-medium is-primary hvr-float-shadow">
+        I am a button
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/about">
+        About page
+      </NuxtLink>
+    </p>
   </div>
 </template>
diff --git a/examples/hello-world/nuxt.config.js b/examples/hello-world/nuxt.config.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
index 0cc6a5c7c8..a93a322b71 100644
--- a/examples/hello-world/package.json
+++ b/examples/hello-world/package.json
@@ -1,11 +1,12 @@
 {
   "name": "example-hello-world",
   "dependencies": {
-    "nuxt": "latest"
+    "nuxt-edge": "latest"
   },
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/hello-world/pages/about.vue b/examples/hello-world/pages/about.vue
index a4d06cd37f..017574200d 100755
--- a/examples/hello-world/pages/about.vue
+++ b/examples/hello-world/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <p>Hi from {{ name }}</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NLink to="/">
+      Home page
+    </NLink>
   </div>
 </template>
 
diff --git a/examples/hello-world/pages/index.vue b/examples/hello-world/pages/index.vue
index 43487b0da4..5b3e5ae010 100755
--- a/examples/hello-world/pages/index.vue
+++ b/examples/hello-world/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <h1>Welcome!</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NLink to="/about">
+      About Page
+    </NLink>
   </div>
 </template>
 
diff --git a/examples/i18n/layouts/default.vue b/examples/i18n/layouts/default.vue
index c11bce81db..7d970a4dd9 100644
--- a/examples/i18n/layouts/default.vue
+++ b/examples/i18n/layouts/default.vue
@@ -2,24 +2,26 @@
   <div>
     <header class="Header">
       <div class="container">
-        <h1 class="Header__Title">Nuxt i18n</h1>
+        <h1 class="Header__Title">
+          Nuxt i18n
+        </h1>
         <nav class="Header__Menu">
-          <nuxt-link :to="$i18n.path('')" class="Header__Link" exact>
+          <NuxtLink :to="$i18n.path('')" class="Header__Link" exact>
             {{ $t('links.home') }}
-          </nuxt-link>
-          <nuxt-link :to="$i18n.path('about')" class="Header__Link" exact>
+          </NuxtLink>
+          <NuxtLink :to="$i18n.path('about')" class="Header__Link" exact>
             {{ $t('links.about') }}
-          </nuxt-link>
-          <nuxt-link v-if="$i18n.locale === 'en'" :to="`/fr` + $route.fullPath" class="Header__Link" active-class="none" exact>
+          </NuxtLink>
+          <NuxtLink v-if="$i18n.locale === 'en'" :to="`/fr` + $route.fullPath" class="Header__Link" active-class="none" exact>
             {{ $t('links.french') }}
-          </nuxt-link>
-          <nuxt-link v-else :to="$route.fullPath.replace(/^\/[^\/]+/, '')" class="Header__Link" active-class="none" exact>
+          </NuxtLink>
+          <NuxtLink v-else :to="$route.fullPath.replace(/^\/[^\/]+/, '')" class="Header__Link" active-class="none" exact>
             {{ $t('links.english') }}
-          </nuxt-link>
+          </NuxtLink>
         </nav>
       </div>
     </header>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/i18n/package.json b/examples/i18n/package.json
index c35861b659..1918a2e69e 100644
--- a/examples/i18n/package.json
+++ b/examples/i18n/package.json
@@ -8,6 +8,7 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate"
+    "generate": "nuxt generate",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/i18n/pages/_lang/about.vue b/examples/i18n/pages/_lang/about.vue
index 7325f8e311..6c412c7303 100644
--- a/examples/i18n/pages/_lang/about.vue
+++ b/examples/i18n/pages/_lang/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="Content">
     <div class="container">
-      <h1 class="Content__Title">{{ $t('about.title') }}</h1>
+      <h1 class="Content__Title">
+        {{ $t('about.title') }}
+      </h1>
       <p>{{ $t('about.introduction') }}</p>
     </div>
   </div>
diff --git a/examples/i18n/pages/_lang/index.vue b/examples/i18n/pages/_lang/index.vue
index cc33a4b978..b9685b9d47 100644
--- a/examples/i18n/pages/_lang/index.vue
+++ b/examples/i18n/pages/_lang/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="Content">
     <div class="container">
-      <h1 class="Content__Title">{{ $t('home.title') }}</h1>
+      <h1 class="Content__Title">
+        {{ $t('home.title') }}
+      </h1>
       <p>{{ $t('home.introduction') }}</p>
     </div>
   </div>
diff --git a/examples/jest-puppeteer/package.json b/examples/jest-puppeteer/package.json
index 82bd0e0ad3..28546fad19 100755
--- a/examples/jest-puppeteer/package.json
+++ b/examples/jest-puppeteer/package.json
@@ -13,6 +13,7 @@
   "devDependencies": {
     "jest": "latest",
     "jest-puppeteer": "latest",
-    "puppeteer": "latest"
+    "puppeteer": "latest",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/jest-puppeteer/pages/about.vue b/examples/jest-puppeteer/pages/about.vue
index bc3b28766f..020d641a90 100755
--- a/examples/jest-puppeteer/pages/about.vue
+++ b/examples/jest-puppeteer/pages/about.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
-    <p id="hello-msg">Hi from {{ name }}</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <p id="hello-msg">
+      Hi from {{ name }}
+    </p>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/jest-puppeteer/pages/index.vue b/examples/jest-puppeteer/pages/index.vue
index 4b5f9be0d7..48b6b78c9e 100755
--- a/examples/jest-puppeteer/pages/index.vue
+++ b/examples/jest-puppeteer/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <h1>Welcome!</h1>
-    <nuxt-link id="about-link" to="/about">About page</nuxt-link>
+    <NuxtLink id="about-link" to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/jest-vtu-example/layouts/default.vue b/examples/jest-vtu-example/layouts/default.vue
index 9842575287..0acb4c7997 100644
--- a/examples/jest-vtu-example/layouts/default.vue
+++ b/examples/jest-vtu-example/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
   <div>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/examples/jest-vtu-example/package.json b/examples/jest-vtu-example/package.json
index 9cc395167a..6819bff5bc 100644
--- a/examples/jest-vtu-example/package.json
+++ b/examples/jest-vtu-example/package.json
@@ -5,7 +5,8 @@
     "build": "nuxt build",
     "start": "nuxt start",
     "generate": "nuxt generate",
-    "test": "jest ."
+    "test": "jest",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "nuxt-edge": "latest"
@@ -17,7 +18,7 @@
     "babel-jest": "^23.6.0",
     "jest": "^23.6.0",
     "jest-serializer-vue": "^2.0.2",
-    "vue-jest": "^2.6.0"
+    "vue-jest": "^3.0.2"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -31,16 +32,17 @@
       "^~~/(.*)$": "<rootDir>/$1"
     },
     "transform": {
-      "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
-      ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
+      "^.+\\.js$": "babel-jest",
+      ".*\\.(vue)$": "vue-jest"
     },
     "snapshotSerializers": [
-      "<rootDir>/node_modules/jest-serializer-vue"
+      "jest-serializer-vue"
     ],
     "collectCoverage": true,
     "collectCoverageFrom": [
       "<rootDir>/components/**/*.vue",
       "<rootDir>/pages/*.vue"
-    ]
+    ],
+    "testURL": "http://localhost/"
   }
 }
diff --git a/examples/jsx/package.json b/examples/jsx/package.json
index 7a07453f21..432c82791f 100644
--- a/examples/jsx/package.json
+++ b/examples/jsx/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/jsx/pages/about.js b/examples/jsx/pages/about.js
index 4bd675870c..ccd4ab6504 100644
--- a/examples/jsx/pages/about.js
+++ b/examples/jsx/pages/about.js
@@ -15,7 +15,7 @@ export default {
     return <div class='container'>
       <h1>About page</h1>
       <test data='I am test component' />
-      <p><nuxt-link to='/'>Home page</nuxt-link></p>
+      <p><NuxtLink to='/'>Home page</NuxtLink></p>
     </div>
   }
 }
diff --git a/examples/jsx/pages/index.js b/examples/jsx/pages/index.js
index ab5d1cb93b..ddc84e9c17 100755
--- a/examples/jsx/pages/index.js
+++ b/examples/jsx/pages/index.js
@@ -14,7 +14,7 @@ export default {
   render() {
     return <div class='container'>
       <h1>Home page 🚀</h1>
-      <nuxt-link to='/about'>About page</nuxt-link>
+      <NuxtLink to='/about'>About page</NuxtLink>
     </div>
   }
 }
diff --git a/examples/layout-transitions/layouts/secondary.vue b/examples/layout-transitions/layouts/secondary.vue
index 9fe2dc21fd..d1d4d2018b 100644
--- a/examples/layout-transitions/layouts/secondary.vue
+++ b/examples/layout-transitions/layouts/secondary.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <h1>Secondary Layout</h1>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/examples/layout-transitions/package.json b/examples/layout-transitions/package.json
index 833d60ca66..b0925efaab 100644
--- a/examples/layout-transitions/package.json
+++ b/examples/layout-transitions/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/layout-transitions/pages/about.vue b/examples/layout-transitions/pages/about.vue
index 1fc62cb777..335a493304 100644
--- a/examples/layout-transitions/pages/about.vue
+++ b/examples/layout-transitions/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <h1>About page</h1>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/layout-transitions/pages/index.vue b/examples/layout-transitions/pages/index.vue
index ff834a5104..a47b1bbf92 100644
--- a/examples/layout-transitions/pages/index.vue
+++ b/examples/layout-transitions/pages/index.vue
@@ -1,9 +1,21 @@
 <template>
   <div class="container">
     <h1>Home page</h1>
-    <p><nuxt-link to="/about">About page</nuxt-link></p>
-    <p><nuxt-link to="/users">Lists of users</nuxt-link></p>
-    <p><nuxt-link to="/users-2">Lists of users #2 (with `watch`)</nuxt-link></p>
+    <p>
+      <NuxtLink to="/about">
+        About page
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/users">
+        Lists of users
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/users-2">
+        Lists of users #2 (with `watch`)
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/layout-transitions/pages/users-2.vue b/examples/layout-transitions/pages/users-2.vue
index 9cb6a5f5c2..cebfef2ec6 100644
--- a/examples/layout-transitions/pages/users-2.vue
+++ b/examples/layout-transitions/pages/users-2.vue
@@ -1,19 +1,31 @@
 <template>
   <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>
+    <NuxtLink v-if="page > 1" :to="'?page=' + (page - 1)">
+      &lt; Prev
+    </NuxtLink>
+    <a v-else class="disabled">
+      &lt; Prev
+    </a>
     <span>{{ page }}/{{ totalPages }}</span>
-    <nuxt-link v-if="page < totalPages" :to="'?page=' + (page + 1)">Next &gt;</nuxt-link>
-    <a v-else class="disabled">Next &gt;</a>
-    <transition :name="transitionName" mode="out-in">
+    <NuxtLink v-if="page < totalPages" :to="'?page=' + (page + 1)">
+      Next &gt;
+    </NuxtLink>
+    <a v-else class="disabled">
+      Next &gt;
+    </a>
+    <Transition :name="transitionName" mode="out-in">
       <ul :key="page">
         <li v-for="user in users" :key="user.id">
           <img :src="user.avatar" class="avatar">
           <span>{{ user.first_name }} {{ user.last_name }}</span>
         </li>
       </ul>
-    </transition>
-    <p><nuxt-link to="/">Back home</nuxt-link></p>
+    </Transition>
+    <p>
+      <NuxtLink to="/">
+        Back home
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/layout-transitions/pages/users.vue b/examples/layout-transitions/pages/users.vue
index 283e783a75..8f6e2e1812 100644
--- a/examples/layout-transitions/pages/users.vue
+++ b/examples/layout-transitions/pages/users.vue
@@ -1,17 +1,29 @@
 <template>
   <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>
+    <NuxtLink v-if="page > 1" :to="'?page=' + (page - 1)">
+      &lt; Prev
+    </NuxtLink>
+    <a v-else class="disabled">
+      &lt; Prev
+    </a>
     <span>{{ page }}/{{ totalPages }}</span>
-    <nuxt-link v-if="page < totalPages" :to="'?page=' + (page + 1)">Next &gt;</nuxt-link>
-    <a v-else class="disabled">Next &gt;</a>
+    <NuxtLink v-if="page < totalPages" :to="'?page=' + (page + 1)">
+      Next &gt;
+    </NuxtLink>
+    <a v-else class="disabled">
+      Next &gt;
+    </a>
     <ul>
       <li v-for="user in users" :key="user.id">
         <img :src="user.avatar" class="avatar">
         <span>{{ user.first_name }} {{ user.last_name }}</span>
       </li>
     </ul>
-    <p><nuxt-link to="/">Back home</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        Back home
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
@@ -21,7 +33,7 @@ import axios from 'axios'
 export default {
   // Watch for $route.query.page to call Component methods (asyncData, fetch, validate, layout, etc.)
   watchQuery: ['page'],
-  // Key for <nuxt-child> (transitions)
+  // Key for <NuxtChild> (transitions)
   key: to => to.fullPath,
   // Called to know which transition to apply
   transition(to, from) {
diff --git a/examples/markdownit/package.json b/examples/markdownit/package.json
index a63e3b6a51..064b51bbfb 100644
--- a/examples/markdownit/package.json
+++ b/examples/markdownit/package.json
@@ -9,7 +9,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "devDependencies": {
     "jstransformer-markdown-it": "^2.0.0"
diff --git a/examples/markdownit/pages/about.vue b/examples/markdownit/pages/about.vue
index aa487b80bb..e3139412bf 100644
--- a/examples/markdownit/pages/about.vue
+++ b/examples/markdownit/pages/about.vue
@@ -2,5 +2,5 @@
   # About Page!
   Current route is: {{ $route.name }}
 
-  <nuxt-link to="/">Back home</nuxt-link>
+  <NuxtLink to="/">Back home</NuxtLink>
 </template>
diff --git a/examples/markdownit/pages/index.vue b/examples/markdownit/pages/index.vue
index 41b534ef46..9abf606cd6 100644
--- a/examples/markdownit/pages/index.vue
+++ b/examples/markdownit/pages/index.vue
@@ -5,9 +5,9 @@
 
   Data model is: {{ model }}
 
-  <nuxt-link to="/about">Goto About</nuxt-link>
+  <NuxtLink to="/about">Goto About</NuxtLink>
 
-  <nuxt-link to="/pug">Goto Pug</nuxt-link>
+  <NuxtLink to="/pug">Goto Pug</NuxtLink>
 </template>
 
 <script>
diff --git a/examples/meta-info/package.json b/examples/meta-info/package.json
index 42ca6fa13d..615138bc5f 100644
--- a/examples/meta-info/package.json
+++ b/examples/meta-info/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/meta-info/pages/about.vue b/examples/meta-info/pages/about.vue
index 4b0637a7c4..3a0eea91b3 100644
--- a/examples/meta-info/pages/about.vue
+++ b/examples/meta-info/pages/about.vue
@@ -2,8 +2,12 @@
   <div class="container">
     <h1>About page</h1>
     <p>Check the source code to see the custom meta tags added with our custom component <code>twitter-head-card</code></p>
-    <twitter-head-card />
-    <p><nuxt-link to="/">Home page</nuxt-link></p>
+    <TwitterHeadCard />
+    <p>
+      <NuxtLink to="/">
+        Home page
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/meta-info/pages/index.vue b/examples/meta-info/pages/index.vue
index 4e14608b6d..f4232a7191 100755
--- a/examples/meta-info/pages/index.vue
+++ b/examples/meta-info/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <h1>Home page 🚀</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/middleware/components/Visits.vue b/examples/middleware/components/Visits.vue
index 8f792bf946..1f4a4db8cb 100644
--- a/examples/middleware/components/Visits.vue
+++ b/examples/middleware/components/Visits.vue
@@ -1,6 +1,8 @@
 <template>
   <ul>
-    <li v-for="(visit, index) in visits" :key="index"><i>{{ visit.date | hours }}</i> - {{ visit.path }}</li>
+    <li v-for="(visit, index) in visits" :key="index">
+      <i>{{ visit.date | hours }}</i> - {{ visit.path }}
+    </li>
   </ul>
 </template>
 
diff --git a/examples/middleware/layouts/default.vue b/examples/middleware/layouts/default.vue
index cb44ae6487..27001bd8e8 100644
--- a/examples/middleware/layouts/default.vue
+++ b/examples/middleware/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <nuxt />
-    <visits />
+    <Nuxt />
+    <Visits />
   </div>
 </template>
 
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index b34de52d49..4e7a8c867c 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/middleware/pages/_slug.vue b/examples/middleware/pages/_slug.vue
index 7542d78473..acae10a28a 100644
--- a/examples/middleware/pages/_slug.vue
+++ b/examples/middleware/pages/_slug.vue
@@ -3,9 +3,15 @@
     <h1>{{ $route.params.slug || 'Home' }}</h1>
     <pre>{{ userAgent }}</pre>
     <ul>
-      <li><nuxt-link to="/">Home</nuxt-link></li>
+      <li>
+        <NuxtLink to="/">
+          Home
+        </NuxtLink>
+      </li>
       <li v-for="(slug, index) in slugs" :key="index">
-        <nuxt-link :to="{ name: 'slug', params: { slug } }">{{ slug }}</nuxt-link>
+        <NuxtLink :to="{ name: 'slug', params: { slug } }">
+          {{ slug }}
+        </NuxtLink>
       </li>
     </ul>
   </div>
diff --git a/examples/named-views/components/childLeft.vue b/examples/named-views/components/childLeft.vue
new file mode 100644
index 0000000000..cf1a6a2d49
--- /dev/null
+++ b/examples/named-views/components/childLeft.vue
@@ -0,0 +1,15 @@
+<template>
+  <div>
+    Child Left content!
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ChildLeft'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/examples/named-views/components/mainTop.vue b/examples/named-views/components/mainTop.vue
new file mode 100644
index 0000000000..44b442afb0
--- /dev/null
+++ b/examples/named-views/components/mainTop.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="top">
+    Main Top content!
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MainTop'
+}
+</script>
+
+<style scoped>
+  .top {
+    margin: auto;
+    max-width: 420px;
+    padding: 10px;
+  }
+</style>
diff --git a/examples/named-views/layouts/default.vue b/examples/named-views/layouts/default.vue
new file mode 100644
index 0000000000..20818174fc
--- /dev/null
+++ b/examples/named-views/layouts/default.vue
@@ -0,0 +1,6 @@
+<template>
+  <div>
+    <Nuxt name="top" />
+    <Nuxt />
+  </div>
+</template>
diff --git a/examples/named-views/nuxt.config.js b/examples/named-views/nuxt.config.js
new file mode 100644
index 0000000000..a23f24aae9
--- /dev/null
+++ b/examples/named-views/nuxt.config.js
@@ -0,0 +1,30 @@
+export default {
+  router: {
+    extendRoutes(routes, resolve) {
+      const indexIndex = routes.findIndex(route => route.name === 'index')
+      let index = routes[indexIndex].children.findIndex(route => route.name === 'index-child-id')
+      routes[indexIndex].children[index] = {
+        ...routes[indexIndex].children[index],
+        components: {
+          default: routes[indexIndex].children[index].component,
+          left: resolve(__dirname, 'components/childLeft.vue')
+        },
+        chunkNames: {
+          left: 'components/childLeft'
+        }
+      }
+
+      index = routes.findIndex(route => route.name === 'main')
+      routes[index] = {
+        ...routes[index],
+        components: {
+          default: routes[index].component,
+          top: resolve(__dirname, 'components/mainTop.vue')
+        },
+        chunkNames: {
+          top: 'components/mainTop'
+        }
+      }
+    }
+  }
+}
diff --git a/examples/named-views/package.json b/examples/named-views/package.json
new file mode 100644
index 0000000000..fb8189c908
--- /dev/null
+++ b/examples/named-views/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "my-app",
+  "dependencies": {
+    "nuxt": "latest"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
+  }
+}
diff --git a/examples/named-views/pages/index.vue b/examples/named-views/pages/index.vue
new file mode 100755
index 0000000000..37f9753ee8
--- /dev/null
+++ b/examples/named-views/pages/index.vue
@@ -0,0 +1,73 @@
+<template lang="html">
+  <div class="main">
+    <h1>Hello there</h1>
+    <p>This is an example of a named views</p>
+    <ul>
+      <li>
+        <NuxtLink to="/">
+          Root
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/section">
+          Section
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/child/123">
+          Child 123
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/child/234">
+          Child 234
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/main">
+          Main page with named view in layout
+        </NuxtLink>
+      </li>
+    </ul>
+
+    <hr>
+    <div>
+      <div class="left">
+        <NuxtChild name="left" />
+      </div>
+      <div class="content">
+        <NuxtChild />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Stage'
+}
+</script>
+
+<style scoped>
+  .main {
+    margin: auto;
+    max-width: 420px;
+    padding: 10px;
+  }
+
+  .left {
+    max-width: 150px;
+    display: inline-block;
+    vertical-align: top;
+    border: 1px;
+  }
+
+  .left:empty {
+    display: none;
+  }
+
+  .content {
+    display: inline-block;
+  }
+
+</style>
diff --git a/examples/named-views/pages/index/child/_id/index.vue b/examples/named-views/pages/index/child/_id/index.vue
new file mode 100644
index 0000000000..85ee3b0fa1
--- /dev/null
+++ b/examples/named-views/pages/index/child/_id/index.vue
@@ -0,0 +1,24 @@
+<template>
+  <div>
+    <h2>Child content</h2>
+    ID:{{ id }}
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Child',
+  validate({ params }) {
+    return !isNaN(+params.id)
+  },
+  computed: {
+    id() {
+      return this.$route.params.id
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/examples/named-views/pages/index/section.vue b/examples/named-views/pages/index/section.vue
new file mode 100644
index 0000000000..48834ac561
--- /dev/null
+++ b/examples/named-views/pages/index/section.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <h2>Section content</h2>
+    <p>This page does not have left panel.</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Section'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/examples/named-views/pages/main.vue b/examples/named-views/pages/main.vue
new file mode 100755
index 0000000000..14ca7e8693
--- /dev/null
+++ b/examples/named-views/pages/main.vue
@@ -0,0 +1,50 @@
+<template lang="html">
+  <div class="main">
+    <h1>Main page</h1>
+    <p>This is an example of a named views</p>
+    <ul>
+      <li>
+        <NuxtLink to="/">
+          Root
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/section">
+          Section
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/child/123">
+          Child 123
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/child/234">
+          Child 234
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/main">
+          Main page with named view in layout
+        </NuxtLink>
+      </li>
+    </ul>
+
+    <hr>
+    <p>At top of this page there is named view from layout!</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Main'
+}
+</script>
+
+<style scoped>
+  .main {
+    margin: auto;
+    max-width: 420px;
+    padding: 10px;
+  }
+</style>
diff --git a/examples/nested-components/components/post.vue b/examples/nested-components/components/post.vue
index 36a42e70b0..ef9cd8be11 100755
--- a/examples/nested-components/components/post.vue
+++ b/examples/nested-components/components/post.vue
@@ -1,15 +1,19 @@
 <template>
   <div class="main">
-    <h1 class="title">{{ title }}</h1>
+    <h1 class="title">
+      {{ title }}
+    </h1>
     <slot />
   </div>
 </template>
 
 <script>
 export default {
-  title: {
-    type: String,
-    default: ''
+  props: {
+    title: {
+      type: String,
+      default: ''
+    }
   }
 }
 </script>
diff --git a/examples/nested-components/package.json b/examples/nested-components/package.json
index a31c195e59..3bd53e3a76 100644
--- a/examples/nested-components/package.json
+++ b/examples/nested-components/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/nested-components/pages/index.vue b/examples/nested-components/pages/index.vue
index 95cb81b454..f53870294e 100755
--- a/examples/nested-components/pages/index.vue
+++ b/examples/nested-components/pages/index.vue
@@ -1,36 +1,36 @@
 <template lang="html">
   <div class="main">
-    <post title="My first blog post">
-      <v-p>Hello there</v-p>
-      <v-p>This is an example of a componentized blog post</v-p>
-    </post>
+    <Post title="My first blog post">
+      <VP>Hello there</VP>
+      <VP>This is an example of a componentized blog post</VP>
+    </Post>
 
-    <v-hr />
+    <VHr />
 
-    <post title="My second blog post">
-      <v-p>Hello there</v-p>
-      <v-p>This is another example.</v-p>
-      <v-p>Wa-hoo!</v-p>
-    </post>
+    <Post title="My second blog post">
+      <VP>Hello there</VP>
+      <VP>This is another example.</VP>
+      <VP>Wa-hoo!</VP>
+    </Post>
 
-    <v-hr />
+    <VHr />
 
-    <post title="The final blog post">
-      <v-p>C'est la fin !</v-p>
-    </post>
+    <Post title="The final blog post">
+      <VP>C'est la fin !</VP>
+    </Post>
   </div>
 </template>
 
 <script>
 import Post from '~/components/post'
-import vP from '~/components/paragraph'
-const vHr = { render: h => h('hr', { class: 'hr' }) }
+import VP from '~/components/paragraph'
+const VHr = { render: h => h('hr', { class: 'hr' }) }
 
 export default {
   components: {
     Post,
-    'v-p': vP,
-    'v-hr': vHr
+    VP,
+    VHr
   }
 }
 </script>
diff --git a/examples/nested-routes/package.json b/examples/nested-routes/package.json
index e0c2566d29..0def519291 100644
--- a/examples/nested-routes/package.json
+++ b/examples/nested-routes/package.json
@@ -7,6 +7,7 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate"
+    "generate": "nuxt generate",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/nested-routes/pages/index.vue b/examples/nested-routes/pages/index.vue
index 08322f2f44..ca2d64976c 100644
--- a/examples/nested-routes/pages/index.vue
+++ b/examples/nested-routes/pages/index.vue
@@ -1,15 +1,21 @@
 <template>
   <div class="container">
     <div class="left">
-      <h2><nuxt-link to="/">Players</nuxt-link></h2>
+      <h2>
+        <NuxtLink to="/">
+          Players
+        </NuxtLink>
+      </h2>
       <ul class="players">
         <li v-for="user in users" :key="user.id">
-          <nuxt-link :to="'/'+user.id">{{ user.name }}</nuxt-link>
+          <NuxtLink :to="'/'+user.id">
+            {{ user.name }}
+          </NuxtLink>
         </li>
       </ul>
     </div>
     <div class="right">
-      <nuxt-child :key="$route.params.id" />
+      <NuxtChild :key="$route.params.id" />
     </div>
   </div>
 </template>
diff --git a/examples/no-ssr/package.json b/examples/no-ssr/package.json
index 9e0a43e9a6..04868bb2d9 100644
--- a/examples/no-ssr/package.json
+++ b/examples/no-ssr/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/no-ssr/pages/index.vue b/examples/no-ssr/pages/index.vue
index b36a31faa3..a6942c6d24 100755
--- a/examples/no-ssr/pages/index.vue
+++ b/examples/no-ssr/pages/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="page">
     <h1>Home</h1>
-    <no-ssr placeholder="Loading...">
+    <NoSsr placeholder="Loading...">
       <h2>This part is rendered on the client-side only</h2>
-    </no-ssr>
-    <no-ssr>
+    </NoSsr>
+    <NoSsr>
       <p><code>placeholder</code> prop is optional</p>
-    </no-ssr>
+    </NoSsr>
   </div>
 </template>
 
diff --git a/examples/nuxt-prefetch/README.md b/examples/nuxt-prefetch/README.md
new file mode 100644
index 0000000000..9907d2f545
--- /dev/null
+++ b/examples/nuxt-prefetch/README.md
@@ -0,0 +1,3 @@
+# Example of Nuxt.js prefetching
+
+Learn more at https://github.com/nuxt/nuxt.js/pull/4574
diff --git a/examples/nuxt-prefetch/assets/check.svg b/examples/nuxt-prefetch/assets/check.svg
new file mode 100644
index 0000000000..bb093ca332
--- /dev/null
+++ b/examples/nuxt-prefetch/assets/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#41b883" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check"><polyline points="20 6 9 17 4 12"></polyline></svg>
diff --git a/examples/nuxt-prefetch/layouts/default.vue b/examples/nuxt-prefetch/layouts/default.vue
new file mode 100644
index 0000000000..a8c577b30c
--- /dev/null
+++ b/examples/nuxt-prefetch/layouts/default.vue
@@ -0,0 +1,57 @@
+<template>
+  <div>
+    <div v-if="$nuxt.isOffline" class="offline">
+      You are offline
+    </div>
+    <div class="container">
+      <h1>{{ $route.name }}</h1>
+      <Nuxt />
+    </div>
+  </div>
+</template>
+
+<style>
+body {
+  padding: 0;
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+}
+.container {
+  padding: 10px 20px;
+  padding-bottom: 40px;
+}
+.offline {
+  background: #3B8070;
+  color: white;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 10px;
+}
+a {
+  display: block;
+  padding: 10px 10px 10px 0px;
+  margin: 20px 0;
+  font-size: 20px;
+  border-bottom: 2px #ddd solid;
+  color: #3B8070;
+  text-decoration: none;
+  transition: border-bottom-color 0.3s linear;
+}
+a:hover,
+a.nuxt-link-exact-active {
+  background-color: rgb(245, 245, 245);
+}
+a.nuxt-link-prefetched:after {
+  content: '';
+  display: inline-block;
+  background: url('../assets/check.svg') no-repeat;
+  background-size: 14px;
+  width: 14px;
+  height: 14px;
+  position: relative;
+  right: -3px;
+  top: 1px;
+}
+</style>
diff --git a/examples/nuxt-prefetch/nuxt.config.js b/examples/nuxt-prefetch/nuxt.config.js
new file mode 100644
index 0000000000..dc2118bd9c
--- /dev/null
+++ b/examples/nuxt-prefetch/nuxt.config.js
@@ -0,0 +1,22 @@
+export default {
+  head: {
+    titleTemplate: '%s - NuxtJS Prefetching',
+    htmlAttrs: { lang: 'en' },
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' }
+    ],
+    // Support polyfill for browsers that don't support it (Safari Mobile for example)
+    script: [
+      { src: 'https://polyfill.io/v2/polyfill.min.js?features=IntersectionObserver', body: true }
+    ]
+  },
+  router: {
+    // To disable prefetching, uncomment the line
+    // prefetchLinks: false
+
+    // Activate prefetched class (default: false)
+    // Used to display the check mark next to the prefetched link
+    linkPrefetchedClass: 'nuxt-link-prefetched'
+  }
+}
diff --git a/examples/nuxt-prefetch/package.json b/examples/nuxt-prefetch/package.json
new file mode 100644
index 0000000000..6747461236
--- /dev/null
+++ b/examples/nuxt-prefetch/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "example-nuxt-prefetch",
+  "dependencies": {
+    "nuxt-edge": "latest"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
+  }
+}
diff --git a/examples/nuxt-prefetch/pages/accelerated.vue b/examples/nuxt-prefetch/pages/accelerated.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/accelerated.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/active.vue b/examples/nuxt-prefetch/pages/active.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/active.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/agile.vue b/examples/nuxt-prefetch/pages/agile.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/agile.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/brisk.vue b/examples/nuxt-prefetch/pages/brisk.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/brisk.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/dashing.vue b/examples/nuxt-prefetch/pages/dashing.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/dashing.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/electric.vue b/examples/nuxt-prefetch/pages/electric.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/electric.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/flashing.vue b/examples/nuxt-prefetch/pages/flashing.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/flashing.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/fleet.vue b/examples/nuxt-prefetch/pages/fleet.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/fleet.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/fleeting.vue b/examples/nuxt-prefetch/pages/fleeting.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/fleeting.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/flying.vue b/examples/nuxt-prefetch/pages/flying.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/flying.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/hot.vue b/examples/nuxt-prefetch/pages/hot.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/hot.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/hurried.vue b/examples/nuxt-prefetch/pages/hurried.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/hurried.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/index.vue b/examples/nuxt-prefetch/pages/index.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/nimble.vue b/examples/nuxt-prefetch/pages/nimble.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/nimble.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/quick.vue b/examples/nuxt-prefetch/pages/quick.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/quick.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/racing.vue b/examples/nuxt-prefetch/pages/racing.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/racing.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/rapid.vue b/examples/nuxt-prefetch/pages/rapid.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/rapid.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/ready.vue b/examples/nuxt-prefetch/pages/ready.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/ready.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/snap.vue b/examples/nuxt-prefetch/pages/snap.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/snap.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/swift.vue b/examples/nuxt-prefetch/pages/swift.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/swift.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/pages/winged.vue b/examples/nuxt-prefetch/pages/winged.vue
new file mode 100755
index 0000000000..de9c09d6d0
--- /dev/null
+++ b/examples/nuxt-prefetch/pages/winged.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <NuxtLink v-for="link of $store.state.links" :key="link" :to="{ name: link }">
+      /{{ link }}
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$route.name
+    }
+  }
+}
+</script>
diff --git a/examples/nuxt-prefetch/store/index.js b/examples/nuxt-prefetch/store/index.js
new file mode 100644
index 0000000000..0295063e7e
--- /dev/null
+++ b/examples/nuxt-prefetch/store/index.js
@@ -0,0 +1,25 @@
+export const state = () => ({
+  links: [
+    'index',
+    'agile',
+    'brisk',
+    'hot',
+    'nimble',
+    'quick',
+    'rapid',
+    'swift',
+    'accelerated',
+    'active',
+    'dashing',
+    'electric',
+    'flashing',
+    'fleet',
+    'fleeting',
+    'flying',
+    'hurried',
+    'racing',
+    'ready',
+    'snap',
+    'winged'
+  ]
+})
diff --git a/examples/plugins-vendor/package.json b/examples/plugins-vendor/package.json
index 462fd003ba..a0b64fe62b 100644
--- a/examples/plugins-vendor/package.json
+++ b/examples/plugins-vendor/package.json
@@ -9,6 +9,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/plugins-vendor/pages/about.vue b/examples/plugins-vendor/pages/about.vue
index c0fcbe822c..963a40bf2e 100644
--- a/examples/plugins-vendor/pages/about.vue
+++ b/examples/plugins-vendor/pages/about.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="container">
     <img :src="thumbnailUrl">
-    <p><nuxt-link to="/">Home</nuxt-link> - About</p>
+    <p>
+      <NuxtLink to="/">
+        Home
+      </NuxtLink> - About
+    </p>
   </div>
 </template>
 
diff --git a/examples/plugins-vendor/pages/index.vue b/examples/plugins-vendor/pages/index.vue
index f30f8f558f..718f199273 100644
--- a/examples/plugins-vendor/pages/index.vue
+++ b/examples/plugins-vendor/pages/index.vue
@@ -1,7 +1,15 @@
 <template>
   <div class="container">
-    <p><button @click="showLoginError">Notif me!</button></p>
-    <p>Home - <nuxt-link to="/about">About</nuxt-link></p>
+    <p>
+      <button @click="showLoginError">
+        Notif me!
+      </button>
+    </p>
+    <p>
+      Home - <NuxtLink to="/about">
+        About
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/pug/README.md b/examples/pug/README.md
new file mode 100644
index 0000000000..8fc6026c97
--- /dev/null
+++ b/examples/pug/README.md
@@ -0,0 +1,3 @@
+# Nuxt.js with Pug
+
+No further packages needed. It works out of the box.
diff --git a/examples/pug/package.json b/examples/pug/package.json
new file mode 100644
index 0000000000..213ddefa3a
--- /dev/null
+++ b/examples/pug/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "example-pug",
+  "dependencies": {
+    "nuxt-edge": "latest",
+    "pug": "^2.0.3",
+    "pug-loader": "^2.4.0"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
+  }
+}
diff --git a/examples/pug/pages/about.vue b/examples/pug/pages/about.vue
new file mode 100755
index 0000000000..56d127ccbc
--- /dev/null
+++ b/examples/pug/pages/about.vue
@@ -0,0 +1,18 @@
+<template lang="pug">
+  div
+    p Hi from {{ name }}
+    NuxtLink(to="/") Home Page
+</template>
+
+<script>
+export default {
+  asyncData() {
+    return {
+      name: process.static ? 'static' : (process.server ? 'server' : 'client')
+    }
+  },
+  head: {
+    title: 'About page'
+  }
+}
+</script>
diff --git a/examples/pug/pages/index.vue b/examples/pug/pages/index.vue
new file mode 100755
index 0000000000..7029972991
--- /dev/null
+++ b/examples/pug/pages/index.vue
@@ -0,0 +1,13 @@
+<template lang="pug">
+  div
+    h1 Welcome
+    NuxtLink(to="/about") About Page
+</template>
+
+<script>
+export default {
+  head: {
+    title: 'Home page'
+  }
+}
+</script>
diff --git a/examples/routes-meta/layouts/default.vue b/examples/routes-meta/layouts/default.vue
index 5012714058..a07cf43941 100644
--- a/examples/routes-meta/layouts/default.vue
+++ b/examples/routes-meta/layouts/default.vue
@@ -1,11 +1,17 @@
 <template>
   <div :class="$store.state.theme" class="theme">
     <div class="nav horizontal-align">
-      <nuxt-link class="nav-item" to="/">Home</nuxt-link>
-      <nuxt-link class="nav-item" to="/about">About</nuxt-link>
-      <nuxt-link class="nav-item" to="/parent">Parent page</nuxt-link>
+      <NuxtLink class="nav-item" to="/">
+        Home
+      </NuxtLink>
+      <NuxtLink class="nav-item" to="/about">
+        About
+      </NuxtLink>
+      <NuxtLink class="nav-item" to="/parent">
+        Parent page
+      </NuxtLink>
     </div>
-    <nuxt class="container" />
+    <Nuxt class="container" />
   </div>
 </template>
 
diff --git a/examples/routes-meta/package.json b/examples/routes-meta/package.json
index 6415c914b5..e159a20711 100644
--- a/examples/routes-meta/package.json
+++ b/examples/routes-meta/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/routes-meta/pages/index.vue b/examples/routes-meta/pages/index.vue
index 2e31ae4815..0eeec0bb91 100644
--- a/examples/routes-meta/pages/index.vue
+++ b/examples/routes-meta/pages/index.vue
@@ -1,13 +1,16 @@
 <template>
   <div>
     <h1>Page with meta</h1>
-    <p>This example is made to illustrate the usafe of
+    <p>
+      This example is made to illustrate the usafe of
       <code>meta</code> inside the page components.
     </p>
-    <p>We have a middleware setup in
+    <p>
+      We have a middleware setup in
       <code>~/middleware/theme.js</code> used to get which theme has to be applied and commit it to the store.
     </p>
-    <p>Then, in our layout, we simply use
+    <p>
+      Then, in our layout, we simply use
       <code>$store.state.theme</code> as a class to change our CSS dynamically.
     </p>
   </div>
diff --git a/examples/routes-meta/pages/parent.vue b/examples/routes-meta/pages/parent.vue
index c207293965..f679baafac 100644
--- a/examples/routes-meta/pages/parent.vue
+++ b/examples/routes-meta/pages/parent.vue
@@ -2,8 +2,10 @@
   <div>
     <h1>Parent</h1>
     Checkout
-    <nuxt-link to="/parent/blue">Blue page</nuxt-link>
-    <nuxt-child />
+    <NuxtLink to="/parent/blue">
+      Blue page
+    </NuxtLink>
+    <NuxtChild />
   </div>
 </template>
 
diff --git a/examples/routes-meta/pages/parent/blue.vue b/examples/routes-meta/pages/parent/blue.vue
index 07ea5f6401..ec654910a4 100644
--- a/examples/routes-meta/pages/parent/blue.vue
+++ b/examples/routes-meta/pages/parent/blue.vue
@@ -2,8 +2,11 @@
   <div>
     <h3>I am the blue page</h3>
     <p>I am a child of /parent, and the theme is overwritten by myself!</p>
-    <p>Go back to
-      <nuxt-link to="/parent">Parent</nuxt-link>
+    <p>
+      Go back to
+      <NuxtLink to="/parent">
+        Parent
+      </NuxtLink>
     </p>
   </div>
 </template>
diff --git a/examples/routes-transitions/package.json b/examples/routes-transitions/package.json
index be3c562d44..4fa70badf9 100644
--- a/examples/routes-transitions/package.json
+++ b/examples/routes-transitions/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/routes-transitions/pages/about.vue b/examples/routes-transitions/pages/about.vue
index bfeea07ec2..33199b54d3 100644
--- a/examples/routes-transitions/pages/about.vue
+++ b/examples/routes-transitions/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="container">
     <h1>About page</h1>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/routes-transitions/pages/index.vue b/examples/routes-transitions/pages/index.vue
index fe5ce74005..9e6c927d20 100644
--- a/examples/routes-transitions/pages/index.vue
+++ b/examples/routes-transitions/pages/index.vue
@@ -1,7 +1,15 @@
 <template>
   <div class="container">
     <h1>Home page</h1>
-    <p><nuxt-link to="/about">About page</nuxt-link></p>
-    <p><nuxt-link to="/users">Lists of users</nuxt-link></p>
+    <p>
+      <NuxtLink to="/about">
+        About page
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/users">
+        Lists of users
+      </NuxtLink>
+    </p>
   </div>
 </template>
diff --git a/examples/routes-transitions/pages/users.vue b/examples/routes-transitions/pages/users.vue
index b738da77f1..c1cd619b74 100644
--- a/examples/routes-transitions/pages/users.vue
+++ b/examples/routes-transitions/pages/users.vue
@@ -1,17 +1,29 @@
 <template>
   <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>
+    <NuxtLink v-if="page > 1" :to="'?page=' + (page - 1)">
+      &lt; Prev
+    </NuxtLink>
+    <a v-else class="disabled">
+      &lt; Prev
+    </a>
     <span>{{ page }}/{{ totalPages }}</span>
-    <nuxt-link v-if="page < totalPages" :to="'?page=' + (page + 1)">Next &gt;</nuxt-link>
-    <a v-else class="disabled">Next &gt;</a>
+    <NuxtLink v-if="page < totalPages" :to="'?page=' + (page + 1)">
+      Next &gt;
+    </NuxtLink>
+    <a v-else class="disabled">
+      Next &gt;
+    </a>
     <ul>
       <li v-for="user in users" :key="user.id">
         <img :src="user.avatar" class="avatar">
         <span>{{ user.first_name }} {{ user.last_name }}</span>
       </li>
     </ul>
-    <p><nuxt-link to="/">Back home</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        Back home
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
@@ -21,7 +33,7 @@ import axios from 'axios'
 export default {
   // Watch for $route.query.page to call Component methods (asyncData, fetch, validate, layout, etc.)
   watchQuery: ['page'],
-  // Key for <nuxt-child> (transitions)
+  // Key for <NuxtChild> (transitions)
   key: to => to.fullPath,
   // Called to know which transition to apply
   transition(to, from) {
diff --git a/examples/scroll-behavior/layouts/default2.vue b/examples/scroll-behavior/layouts/default2.vue
new file mode 100644
index 0000000000..5d3ae9c407
--- /dev/null
+++ b/examples/scroll-behavior/layouts/default2.vue
@@ -0,0 +1,3 @@
+<template>
+  <Nuxt />
+</template>
diff --git a/examples/scroll-behavior/nuxt.config.js b/examples/scroll-behavior/nuxt.config.js
index 737f516991..c236197313 100644
--- a/examples/scroll-behavior/nuxt.config.js
+++ b/examples/scroll-behavior/nuxt.config.js
@@ -1,3 +1,4 @@
 export default {
-  css: ['~/assets/main.css']
+  css: ['~/assets/main.css'],
+  modules: ['@nuxtjs/axios']
 }
diff --git a/examples/scroll-behavior/package.json b/examples/scroll-behavior/package.json
index ba290bcd74..19c77bab1d 100644
--- a/examples/scroll-behavior/package.json
+++ b/examples/scroll-behavior/package.json
@@ -1,13 +1,14 @@
 {
   "name": "example-scroll-behavior",
   "dependencies": {
-    "axios": "^0.15.3",
+    "@nuxtjs/axios": "^5.3.6",
     "nuxt-edge": "latest",
     "vue-router": "https://github.com/homerjam/vue-router#dist"
   },
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/scroll-behavior/pages/about.vue b/examples/scroll-behavior/pages/about.vue
index 79d7d2c09e..837e71361d 100644
--- a/examples/scroll-behavior/pages/about.vue
+++ b/examples/scroll-behavior/pages/about.vue
@@ -3,14 +3,20 @@
     <h1>About page</h1>
     <ul>
       <li>
-        <nuxt-link to="/about/profile">Profile</nuxt-link>
+        <NuxtLink to="/about/profile">
+          Profile
+        </NuxtLink>
       </li>
       <li>
-        <nuxt-link to="/about/contact">Contact</nuxt-link>
+        <NuxtLink to="/about/contact">
+          Contact
+        </NuxtLink>
       </li>
     </ul>
-    <nuxt-child />
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtChild />
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/scroll-behavior/pages/another-long.vue b/examples/scroll-behavior/pages/another-long.vue
new file mode 100644
index 0000000000..365451a6e7
--- /dev/null
+++ b/examples/scroll-behavior/pages/another-long.vue
@@ -0,0 +1,16 @@
+<template>
+  <div class="container">
+    <h1>Another long page</h1>
+    <div class="spacer" style="width: 100%; height: 3000px; background: darkgreen" />
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  layout: 'default2',
+  scrollToTop: true
+}
+</script>
diff --git a/examples/scroll-behavior/pages/index.vue b/examples/scroll-behavior/pages/index.vue
index ee81801479..2c108144bc 100644
--- a/examples/scroll-behavior/pages/index.vue
+++ b/examples/scroll-behavior/pages/index.vue
@@ -1,10 +1,31 @@
 <template>
   <div class="container">
     <h1>Home page</h1>
-    <p><nuxt-link to="/about">About page</nuxt-link></p>
-    <p><nuxt-link to="/users">Lists of users</nuxt-link></p>
-    <p><nuxt-link to="/long">Long page</nuxt-link></p>
-    <p><nuxt-link to="/long#anchor">Long page #anchor</nuxt-link></p>
+    <p>
+      <NuxtLink to="/about">
+        About page
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/users">
+        Lists of users
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/long">
+        Long page
+      </NuxtLink>
+    </p>
+    <p>
+      <NuxtLink to="/long#anchor">
+        Long page #anchor
+      </NuxtLink>
+    </p>
     <div class="spacer" style="width: 100%; height: 3000px; background: grey" />
+    <p>
+      <NuxtLink to="/another-long">
+        Another long page
+      </NuxtLink>
+    </p>
   </div>
 </template>
diff --git a/examples/scroll-behavior/pages/long.vue b/examples/scroll-behavior/pages/long.vue
index eb4fd41ef5..2449147789 100644
--- a/examples/scroll-behavior/pages/long.vue
+++ b/examples/scroll-behavior/pages/long.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="container">
     <h1>Long page</h1>
-    <p><a href="#anchor">Go to anchor</a></p>
+    <p>
+      <a href="#anchor">
+        Go to anchor
+      </a>
+    </p>
     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque turpis, tempor vitae accumsan eget, bibendum eget dui. Vestibulum fringilla mi ac nunc malesuada accumsan. Proin mattis, ex vitae rhoncus dapibus, tellus tortor tincidunt metus, sed scelerisque dolor nunc rhoncus enim. Pellentesque semper interdum quam in placerat. Sed ut finibus mi. Aliquam placerat tellus ac tincidunt sodales. Quisque pharetra neque a risus placerat, sed suscipit felis mattis. Maecenas pretium efficitur fringilla. Sed commodo leo congue velit pretium, in consequat ex egestas. Pellentesque gravida vitae elit varius condimentum. Fusce in magna tellus. Proin in odio ac est elementum pharetra.</p>
     <p>Vivamus dapibus libero sem, eu sagittis lorem hendrerit id. Suspendisse faucibus sapien quis cursus lobortis. Phasellus blandit tellus at arcu ornare fermentum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Morbi ac massa sollicitudin, lacinia lacus porta, cursus mi. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc aliquam quis elit ut maximus. Integer blandit ipsum sed elit laoreet consequat. Pellentesque quis volutpat tellus, vitae finibus nulla. Etiam a porta orci. Morbi at libero sit amet tortor eleifend congue. Integer egestas fermentum lacinia. Curabitur dignissim, enim eget consectetur tempor, lacus felis auctor ante, in egestas arcu turpis ut tellus. Phasellus mattis dictum leo, a gravida purus tristique sed. Pellentesque sollicitudin arcu eu augue vehicula, molestie hendrerit sapien mollis.</p>
     <p>Nunc ullamcorper magna nunc, vitae vestibulum est laoreet vel. Aliquam erat volutpat. Duis vehicula ligula at justo egestas posuere. Mauris pharetra nulla ac pretium eleifend. Mauris purus eros, venenatis sollicitudin ornare id, mattis in lorem. Curabitur tortor magna, viverra eget lorem ultricies, aliquam aliquam libero. Maecenas vestibulum id libero sed fermentum. Praesent consequat dui sed pellentesque commodo. Curabitur finibus purus vel purus mattis luctus. Nullam maximus dapibus orci, ac mattis diam egestas vel. Praesent lorem dolor, congue quis gravida commodo, rhoncus nec justo. In et elementum augue. Donec fringilla imperdiet magna, quis luctus leo placerat sed. Morbi scelerisque in sem eu dapibus. Sed interdum, felis luctus semper viverra, ex lorem posuere velit, in bibendum nunc dolor et diam.</p>
@@ -12,7 +16,9 @@
     <p>Nunc ullamcorper magna nunc, vitae vestibulum est laoreet vel. Aliquam erat volutpat. Duis vehicula ligula at justo egestas posuere. Mauris pharetra nulla ac pretium eleifend. Mauris purus eros, venenatis sollicitudin ornare id, mattis in lorem. Curabitur tortor magna, viverra eget lorem ultricies, aliquam aliquam libero. Maecenas vestibulum id libero sed fermentum. Praesent consequat dui sed pellentesque commodo. Curabitur finibus purus vel purus mattis luctus. Nullam maximus dapibus orci, ac mattis diam egestas vel. Praesent lorem dolor, congue quis gravida commodo, rhoncus nec justo. In et elementum augue. Donec fringilla imperdiet magna, quis luctus leo placerat sed. Morbi scelerisque in sem eu dapibus. Sed interdum, felis luctus semper viverra, ex lorem posuere velit, in bibendum nunc dolor et diam.</p>
     <p>Duis pulvinar lorem vel tempus pellentesque. Vivamus imperdiet imperdiet augue, ac rhoncus velit vulputate eu. Sed sed nulla risus. Curabitur ut velit consectetur, semper velit quis, elementum tellus. Ut eget ligula eget leo porta vestibulum. Curabitur ligula magna, rutrum ut enim vitae, gravida sollicitudin augue. Aliquam auctor gravida mauris, nec feugiat ipsum mollis vel. Vivamus nec aliquet ipsum, id scelerisque nibh. Vestibulum iaculis eleifend nunc, vitae efficitur massa egestas et. Ut pulvinar, purus eget viverra sodales, est mauris luctus metus, non luctus tellus diam in elit.</p>
     <p>Quisque sollicitudin non urna non consectetur. Cras quis dapibus nisi. Maecenas maximus rhoncus neque, a lacinia urna egestas nec. Morbi molestie odio sit amet tempus cursus. Vivamus lorem nunc, malesuada et maximus id, imperdiet eget felis. Ut elementum fringilla velit in mattis. Morbi ut laoreet mi. Aliquam et odio dignissim, fermentum purus sit amet, facilisis lorem. Donec semper mi ut semper tristique. Sed in dolor placerat, porta elit in, tempor felis. Integer metus erat, tristique efficitur quam quis, finibus blandit magna. Nunc sit amet lorem dui. Suspendisse ut vulputate nisi. Integer sit amet sollicitudin libero.</p>
-    <h2 id="anchor">Anchor</h2>
+    <h2 id="anchor">
+      Anchor
+    </h2>
     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam neque turpis, tempor vitae accumsan eget, bibendum eget dui. Vestibulum fringilla mi ac nunc malesuada accumsan. Proin mattis, ex vitae rhoncus dapibus, tellus tortor tincidunt metus, sed scelerisque dolor nunc rhoncus enim. Pellentesque semper interdum quam in placerat. Sed ut finibus mi. Aliquam placerat tellus ac tincidunt sodales. Quisque pharetra neque a risus placerat, sed suscipit felis mattis. Maecenas pretium efficitur fringilla. Sed commodo leo congue velit pretium, in consequat ex egestas. Pellentesque gravida vitae elit varius condimentum. Fusce in magna tellus. Proin in odio ac est elementum pharetra.</p>
     <p>Vivamus dapibus libero sem, eu sagittis lorem hendrerit id. Suspendisse faucibus sapien quis cursus lobortis. Phasellus blandit tellus at arcu ornare fermentum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Morbi ac massa sollicitudin, lacinia lacus porta, cursus mi. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc aliquam quis elit ut maximus. Integer blandit ipsum sed elit laoreet consequat. Pellentesque quis volutpat tellus, vitae finibus nulla. Etiam a porta orci. Morbi at libero sit amet tortor eleifend congue. Integer egestas fermentum lacinia. Curabitur dignissim, enim eget consectetur tempor, lacus felis auctor ante, in egestas arcu turpis ut tellus. Phasellus mattis dictum leo, a gravida purus tristique sed. Pellentesque sollicitudin arcu eu augue vehicula, molestie hendrerit sapien mollis.</p>
     <p>Nunc ullamcorper magna nunc, vitae vestibulum est laoreet vel. Aliquam erat volutpat. Duis vehicula ligula at justo egestas posuere. Mauris pharetra nulla ac pretium eleifend. Mauris purus eros, venenatis sollicitudin ornare id, mattis in lorem. Curabitur tortor magna, viverra eget lorem ultricies, aliquam aliquam libero. Maecenas vestibulum id libero sed fermentum. Praesent consequat dui sed pellentesque commodo. Curabitur finibus purus vel purus mattis luctus. Nullam maximus dapibus orci, ac mattis diam egestas vel. Praesent lorem dolor, congue quis gravida commodo, rhoncus nec justo. In et elementum augue. Donec fringilla imperdiet magna, quis luctus leo placerat sed. Morbi scelerisque in sem eu dapibus. Sed interdum, felis luctus semper viverra, ex lorem posuere velit, in bibendum nunc dolor et diam.</p>
@@ -23,7 +29,9 @@
     <p>Nunc ullamcorper magna nunc, vitae vestibulum est laoreet vel. Aliquam erat volutpat. Duis vehicula ligula at justo egestas posuere. Mauris pharetra nulla ac pretium eleifend. Mauris purus eros, venenatis sollicitudin ornare id, mattis in lorem. Curabitur tortor magna, viverra eget lorem ultricies, aliquam aliquam libero. Maecenas vestibulum id libero sed fermentum. Praesent consequat dui sed pellentesque commodo. Curabitur finibus purus vel purus mattis luctus. Nullam maximus dapibus orci, ac mattis diam egestas vel. Praesent lorem dolor, congue quis gravida commodo, rhoncus nec justo. In et elementum augue. Donec fringilla imperdiet magna, quis luctus leo placerat sed. Morbi scelerisque in sem eu dapibus. Sed interdum, felis luctus semper viverra, ex lorem posuere velit, in bibendum nunc dolor et diam.</p>
     <p>Duis pulvinar lorem vel tempus pellentesque. Vivamus imperdiet imperdiet augue, ac rhoncus velit vulputate eu. Sed sed nulla risus. Curabitur ut velit consectetur, semper velit quis, elementum tellus. Ut eget ligula eget leo porta vestibulum. Curabitur ligula magna, rutrum ut enim vitae, gravida sollicitudin augue. Aliquam auctor gravida mauris, nec feugiat ipsum mollis vel. Vivamus nec aliquet ipsum, id scelerisque nibh. Vestibulum iaculis eleifend nunc, vitae efficitur massa egestas et. Ut pulvinar, purus eget viverra sodales, est mauris luctus metus, non luctus tellus diam in elit.</p>
     <p>Quisque sollicitudin non urna non consectetur. Cras quis dapibus nisi. Maecenas maximus rhoncus neque, a lacinia urna egestas nec. Morbi molestie odio sit amet tempus cursus. Vivamus lorem nunc, malesuada et maximus id, imperdiet eget felis. Ut elementum fringilla velit in mattis. Morbi ut laoreet mi. Aliquam et odio dignissim, fermentum purus sit amet, facilisis lorem. Donec semper mi ut semper tristique. Sed in dolor placerat, porta elit in, tempor felis. Integer metus erat, tristique efficitur quam quis, finibus blandit magna. Nunc sit amet lorem dui. Suspendisse ut vulputate nisi. Integer sit amet sollicitudin libero.</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/scroll-behavior/pages/users.vue b/examples/scroll-behavior/pages/users.vue
index b738da77f1..73885ed5c4 100644
--- a/examples/scroll-behavior/pages/users.vue
+++ b/examples/scroll-behavior/pages/users.vue
@@ -1,36 +1,47 @@
 <template>
   <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>
+    <NuxtLink v-if="page > 1" :to="'?page=' + (page - 1)">
+      &lt; Prev
+    </NuxtLink>
+    <a v-else class="disabled">
+      &lt; Prev
+    </a>
     <span>{{ page }}/{{ totalPages }}</span>
-    <nuxt-link v-if="page < totalPages" :to="'?page=' + (page + 1)">Next &gt;</nuxt-link>
-    <a v-else class="disabled">Next &gt;</a>
+    <NuxtLink v-if="page < totalPages" :to="'?page=' + (page + 1)">
+      Next &gt;
+    </NuxtLink>
+    <a v-else class="disabled">
+      Next &gt;
+    </a>
     <ul>
       <li v-for="user in users" :key="user.id">
         <img :src="user.avatar" class="avatar">
         <span>{{ user.first_name }} {{ user.last_name }}</span>
       </li>
     </ul>
-    <p><nuxt-link to="/">Back home</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        Back home
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
 <script>
-import axios from 'axios'
 
 export default {
   // Watch for $route.query.page to call Component methods (asyncData, fetch, validate, layout, etc.)
   watchQuery: ['page'],
-  // Key for <nuxt-child> (transitions)
+  // Key for <NuxtChild> (transitions)
   key: to => to.fullPath,
   // Called to know which transition to apply
   transition(to, from) {
     if (!from) return 'slide-left'
     return +to.query.page < +from.query.page ? 'slide-right' : 'slide-left'
   },
-  async asyncData({ query }) {
+  async asyncData({ query, $axios }) {
     const page = +query.page || 1
-    const { data } = await axios.get(`https://reqres.in/api/users?page=${page}`)
+    const data = await $axios.$get(`https://reqres.in/api/users?page=${page}`)
     return {
       page: +data.page,
       totalPages: data.total_pages,
diff --git a/examples/spa/package.json b/examples/spa/package.json
index 90b978cbf7..1fc945316e 100644
--- a/examples/spa/package.json
+++ b/examples/spa/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt"
+    "start": "nuxt",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/spa/pages/about.vue b/examples/spa/pages/about.vue
index 78419630fe..1becf63e29 100644
--- a/examples/spa/pages/about.vue
+++ b/examples/spa/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <p>Hi from {{ name }}</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/spa/pages/index.vue b/examples/spa/pages/index.vue
index 9655d7d866..74922a3527 100644
--- a/examples/spa/pages/index.vue
+++ b/examples/spa/pages/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
     <h1>Welcome!</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
diff --git a/examples/static-images/package.json b/examples/static-images/package.json
index 27726600c3..5ea6218cff 100644
--- a/examples/static-images/package.json
+++ b/examples/static-images/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/static-images/pages/about.vue b/examples/static-images/pages/about.vue
index 71dc2952fe..1581f4242e 100644
--- a/examples/static-images/pages/about.vue
+++ b/examples/static-images/pages/about.vue
@@ -3,7 +3,11 @@
     <img src="~static/nuxt-black.png">
     <h2>Thank you for testing nuxt.js</h2>
     <p>Loaded from the {{ name }}</p>
-    <p><nuxt-link to="/">Back home</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        Back home
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/static-images/pages/index.vue b/examples/static-images/pages/index.vue
index 82a5d321ca..92d956cf68 100644
--- a/examples/static-images/pages/index.vue
+++ b/examples/static-images/pages/index.vue
@@ -2,7 +2,11 @@
   <div class="container">
     <img src="nuxt.png">
     <h2>Hello World.</h2>
-    <p><nuxt-link to="/about">About</nuxt-link></p>
+    <p>
+      <NuxtLink to="/about">
+        About
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/storybook/components/Button.vue b/examples/storybook/components/Button.vue
index 250aa018b6..2bcefd8335 100644
--- a/examples/storybook/components/Button.vue
+++ b/examples/storybook/components/Button.vue
@@ -1,5 +1,7 @@
 <template>
-  <button :style="{color: color, borderColor: color}" :class="{rounded: rounded}" class="wr-button" @click="handleClick"><slot />!</button>
+  <button :style="{color: color, borderColor: color}" :class="{rounded: rounded}" class="wr-button" @click="handleClick">
+    <slot />!
+  </button>
 </template>
 
 <script>
diff --git a/examples/storybook/components/Layout.vue b/examples/storybook/components/Layout.vue
index ffd1dffca9..70ad04e579 100644
--- a/examples/storybook/components/Layout.vue
+++ b/examples/storybook/components/Layout.vue
@@ -16,7 +16,9 @@
               <v-list-tile-title>{{ item.title }}</v-list-tile-title>
             </v-list-tile-content>
             <v-list-tile-action>
-              <v-icon v-if="item.items">keyboard_arrow_down</v-icon>
+              <v-icon v-if="item.items">
+                keyboard_arrow_down
+              </v-icon>
             </v-list-tile-action>
           </v-list-tile>
           <v-list-tile v-for="subItem in item.items" :key="subItem.title">
@@ -29,7 +31,6 @@
           </v-list-tile>
         </v-list-group>
       </v-list>
-
     </v-navigation-drawer>
     <v-toolbar app fixed clipped-left>
       <v-toolbar-side-icon @click.stop="drawer = !drawer" />
@@ -40,7 +41,9 @@
         <v-layout row wrap>
           <v-flex xs12>
             <v-card dark color="primary">
-              <v-card-text class="px-0"><slot /></v-card-text>
+              <v-card-text class="px-0">
+                <slot />
+              </v-card-text>
             </v-card>
           </v-flex>
         </v-layout>
@@ -50,12 +53,13 @@
         <v-layout justify-center align-center>
           <v-tooltip right>
             <v-btn slot="activator" :href="source" icon large target="_blank">
-              <v-icon large>code</v-icon>
+              <v-icon large>
+                code
+              </v-icon>
             </v-btn>
             <span>Source</span>
           </v-tooltip>
         </v-layout>
-
       </v-container>
     </v-content>
     <v-footer app fixed>
diff --git a/examples/storybook/components/Welcome.vue b/examples/storybook/components/Welcome.vue
index 686b6659ef..1d4d67fcc9 100644
--- a/examples/storybook/components/Welcome.vue
+++ b/examples/storybook/components/Welcome.vue
@@ -7,7 +7,8 @@
           This is a UI component dev environment for your app.
         </p>
 
-        <p>The repo for this project exists here
+        <p>
+          The repo for this project exists here
           <a
             class="link"
             href="https://github.com/white-rabbit-japan/vuetify-storyboard-boilerplate"
@@ -21,7 +22,9 @@
         <p>
           We've added some basic stories inside the
 
-          <code class="code">src/stories</code>
+          <code class="code">
+            src/stories
+          </code>
           directory.
           A story is a single state of one or more UI components. You can have as many stories as you want.
           (Basically a story is like a visual test case.)
@@ -29,17 +32,25 @@
         <p>
           See these sample
 
-          <a class="link" role="button" tabIndex="0" @click.prevent="showApp">stories</a>
+          <a class="link" role="button" tabIndex="0" @click.prevent="showApp">
+            stories
+          </a>
           for a component called
 
-          <code class="code">Button</code> .
+          <code class="code">
+            Button
+          </code> .
         </p>
         <p>
           Just like that, you can add your own components as stories.
           You can also edit those components and see changes right away.
           (Try editing the
-          <code class="code">Button</code> component located at
-          <code class="code">src/stories/Button.js</code>.)
+          <code class="code">
+            Button
+          </code> component located at
+          <code class="code">
+            src/stories/Button.js
+          </code>.)
         </p>
         <p>
           This is just one thing you can do with Storybook.
@@ -54,11 +65,12 @@
           <b>NOTE:</b>
           Have a look at the
 
-          <code class="code">.storybook/webpack.config.js</code>
+          <code class="code">
+            .storybook/webpack.config.js
+          </code>
           to add webpack loaders and plugins you are using in this project.
         </p>
       </div>
-
     </v-container>
   </v-app>
 </template>
diff --git a/examples/storybook/layouts/default.vue b/examples/storybook/layouts/default.vue
index 5112f765d5..1a22243da8 100644
--- a/examples/storybook/layouts/default.vue
+++ b/examples/storybook/layouts/default.vue
@@ -67,7 +67,9 @@
       <v-list>
         <v-list-tile @click.native="right = !right">
           <v-list-tile-action>
-            <v-icon light>compare_arrows</v-icon>
+            <v-icon light>
+              compare_arrows
+            </v-icon>
           </v-list-tile-action>
           <v-list-tile-title>Switch drawer (click me)</v-list-tile-title>
         </v-list-tile>
diff --git a/examples/storybook/package.json b/examples/storybook/package.json
index 2d3425a9b2..45e47dc423 100644
--- a/examples/storybook/package.json
+++ b/examples/storybook/package.json
@@ -9,7 +9,8 @@
     "generate": "nuxt generate",
     "precommit": "yarn run lint",
     "storybook": "start-storybook -p 9001 -c .storybook",
-    "storybookoutput": "build-storybook -c .storybook -o .out"
+    "storybookoutput": "build-storybook -c .storybook -o .out",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "chart.js": "^2.7.1",
diff --git a/examples/storybook/pages/index.vue b/examples/storybook/pages/index.vue
index b095df4c59..6ab62e09aa 100644
--- a/examples/storybook/pages/index.vue
+++ b/examples/storybook/pages/index.vue
@@ -6,24 +6,44 @@
         <vuetify-logo />
       </div>
       <v-card>
-        <v-card-title class="headline">Welcome to the Vuetify + Nuxt.js template</v-card-title>
+        <v-card-title class="headline">
+          Welcome to the Vuetify + Nuxt.js template
+        </v-card-title>
         <v-card-text>
           <p>Vuetify is a progressive Material Design component framework for Vue.js. It was designed to empower developers to create amazing applications.</p>
-          <p>For more information on Vuetify, check out the <a href="https://vuetifyjs.com" target="_blank">documentation</a>.</p>
-          <p>If you have questions, please join the official <a href="https://chat.vuetifyjs.com/" target="_blank" title="chat">discord</a>.</p>
-          <p>Find a bug? Report it on the github <a href="https://github.com/vuetifyjs/vuetify/issues" target="_blank" title="contribute">issue board</a>.</p>
+          <p>
+            For more information on Vuetify, check out the <a href="https://vuetifyjs.com" target="_blank">
+              documentation
+            </a>.
+          </p>
+          <p>
+            If you have questions, please join the official <a href="https://chat.vuetifyjs.com/" target="_blank" title="chat">
+              discord
+            </a>.
+          </p>
+          <p>
+            Find a bug? Report it on the github <a href="https://github.com/vuetifyjs/vuetify/issues" target="_blank" title="contribute">
+              issue board
+            </a>.
+          </p>
           <p>Thank you for developing with Vuetify and I look forward to bringing more exciting features in the future.</p>
           <div class="text-xs-right">
             <em><small>&mdash; John Leider</small></em>
           </div>
           <hr class="my-3">
-          <a href="https://nuxtjs.org/" target="_blank">Nuxt Documentation</a>
+          <a href="https://nuxtjs.org/" target="_blank">
+            Nuxt Documentation
+          </a>
           <br>
-          <a href="https://github.com/nuxt/nuxt.js" target="_blank">Nuxt GitHub</a>
+          <a href="https://github.com/nuxt/nuxt.js" target="_blank">
+            Nuxt GitHub
+          </a>
         </v-card-text>
         <v-card-actions>
           <v-spacer />
-          <v-btn color="primary" flat nuxt to="/inspire">Continue</v-btn>
+          <v-btn color="primary" flat nuxt to="/inspire">
+            Continue
+          </v-btn>
         </v-card-actions>
       </v-card>
     </v-flex>
diff --git a/examples/style-resources/README.md b/examples/style-resources/README.md
index 152ac1bccc..eef7d89305 100644
--- a/examples/style-resources/README.md
+++ b/examples/style-resources/README.md
@@ -41,7 +41,7 @@ Then in your pages, you can use directly:
 <template>
   <div class="main">
     <p>Page with SCSS</p>
-    <p><nuxt-link to="/less">LESS</nuxt-link></p>
+    <p><NuxtLink to="/less">LESS</NuxtLink></p>
   </div>
 </template>
 
diff --git a/examples/style-resources/package.json b/examples/style-resources/package.json
index dc43696981..f675f7efaa 100644
--- a/examples/style-resources/package.json
+++ b/examples/style-resources/package.json
@@ -8,7 +8,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "devDependencies": {
     "node-sass": "^4.7.2",
diff --git a/examples/style-resources/pages/index.vue b/examples/style-resources/pages/index.vue
index d20e3c5999..f0b7b46d8e 100755
--- a/examples/style-resources/pages/index.vue
+++ b/examples/style-resources/pages/index.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="main">
     <p>Page with SCSS</p>
-    <p><nuxt-link to="/less">LESS</nuxt-link></p>
+    <p>
+      <NuxtLink to="/less">
+        LESS
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/style-resources/pages/less.vue b/examples/style-resources/pages/less.vue
index a46bbda840..0be9c148dc 100644
--- a/examples/style-resources/pages/less.vue
+++ b/examples/style-resources/pages/less.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="main">
     <p>Page with LESS</p>
-    <p><nuxt-link to="/">SCSS</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        SCSS
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/styled-vue/README.md b/examples/styled-vue/README.md
new file mode 100644
index 0000000000..d7e7d3076e
--- /dev/null
+++ b/examples/styled-vue/README.md
@@ -0,0 +1,3 @@
+# styled-vue Example
+
+See https://github.com/egoist/styled-vue
diff --git a/examples/styled-vue/nuxt.config.js b/examples/styled-vue/nuxt.config.js
new file mode 100644
index 0000000000..9c00c59049
--- /dev/null
+++ b/examples/styled-vue/nuxt.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  modules: [
+    'styled-vue/nuxt'
+  ]
+}
diff --git a/examples/styled-vue/package.json b/examples/styled-vue/package.json
new file mode 100644
index 0000000000..4d3e94ec85
--- /dev/null
+++ b/examples/styled-vue/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "example-styled-vue",
+  "version": "1.0.0",
+  "dependencies": {
+    "nuxt-edge": "latest"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
+  },
+  "devDependencies": {
+    "styled-vue": "^0.1.3"
+  }
+}
diff --git a/examples/styled-vue/pages/index.vue b/examples/styled-vue/pages/index.vue
new file mode 100644
index 0000000000..d8aa058910
--- /dev/null
+++ b/examples/styled-vue/pages/index.vue
@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <h1>styled-vue</h1>
+    <a href="https://github.com/egoist/styled-vue" class="github">
+      Check it out on GitHub.
+    </a>
+  </div>
+</template>
+
+<script>
+import { css } from 'styled-vue'
+
+export default {
+  style: css`
+    h1 {
+      color: red;
+      font-size: ${vm => vm.fontSize}px;
+    }
+    .github {
+      color: blue;
+      animation: blink 1s linear infinite;
+    }
+    @keyframes blink {
+      50% {
+        opacity: 0;
+      }
+    }
+  `,
+  data() {
+    return {
+      fontSize: 60
+    }
+  }
+}
+</script>
diff --git a/examples/tailwindcss-purgecss/components/MyComponent.vue b/examples/tailwindcss-purgecss/components/MyComponent.vue
index 8c9baf0e9e..bdf92cf1e1 100644
--- a/examples/tailwindcss-purgecss/components/MyComponent.vue
+++ b/examples/tailwindcss-purgecss/components/MyComponent.vue
@@ -1,5 +1,7 @@
 <template>
   <div>
-    <button class="bg-blue hover:bg-blue-dark text-white font-bold py-2 px-4 rounded">My Component Button</button>
+    <button class="bg-blue hover:bg-blue-dark text-white font-bold py-2 px-4 rounded">
+      My Component Button
+    </button>
   </div>
 </template>
diff --git a/examples/tailwindcss-purgecss/layouts/default.vue b/examples/tailwindcss-purgecss/layouts/default.vue
index d89470fb9c..1910dc63f3 100644
--- a/examples/tailwindcss-purgecss/layouts/default.vue
+++ b/examples/tailwindcss-purgecss/layouts/default.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="p-10">
-    <h1 class="mb-6">Nuxt Tailwind CSS + Purgecss</h1>
-    <nuxt />
+    <h1 class="mb-6">
+      Nuxt Tailwind CSS + Purgecss
+    </h1>
+    <Nuxt />
   </div>
 </template>
diff --git a/examples/tailwindcss-purgecss/package.json b/examples/tailwindcss-purgecss/package.json
index 0e9a5d4916..5b8c4b9e1b 100644
--- a/examples/tailwindcss-purgecss/package.json
+++ b/examples/tailwindcss-purgecss/package.json
@@ -8,7 +8,8 @@
     "build": "nuxt build",
     "start": "nuxt start",
     "generate": "nuxt generate",
-    "deploy": "surge -p dist/ -d https://nuxt-tailwindcss-purgecss.surge.sh"
+    "deploy": "surge -p dist/ -d https://nuxt-tailwindcss-purgecss.surge.sh",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "nuxt": "^2.2.0"
diff --git a/examples/tailwindcss-purgecss/pages/index.vue b/examples/tailwindcss-purgecss/pages/index.vue
index 7aa6dc2c35..65bcffecd0 100644
--- a/examples/tailwindcss-purgecss/pages/index.vue
+++ b/examples/tailwindcss-purgecss/pages/index.vue
@@ -1,8 +1,12 @@
 <template>
   <div>
-    <h2 class="mb-4 text-blue">Homepage</h2>
-    <p class="mb-4 bg-grey-light p-4 text-sm rounded leading-normal">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ut dolor placerat enim suscipit porttitor et sodales orci. In eget lorem a odio rhoncus finibus vel quis ex. Donec varius nisl ligula, vel finibus velit dignissim in.</p>
-    <my-component />
+    <h2 class="mb-4 text-blue">
+      Homepage
+    </h2>
+    <p class="mb-4 bg-grey-light p-4 text-sm rounded leading-normal">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ut dolor placerat enim suscipit porttitor et sodales orci. In eget lorem a odio rhoncus finibus vel quis ex. Donec varius nisl ligula, vel finibus velit dignissim in.
+    </p>
+    <MyComponent />
   </div>
 </template>
 
diff --git a/examples/tailwindcss/layouts/default.vue b/examples/tailwindcss/layouts/default.vue
index 0ff10c15cd..21ab7eb464 100644
--- a/examples/tailwindcss/layouts/default.vue
+++ b/examples/tailwindcss/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- See https://tailwindcss.com/docs/container -->
   <div class="container mx-auto">
-    <nuxt />
+    <Nuxt />
     <a href="https://github.com/nuxt/nuxt.js/tree/dev/examples/tailwindcss" class="inline-flex items-center no-underline mt-4 rounded-full border border-grey-light bg-grey-lightest text-xs text-grey-darkest font-semibold p-2">
       <span class="inline-flex rounded-full mr-1">
         <svg class="h-4 w-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
diff --git a/examples/tailwindcss/package.json b/examples/tailwindcss/package.json
index e113bb7e33..ca49f487f7 100644
--- a/examples/tailwindcss/package.json
+++ b/examples/tailwindcss/package.json
@@ -4,7 +4,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "nuxt-edge": "latest"
diff --git a/examples/tailwindcss/pages/about.vue b/examples/tailwindcss/pages/about.vue
index 533691dd50..7c69c23f4f 100644
--- a/examples/tailwindcss/pages/about.vue
+++ b/examples/tailwindcss/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <div class="mt-4 bg-orange-lightest border-l-4 border-orange text-orange-dark p-4">
-      <p class="font-bold">Be Warned!</p>
+      <p class="font-bold">
+        Be Warned!
+      </p>
       <p>This page has been {{ mode }}-side rendered!</p>
     </div>
     <button class="mt-4 bg-blue hover:bg-blue-light text-white font-bold py-2 px-4 border-b-4 border-blue-dark hover:border-blue rounded" @click="$router.push('/')">
diff --git a/examples/tailwindcss/pages/index.vue b/examples/tailwindcss/pages/index.vue
index 1bdfd7fb25..5c633c2b9f 100644
--- a/examples/tailwindcss/pages/index.vue
+++ b/examples/tailwindcss/pages/index.vue
@@ -3,15 +3,27 @@
     <div class="max-w-sm mt-4 rounded overflow-hidden shadow-lg">
       <img class="w-full" src="https://tailwindcss.com/img/card-top.jpg">
       <div class="px-6 py-4">
-        <div class="font-bold text-xl mb-2">The Coldest Sunset</div>
-        <p class="text-slate text-base">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptatibus quia, nulla! Maiores et perferendis eaque, exercitationem praesentium nihil.</p>
+        <div class="font-bold text-xl mb-2">
+          The Coldest Sunset
+        </div>
+        <p class="text-slate text-base">
+          Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptatibus quia, nulla! Maiores et perferendis eaque, exercitationem praesentium nihil.
+        </p>
       </div>
       <div class="px-6 py-4">
-        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">#photography</span>
-        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">#travel</span>
-        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate">#winter</span>
+        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">
+          #photography
+        </span>
+        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">
+          #travel
+        </span>
+        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate">
+          #winter
+        </span>
       </div>
     </div>
-    <button class="bg-blue mt-4 hover:bg-blue-dark text-white font-bold py-2 px-4 rounded" @click="$router.push('/about')">About</button>
+    <button class="bg-blue mt-4 hover:bg-blue-dark text-white font-bold py-2 px-4 rounded" @click="$router.push('/about')">
+      About
+    </button>
   </div>
 </template>
diff --git a/examples/typescript-vuex/README.md b/examples/typescript-vuex/README.md
new file mode 100644
index 0000000000..6a041d9201
--- /dev/null
+++ b/examples/typescript-vuex/README.md
@@ -0,0 +1,3 @@
+# TypeScript with Vuex example
+
+https://nuxtjs.org/examples/typescript-vuex
diff --git a/examples/typescript/assets/css/main.css b/examples/typescript-vuex/assets/css/main.css
similarity index 100%
rename from examples/typescript/assets/css/main.css
rename to examples/typescript-vuex/assets/css/main.css
diff --git a/examples/typescript-vuex/components/Card.vue b/examples/typescript-vuex/components/Card.vue
new file mode 100644
index 0000000000..eab608c226
--- /dev/null
+++ b/examples/typescript-vuex/components/Card.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="ba b--black-20 mw5 ma2">
+    <img :src="'https://robots.johnlindquist.com/' + person.first_name + '_' + person.last_name">
+    <div class="flex flex-column items-center pa2 b--black-20">
+      <div class="f4">
+        {{ person.first_name }} {{ person.last_name }}
+      </div>
+      <button class="w-100 bg-blue dim mv2 pv2 bn pointer" @click="select(person.id)">
+        Select
+      </button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component, Prop } from 'vue-property-decorator'
+import { namespace } from 'vuex-class'
+
+import * as people from '~/store/modules/people'
+
+const People = namespace(people.name)
+
+@Component
+export default class Card extends Vue {
+  @Prop() person
+  @People.Action select
+}
+</script>
diff --git a/examples/typescript-vuex/layouts/default.vue b/examples/typescript-vuex/layouts/default.vue
new file mode 100644
index 0000000000..a11d79fb00
--- /dev/null
+++ b/examples/typescript-vuex/layouts/default.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="container">
+    <Nuxt />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component
+export default class DefaultLayout extends Vue {}
+</script>
diff --git a/examples/typescript/nuxt.config.js b/examples/typescript-vuex/nuxt.config.ts
similarity index 53%
rename from examples/typescript/nuxt.config.js
rename to examples/typescript-vuex/nuxt.config.ts
index 682c251744..985fb1eece 100644
--- a/examples/typescript/nuxt.config.js
+++ b/examples/typescript-vuex/nuxt.config.ts
@@ -1,23 +1,15 @@
-export default {
-  env: {
-    baseUrl: process.env.BASE_URL || 'http://localhost:3000'
-  },
+const config = {
   head: {
     title: 'starter',
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: 'Nuxt.js project' }
+      { hid: 'description', name: 'description', content: 'Nuxt TS project' }
     ],
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
-  /*
-  ** Customize the progress-bar color
-  */
   loading: { color: '#3B8070' },
-  /*
-  ** Build configuration
-  */
-  css: ['tachyons/css/tachyons.min.css', '~/assets/css/main.css'],
-  modules: ['~/modules/typescript']
+  css: ['tachyons/css/tachyons.min.css', '~/assets/css/main.css']
 }
+
+export default config
diff --git a/examples/typescript-vuex/package.json b/examples/typescript-vuex/package.json
new file mode 100644
index 0000000000..9973e39dd6
--- /dev/null
+++ b/examples/typescript-vuex/package.json
@@ -0,0 +1,22 @@
+{
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "axios": "^0.18.0",
+    "nuxt-ts-edge": "latest",
+    "tachyons": "^4.11.1",
+    "vue-property-decorator": "^7.3.0",
+    "vuex-class": "^0.3.1"
+  },
+  "scripts": {
+    "dev": "nuxt-ts",
+    "build": "nuxt-ts build",
+    "start": "nuxt-ts start",
+    "generate": "nuxt-ts generate",
+    "lint": "tslint --project .",
+    "post-update": "yarn upgrade --latest"
+  },
+  "devDependencies": {
+    "tslint-config-standard": "^8.0.1"
+  }
+}
diff --git a/examples/typescript-vuex/pages/index.vue b/examples/typescript-vuex/pages/index.vue
new file mode 100644
index 0000000000..7b2869716c
--- /dev/null
+++ b/examples/typescript-vuex/pages/index.vue
@@ -0,0 +1,39 @@
+<template>
+  <section class="pa4">
+    <div class="bg-white-90 pa4">
+      <div class="f1">
+        Nuxt TypeScript Starter
+      </div>
+      <div class="f3">
+        Selected Person: {{ selectedPerson.first_name }} {{ selectedPerson.last_name }}
+      </div>
+      {{ selected }}
+    </div>
+    <div class="flex flex-wrap ph2 justify-between bg-white-80">
+      <div v-for="person in people" :key="person.id">
+        <Card :person="person" />
+      </div>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+import Card from '~/components/Card.vue'
+import { namespace } from 'vuex-class'
+
+import * as people from '~/store/modules/people'
+
+const People = namespace(people.name)
+
+@Component({
+  components: {
+    Card
+  }
+})
+export default class IndexPage extends Vue {
+  @People.State selected
+  @People.State people
+  @People.Getter selectedPerson
+}
+</script>
diff --git a/examples/typescript/static/favicon.ico b/examples/typescript-vuex/static/favicon.ico
similarity index 100%
rename from examples/typescript/static/favicon.ico
rename to examples/typescript-vuex/static/favicon.ico
diff --git a/examples/typescript/static/random-data.json b/examples/typescript-vuex/static/random-data.json
similarity index 100%
rename from examples/typescript/static/random-data.json
rename to examples/typescript-vuex/static/random-data.json
diff --git a/examples/typescript/store/index.ts b/examples/typescript-vuex/store/index.ts
similarity index 88%
rename from examples/typescript/store/index.ts
rename to examples/typescript-vuex/store/index.ts
index 5bb3f11913..56e90e9be6 100644
--- a/examples/typescript/store/index.ts
+++ b/examples/typescript-vuex/store/index.ts
@@ -11,11 +11,7 @@ import * as people from './modules/people'
   // action: Sync or async operations that commit mutations
   // mutations: Modify the state
 
-interface ModulesStates {
-  people: people.State
-}
-
-export type RootState = root.State & ModulesStates
+export type RootState = root.State
 
 const createStore = () => {
   return new Vuex.Store({
diff --git a/examples/typescript/store/modules/people.ts b/examples/typescript-vuex/store/modules/people.ts
similarity index 87%
rename from examples/typescript/store/modules/people.ts
rename to examples/typescript-vuex/store/modules/people.ts
index 25f3fb6f4a..f6deceb8a0 100644
--- a/examples/typescript/store/modules/people.ts
+++ b/examples/typescript-vuex/store/modules/people.ts
@@ -52,20 +52,20 @@ export const getters: GetterTree<State, RootState> = {
 }
 
 export interface Actions<S, R> extends ActionTree<S, R> {
-  select(context: ActionContext<S, R>, id: number): void
+  select (context: ActionContext<S, R>, id: number): void
 }
 
 export const actions: Actions<State, RootState> = {
-  select({ commit }, id: number) {
+  select ({ commit }, id: number) {
     commit(types.SELECT, id)
   }
 }
 
 export const mutations: MutationTree<State> = {
-  [types.SELECT](state, id: number) {
+  [types.SELECT] (state, id: number) {
     state.selected = id
   },
-  [types.SET](state, people: Person[]) {
+  [types.SET] (state, people: Person[]) {
     state.people = people
   }
 }
diff --git a/examples/typescript/store/root.ts b/examples/typescript-vuex/store/root.ts
similarity index 73%
rename from examples/typescript/store/root.ts
rename to examples/typescript-vuex/store/root.ts
index 41f5373e8c..145020363a 100644
--- a/examples/typescript/store/root.ts
+++ b/examples/typescript-vuex/store/root.ts
@@ -1,5 +1,5 @@
 import { GetterTree, ActionContext, ActionTree, MutationTree } from 'vuex'
-import axios from '~/plugins/axios'
+import axios from 'axios'
 import { RootState } from 'store'
 import * as people from './modules/people'
 
@@ -12,12 +12,12 @@ export const state = (): State => ({})
 export const getters: GetterTree<State, RootState> = {}
 
 export interface Actions<S, R> extends ActionTree<S, R> {
-  nuxtServerInit(context: ActionContext<S, R>): void
+  nuxtServerInit (context: ActionContext<S, R>): void
 }
 
 export const actions: Actions<State, RootState> = {
-  async nuxtServerInit({ commit }) {
-    const response = await axios.get('/random-data.json')
+  async nuxtServerInit ({ commit }) {
+    const response = await axios.get('/random-data.json', { proxy: { host: '127.0.0.1', port: 3000 } })
     const staticPeople = response.data.slice(0, 10)
     commit(`${people.name}/${people.types.SET}`, staticPeople, { root: true })
   }
diff --git a/examples/typescript-vuex/tsconfig.json b/examples/typescript-vuex/tsconfig.json
new file mode 100644
index 0000000000..2b98ff6b4b
--- /dev/null
+++ b/examples/typescript-vuex/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "@nuxt/typescript-edge",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "noImplicitAny": false,
+    "types": [
+      "@types/node",
+      "@nuxt/vue-app-edge"
+    ]
+  }
+}
diff --git a/examples/typescript-vuex/tslint.json b/examples/typescript-vuex/tslint.json
new file mode 100644
index 0000000000..085d45bd4b
--- /dev/null
+++ b/examples/typescript-vuex/tslint.json
@@ -0,0 +1,9 @@
+{
+  "defaultSeverity": "error",
+  "extends": [
+    "tslint-config-standard"
+  ],
+  "rules": {
+    "prefer-const": true
+  }
+}
diff --git a/examples/typescript/README.md b/examples/typescript/README.md
index a72ae8fe82..e14feee334 100644
--- a/examples/typescript/README.md
+++ b/examples/typescript/README.md
@@ -1,3 +1,3 @@
-# Using typescript within nuxt.js
+# TypeScript example
 
-https://github.com/johnlindquist/nuxt-typescript-starter/
+https://codesandbox.io/s/0qmykr7wq0
diff --git a/examples/typescript/components/Card.vue b/examples/typescript/components/Card.vue
deleted file mode 100644
index 6632f4b404..0000000000
--- a/examples/typescript/components/Card.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-  <div class="ba b--black-20 mw5 ma2">
-    <img :src="'https://robots.johnlindquist.com/' + person.first_name + '_' + person.last_name">
-    <div class="flex flex-column items-center pa2 b--black-20">
-      <div class="f4">{{ person.first_name }} {{ person.last_name }}</div>
-      <button class="w-100 bg-blue dim mv2 pv2 bn pointer" @click="select(person.id)">Select</button>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-// PLEASE NOTE
-// All "Nuxt Class Components" require at minimum a script tag that exports a default object
-import Vue from 'vue'
-import Component from 'nuxt-class-component'
-import { Prop } from 'vue-property-decorator'
-import { Action, namespace } from 'vuex-class'
-
-import * as people from '~/store/modules/people'
-
-const PeopleAction = namespace(people.name, Action)
-
-export default
-@Component({})
-class Card extends Vue {
-  @Prop() person
-  @PeopleAction select
-}
-</script>
diff --git a/examples/typescript/components/HelloWorld.vue b/examples/typescript/components/HelloWorld.vue
new file mode 100644
index 0000000000..92c06e3df1
--- /dev/null
+++ b/examples/typescript/components/HelloWorld.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>
+    {{ message }}
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component
+export default class HelloWorld extends Vue {
+  message: string = 'Hello world !'
+}
+</script>
diff --git a/examples/typescript/layouts/default.vue b/examples/typescript/layouts/default.vue
deleted file mode 100644
index d531baa1f2..0000000000
--- a/examples/typescript/layouts/default.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div class="container">
-    <nuxt />
-  </div>
-</template>
diff --git a/examples/typescript/modules/typescript.js b/examples/typescript/modules/typescript.js
deleted file mode 100644
index 0c7f88df45..0000000000
--- a/examples/typescript/modules/typescript.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export default function () {
-  // Add .ts extension for store, middleware and more
-  this.nuxt.options.extensions.push('ts')
-  // Extend build
-  this.extendBuild((config) => {
-    const tsLoader = {
-      loader: 'ts-loader',
-      options: {
-        appendTsSuffixTo: [/\.vue$/]
-      },
-      exclude: [
-        /dist/,
-        /\.temp/
-      ]
-    }
-    // Add TypeScript loader
-    config.module.rules.push(
-      Object.assign(
-        {
-          test: /((client|server)\.js)|(\.tsx?)$/
-        },
-        tsLoader
-      )
-    )
-    // Add .ts extension in webpack resolve
-    if (config.resolve.extensions.indexOf('.ts') === -1) {
-      config.resolve.extensions.push('.ts')
-    }
-  })
-}
diff --git a/examples/typescript/nuxt.config.ts b/examples/typescript/nuxt.config.ts
new file mode 100644
index 0000000000..f33d7c4e6e
--- /dev/null
+++ b/examples/typescript/nuxt.config.ts
@@ -0,0 +1,3 @@
+export default {
+  plugins: ['~/plugins/hello']
+}
diff --git a/examples/typescript/package.json b/examples/typescript/package.json
index 4dcc4f8583..0d28e44bcd 100644
--- a/examples/typescript/package.json
+++ b/examples/typescript/package.json
@@ -1,22 +1,19 @@
 {
-  "version": "1.0.1",
+  "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "axios": "^0.17.1",
-    "nuxt-edge": "latest",
-    "nuxt-class-component": "^1.1.3",
-    "tachyons": "^4.9.1",
-    "vue-property-decorator": "^6.0.0",
-    "vuex-class": "^0.3.0"
+    "nuxt-ts-edge": "latest",
+    "vue-property-decorator": "^7.3.0"
   },
   "scripts": {
-    "dev": "nuxt",
-    "build": "nuxt build",
-    "start": "nuxt start",
-    "generate": "nuxt generate"
+    "dev": "nuxt-ts",
+    "build": "nuxt-ts build",
+    "start": "nuxt-ts start",
+    "generate": "nuxt-ts generate",
+    "lint": "tslint --project .",
+    "post-update": "yarn upgrade --latest"
   },
   "devDependencies": {
-    "ts-loader": "^3.2.0",
-    "typescript": "^2.6.2"
+    "tslint-config-standard": "^8.0.1"
   }
 }
diff --git a/examples/typescript/pages/index.vue b/examples/typescript/pages/index.vue
index 1480c6c73d..1bfe2bdf0b 100644
--- a/examples/typescript/pages/index.vue
+++ b/examples/typescript/pages/index.vue
@@ -1,38 +1,15 @@
 <template>
-  <section class="pa4">
-    <div class="bg-white-90 pa4">
-      <div class="f1">Nuxt TypeScript Starter</div>
-      <div class="f3">Selected Person: {{ selectedPerson.first_name }} {{ selectedPerson.last_name }}</div>
-      {{ selected }}
-    </div>
-    <div class="flex flex-wrap ph2 justify-between bg-white-80">
-      <div v-for="person in people" :key="person.id">
-        <Card :person="person" />
-      </div>
-    </div>
-  </section>
+  <HelloWorld />
 </template>
 
 <script lang="ts">
-import Vue from 'vue'
-import Component from 'nuxt-class-component'
-import Card from '~/components/Card.vue'
-import { State, Getter, namespace } from 'vuex-class'
+import { Component, Vue } from 'vue-property-decorator'
+import HelloWorld from '~/components/HelloWorld.vue'
 
-import * as people from '~/store/modules/people'
-
-const PeopleState = namespace(people.name, State)
-const PeopleGetter = namespace(people.name, Getter)
-
-export default
 @Component({
   components: {
-    Card
+    HelloWorld
   }
 })
-class extends Vue {
-  @PeopleState selected
-  @PeopleState people
-  @PeopleGetter selectedPerson
-}
+export default class Home extends Vue {}
 </script>
diff --git a/examples/typescript/plugins/axios.js b/examples/typescript/plugins/axios.js
deleted file mode 100644
index 444dd65f50..0000000000
--- a/examples/typescript/plugins/axios.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import axios from 'axios'
-
-export default axios.create({
-  baseURL: process.env.baseUrl
-})
diff --git a/examples/typescript/plugins/hello.ts b/examples/typescript/plugins/hello.ts
new file mode 100644
index 0000000000..e37dd192fe
--- /dev/null
+++ b/examples/typescript/plugins/hello.ts
@@ -0,0 +1,3 @@
+export default () => {
+  console.log(`Hello from ${process.server ? 'Server' : 'Client'} !`)
+}
diff --git a/examples/typescript/tsconfig.json b/examples/typescript/tsconfig.json
index 25539ebd12..b2825067b2 100644
--- a/examples/typescript/tsconfig.json
+++ b/examples/typescript/tsconfig.json
@@ -1,30 +1,10 @@
 {
+  "extends": "@nuxt/typescript-edge",
   "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "es2015"
-    ],
-    "module": "es2015",
-    "moduleResolution": "node",
-    "experimentalDecorators": true,
-    "noImplicitAny": false,
-    "noImplicitThis": false,
-    "strictNullChecks": true,
-    "removeComments": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "allowSyntheticDefaultImports": true,
     "baseUrl": ".",
-    "allowJs": true,
-    "paths": {
-      "~/": ["./"],
-      "~/assets/*": ["./assets/*"],
-      "~/components/*": ["./components/*"],
-      "~/middleware/*": ["./middleware/*"],
-      "~/pages/*": ["./pages/*"],
-      "~/plugins/*": ["./plugins/*"],
-      "~/static/*": ["./static/*"],
-      "~/store/*": ["./store/*"]
-    }
-  }
+    "types": [
+      "@types/node",
+      "@nuxt/vue-app-edge"
+    ]
+  },
 }
diff --git a/examples/typescript/tslint.json b/examples/typescript/tslint.json
new file mode 100644
index 0000000000..085d45bd4b
--- /dev/null
+++ b/examples/typescript/tslint.json
@@ -0,0 +1,9 @@
+{
+  "defaultSeverity": "error",
+  "extends": [
+    "tslint-config-standard"
+  ],
+  "rules": {
+    "prefer-const": true
+  }
+}
diff --git a/examples/uikit/layouts/default.vue b/examples/uikit/layouts/default.vue
index 04f11e3238..636babbeea 100644
--- a/examples/uikit/layouts/default.vue
+++ b/examples/uikit/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
   <div class="uk-container">
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/examples/uikit/package.json b/examples/uikit/package.json
index 80b0ad45dd..ab8bbdce75 100644
--- a/examples/uikit/package.json
+++ b/examples/uikit/package.json
@@ -8,6 +8,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/uikit/pages/about.vue b/examples/uikit/pages/about.vue
index dd5cf8cc66..f80eec84f6 100644
--- a/examples/uikit/pages/about.vue
+++ b/examples/uikit/pages/about.vue
@@ -4,7 +4,9 @@
     <span class="uk-margin-small-right" uk-icon="icon: check" />
     <a href="#" uk-icon="icon: heart" />
     <hr class="uk-divider-icon">
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/uikit/pages/index.vue b/examples/uikit/pages/index.vue
index ab5b67b26a..ae84cbb077 100644
--- a/examples/uikit/pages/index.vue
+++ b/examples/uikit/pages/index.vue
@@ -1,12 +1,22 @@
 <template>
   <div class="uk-card uk-card-body uk-card-primary">
-    <h3 class="uk-card-title">Nuxt.js + UIKIT</h3>
-    <button class="uk-button uk-button-default" title="Hello World" uk-tooltip>Hover</button>
+    <h3 class="uk-card-title">
+      Nuxt.js + UIKIT
+    </h3>
+    <button class="uk-button uk-button-default" title="Hello World" uk-tooltip>
+      Hover
+    </button>
     <div class="uk-inline">
-      <button class="uk-button uk-button-default" type="button">Click</button>
-      <div uk-dropdown="mode: click" class="uk-dropdown">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.</div>
+      <button class="uk-button uk-button-default" type="button">
+        Click
+      </button>
+      <div uk-dropdown="mode: click" class="uk-dropdown">
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.
+      </div>
     </div>
     <hr class="uk-divider-icon">
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
diff --git a/examples/vue-apollo/package.json b/examples/vue-apollo/package.json
index c77a65bef3..f2344fbc0d 100644
--- a/examples/vue-apollo/package.json
+++ b/examples/vue-apollo/package.json
@@ -8,6 +8,7 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate"
+    "generate": "nuxt generate",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/vue-apollo/pages/car/_id.vue b/examples/vue-apollo/pages/car/_id.vue
index b64cfe26f4..0967005465 100644
--- a/examples/vue-apollo/pages/car/_id.vue
+++ b/examples/vue-apollo/pages/car/_id.vue
@@ -3,7 +3,11 @@
     <h3>{{ Car.make }} {{ Car.model }}</h3>
     <p>{{ formatCurrency(Car.price) }}</p>
     <img :src="Car.photoURL" :alt="`${Car.model} photo`">
-    <p><nuxt-link to="/">Home page</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        Home page
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/vue-apollo/pages/index.vue b/examples/vue-apollo/pages/index.vue
index 6c6e440d36..33d8f6d996 100644
--- a/examples/vue-apollo/pages/index.vue
+++ b/examples/vue-apollo/pages/index.vue
@@ -3,9 +3,9 @@
     <h3>Cars</h3>
     <ul>
       <li v-for="car in allCars" :key="car.id">
-        <nuxt-link :to="`car/${car.id}`">
+        <NuxtLink :to="`car/${car.id}`">
           {{ car.year }} {{ car.make }} {{ car.model }}
-        </nuxt-link>
+        </NuxtLink>
       </li>
     </ul>
   </div>
diff --git a/examples/vue-chartjs/layouts/default.vue b/examples/vue-chartjs/layouts/default.vue
index 317c56c0e4..b1d322c34b 100644
--- a/examples/vue-chartjs/layouts/default.vue
+++ b/examples/vue-chartjs/layouts/default.vue
@@ -1,10 +1,18 @@
 <template>
   <div>
     <ul>
-      <li><nuxt-link to="/">Activity</nuxt-link></li>
-      <li><nuxt-link to="/contributors">Contributors</nuxt-link></li>
+      <li>
+        <NuxtLink to="/">
+          Activity
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/contributors">
+          Contributors
+        </NuxtLink>
+      </li>
     </ul>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/vue-chartjs/package.json b/examples/vue-chartjs/package.json
index cc3f1d2665..0157c6b051 100644
--- a/examples/vue-chartjs/package.json
+++ b/examples/vue-chartjs/package.json
@@ -10,6 +10,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/vue-chartjs/pages/contributors.vue b/examples/vue-chartjs/pages/contributors.vue
index f4337aeae9..671a981835 100644
--- a/examples/vue-chartjs/pages/contributors.vue
+++ b/examples/vue-chartjs/pages/contributors.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="doughnut-chart">
-    <doughnut-chart :data="doughnutChartData" :options="{ legend: { display: false }, maintainAspectRatio: false }" />
+    <DoughnutChart :data="doughnutChartData" :options="{ legend: { display: false }, maintainAspectRatio: false }" />
   </div>
 </template>
 
diff --git a/examples/vue-chartjs/pages/index.vue b/examples/vue-chartjs/pages/index.vue
index fd74161569..0814675a55 100755
--- a/examples/vue-chartjs/pages/index.vue
+++ b/examples/vue-chartjs/pages/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="bar-chart">
-    <bar-chart :data="barChartData" :options="{ maintainAspectRatio: false }" />
+    <BarChart :data="barChartData" :options="{ maintainAspectRatio: false }" />
   </div>
 </template>
 
diff --git a/examples/vue-class-component/components/Base.vue b/examples/vue-class-component/components/Base.vue
index e732d9414d..dce1f2d8d9 100644
--- a/examples/vue-class-component/components/Base.vue
+++ b/examples/vue-class-component/components/Base.vue
@@ -4,8 +4,14 @@
     <p>msg: {{ msg }}</p>
     <p>env: {{ env }}</p>
     <p>computed msg: {{ computedMsg }}</p>
-    <button @click="greet">Greet</button>
-    <p><nuxt-link to="/about">About page</nuxt-link></p>
+    <button @click="greet">
+      Greet
+    </button>
+    <p>
+      <NuxtLink to="/about">
+        About page
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/vue-class-component/components/Child.vue b/examples/vue-class-component/components/Child.vue
index cf007c7a42..827eee6f2f 100644
--- a/examples/vue-class-component/components/Child.vue
+++ b/examples/vue-class-component/components/Child.vue
@@ -4,8 +4,14 @@
     <p>msg: {{ msg }}</p>
     <p>env: {{ env }}</p>
     <p>computed msg: {{ computedMsg }}</p>
-    <button @click="greet">Greet</button>
-    <p><nuxt-link to="/about">About page</nuxt-link></p>
+    <button @click="greet">
+      Greet
+    </button>
+    <p>
+      <NuxtLink to="/about">
+        About page
+      </NuxtLink>
+    </p>
   </div>
 </template>
 
diff --git a/examples/vue-class-component/package.json b/examples/vue-class-component/package.json
index 3ee600c4d8..6b57af78d7 100644
--- a/examples/vue-class-component/package.json
+++ b/examples/vue-class-component/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/vue-class-component/pages/about.vue b/examples/vue-class-component/pages/about.vue
index cbe04d7fda..57a01449ef 100644
--- a/examples/vue-class-component/pages/about.vue
+++ b/examples/vue-class-component/pages/about.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
     <h1>About</h1>
-    <p><nuxt-link to="/">Home page</nuxt-link></p>
+    <p>
+      <NuxtLink to="/">
+        Home page
+      </NuxtLink>
+    </p>
   </div>
 </template>
diff --git a/examples/vuex-persistedstate/package.json b/examples/vuex-persistedstate/package.json
index 4fcdf73950..ede2867060 100644
--- a/examples/vuex-persistedstate/package.json
+++ b/examples/vuex-persistedstate/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/vuex-persistedstate/pages/index.vue b/examples/vuex-persistedstate/pages/index.vue
index 8540d23c60..8734ceb2fb 100644
--- a/examples/vuex-persistedstate/pages/index.vue
+++ b/examples/vuex-persistedstate/pages/index.vue
@@ -2,8 +2,12 @@
   <div>
     <p>{{ counter }}</p>
     <p>
-      <button @click="increment">+</button>
-      <button @click="decrement">-</button>
+      <button @click="increment">
+        +
+      </button>
+      <button @click="decrement">
+        -
+      </button>
     </p>
   </div>
 </template>
diff --git a/examples/vuex-store-modules/package.json b/examples/vuex-store-modules/package.json
index 9cf23402db..d637bb72d7 100644
--- a/examples/vuex-store-modules/package.json
+++ b/examples/vuex-store-modules/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/vuex-store-modules/pages/about.vue b/examples/vuex-store-modules/pages/about.vue
index f489bfe089..45fa28a173 100644
--- a/examples/vuex-store-modules/pages/about.vue
+++ b/examples/vuex-store-modules/pages/about.vue
@@ -1,8 +1,12 @@
 <template>
   <div>
     <p>
-      <button @click="$store.commit('increment')">{{ $store.state.counter }}</button><br>
-      <nuxt-link to="/">Home</nuxt-link>
+      <button @click="$store.commit('increment')">
+        {{ $store.state.counter }}
+      </button><br>
+      <NuxtLink to="/">
+        Home
+      </NuxtLink>
     </p>
   </div>
 </template>
diff --git a/examples/vuex-store-modules/pages/index.vue b/examples/vuex-store-modules/pages/index.vue
index 24efe70cdd..33316ebce5 100644
--- a/examples/vuex-store-modules/pages/index.vue
+++ b/examples/vuex-store-modules/pages/index.vue
@@ -1,17 +1,25 @@
 <template>
   <div>
     <p /><h3>Index Module</h3>
-    <button @click="increment">{{ counter }}</button>
+    <button @click="increment">
+      {{ counter }}
+    </button>
     <br>
-    <nuxt-link to="/about">About</nuxt-link>
+    <NuxtLink to="/about">
+      About
+    </NuxtLink>
     <br>
     <br>
     <h3>Todo Module</h3>
-    <nuxt-link to="/todos">Todos</nuxt-link>
+    <NuxtLink to="/todos">
+      Todos
+    </NuxtLink>
     <br>
     <br>
     <h3>Nested Modules</h3>
-    <nuxt-link to="/website">Website</nuxt-link>
+    <NuxtLink to="/website">
+      Website
+    </NuxtLink>
     </p>
   </div>
 </template>
diff --git a/examples/vuex-store-modules/pages/todos.vue b/examples/vuex-store-modules/pages/todos.vue
index 3ca87b7a0b..5cc5133cef 100644
--- a/examples/vuex-store-modules/pages/todos.vue
+++ b/examples/vuex-store-modules/pages/todos.vue
@@ -4,11 +4,15 @@
     <ul>
       <li v-for="(todo, index) in todos" :key="index">
         <input :checked="todo.done" type="checkbox" @change="toggle(todo)">
-        <span :class="{ done: todo.done }">{{ todo.text }}</span>
+        <span :class="{ done: todo.done }">
+          {{ todo.text }}
+        </span>
       </li>
       <li><input placeholder="What needs to be done?" @keyup.enter="addTodo"></li>
     </ul>
-    <nuxt-link to="/">Home</nuxt-link>
+    <NuxtLink to="/">
+      Home
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/vuex-store-modules/pages/website.vue b/examples/vuex-store-modules/pages/website.vue
index d85e4aa00b..0d33e8425a 100644
--- a/examples/vuex-store-modules/pages/website.vue
+++ b/examples/vuex-store-modules/pages/website.vue
@@ -12,7 +12,9 @@
         <span>{{ comment }}</span>
       </li>
     </ul>
-    <nuxt-link to="/">Home</nuxt-link>
+    <NuxtLink to="/">
+      Home
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/vuex-store/package.json b/examples/vuex-store/package.json
index 61b1996ad7..cd8ae6f989 100644
--- a/examples/vuex-store/package.json
+++ b/examples/vuex-store/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/vuex-store/pages/about.vue b/examples/vuex-store/pages/about.vue
index f489bfe089..45fa28a173 100644
--- a/examples/vuex-store/pages/about.vue
+++ b/examples/vuex-store/pages/about.vue
@@ -1,8 +1,12 @@
 <template>
   <div>
     <p>
-      <button @click="$store.commit('increment')">{{ $store.state.counter }}</button><br>
-      <nuxt-link to="/">Home</nuxt-link>
+      <button @click="$store.commit('increment')">
+        {{ $store.state.counter }}
+      </button><br>
+      <NuxtLink to="/">
+        Home
+      </NuxtLink>
     </p>
   </div>
 </template>
diff --git a/examples/vuex-store/pages/index.vue b/examples/vuex-store/pages/index.vue
index 7406a84dd8..9bd9563c16 100644
--- a/examples/vuex-store/pages/index.vue
+++ b/examples/vuex-store/pages/index.vue
@@ -1,8 +1,12 @@
 <template>
   <div>
     <p>
-      <button @click="increment">{{ counter }}</button><br>
-      <nuxt-link to="/about">About</nuxt-link>
+      <button @click="increment">
+        {{ counter }}
+      </button><br>
+      <NuxtLink to="/about">
+        About
+      </NuxtLink>
     </p>
   </div>
 </template>
diff --git a/examples/web-worker/layouts/default.vue b/examples/web-worker/layouts/default.vue
index 85a5090efe..3fec18260f 100644
--- a/examples/web-worker/layouts/default.vue
+++ b/examples/web-worker/layouts/default.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/web-worker/package.json b/examples/web-worker/package.json
index 377950b296..b70cd20a47 100644
--- a/examples/web-worker/package.json
+++ b/examples/web-worker/package.json
@@ -8,7 +8,8 @@
     "start": "nuxt start",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
-    "precommit": "npm run lint"
+    "precommit": "npm run lint",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "nuxt-edge": "latest"
diff --git a/examples/web-worker/pages/index.vue b/examples/web-worker/pages/index.vue
index eb307006c3..8835240495 100644
--- a/examples/web-worker/pages/index.vue
+++ b/examples/web-worker/pages/index.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="container">
     <div>
-      <app-logo />
+      <AppLogo />
       <h1 class="title">
         web-worker
       </h1>
@@ -19,25 +19,35 @@
           :class="needWorkerSetup ? 'hidden' : 'visible'"
           class="button button--green"
           @click="test"
-        >Test Worker</a>
+        >
+          Test Worker
+        </a>
         <a
           :class="needWorkerSetup ? 'hidden' : 'visible'"
           class="button button--green"
           @click="long(4000)"
-        >Execute long running Worker</a>
+        >
+          Execute long running Worker
+        </a>
         <a
           :class="needWorkerSetup || !longRunningWorkers.length ? 'hidden' : 'visible'"
           class="button button--green"
           @click="freeWorker"
-        >Free long running Worker</a>
+        >
+          Free long running Worker
+        </a>
         <a
           class="button button--grey"
           @click="removeWorker"
-        >Remove Web Worker</a>
+        >
+          Remove Web Worker
+        </a>
         <a
           class="button button--grey"
           @click="createWorkers"
-        >Create more Workers</a>
+        >
+          Create more Workers
+        </a>
       </div>
     </div>
   </section>
diff --git a/examples/with-amp/package.json b/examples/with-amp/package.json
index 80ab8f9947..1480f32ee6 100644
--- a/examples/with-amp/package.json
+++ b/examples/with-amp/package.json
@@ -8,6 +8,7 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate"
+    "generate": "nuxt generate",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/with-amp/pages/dog.vue b/examples/with-amp/pages/dog.vue
index 2c6fab59a9..9747cd1e6d 100644
--- a/examples/with-amp/pages/dog.vue
+++ b/examples/with-amp/pages/dog.vue
@@ -1,10 +1,17 @@
 <template>
   <div>
     <h1>The Dog</h1>
-    <byline author="Meow Meow Fuzzyface" />
+    <Byline author="Meow Meow Fuzzyface" />
+    <!-- eslint-disable-next-line vue/component-name-in-template-casing -->
     <amp-img src="/dog.jpg" width="470" height="350" layout="responsive" alt="Woof" />
-    <p class="caption">Woooooooooooof</p>
-    <p>Go to <a href="/">the cat</a>.</p>
+    <p class="caption">
+      Woooooooooooof
+    </p>
+    <p>
+      Go to <a href="/">
+        the cat
+      </a>.
+    </p>
     <p>Wafer donut candy soufflé lemon drops icing. Marzipan gummi bears pie danish lollipop pudding powder gummi bears sweet. Pie sweet roll sweet roll topping chocolate bar dragée pudding chocolate cake. Croissant sweet chocolate bar cheesecake candy canes. Tootsie roll icing macaroon bonbon cupcake apple pie candy canes biscuit candy canes. Jujubes jelly liquorice toffee gingerbread. Candy tootsie roll macaroon chocolate bar icing sugar plum pie. Icing gummies chocolate bar chocolate marzipan bonbon cookie chocolate tart. Caramels danish halvah croissant. Cheesecake cookie tootsie roll ice cream. Powder dessert carrot cake muffin tiramisu lemon drops liquorice topping brownie. Soufflé chocolate cake croissant cupcake jelly.</p>
     <p>Muffin gummies dessert cheesecake candy canes. Candy canes danish cotton candy tart dessert powder bear claw marshmallow. Muffin chocolate marshmallow danish. Chocolate bar biscuit cake tiramisu. Topping sweet brownie jujubes powder marzipan. Croissant wafer bonbon chupa chups cake cake marzipan caramels jujubes. Cupcake cheesecake sweet roll marshmallow lollipop danish jujubes jelly icing. Apple pie chupa chups lollipop jelly-o cheesecake jelly beans cake dessert. Tootsie roll tootsie roll bonbon pastry croissant gummi bears cake cake. Fruitcake sugar plum halvah gingerbread cookie pastry chupa chups wafer lemon drops. Marshmallow liquorice oat cake lollipop. Lemon drops oat cake halvah liquorice danish powder cupcake soufflé. Cake tart topping jelly-o tart sugar plum. Chocolate bar cookie wafer tootsie roll candy cotton candy toffee pie donut.</p>
     <p>Ice cream lollipop marshmallow tiramisu jujubes croissant. Bear claw lemon drops marzipan candy bonbon cupcake powder. Candy canes cheesecake bear claw pastry cake donut jujubes. Icing tart jelly-o soufflé bonbon apple pie. Cheesecake pie chupa chups toffee powder. Bonbon lemon drops carrot cake pudding candy halvah cheesecake lollipop cupcake. Pudding marshmallow fruitcake. Gummi bears bonbon chupa chups lemon drops. Wafer dessert gummies gummi bears biscuit donut tiramisu gummi bears brownie. Tootsie roll liquorice bonbon cookie. Sesame snaps chocolate bar cake croissant chupa chups cheesecake gingerbread tiramisu jelly. Cheesecake ice cream muffin lollipop gummies. Sesame snaps jelly beans sweet bear claw tart.</p>
diff --git a/examples/with-amp/pages/index.vue b/examples/with-amp/pages/index.vue
index 8a27befcce..3a79392c74 100644
--- a/examples/with-amp/pages/index.vue
+++ b/examples/with-amp/pages/index.vue
@@ -1,10 +1,17 @@
 <template>
   <div>
     <h1>The Cat</h1>
-    <byline author="Dan Zajdband" />
+    <Byline author="Dan Zajdband" />
+    <!-- eslint-disable-next-line vue/component-name-in-template-casing -->
     <amp-img src="/cat.jpg" width="470" height="350" layout="responsive" alt="Meow" />
-    <p class="caption">Meowwwwwwww</p>
-    <p>Go to <a href="/dog">the dog</a>.</p>
+    <p class="caption">
+      Meowwwwwwww
+    </p>
+    <p>
+      Go to <a href="/dog">
+        the dog
+      </a>.
+    </p>
     <p>Cat ipsum dolor sit amet, eat grass, throw it back up but refuse to leave cardboard box or groom yourself 4 hours - checked, have your beauty sleep 18 hours - checked, be fabulous for the rest of the day - checked!. Hide from vacuum cleaner. Chirp at birds chew foot chase the pig around the house and meoooow!. Chase ball of string climb a tree, wait for a fireman jump to fireman then scratch his face claw drapes, for meow to be let in yet attack dog, run away and pretend to be victim meow loudly just to annoy owners. Touch water with paw then recoil in horror hide when guests come over, and tuxedo cats always looking dapper so has closed eyes but still sees you or a nice warm laptop for me to sit on pee in human's bed until he cleans the litter box. Steal the warm chair right after you get up cat not kitten around yet claws in your leg eat all the power cords. Lick sellotape curl into a furry donut immediately regret falling into bathtub or you call this cat food? and fall asleep on the washing machine. Purr for no reason hack up furballs and pelt around the house and up and down stairs chasing phantoms. If it smells like fish eat as much as you wish. Unwrap toilet paper chew iPad power cord white cat sleeps on a black shirt lick the other cats. Lounge in doorway mew. Has closed eyes but still sees you sleep on keyboard, so hunt anything that moves lick sellotape but slap owner's face at 5am until human fills food dish if it smells like fish eat as much as you wish. Meow to be let in find empty spot in cupboard and sleep all day and thug cat sit by the fire burrow under covers always hungry. Swat at dog hide when guests come over purrrrrr chew on cable so mark territory, yet howl on top of tall thing or find something else more interesting. Chase mice kitten is playing with dead mouse. Sit and stare if it fits, i sits. Mark territory damn that dog , but step on your keyboard while you're gaming and then turn in a circle put butt in owner's face human give me attention meow or eat and than sleep on your face. Friends are not food jump around on couch, meow constantly until given food, or walk on car leaving trail of paw prints on hood and windshield, and spread kitty litter all over house, going to catch the red dot today going to catch the red dot today. Jump off balcony, onto stranger's head.</p>
     <p>Meow to be let out damn that dog howl uncontrollably for no reason caticus cuteicus for play riveting piece on synthesizer keyboard. Meow loudly just to annoy owners the dog smells bad for eat the fat cats food, yet ignore the squirrels, you'll never catch them anyway cat snacks spread kitty litter all over house or hopped up on catnip. Spit up on light gray carpet instead of adjacent linoleum throwup on your pillow, so cat is love, cat is life yet human is washing you why halp oh the horror flee scratch hiss bite. Chase mice. Swat turds around the house hide at bottom of staircase to trip human. Meowing non stop for food howl on top of tall thing. Shake treat bag pee in human's bed until he cleans the litter box missing until dinner time. Have secret plans climb a tree, wait for a fireman jump to fireman then scratch his face bleghbleghvomit my furball really tie the room together. Chase dog then run away purr shake treat bag spit up on light gray carpet instead of adjacent linoleum but dream about hunting birds. Hiss at vacuum cleaner milk the cow lay on arms while you're using the keyboard sleep in the bathroom sink. Stare at ceiling touch water with paw then recoil in horror or refuse to leave cardboard box. Paw at your fat belly plan steps for world domination for going to catch the red dot today going to catch the red dot today slap owner's face at 5am until human fills food dish scratch at the door then walk away for intrigued by the shower, but steal the warm chair right after you get up. Fall asleep on the washing machine destroy couch as revenge scream at teh bath so love to play with owner's hair tie. Howl uncontrollably for no reason rub whiskers on bare skin act innocent. Cats making all the muffins lick butt and make a weird face meow all night having their mate disturbing sleeping humans human give me attention meow intently stare at the same spot. Sleep on dog bed, force dog to sleep on floor spot something, big eyes, big eyes, crouch, shake butt, prepare to pounce for wake up human for food at 4am or pooping rainbow while flying in a toasted bread costume in space sleep on keyboard put toy mouse in food bowl run out of litter box at full speed . Jump off balcony, onto stranger's head lick butt and make a weird face but go into a room to decide you didn't want to be in there anyway so then cats take over the world, pee in human's bed until he cleans the litter box and if it fits, i sits caticus cuteicus. Eats owners hair then claws head lounge in doorway, and hide when guests come over chase ball of string eat owner's food play riveting piece on synthesizer keyboard. Purrr purr littel cat, little cat purr purr spit up on light gray carpet instead of adjacent linoleum kitty loves pigs yet damn that dog meow or walk on car leaving trail of paw prints on hood and windshield. Roll on the floor purring your whiskers off meow all night having their mate disturbing sleeping humans need to chase tail meow hide when guests come over. Soft kitty warm kitty little ball of furr destroy the blinds meow leave hair everywhere attack dog, run away and pretend to be victim. Going to catch the red dot today going to catch the red dot today instantly break out into full speed gallop across the house for no reason meow so hide when guests come over, yet hide at bottom of staircase to trip human toy mouse squeak roll over claws in your leg. Cat slap dog in face lick plastic bags why must they do that.</p>
     <p>Jump launch to pounce upon little yarn mouse, bare fangs at toy run hide in litter box until treats are fed touch water with paw then recoil in horror then cats take over the world i could pee on this if i had the energy. Lie on your belly and purr when you are asleep toy mouse squeak roll over so stick butt in face you call this cat food? and behind the couch curl up and sleep on the freshly laundered towels yet love to play with owner's hair tie. Knock dish off table head butt cant eat out of my own dish walk on car leaving trail of paw prints on hood and windshield find something else more interesting cats go for world domination, spit up on light gray carpet instead of adjacent linoleum sit in box. Missing until dinner time put toy mouse in food bowl run out of litter box at full speed but poop in the plant pot and nap all day caticus cuteicus. Leave hair everywhere attack feet mrow bleghbleghvomit my furball really tie the room together meowwww eat grass, throw it back up. Hate dog meowzer! find something else more interesting, yet cat snacks, so scratch at the door then walk away chase mice. Chase laser scratch the box plan steps for world domination massacre a bird in the living room and then look like the cutest and most innocent animal on the planet for stare at ceiling light and who's the baby. Stare at ceiling Gate keepers of hell, for licks paws intently sniff hand. Pooping rainbow while flying in a toasted bread costume in space. Gnaw the corn cob. Lick yarn hanging out of own butt stare at ceiling lick butt and make a weird face eat and than sleep on your face. Meow all night having their mate disturbing sleeping humans attack feet, so poop on grasses stare at wall turn and meow stare at wall some more meow again continue staring yet purr. Have my breakfast spaghetti yarn. Cats secretly make all the worlds muffins throwup on your pillow plays league of legends. Lick the plastic bag scratch at the door then walk away. Unwrap toilet paper meow to be let in walk on car leaving trail of paw prints on hood and windshield yet hide from vacuum cleaner or massacre a bird in the living room and then look like the cutest and most innocent animal on the planet. Purr lick the curtain just to be annoying go into a room to decide you didn't want to be in there anyway attack feet, and spit up on light gray carpet instead of adjacent linoleum yet lick plastic bags. Spit up on light gray carpet instead of adjacent linoleum touch water with paw then recoil in horror so cat snacks. Purr. Lick sellotape please stop looking at your phone and pet me yet stick butt in face meow. Groom yourself 4 hours - checked, have your beauty sleep 18 hours - checked, be fabulous for the rest of the day - checked! tuxedo cats always looking dapper but purrrrrr. Claws in your leg i could pee on this if i had the energy. Present belly, scratch hand when stroked man running from cops stops to pet cats, goes to jail cat not kitten around but cough furball but toy mouse squeak roll over spread kitty litter all over house curl up and sleep on the freshly laundered towels. Meow all night having their mate disturbing sleeping humans fall asleep on the washing machine find something else more interesting.</p>
diff --git a/examples/with-ava/package.json b/examples/with-ava/package.json
index b6fde5e013..8fe8464d0b 100755
--- a/examples/with-ava/package.json
+++ b/examples/with-ava/package.json
@@ -4,7 +4,8 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "test": "ava --serial --verbose"
+    "test": "ava --serial --verbose",
+    "post-update": "yarn upgrade --latest"
   },
   "devDependencies": {
     "ava": "^0.19.1",
diff --git a/examples/with-ava/pages/index.vue b/examples/with-ava/pages/index.vue
index b411fa4762..53bc701abb 100755
--- a/examples/with-ava/pages/index.vue
+++ b/examples/with-ava/pages/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1 class="red">Hello {{ name }}!</h1>
+  <h1 class="red">
+    Hello {{ name }}!
+  </h1>
 </template>
 
 <script>
diff --git a/examples/with-buefy/package.json b/examples/with-buefy/package.json
index e4d28c4796..4834759a38 100644
--- a/examples/with-buefy/package.json
+++ b/examples/with-buefy/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "buefy": "^0.5.4",
diff --git a/examples/with-buefy/pages/index.vue b/examples/with-buefy/pages/index.vue
index 2a509e1402..443f64cb5a 100644
--- a/examples/with-buefy/pages/index.vue
+++ b/examples/with-buefy/pages/index.vue
@@ -2,14 +2,18 @@
   <nav class="navbar has-shadow is-light">
     <div class="container">
       <div class="navbar-brand">
-        <nuxt-link to="/" class="navbar-item">
+        <NuxtLink to="/" class="navbar-item">
           <img src="~/assets/logo.png">
-        </nuxt-link>
+        </NuxtLink>
       </div>
       <div class="navbar-menu">
         <div class="navbar-start">
-          <nuxt-link to="/" class="navbar-item is-tab" exact>Home</nuxt-link>
-          <nuxt-link to="/about" class="navbar-item is-tab" exact>About</nuxt-link>
+          <NuxtLink to="/" class="navbar-item is-tab" exact>
+            Home
+          </NuxtLink>
+          <NuxtLink to="/about" class="navbar-item is-tab" exact>
+            About
+          </NuxtLink>
         </div>
       </div>
     </div>
diff --git a/examples/with-cookies/package.json b/examples/with-cookies/package.json
index 1cf7cbde0e..3c2af9e923 100644
--- a/examples/with-cookies/package.json
+++ b/examples/with-cookies/package.json
@@ -3,7 +3,8 @@
   "dependencies": {
     "cookie": "^0.3.1",
     "js-cookie": "^2.1.4",
-    "nuxt-edge": "latest"
+    "nuxt-edge": "latest",
+    "post-update": "yarn upgrade --latest"
   },
   "scripts": {
     "dev": "nuxt",
diff --git a/examples/with-cookies/pages/index.vue b/examples/with-cookies/pages/index.vue
index 8562327f3a..d0f4d999e2 100755
--- a/examples/with-cookies/pages/index.vue
+++ b/examples/with-cookies/pages/index.vue
@@ -11,7 +11,11 @@
         <tr v-for="(value, key) in cookies" :key="key">
           <td>{{ key }}</td>
           <td>{{ value }}</td>
-          <td><button @click="removeCookie(key)">Remove</button></td>
+          <td>
+            <button @click="removeCookie(key)">
+              Remove
+            </button>
+          </td>
         </tr>
       </tbody>
     </table>
@@ -19,7 +23,9 @@
     <form @submit.prevent="addCookie">
       <input v-model="newCookie.key" type="text" placeholder="Key" class="key">:
       <input v-model="newCookie.value" type="text" placeholder="Value" class="value">
-      <button type="submit">Add</button>
+      <button type="submit">
+        Add
+      </button>
     </form>
   </div>
 </template>
diff --git a/examples/with-element-ui/package.json b/examples/with-element-ui/package.json
index 3815ac0f79..147ec18b70 100644
--- a/examples/with-element-ui/package.json
+++ b/examples/with-element-ui/package.json
@@ -4,7 +4,8 @@
   "license": "MIT",
   "dependencies": {
     "element-ui": "^2",
-    "nuxt-edge": "latest"
+    "nuxt-edge": "latest",
+    "post-update": "yarn upgrade --latest"
   },
   "scripts": {
     "dev": "nuxt",
diff --git a/examples/with-element-ui/pages/index.vue b/examples/with-element-ui/pages/index.vue
index 4ffc790ba4..53d7fb66fb 100644
--- a/examples/with-element-ui/pages/index.vue
+++ b/examples/with-element-ui/pages/index.vue
@@ -29,15 +29,23 @@
         <el-col :xs="24" :sm="{span: 10, offset: 2}">
           <el-form-item label="Priority" prop="priority">
             <el-radio-group v-model="account.priority">
-              <el-radio label="m">Medium</el-radio>
-              <el-radio label="h">High</el-radio>
+              <el-radio label="m">
+                Medium
+              </el-radio>
+              <el-radio label="h">
+                High
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" justify="center">
-        <el-button type="primary" @click="submit('elm-demo')">Create</el-button>
-        <el-button @click="reset('elm-demo')">Reset</el-button>
+        <el-button type="primary" @click="submit('elm-demo')">
+          Create
+        </el-button>
+        <el-button @click="reset('elm-demo')">
+          Reset
+        </el-button>
       </el-row>
     </el-form>
   </div>
diff --git a/examples/with-feathers/package.json b/examples/with-feathers/package.json
index 650e1fc102..019a450c2a 100644
--- a/examples/with-feathers/package.json
+++ b/examples/with-feathers/package.json
@@ -17,7 +17,8 @@
     "dev": "DEBUG=nuxt:* nodemon --watch src/ --watch config/ src/index.js",
     "build": "nuxt build",
     "start": "NODE_ENV=production node src/",
-    "mocha": "mocha test/ --recursive --timeout=30000"
+    "mocha": "mocha test/ --recursive --timeout=30000",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "body-parser": "^1.15.2",
diff --git a/examples/with-feathers/pages/about.vue b/examples/with-feathers/pages/about.vue
index a16b409edc..3cb15affec 100644
--- a/examples/with-feathers/pages/about.vue
+++ b/examples/with-feathers/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <p>Hi from {{ name }}</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/with-feathers/pages/index.vue b/examples/with-feathers/pages/index.vue
index 9655d7d866..74922a3527 100644
--- a/examples/with-feathers/pages/index.vue
+++ b/examples/with-feathers/pages/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
     <h1>Welcome!</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
diff --git a/examples/with-firebase/layouts/default.vue b/examples/with-firebase/layouts/default.vue
index 7330926522..e282e55be6 100644
--- a/examples/with-firebase/layouts/default.vue
+++ b/examples/with-firebase/layouts/default.vue
@@ -2,10 +2,12 @@
   <div class="container">
     <div class="header">
       <nav>
-        <h1 @click="$router.push('/')">Nuxt.js + Firebase</h1>
+        <h1 @click="$router.push('/')">
+          Nuxt.js + Firebase
+        </h1>
       </nav>
     </div>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
 
diff --git a/examples/with-firebase/package.json b/examples/with-firebase/package.json
index b9daee7b4a..cafcd33cd4 100644
--- a/examples/with-firebase/package.json
+++ b/examples/with-firebase/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "keywords": [
     "nuxt",
diff --git a/examples/with-firebase/pages/index.vue b/examples/with-firebase/pages/index.vue
index 7168ef1231..1b1fbf8cd8 100644
--- a/examples/with-firebase/pages/index.vue
+++ b/examples/with-firebase/pages/index.vue
@@ -12,14 +12,16 @@
       <tbody>
         <tr v-for="(user, key) in users" :key="key">
           <td>
-            <nuxt-link :to="{ path: `/users/${key}`}">
+            <NuxtLink :to="{ path: `/users/${key}`}">
               <img :src="user.avatar" class="rounded" alt="avatar">
-            </nuxt-link>
+            </NuxtLink>
           </td>
           <td>{{ user.name }}</td>
           <td>{{ user.title }}</td>
           <td>
-            <nuxt-link :to="{ path: `/users/${key}`}">View profile &rarr;</nuxt-link>
+            <NuxtLink :to="{ path: `/users/${key}`}">
+              View profile &rarr;
+            </NuxtLink>
           </td>
         </tr>
       </tbody>
diff --git a/examples/with-firebase/pages/users/_key.vue b/examples/with-firebase/pages/users/_key.vue
index 410842a241..3202b78068 100644
--- a/examples/with-firebase/pages/users/_key.vue
+++ b/examples/with-firebase/pages/users/_key.vue
@@ -2,10 +2,18 @@
   <div class="card" style="width: 20rem;">
     <div class="card-block">
       <img :src="user.avatar" class="rounded" alt="avatar"> <br><br>
-      <h4 class="card-title">{{ user.name }}</h4>
-      <h6 class="card-subtitle mb-2 text-muted">{{ user.title }}</h6>
-      <p class="card-text">{{ user.description }}</p>
-      <a href="#" class="btn btn-primary">Hire {{ user.name.split(' ')[0] }}</a>
+      <h4 class="card-title">
+        {{ user.name }}
+      </h4>
+      <h6 class="card-subtitle mb-2 text-muted">
+        {{ user.title }}
+      </h6>
+      <p class="card-text">
+        {{ user.description }}
+      </p>
+      <a href="#" class="btn btn-primary">
+        Hire {{ user.name.split(' ')[0] }}
+      </a>
     </div>
   </div>
 </template>
diff --git a/examples/with-keep-alive/README.md b/examples/with-keep-alive/README.md
index cf4646dda2..46d8033846 100644
--- a/examples/with-keep-alive/README.md
+++ b/examples/with-keep-alive/README.md
@@ -1,12 +1,12 @@
 # `<keep-alive>` with Nuxt.js
 
-Introduced in v1.2.0, you can add the `keep-alive` prop to `<nuxt/>` or `<nuxt-child/>` to "keep alive" the pages.
+Introduced in v1.2.0, you can add the `keep-alive` prop to `<Nuxt/>` or `<NuxtChild/>` to "keep alive" the pages.
 
 `layouts/default.vue`:
 
 ```vue
 <template>
-  <nuxt keep-alive/>
+  <Nuxt keep-alive/>
 </template>
 ```
 
diff --git a/examples/with-keep-alive/layouts/default.vue b/examples/with-keep-alive/layouts/default.vue
index c1875dea61..fb1a815fa1 100644
--- a/examples/with-keep-alive/layouts/default.vue
+++ b/examples/with-keep-alive/layouts/default.vue
@@ -1,3 +1,3 @@
 <template>
-  <nuxt keep-alive />
+  <Nuxt keep-alive />
 </template>
diff --git a/examples/with-keep-alive/package.json b/examples/with-keep-alive/package.json
index b467fe9b97..8dbc86f2db 100644
--- a/examples/with-keep-alive/package.json
+++ b/examples/with-keep-alive/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/with-keep-alive/pages/about.vue b/examples/with-keep-alive/pages/about.vue
index a4d06cd37f..adb28c3024 100755
--- a/examples/with-keep-alive/pages/about.vue
+++ b/examples/with-keep-alive/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <p>Hi from {{ name }}</p>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/with-keep-alive/pages/index.vue b/examples/with-keep-alive/pages/index.vue
index 43487b0da4..dbb2b05868 100755
--- a/examples/with-keep-alive/pages/index.vue
+++ b/examples/with-keep-alive/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <h1>Welcome!</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/examples/with-museui/package.json b/examples/with-museui/package.json
index c17063eab7..d85db357d5 100644
--- a/examples/with-museui/package.json
+++ b/examples/with-museui/package.json
@@ -7,6 +7,7 @@
 	"scripts": {
 		"dev": "nuxt",
 		"build": "nuxt build",
-		"start": "nuxt start"
+		"start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
 	}
 }
diff --git a/examples/with-purgecss/layouts/default.vue b/examples/with-purgecss/layouts/default.vue
index db9bb37d8e..750ea7d80b 100644
--- a/examples/with-purgecss/layouts/default.vue
+++ b/examples/with-purgecss/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- See https://tailwindcss.com/docs/container -->
   <div class="container mx-auto">
-    <nuxt />
+    <Nuxt />
     <a href="https://github.com/nuxt/nuxt.js/tree/dev/examples/with-purgecss" class="inline-flex items-center no-underline mt-4 rounded-full border border-grey-light bg-grey-lightest text-xs text-grey-darkest font-semibold p-2">
       <span class="inline-flex rounded-full mr-1">
         <svg class="h-4 w-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
diff --git a/examples/with-purgecss/package.json b/examples/with-purgecss/package.json
index 98ee993323..f75d058aa1 100644
--- a/examples/with-purgecss/package.json
+++ b/examples/with-purgecss/package.json
@@ -4,7 +4,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "nuxt-edge": "latest"
diff --git a/examples/with-purgecss/pages/about.vue b/examples/with-purgecss/pages/about.vue
index 533691dd50..7c69c23f4f 100644
--- a/examples/with-purgecss/pages/about.vue
+++ b/examples/with-purgecss/pages/about.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <div class="mt-4 bg-orange-lightest border-l-4 border-orange text-orange-dark p-4">
-      <p class="font-bold">Be Warned!</p>
+      <p class="font-bold">
+        Be Warned!
+      </p>
       <p>This page has been {{ mode }}-side rendered!</p>
     </div>
     <button class="mt-4 bg-blue hover:bg-blue-light text-white font-bold py-2 px-4 border-b-4 border-blue-dark hover:border-blue rounded" @click="$router.push('/')">
diff --git a/examples/with-purgecss/pages/index.vue b/examples/with-purgecss/pages/index.vue
index 1bdfd7fb25..5c633c2b9f 100644
--- a/examples/with-purgecss/pages/index.vue
+++ b/examples/with-purgecss/pages/index.vue
@@ -3,15 +3,27 @@
     <div class="max-w-sm mt-4 rounded overflow-hidden shadow-lg">
       <img class="w-full" src="https://tailwindcss.com/img/card-top.jpg">
       <div class="px-6 py-4">
-        <div class="font-bold text-xl mb-2">The Coldest Sunset</div>
-        <p class="text-slate text-base">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptatibus quia, nulla! Maiores et perferendis eaque, exercitationem praesentium nihil.</p>
+        <div class="font-bold text-xl mb-2">
+          The Coldest Sunset
+        </div>
+        <p class="text-slate text-base">
+          Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptatibus quia, nulla! Maiores et perferendis eaque, exercitationem praesentium nihil.
+        </p>
       </div>
       <div class="px-6 py-4">
-        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">#photography</span>
-        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">#travel</span>
-        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate">#winter</span>
+        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">
+          #photography
+        </span>
+        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate mr-2">
+          #travel
+        </span>
+        <span class="inline-block bg-grey-lighter rounded-full px-3 py-1 text-sm font-semibold text-slate">
+          #winter
+        </span>
       </div>
     </div>
-    <button class="bg-blue mt-4 hover:bg-blue-dark text-white font-bold py-2 px-4 rounded" @click="$router.push('/about')">About</button>
+    <button class="bg-blue mt-4 hover:bg-blue-dark text-white font-bold py-2 px-4 rounded" @click="$router.push('/about')">
+      About
+    </button>
   </div>
 </template>
diff --git a/examples/with-sockets/package.json b/examples/with-sockets/package.json
index 9dd2bff40e..05e83aa105 100644
--- a/examples/with-sockets/package.json
+++ b/examples/with-sockets/package.json
@@ -3,7 +3,8 @@
   "scripts": {
     "dev": "nodemon -w server.js -w nuxt.config.js server.js",
     "build": "nuxt build",
-    "start": "NODE_ENV=production node server.js"
+    "start": "NODE_ENV=production node server.js",
+    "post-update": "yarn upgrade --latest"
   },
   "dependencies": {
     "express": "^4.14.0",
diff --git a/examples/with-sockets/pages/index.vue b/examples/with-sockets/pages/index.vue
index 2400d2da0f..2c0fd93b9f 100644
--- a/examples/with-sockets/pages/index.vue
+++ b/examples/with-sockets/pages/index.vue
@@ -5,7 +5,9 @@
         <div class="chatArea">
           <ul ref="messages" class="messages">
             <li v-for="(message, index) in messages" :key="index" class="message">
-              <i :title="message.date">{{ message.date.split('T')[1].slice(0, -2) }}</i>: {{ message.text }}
+              <i :title="message.date">
+                {{ message.date.split('T')[1].slice(0, -2) }}
+              </i>: {{ message.text }}
             </li>
           </ul>
         </div>
diff --git a/examples/with-tape/package.json b/examples/with-tape/package.json
index 31570994c8..ba15a7697b 100755
--- a/examples/with-tape/package.json
+++ b/examples/with-tape/package.json
@@ -4,7 +4,8 @@
 		"dev": "nuxt",
 		"build": "nuxt build",
 		"start": "nuxt start",
-		"test": "tape ./test/**/*.js -r ./test/setup.js | tap-spec"
+		"test": "tape ./test/**/*.js -r ./test/setup.js | tap-spec",
+    "post-update": "yarn upgrade --latest"
 	},
 	"devDependencies": {
 		"browser-env": "^3.2.1",
diff --git a/examples/with-tape/pages/index.vue b/examples/with-tape/pages/index.vue
index e92b678e8d..61c0b65f2d 100755
--- a/examples/with-tape/pages/index.vue
+++ b/examples/with-tape/pages/index.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
-    <h1 :class="className">Hello {{ name }}!</h1>
-    <button @click="changeColor()"> Change h1 Color </button>
+    <h1 :class="className">
+      Hello {{ name }}!
+    </h1>
+    <button @click="changeColor()">
+      Change h1 Color
+    </button>
   </div>
 </template>
 
diff --git a/examples/with-vue-material/package.json b/examples/with-vue-material/package.json
index b23329e7c7..172a6a6d1d 100644
--- a/examples/with-vue-material/package.json
+++ b/examples/with-vue-material/package.json
@@ -9,6 +9,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/with-vue-material/pages/index.vue b/examples/with-vue-material/pages/index.vue
index 53cdc74f92..8773eca347 100644
--- a/examples/with-vue-material/pages/index.vue
+++ b/examples/with-vue-material/pages/index.vue
@@ -4,65 +4,91 @@
       <md-button class="md-icon-button" @click="showNavigation = true">
         <md-icon>menu</md-icon>
       </md-button>
-      <span class="md-title">Nuxt + Vue Material</span>
+      <span class="md-title">
+        Nuxt + Vue Material
+      </span>
 
       <div class="md-toolbar-section-end">
-        <md-button @click="showSidepanel = true">Favorites</md-button>
+        <md-button @click="showSidepanel = true">
+          Favorites
+        </md-button>
       </div>
     </md-toolbar>
 
     <md-drawer :md-active.sync="showNavigation">
       <md-toolbar class="md-transparent" md-elevation="0">
-        <span class="md-title">My App name</span>
+        <span class="md-title">
+          My App name
+        </span>
       </md-toolbar>
 
       <md-list>
         <md-list-item>
           <md-icon>move_to_inbox</md-icon>
-          <span class="md-list-item-text">Inbox</span>
+          <span class="md-list-item-text">
+            Inbox
+          </span>
         </md-list-item>
 
         <md-list-item>
           <md-icon>send</md-icon>
-          <span class="md-list-item-text">Sent Mail</span>
+          <span class="md-list-item-text">
+            Sent Mail
+          </span>
         </md-list-item>
 
         <md-list-item>
           <md-icon>delete</md-icon>
-          <span class="md-list-item-text">Trash</span>
+          <span class="md-list-item-text">
+            Trash
+          </span>
         </md-list-item>
 
         <md-list-item>
           <md-icon>error</md-icon>
-          <span class="md-list-item-text">Spam</span>
+          <span class="md-list-item-text">
+            Spam
+          </span>
         </md-list-item>
       </md-list>
     </md-drawer>
 
     <md-drawer :md-active.sync="showSidepanel" class="md-right">
       <md-toolbar class="md-transparent" md-elevation="0">
-        <span class="md-title">Favorites</span>
+        <span class="md-title">
+          Favorites
+        </span>
       </md-toolbar>
 
       <md-list>
         <md-list-item>
-          <span class="md-list-item-text">Abbey Christansen</span>
+          <span class="md-list-item-text">
+            Abbey Christansen
+          </span>
 
           <md-button class="md-icon-button md-list-action">
-            <md-icon class="md-primary">chat_bubble</md-icon>
+            <md-icon class="md-primary">
+              chat_bubble
+            </md-icon>
           </md-button>
         </md-list-item>
 
         <md-list-item>
-          <span class="md-list-item-text">Alex Nelson</span>
+          <span class="md-list-item-text">
+            Alex Nelson
+          </span>
 
           <md-button class="md-icon-button md-list-action">
-            <md-icon class="md-primary">chat_bubble</md-icon>
+            <md-icon class="md-primary">
+              chat_bubble
+            </md-icon>
           </md-button>
         </md-list-item>
 
         <md-list-item>
-          <span class="md-list-item-text">Mary Johnson</span>
+          <span class="md-list-item-text">
+            Mary Johnson
+          </span>
 
           <md-button class="md-icon-button md-list-action">
             <md-icon>chat_bubble</md-icon>
diff --git a/examples/with-vuetify/package.json b/examples/with-vuetify/package.json
index 0bd05cb0fd..a790bcda3b 100644
--- a/examples/with-vuetify/package.json
+++ b/examples/with-vuetify/package.json
@@ -9,7 +9,8 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate"
+    "generate": "nuxt generate",
+    "post-update": "yarn upgrade --latest"
   },
   "devDependencies": {
     "stylus": "^0.54.5",
diff --git a/examples/with-vuetify/pages/index.vue b/examples/with-vuetify/pages/index.vue
index d89fa90086..3e2d64d81c 100644
--- a/examples/with-vuetify/pages/index.vue
+++ b/examples/with-vuetify/pages/index.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="title">
     <h2>Main content</h2>
-    <v-btn color="primary">Primary button</v-btn>
-    <v-btn color="secondary">Secondary button</v-btn>
-    <v-btn color="success">Success button</v-btn>
+    <v-btn color="primary">
+      Primary button
+    </v-btn>
+    <v-btn color="secondary">
+      Secondary button
+    </v-btn>
+    <v-btn color="success">
+      Success button
+    </v-btn>
   </div>
 </template>
diff --git a/examples/with-vuikit/package.json b/examples/with-vuikit/package.json
index 46aa4d8680..f20fda65dd 100644
--- a/examples/with-vuikit/package.json
+++ b/examples/with-vuikit/package.json
@@ -9,6 +9,7 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   }
 }
diff --git a/examples/with-vux/package.json b/examples/with-vux/package.json
index ad4a43f4d0..bd017b2a7c 100644
--- a/examples/with-vux/package.json
+++ b/examples/with-vux/package.json
@@ -9,7 +9,8 @@
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
-    "start": "nuxt start"
+    "start": "nuxt start",
+    "post-update": "yarn upgrade --latest"
   },
   "devDependencies": {
     "less": "^2.7.3",
diff --git a/jest.config.js b/jest.config.js
index 8927536272..bffe47ee75 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -9,6 +9,7 @@ module.exports = {
   // But its performance overhead is pretty bad (30+%).
   // detectOpenHandles: true
 
+  // setupFilesAfterEnv: ['./test/utils/setup'],
   setupTestFrameworkScriptFile: './test/utils/setup',
 
   coverageDirectory: './coverage',
@@ -33,11 +34,13 @@ module.exports = {
   ],
 
   transform: {
+    '^.+\\.ts$': 'ts-jest',
     '^.+\\.js$': 'babel-jest',
     '.*\\.(vue)$': 'vue-jest'
   },
 
   moduleFileExtensions: [
+    'ts',
     'js',
     'json'
   ],
diff --git a/lerna.json b/lerna.json
index 89b3c6926d..d1fdf1ffdb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.4",
+  "version": "2.4.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "conventionalCommits": true,
@@ -11,6 +11,9 @@
   "command": {
     "publish": {
       "npmClient": "npm"
+    },
+    "init": {
+      "exact": true
     }
   },
   "changelog": {
diff --git a/package.json b/package.json
index 82c98f9ca5..0371642a15 100644
--- a/package.json
+++ b/package.json
@@ -13,19 +13,20 @@
     "dev": "node -r esm ./scripts/dev",
     "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue .",
-    "lint:app": "eslint-multiplexer eslint --ignore-path packages/app/template/.eslintignore 'test/fixtures/!(missing-plugin)/.nuxt!(-dev)/**' | eslint-multiplexer -b",
+    "lint:app": "eslint-multiplexer eslint --ignore-path packages/vue-app/template/.eslintignore 'test/fixtures/!(missing-plugin)/.nuxt!(-dev)/**' | eslint-multiplexer -b",
     "nuxt": "node -r esm ./packages/cli/bin/nuxt-cli.js",
-    "test": "yarn test:fixtures && yarn test:unit",
-    "test:fixtures": "jest test/fixtures",
-    "test:e2e": "jest -i test/e2e",
+    "test": "yarn test:fixtures && yarn test:unit && yarn test:types",
+    "test:fixtures": "jest test/fixtures --forceExit",
+    "test:e2e": "jest -i test/e2e --forceExit",
     "test:lint": "yarn lint",
-    "test:unit": "jest test/unit",
+    "test:unit": "jest test/unit packages --forceExit",
+    "test:types": "tsc -p test/types",
     "postinstall": "lerna link && yarn dev",
     "release": "./scripts/release"
   },
   "devDependencies": {
-    "@babel/core": "^7.1.6",
-    "@babel/preset-env": "^7.1.6",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.3.1",
     "@nuxtjs/eslint-config": "^0.0.1",
     "babel-core": "^7.0.0-bridge",
     "babel-eslint": "^10.0.1",
@@ -33,50 +34,57 @@
     "babel-plugin-dynamic-import-node": "^2.2.0",
     "cheerio": "^1.0.0-rc.2",
     "codecov": "^3.1.0",
-    "consola": "^2.3.0",
+    "consola": "^2.3.2",
     "cross-env": "^5.2.0",
     "cross-spawn": "^6.0.5",
-    "eslint": "^5.9.0",
+    "eslint": "^5.12.1",
     "eslint-config-standard": "^12.0.0",
-    "eslint-multiplexer": "^1.0.2",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^22.0.0",
-    "eslint-plugin-node": "^8.0.0",
+    "eslint-multiplexer": "^1.0.3",
+    "eslint-plugin-import": "^2.15.0",
+    "eslint-plugin-jest": "^22.1.3",
+    "eslint-plugin-node": "^8.0.1",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
-    "eslint-plugin-vue": "^5.0.0-beta.4",
-    "esm": "^3.0.84",
+    "eslint-plugin-vue": "^5.1.0",
+    "esm": "^3.1.4",
     "express": "^4.16.4",
     "finalhandler": "^1.1.1",
+    "fork-ts-checker-webpack-plugin": "^0.5.2",
     "fs-extra": "^7.0.1",
-    "get-port": "^4.0.0",
+    "get-port": "^4.1.0",
     "glob": "^7.1.3",
     "jest": "^23.6.0",
-    "jest-junit": "^5.2.0",
-    "jsdom": "^13.0.0",
+    "jest-junit": "^6.1.0",
+    "jsdom": "^13.2.0",
     "klaw-sync": "^6.0.0",
-    "lerna": "^3.4.3",
+    "lerna": "3.10.7",
     "lodash": "^4.17.11",
     "node-fetch": "^2.3.0",
     "pug": "^2.0.3",
     "pug-plain-loader": "^1.0.0",
-    "puppeteer": "^1.10.0",
+    "puppeteer": "^1.11.0",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.67.3",
-    "rollup-plugin-alias": "^1.4.0",
-    "rollup-plugin-babel": "^4.0.3",
+    "rimraf": "^2.6.3",
+    "rollup": "^1.1.2",
+    "rollup-plugin-alias": "^1.5.1",
+    "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-json": "^3.1.0",
-    "rollup-plugin-license": "^0.7.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-license": "^0.8.1",
+    "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-replace": "^2.1.0",
-    "sort-package-json": "^1.16.0",
-    "vue-jest": "^3.0.0"
+    "sort-package-json": "^1.18.0",
+    "ts-jest": "^23.10.5",
+    "ts-loader": "^5.3.3",
+    "tslint": "^5.12.1",
+    "typescript": "^3.2.4",
+    "vue-jest": "^3.0.2",
+    "vue-property-decorator": "^7.3.0"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.js.git"
-  }
+  },
+  "name": "nuxt.js"
 }
diff --git a/packages/babel-preset-app/CHANGELOG.md b/packages/babel-preset-app/CHANGELOG.md
index 3643b937dc..05c89b62e2 100644
--- a/packages/babel-preset-app/CHANGELOG.md
+++ b/packages/babel-preset-app/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **ts:** switch from babel preset to ts-loader ([#4563](https://github.com/nuxt/nuxt.js/issues/4563)) ([75e3df6](https://github.com/nuxt/nuxt.js/commit/75e3df6))
+
+
+### Features
+
+* **builder:** optional typescript support ([#4557](https://github.com/nuxt/nuxt.js/issues/4557)) ([7145c1a](https://github.com/nuxt/nuxt.js/commit/7145c1a))
+* replace babel-plugin-transform-vue-jsx with [@vue](https://github.com/vue)/babel-preset-jsx ([#4740](https://github.com/nuxt/nuxt.js/issues/4740)) ([da8a3d8](https://github.com/nuxt/nuxt.js/commit/da8a3d8))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 **Note:** Version bump only for package @nuxt/babel-preset-app
diff --git a/packages/babel-preset-app/package.json b/packages/babel-preset-app/package.json
index ffb6f2f2bd..1798a8544e 100644
--- a/packages/babel-preset-app/package.json
+++ b/packages/babel-preset-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/babel-preset-app",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "babel-preset-app for nuxt.js",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
@@ -10,16 +10,14 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@babel/core": "^7.1.6",
-    "@babel/plugin-proposal-class-properties": "^7.1.0",
-    "@babel/plugin-proposal-decorators": "^7.1.6",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-syntax-jsx": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.1.0",
-    "@babel/preset-env": "^7.1.6",
-    "@babel/runtime": "^7.1.5",
-    "babel-helper-vue-jsx-merge-props": "^2.0.3",
-    "babel-plugin-transform-vue-jsx": "^4.0.1"
+    "@babel/core": "^7.2.2",
+    "@babel/plugin-proposal-class-properties": "^7.3.0",
+    "@babel/plugin-proposal-decorators": "^7.3.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/preset-env": "^7.3.1",
+    "@babel/runtime": "^7.3.1",
+    "@vue/babel-preset-jsx": "^1.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/babel-preset-app/src/index.js b/packages/babel-preset-app/src/index.js
index f687cf60d0..c852c10cbe 100644
--- a/packages/babel-preset-app/src/index.js
+++ b/packages/babel-preset-app/src/index.js
@@ -1,3 +1,5 @@
+const path = require('path')
+
 const defaultPolyfills = [
   // Promise polyfill alone doesn't work in IE,
   // Needs this as well. see: #1642
@@ -24,31 +26,27 @@ module.exports = (context, options = {}) => {
   const presets = []
   const plugins = []
 
-  // JSX
-  if (options.jsx !== false) {
-    plugins.push(
-      require('@babel/plugin-syntax-jsx'),
-      require('babel-plugin-transform-vue-jsx')
-      // require('babel-plugin-jsx-event-modifiers'),
-      // require('babel-plugin-jsx-v-model')
-    )
-  }
-
   const modern = !!options.modern
 
   const {
+    polyfills: userPolyfills,
     buildTarget,
     loose = false,
-    useBuiltIns = (modern ? false : 'usage'),
+    debug = false,
+    useBuiltIns = 'usage',
     modules = false,
-    polyfills: userPolyfills,
+    spec,
     ignoreBrowserslistConfig = modern,
     configPath,
+    include,
+    exclude,
+    shippedProposals,
     forceAllTransforms,
+    decoratorsBeforeExport,
     decoratorsLegacy
   } = options
 
-  let targets = options.targets
+  let { targets } = options
   if (modern === true) {
     targets = { esmodules: true }
   } else if (targets === undefined) {
@@ -69,25 +67,42 @@ module.exports = (context, options = {}) => {
   // Pass options along to babel-preset-env
   presets.push([
     require('@babel/preset-env'), {
+      spec,
       loose,
+      debug,
       modules,
       targets,
       useBuiltIns,
-      forceAllTransforms,
       ignoreBrowserslistConfig,
-      exclude: polyfills
+      configPath,
+      include,
+      exclude: polyfills.concat(exclude || []),
+      shippedProposals,
+      forceAllTransforms
     }
   ])
 
+  // JSX
+  if (options.jsx !== false) {
+    presets.push([require('@vue/babel-preset-jsx'), Object.assign({}, options.jsx)])
+  }
+
   plugins.push(
     require('@babel/plugin-syntax-dynamic-import'),
-    [require('@babel/plugin-proposal-decorators'), { legacy: decoratorsLegacy !== false }],
+    [require('@babel/plugin-proposal-decorators'), {
+      decoratorsBeforeExport,
+      legacy: decoratorsLegacy !== false
+    }],
     [require('@babel/plugin-proposal-class-properties'), { loose }]
   )
 
   // Transform runtime, but only for helpers
   plugins.push([require('@babel/plugin-transform-runtime'), {
-    regenerator: useBuiltIns !== 'usage'
+    regenerator: useBuiltIns !== 'usage',
+    corejs: useBuiltIns !== false ? false : 2,
+    helpers: useBuiltIns === 'usage',
+    useESModules: true,
+    absoluteRuntime: path.dirname(require.resolve('@babel/runtime/package.json'))
   }])
 
   return {
diff --git a/packages/builder/CHANGELOG.md b/packages/builder/CHANGELOG.md
index aa7bb548a6..a4f81a7c2c 100644
--- a/packages/builder/CHANGELOG.md
+++ b/packages/builder/CHANGELOG.md
@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* plugins for modern mode ([#4659](https://github.com/nuxt/nuxt.js/issues/4659)) ([867e8e1](https://github.com/nuxt/nuxt.js/commit/867e8e1))
+* **builder:** add lodash inside templates ([#4368](https://github.com/nuxt/nuxt.js/issues/4368)) ([27e79be](https://github.com/nuxt/nuxt.js/commit/27e79be))
+* add option to rewatch on path after raw fs event ([#4717](https://github.com/nuxt/nuxt.js/issues/4717)) ([9c6df49](https://github.com/nuxt/nuxt.js/commit/9c6df49))
+* detect plugin without extension ([#4579](https://github.com/nuxt/nuxt.js/issues/4579)) ([e7df65b](https://github.com/nuxt/nuxt.js/commit/e7df65b))
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* invalid plugin mode warning for all ([9b3e7be](https://github.com/nuxt/nuxt.js/commit/9b3e7be))
+* no false positives for plugins with index.js ([#4714](https://github.com/nuxt/nuxt.js/issues/4714)) ([eef2af3](https://github.com/nuxt/nuxt.js/commit/eef2af3)), closes [#4713](https://github.com/nuxt/nuxt.js/issues/4713)
+* properly serialize head functions ([#4558](https://github.com/nuxt/nuxt.js/issues/4558)) ([7831e57](https://github.com/nuxt/nuxt.js/commit/7831e57)), closes [#4079](https://github.com/nuxt/nuxt.js/issues/4079)
+* watch custom patterns only when it exists ([#4823](https://github.com/nuxt/nuxt.js/issues/4823)) ([3966b26](https://github.com/nuxt/nuxt.js/commit/3966b26))
+* **builder:** js layout ([#4701](https://github.com/nuxt/nuxt.js/issues/4701)) ([af76e07](https://github.com/nuxt/nuxt.js/commit/af76e07))
+* **builder:** layouts condition ([#4641](https://github.com/nuxt/nuxt.js/issues/4641)) ([6436e3b](https://github.com/nuxt/nuxt.js/commit/6436e3b))
+* **builder, module:** addLayout and nuxt.config precedence over auto-scanned layouts ([#4702](https://github.com/nuxt/nuxt.js/issues/4702)) ([f85ac94](https://github.com/nuxt/nuxt.js/commit/f85ac94))
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* **ts:** switch from babel preset to ts-loader ([#4563](https://github.com/nuxt/nuxt.js/issues/4563)) ([75e3df6](https://github.com/nuxt/nuxt.js/commit/75e3df6))
+
+
+### Features
+
+* **builder:** optional typescript support ([#4557](https://github.com/nuxt/nuxt.js/issues/4557)) ([7145c1a](https://github.com/nuxt/nuxt.js/commit/7145c1a))
+* mode for plugins ([#4592](https://github.com/nuxt/nuxt.js/issues/4592)) ([e71c455](https://github.com/nuxt/nuxt.js/commit/e71c455))
+* **builder:** validate vue-app dependencies and suggest fix ([#4669](https://github.com/nuxt/nuxt.js/issues/4669)) ([7dd33fe](https://github.com/nuxt/nuxt.js/commit/7dd33fe))
+* **router:** custom route name splitter ([#4598](https://github.com/nuxt/nuxt.js/issues/4598)) ([add8000](https://github.com/nuxt/nuxt.js/commit/add8000))
+* **ts:** add TSX support ([#4613](https://github.com/nuxt/nuxt.js/issues/4613)) ([4d52742](https://github.com/nuxt/nuxt.js/commit/4d52742))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 **Note:** Version bump only for package @nuxt/builder
diff --git a/packages/builder/package.json b/packages/builder/package.json
index ad3d8b683e..33e7cafead 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/builder",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -8,17 +8,18 @@
   ],
   "main": "dist/builder.js",
   "dependencies": {
-    "@nuxt/common": "2.3.4",
-    "@nuxt/vue-app": "2.3.4",
-    "@nuxtjs/devalue": "^1.1.0",
+    "@nuxt/devalue": "^1.2.0",
+    "@nuxt/utils": "2.4.0",
+    "@nuxt/vue-app": "2.4.0",
     "chokidar": "^2.0.4",
-    "consola": "^2.3.0",
+    "consola": "^2.3.2",
     "fs-extra": "^7.0.1",
     "glob": "^7.1.3",
     "hash-sum": "^1.0.2",
     "lodash": "^4.17.11",
     "pify": "^4.0.1",
-    "serialize-javascript": "^1.5.0",
+    "semver": "^5.6.0",
+    "serialize-javascript": "^1.6.1",
     "upath": "^1.1.0"
   },
   "publishConfig": {
diff --git a/packages/builder/src/builder.js b/packages/builder/src/builder.js
index 6ebeee904b..ad4fabf8f8 100644
--- a/packages/builder/src/builder.js
+++ b/packages/builder/src/builder.js
@@ -7,17 +7,15 @@ import hash from 'hash-sum'
 import pify from 'pify'
 import serialize from 'serialize-javascript'
 import upath from 'upath'
+import semver from 'semver'
 
-import concat from 'lodash/concat'
 import debounce from 'lodash/debounce'
-import map from 'lodash/map'
 import omit from 'lodash/omit'
 import template from 'lodash/template'
 import uniq from 'lodash/uniq'
 import uniqBy from 'lodash/uniqBy'
-import values from 'lodash/values'
 
-import devalue from '@nuxtjs/devalue'
+import devalue from '@nuxt/devalue'
 
 import {
   r,
@@ -26,10 +24,12 @@ import {
   createRoutes,
   relativeTo,
   waitFor,
+  serializeFunction,
   determineGlobals,
   stripWhitespace,
-  isString
-} from '@nuxt/common'
+  isString,
+  isIndexFileAndFolder
+} from '@nuxt/utils'
 
 import BuildContext from './context'
 
@@ -47,6 +47,8 @@ export default class Builder {
       restart: null
     }
 
+    this.supportedExtensions = ['vue', 'js', 'ts', 'tsx']
+
     // Helper to resolve build paths
     this.relativeToBuild = (...args) =>
       relativeTo(this.options.buildDir, ...args)
@@ -59,10 +61,11 @@ export default class Builder {
       this.nuxt.hook('build:done', () => {
         consola.info('Waiting for file changes')
         this.watchClient()
+        this.watchRestart()
       })
 
-      // Stop watching on nuxt.close()
-      this.nuxt.hook('close', () => this.unwatch())
+      // Close hook
+      this.nuxt.hook('close', () => this.close())
     }
 
     if (this.options.build.analyze) {
@@ -74,7 +77,7 @@ export default class Builder {
     // Resolve template
     this.template = this.options.build.template || '@nuxt/vue-app'
     if (typeof this.template === 'string') {
-      this.template = this.nuxt.resolver.requireModule(this.template)
+      this.template = this.nuxt.resolver.requireModule(this.template).template
     }
 
     // if(!this.options.dev) {
@@ -93,7 +96,7 @@ export default class Builder {
     const context = new BuildContext(this)
 
     if (typeof BundleBuilder !== 'function') {
-      BundleBuilder = require('@nuxt/webpack').BundleBuilder
+      ({ BundleBuilder } = require('@nuxt/webpack'))
     }
 
     return new BundleBuilder(context)
@@ -102,14 +105,26 @@ export default class Builder {
   normalizePlugins() {
     return uniqBy(
       this.options.plugins.map((p) => {
-        if (typeof p === 'string') p = { src: p }
+        if (typeof p === 'string') {
+          p = { src: p }
+        }
         const pluginBaseName = path.basename(p.src, path.extname(p.src)).replace(
           /[^a-zA-Z?\d\s:]/g,
           ''
         )
+
+        if (p.ssr === false) {
+          p.mode = 'client'
+        } else if (p.mode === undefined) {
+          p.mode = 'all'
+        } else if (!['client', 'server', 'all'].includes(p.mode)) {
+          consola.warn(`Invalid plugin mode (server/client/all): '${p.mode}'. Falling back to 'all'`)
+          p.mode = 'all'
+        }
+
         return {
           src: this.nuxt.resolver.resolveAlias(p.src),
-          ssr: p.ssr !== false,
+          mode: p.mode,
           name: 'nuxt_plugin_' + pluginBaseName + '_' + hash(p.src)
         }
       }),
@@ -120,18 +135,29 @@ export default class Builder {
   resolvePlugins() {
     // Check plugins exist then set alias to their real path
     return Promise.all(this.plugins.map(async (p) => {
-      const ext = path.extname(p.src) ? '' : '{.+([^.]),/index.+([^.])}'
+      const ext = '{?(.+([^.])),/index.+([^.])}'
       const pluginFiles = await glob(`${p.src}${ext}`)
 
       if (!pluginFiles || pluginFiles.length === 0) {
         throw new Error(`Plugin not found: ${p.src}`)
-      } else if (pluginFiles.length > 1) {
+      }
+
+      if (pluginFiles.length > 1 && !isIndexFileAndFolder(pluginFiles)) {
         consola.warn({
           message: `Found ${pluginFiles.length} plugins that match the configuration, suggest to specify extension:`,
           additional: '\n' + pluginFiles.map(x => `- ${x}`).join('\n')
         })
       }
 
+      const modes = ['client', 'server']
+      const modePattern = new RegExp(`\\.(${modes.join('|')})\\.\\w+$`)
+      pluginFiles[0].replace(modePattern, (_, mode) => {
+        // mode in nuxt.config has higher priority
+        if (p.mode === 'all' && modes.includes(mode)) {
+          p.mode = mode
+        }
+      })
+
       p.src = this.relativeToBuild(p.src)
     }))
   }
@@ -167,20 +193,13 @@ export default class Builder {
     // Call before hook
     await this.nuxt.callHook('build:before', this, this.options.build)
 
-    // Check if pages dir exists and warn if not
-    this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
-    if (this._nuxtPages) {
-      if (!fsExtra.existsSync(path.join(this.options.srcDir, this.options.dir.pages))) {
-        const dir = this.options.srcDir
-        if (fsExtra.existsSync(path.join(this.options.srcDir, '..', this.options.dir.pages))) {
-          throw new Error(
-            `No \`${this.options.dir.pages}\` directory found in ${dir}. Did you mean to run \`nuxt\` in the parent (\`../\`) directory?`
-          )
-        } else {
-          this._defaultPage = true
-          consola.warn(`No \`${this.options.dir.pages}\` directory found in ${dir}. Using the default built-in page.`)
-        }
-      }
+    await this.validatePages()
+
+    // Validate template
+    try {
+      this.validateTemplate()
+    } catch (err) {
+      consola.fatal(err)
     }
 
     consola.success('Builder initialized')
@@ -215,6 +234,65 @@ export default class Builder {
     return this
   }
 
+  // Check if pages dir exists and warn if not
+  async validatePages() {
+    this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
+
+    if (
+      !this._nuxtPages ||
+      await fsExtra.exists(path.join(this.options.srcDir, this.options.dir.pages))
+    ) {
+      return
+    }
+
+    const dir = this.options.srcDir
+    if (await fsExtra.exists(path.join(this.options.srcDir, '..', this.options.dir.pages))) {
+      throw new Error(
+        `No \`${this.options.dir.pages}\` directory found in ${dir}. Did you mean to run \`nuxt\` in the parent (\`../\`) directory?`
+      )
+    }
+
+    this._defaultPage = true
+    consola.warn(`No \`${this.options.dir.pages}\` directory found in ${dir}. Using the default built-in page.`)
+  }
+
+  validateTemplate() {
+    // Validate template dependencies
+    const templateDependencies = this.template.dependencies
+    const dpendencyFixes = []
+    for (const depName in templateDependencies) {
+      const depVersion = templateDependencies[depName]
+      const requiredVersion = `${depName}@${depVersion}`
+
+      // Load installed version
+      const pkg = this.nuxt.resolver.requireModule(path.join(depName, 'package.json'))
+      if (pkg) {
+        const validVersion = semver.satisfies(pkg.version, depVersion)
+        if (!validVersion) {
+          consola.warn(`${requiredVersion} is required but ${depName}@${pkg.version} is installed!`)
+          dpendencyFixes.push(requiredVersion)
+        }
+      } else {
+        consola.warn(`${depName}@${depVersion} is required but not installed!`)
+        dpendencyFixes.push(requiredVersion)
+      }
+    }
+
+    // Suggest dependency fixes (TODO: automate me)
+    if (dpendencyFixes.length) {
+      consola.error(
+        `Please install missing dependencies:\n`,
+        '\n',
+        `Using yarn:\n`,
+        `yarn add ${dpendencyFixes.join(' ')}\n`,
+        '\n',
+        `Using npm:\n`,
+        `npm i ${dpendencyFixes.join(' ')}\n`
+      )
+      throw new Error('Missing Template Dependencies')
+    }
+  }
+
   async generateRoutesAndFiles() {
     consola.debug(`Generating nuxt files`)
 
@@ -222,7 +300,7 @@ export default class Builder {
     this.plugins = Array.from(this.normalizePlugins())
 
     // -- Templates --
-    let templatesFiles = Array.from(this.template.templatesFiles)
+    let templatesFiles = Array.from(this.template.files)
 
     const templateVars = {
       options: this.options,
@@ -265,14 +343,15 @@ export default class Builder {
 
     // -- Layouts --
     if (fsExtra.existsSync(path.resolve(this.options.srcDir, this.options.dir.layouts))) {
-      const layoutsFiles = await glob(`${this.options.dir.layouts}/**/*.{vue,js}`, {
+      const configLayouts = this.options.layouts
+      const layoutsFiles = await glob(`${this.options.dir.layouts}/**/*.{${this.supportedExtensions.join(',')}}`, {
         cwd: this.options.srcDir,
         ignore: this.options.ignore
       })
       layoutsFiles.forEach((file) => {
         const name = file
           .replace(new RegExp(`^${this.options.dir.layouts}/`), '')
-          .replace(/\.(vue|js)$/, '')
+          .replace(new RegExp(`\\.(${this.supportedExtensions.join('|')})$`), '')
         if (name === 'error') {
           if (!templateVars.components.ErrorPage) {
             templateVars.components.ErrorPage = this.relativeToBuild(
@@ -282,7 +361,10 @@ export default class Builder {
           }
           return
         }
-        if (!templateVars.layouts[name] || /\.vue$/.test(file)) {
+        // Layout Priority: module.addLayout > .vue file > other extensions
+        if (configLayouts[name]) {
+          consola.warn(`Duplicate layout registration, "${name}" has been registered as "${configLayouts[name]}"`)
+        } else if (!templateVars.layouts[name] || /\.vue$/.test(file)) {
           templateVars.layouts[name] = this.relativeToBuild(
             this.options.srcDir,
             file
@@ -303,24 +385,28 @@ export default class Builder {
     if (this._defaultPage) {
       templateVars.router.routes = createRoutes(
         ['index.vue'],
-        this.template.templatesDir + '/pages'
+        this.template.dir + '/pages',
+        '',
+        this.options.router.routeNameSplitter
       )
     } else if (this._nuxtPages) {
       // Use nuxt.js createRoutes bases on pages/
       const files = {}
-        ; (await glob(`${this.options.dir.pages}/**/*.{vue,js}`, {
+      ;(await glob(`${this.options.dir.pages}/**/*.{${this.supportedExtensions.join(',')}}`, {
         cwd: this.options.srcDir,
         ignore: this.options.ignore
       })).forEach((f) => {
-        const key = f.replace(/\.(js|vue)$/, '')
+        const key = f.replace(new RegExp(`\\.(${this.supportedExtensions.join('|')})$`), '')
+        // .vue file takes precedence over other extensions
         if (/\.vue$/.test(f) || !files[key]) {
-          files[key] = f.replace(/('|")/g, '\\$1')
+          files[key] = f.replace(/(['"])/g, '\\$1')
         }
       })
       templateVars.router.routes = createRoutes(
         Object.values(files),
         this.options.srcDir,
-        this.options.dir.pages
+        this.options.dir.pages,
+        this.options.router.routeNameSplitter
       )
     } else { // If user defined a custom method to create routes
       templateVars.router.routes = this.options.build.createRoutes(
@@ -371,7 +457,7 @@ export default class Builder {
         const customFileExists = fsExtra.existsSync(customPath)
 
         return {
-          src: customFileExists ? customPath : r(this.template.templatesDir, file),
+          src: customFileExists ? customPath : r(this.template.dir, file),
           dst: file,
           custom: customFileExists
         }
@@ -395,21 +481,30 @@ export default class Builder {
 
     // -- Loading indicator --
     if (this.options.loadingIndicator.name) {
-      const indicatorPath1 = path.resolve(
-        this.template.templatesDir,
+      let indicatorPath = path.resolve(
+        this.template.dir,
         'views/loading',
         this.options.loadingIndicator.name + '.html'
       )
-      const indicatorPath2 = this.nuxt.resolver.resolveAlias(
-        this.options.loadingIndicator.name
-      )
-      const indicatorPath = fsExtra.existsSync(indicatorPath1)
-        ? indicatorPath1
-        : fsExtra.existsSync(indicatorPath2) ? indicatorPath2 : null
+
+      let customIndicator = false
+      if (!fsExtra.existsSync(indicatorPath)) {
+        indicatorPath = this.nuxt.resolver.resolveAlias(
+          this.options.loadingIndicator.name
+        )
+
+        if (fsExtra.existsSync(indicatorPath)) {
+          customIndicator = true
+        } else {
+          indicatorPath = null
+        }
+      }
+
       if (indicatorPath) {
         templatesFiles.push({
           src: indicatorPath,
           dst: 'loading.html',
+          custom: customIndicator,
           options: this.options.loadingIndicator
         })
       } else {
@@ -434,6 +529,7 @@ export default class Builder {
     const templateOptions = {
       imports: {
         serialize,
+        serializeFunction,
         devalue,
         hash,
         r,
@@ -456,11 +552,17 @@ export default class Builder {
       interpolate: /<%=([\s\S]+?)%>/g
     }
 
+    // Add vue-app template dir to watchers
+    this.options.build.watch.push(this.template.dir)
+
     // Interpret and move template files to .nuxt/
     await Promise.all(
       templatesFiles.map(async ({ src, dst, options, custom }) => {
-        // Add template to watchers
-        this.options.build.watch.push(src)
+        // Add custom templates to watcher
+        if (custom) {
+          this.options.build.watch.push(src)
+        }
+
         // Render template to dst
         const fileContent = await fsExtra.readFile(src, 'utf8')
         let content
@@ -502,21 +604,23 @@ export default class Builder {
 
   watchClient() {
     const src = this.options.srcDir
+    const rGlob = dir => ['*', '**/*'].map(glob => r(src, `${dir}/${glob}.{${this.supportedExtensions.join(',')}}`))
+
     let patterns = [
       r(src, this.options.dir.layouts),
       r(src, this.options.dir.store),
       r(src, this.options.dir.middleware),
-      r(src, `${this.options.dir.layouts}/*.{vue,js}`),
-      r(src, `${this.options.dir.layouts}/**/*.{vue,js}`)
+      ...rGlob(this.options.dir.layouts)
     ]
+
     if (this._nuxtPages) {
       patterns.push(
         r(src, this.options.dir.pages),
-        r(src, `${this.options.dir.pages}/*.{vue,js}`),
-        r(src, `${this.options.dir.pages}/**/*.{vue,js}`)
+        ...rGlob(this.options.dir.pages)
       )
     }
-    patterns = map(patterns, upath.normalizeSafe)
+
+    patterns = patterns.map(upath.normalizeSafe)
 
     const options = this.options.watchers.chokidar
     /* istanbul ignore next */
@@ -528,44 +632,79 @@ export default class Builder {
       .on('add', refreshFiles)
       .on('unlink', refreshFiles)
 
+    this.watchCustom(refreshFiles)
+  }
+
+  watchCustom(refreshFiles, refresh) {
+    const options = this.options.watchers.chokidar
     // Watch for custom provided files
-    let customPatterns = concat(
-      this.options.build.watch,
-      ...values(omit(this.options.build.styleResources, ['options']))
-    )
-    customPatterns = map(uniq(customPatterns), upath.normalizeSafe)
+    const customPatterns = uniq([
+      ...this.options.build.watch,
+      ...Object.values(omit(this.options.build.styleResources, ['options']))
+    ]).map(upath.normalizeSafe)
+
+    if (customPatterns.length === 0) {
+      return
+    }
+
+    if (refresh) {
+      refreshFiles()
+    }
+
     this.watchers.custom = chokidar
       .watch(customPatterns, options)
       .on('change', refreshFiles)
+
+    const { rewatchOnRawEvents } = this.options.watchers
+    if (rewatchOnRawEvents && Array.isArray(rewatchOnRawEvents)) {
+      this.watchers.custom.on('raw', (_event, _path, opts) => {
+        if (rewatchOnRawEvents.includes(_event)) {
+          this.watchers.custom.close()
+          this.watchers.custom = null
+
+          this.watchCustom(refreshFiles, true)
+        }
+      })
+    }
   }
 
-  watchServer() {
-    const nuxtRestartWatch = concat(
-      this.options.serverMiddleware
-        .filter(isString)
-        .map(this.nuxt.resolver.resolveAlias),
-      this.options.watch.map(this.nuxt.resolver.resolveAlias),
-      path.join(this.options.rootDir, 'nuxt.config.js')
-    )
+  watchRestart() {
+    const nuxtRestartWatch = [
+      // Server middleware
+      ...this.options.serverMiddleware.filter(isString),
+      // Custom watchers
+      ...this.options.watch
+    ].map(this.nuxt.resolver.resolveAlias)
 
     this.watchers.restart = chokidar
       .watch(nuxtRestartWatch, this.options.watchers.chokidar)
-      .on('change', (_path) => {
-        this.watchers.restart.close()
-        const { name, ext } = path.parse(_path)
-        this.nuxt.callHook('watch:fileChanged', this, `${name}${ext}`)
+      .on('all', (event, _path) => {
+        if (['add', 'change', 'unlink'].includes(event) === false) {
+          return
+        }
+        this.nuxt.callHook('watch:fileChanged', this, _path) // Legacy
+        this.nuxt.callHook('watch:restart', { event, path: _path })
       })
   }
 
-  async unwatch() {
+  unwatch() {
     for (const watcher in this.watchers) {
-      if (this.watchers[watcher]) {
-        this.watchers[watcher].close()
-      }
+      this.watchers[watcher].close()
     }
+  }
 
-    if (this.bundleBuilder.unwatch) {
-      await this.bundleBuilder.unwatch()
+  async close() {
+    if (this.__closed) {
+      return
+    }
+    this.__closed = true
+
+    // Unwatch
+    this.unwatch()
+
+    // Close bundleBuilder
+    if (typeof this.bundleBuilder.close === 'function') {
+      await this.bundleBuilder.close()
     }
   }
 }
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index e177651fe8..db89e1a776 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* exit with proper error code on errors ([#4806](https://github.com/nuxt/nuxt.js/issues/4806)) ([a7ba73e](https://github.com/nuxt/nuxt.js/commit/a7ba73e))
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* modern=true or false not work as expected ([#4378](https://github.com/nuxt/nuxt.js/issues/4378)) ([4c27088](https://github.com/nuxt/nuxt.js/commit/4c27088))
+* **config:** define once default nuxt config filename ([#4814](https://github.com/nuxt/nuxt.js/issues/4814)) ([06a18ca](https://github.com/nuxt/nuxt.js/commit/06a18ca))
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* **dev:** Show correct path when webpack watched files changed ([25dea5f](https://github.com/nuxt/nuxt.js/commit/25dea5f))
+
+
+### Features
+
+* **cli:** add `--devtools` option for build and generate ([#4357](https://github.com/nuxt/nuxt.js/issues/4357)) ([e6f73b5](https://github.com/nuxt/nuxt.js/commit/e6f73b5))
+* improve SSR bundle ([#4439](https://github.com/nuxt/nuxt.js/issues/4439)) ([0f104aa](https://github.com/nuxt/nuxt.js/commit/0f104aa)), closes [#4225](https://github.com/nuxt/nuxt.js/issues/4225) [#3465](https://github.com/nuxt/nuxt.js/issues/3465) [#1728](https://github.com/nuxt/nuxt.js/issues/1728) [#1601](https://github.com/nuxt/nuxt.js/issues/1601) [#1481](https://github.com/nuxt/nuxt.js/issues/1481)
+* **cli:** improvements and external commands ([#4314](https://github.com/nuxt/nuxt.js/issues/4314)) ([0145551](https://github.com/nuxt/nuxt.js/commit/0145551))
+* nuxt-ts ([#4658](https://github.com/nuxt/nuxt.js/issues/4658)) ([ee0096b](https://github.com/nuxt/nuxt.js/commit/ee0096b))
+* **nuxt-ts:** typescript support improvements ([#4750](https://github.com/nuxt/nuxt.js/issues/4750)) ([dfaffc0](https://github.com/nuxt/nuxt.js/commit/dfaffc0))
+* **test:** unit tests for core/config module ([#4760](https://github.com/nuxt/nuxt.js/issues/4760)) ([a616c09](https://github.com/nuxt/nuxt.js/commit/a616c09))
+* **webpack,cli:** standalone build mode ([#4661](https://github.com/nuxt/nuxt.js/issues/4661)) ([bdb6791](https://github.com/nuxt/nuxt.js/commit/bdb6791))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/packages/cli/bin/nuxt-cli.js b/packages/cli/bin/nuxt-cli.js
index 9876a2055f..63fe65902b 100755
--- a/packages/cli/bin/nuxt-cli.js
+++ b/packages/cli/bin/nuxt-cli.js
@@ -1,3 +1,7 @@
 #!/usr/bin/env node
 
 require('../dist/cli.js').run()
+  .catch((error) => {
+    require('consola').fatal(error)
+    process.exit(2)
+  })
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2e47c89056..df00092fda 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/cli",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -12,11 +12,12 @@
     "nuxt-cli": "bin/nuxt-cli.js"
   },
   "dependencies": {
-    "@nuxt/config": "2.3.4",
-    "boxen": "^2.0.0",
-    "chalk": "^2.4.1",
-    "consola": "^2.3.0",
-    "esm": "^3.0.84",
+    "@nuxt/config": "2.4.0",
+    "boxen": "^2.1.0",
+    "chalk": "^2.4.2",
+    "consola": "^2.3.2",
+    "esm": "^3.1.4",
+    "execa": "^1.0.0",
     "minimist": "^1.2.0",
     "pretty-bytes": "^5.1.0",
     "std-env": "^2.2.1",
diff --git a/packages/cli/src/command.js b/packages/cli/src/command.js
index b34d00725c..e93d7a3957 100644
--- a/packages/cli/src/command.js
+++ b/packages/cli/src/command.js
@@ -1,70 +1,72 @@
-import parseArgs from 'minimist'
+
+import minimist from 'minimist'
 import { name, version } from '../package.json'
 import { loadNuxtConfig } from './utils'
 import { indent, foldLines, startSpaces, optionSpaces, colorize } from './utils/formatting'
-import * as commands from './commands'
 import * as imports from './imports'
 
 export default class NuxtCommand {
-  constructor({ name, description, usage, options, run } = {}) {
-    this.name = name || ''
-    this.description = description || ''
-    this.usage = usage || ''
-    this.options = Object.assign({}, options)
-    this._run = run
+  constructor(cmd = { name: '', usage: '', description: '' }, argv = process.argv.slice(2)) {
+    if (!cmd.options) {
+      cmd.options = {}
+    }
+    this.cmd = cmd
+
+    this._argv = Array.from(argv)
+    this._parsedArgv = null // Lazy evaluate
   }
 
-  static async load(name) {
-    if (name in commands) {
-      const cmd = await commands[name]() // eslint-disable-line import/namespace
-        .then(m => m.default)
-      return NuxtCommand.from(cmd)
-    } else {
-      // TODO dynamic module loading
-      throw new Error('Command ' + name + ' could not be loaded!')
-    }
+  static run(cmd, argv) {
+    return NuxtCommand.from(cmd, argv).run()
   }
 
-  static from(options) {
-    if (options instanceof NuxtCommand) {
-      return options
+  static from(cmd, argv) {
+    if (cmd instanceof NuxtCommand) {
+      return cmd
     }
-    return new NuxtCommand(options)
+    return new NuxtCommand(cmd, argv)
   }
 
   run() {
-    return this._run(this)
+    if (this.argv.help) {
+      this.showHelp()
+      return Promise.resolve()
+    }
+
+    if (this.argv.version) {
+      this.showVersion()
+      return Promise.resolve()
+    }
+
+    if (typeof this.cmd.run !== 'function') {
+      return Promise.resolve()
+    }
+
+    return Promise.resolve(this.cmd.run(this))
   }
 
   showVersion() {
     process.stdout.write(`${name} v${version}\n`)
-    process.exit(0)
   }
 
   showHelp() {
     process.stdout.write(this._getHelp())
-    process.exit(0)
   }
 
-  getArgv(args) {
-    const minimistOptions = this._getMinimistOptions()
-    const argv = parseArgs(args || process.argv.slice(2), minimistOptions)
-
-    if (argv.version) {
-      this.showVersion()
-    } else if (argv.help) {
-      this.showHelp()
+  get argv() {
+    if (!this._parsedArgv) {
+      const minimistOptions = this._getMinimistOptions()
+      this._parsedArgv = minimist(this._argv, minimistOptions)
     }
-
-    return argv
+    return this._parsedArgv
   }
 
-  async getNuxtConfig(argv, extraOptions) {
-    const config = await loadNuxtConfig(argv)
+  async getNuxtConfig(extraOptions) {
+    const config = await loadNuxtConfig(this.argv)
     const options = Object.assign(config, extraOptions || {})
 
-    for (const name of Object.keys(this.options)) {
-      this.options[name].prepare && this.options[name].prepare(this, options, argv)
+    for (const name of Object.keys(this.cmd.options)) {
+      this.cmd.options[name].prepare && this.cmd.options[name].prepare(this, options, this.argv)
     }
 
     return options
@@ -72,7 +74,9 @@ export default class NuxtCommand {
 
   async getNuxt(options) {
     const { Nuxt } = await imports.core()
-    return new Nuxt(options)
+    const nuxt = new Nuxt(options)
+    await nuxt.ready()
+    return nuxt
   }
 
   async getBuilder(nuxt) {
@@ -95,8 +99,8 @@ export default class NuxtCommand {
       default: {}
     }
 
-    for (const name of Object.keys(this.options)) {
-      const option = this.options[name]
+    for (const name of Object.keys(this.cmd.options)) {
+      const option = this.cmd.options[name]
 
       if (option.alias) {
         minimistOptions.alias[option.alias] = name
@@ -116,8 +120,8 @@ export default class NuxtCommand {
     const options = []
     let maxOptionLength = 0
 
-    for (const name in this.options) {
-      const option = this.options[name]
+    for (const name in this.cmd.options) {
+      const option = this.cmd.options[name]
 
       let optionHelp = '--'
       optionHelp += option.type === 'boolean' && option.default ? 'no-' : ''
@@ -139,13 +143,17 @@ export default class NuxtCommand {
       )
     }).join('\n')
 
-    const usage = foldLines(`Usage: nuxt ${this.usage} [options]`, startSpaces)
-    const description = foldLines(this.description, startSpaces)
+    const usage = foldLines(`Usage: nuxt ${this.cmd.usage} [options]`, startSpaces)
+    const description = foldLines(this.cmd.description, startSpaces)
     const opts = foldLines(`Options:`, startSpaces) + '\n\n' + _opts
 
     let helpText = colorize(`${usage}\n\n`)
-    if (this.description) helpText += colorize(`${description}\n\n`)
-    if (options.length) helpText += colorize(`${opts}\n\n`)
+    if (this.cmd.description) {
+      helpText += colorize(`${description}\n\n`)
+    }
+    if (options.length) {
+      helpText += colorize(`${opts}\n\n`)
+    }
 
     return helpText
   }
diff --git a/packages/cli/src/commands/build.js b/packages/cli/src/commands/build.js
index 9870bed3e8..0a7d153995 100644
--- a/packages/cli/src/commands/build.js
+++ b/packages/cli/src/commands/build.js
@@ -1,4 +1,3 @@
-import consola from 'consola'
 import { common } from '../options'
 
 export default {
@@ -19,6 +18,18 @@ export default {
         }
       }
     },
+    devtools: {
+      type: 'boolean',
+      default: false,
+      description: 'Enable Vue devtools',
+      prepare(cmd, options, argv) {
+        options.vue = options.vue || {}
+        options.vue.config = options.vue.config || {}
+        if (argv.devtools) {
+          options.vue.config.devtools = true
+        }
+      }
+    },
     generate: {
       type: 'boolean',
       default: true,
@@ -35,40 +46,30 @@ export default {
           options.build.quiet = !!argv.quiet
         }
       }
+    },
+    standalone: {
+      type: 'boolean',
+      default: false,
+      description: 'Bundle all server dependencies (useful for nuxt-start)',
+      prepare(cmd, options, argv) {
+        if (argv.standalone) {
+          options.build.standalone = true
+        }
+      }
     }
   },
   async run(cmd) {
-    const argv = cmd.getArgv()
+    const config = await cmd.getNuxtConfig({ dev: false })
+    const nuxt = await cmd.getNuxt(config)
 
-    // Create production build when calling `nuxt build` (dev: false)
-    const nuxt = await cmd.getNuxt(
-      await cmd.getNuxtConfig(argv, { dev: false })
-    )
-
-    let builderOrGenerator
-    if (nuxt.options.mode !== 'spa' || argv.generate === false) {
+    if (nuxt.options.mode !== 'spa' || cmd.argv.generate === false) {
       // Build only
-      builderOrGenerator = (await cmd.getBuilder(nuxt)).build()
+      const builder = await cmd.getBuilder(nuxt)
+      await builder.build()
     } else {
       // Build + Generate for static deployment
-      builderOrGenerator = (await cmd.getGenerator(nuxt)).generate({
-        build: true
-      })
+      const generator = await cmd.getGenerator(nuxt)
+      await generator.generate({ build: true })
     }
-
-    return builderOrGenerator
-      .then(() => {
-        // In analyze mode wait for plugin
-        // emitting assets and opening browser
-        if (
-          nuxt.options.build.analyze === true ||
-          typeof nuxt.options.build.analyze === 'object'
-        ) {
-          return
-        }
-
-        process.exit(0)
-      })
-      .catch(err => consola.fatal(err))
   }
 }
diff --git a/packages/cli/src/commands/dev.js b/packages/cli/src/commands/dev.js
index b8999d2a68..e0738c751a 100644
--- a/packages/cli/src/commands/dev.js
+++ b/packages/cli/src/commands/dev.js
@@ -1,8 +1,7 @@
 import consola from 'consola'
 import chalk from 'chalk'
-import env from 'std-env'
 import { common, server } from '../options'
-import { showBanner } from '../utils'
+import { showBanner, eventsMapping, formatPath } from '../utils'
 
 export default {
   name: 'dev',
@@ -12,68 +11,63 @@ export default {
     ...common,
     ...server
   },
+
   async run(cmd) {
-    const argv = cmd.getArgv()
+    const { argv } = cmd
+    await this.startDev(cmd, argv)
+  },
 
-    const errorHandler = (err, instance) => {
-      instance && instance.builder.watchServer()
-      consola.error(err)
+  async startDev(cmd, argv) {
+    try {
+      await this._startDev(cmd, argv)
+    } catch (error) {
+      consola.error(error)
     }
+  },
 
-    // Start dev
-    async function startDev(oldInstance) {
-      let nuxt, builder
+  async _startDev(cmd, argv) {
+    const config = await cmd.getNuxtConfig({ dev: true })
+    const nuxt = await cmd.getNuxt(config)
 
-      try {
-        nuxt = await cmd.getNuxt(
-          await cmd.getNuxtConfig(argv, { dev: true })
-        )
-        builder = await cmd.getBuilder(nuxt)
-      } catch (err) {
-        return errorHandler(err, oldInstance)
-      }
+    // Setup hooks
+    nuxt.hook('watch:restart', payload => this.onWatchRestart(payload, { nuxt, builder, cmd, argv }))
+    nuxt.hook('bundler:change', changedFileName => this.onBundlerChange(changedFileName))
 
-      const logChanged = (name) => {
-        consola.log({
-          type: 'change',
-          icon: chalk.blue.bold(env.windows ? '»' : '↻'),
-          message: chalk.blue(name)
-        })
-      }
+    // Start listening
+    await nuxt.server.listen()
 
-      nuxt.hook('watch:fileChanged', async (builder, name) => {
-        logChanged(name)
-        await startDev({ nuxt: builder.nuxt, builder })
-      })
+    // Create builder instance
+    const builder = await cmd.getBuilder(nuxt)
 
-      nuxt.hook('bundler:change', (name) => {
-        logChanged(name)
-      })
+    // Start Build
+    await builder.build()
 
-      return (
-        Promise.resolve()
-          .then(() => oldInstance && oldInstance.nuxt.clearHook('watch:fileChanged'))
-          .then(() => oldInstance && oldInstance.builder.unwatch())
-          // Start build
-          .then(() => builder.build())
-          // Close old nuxt no matter if build successfully
-          .catch((err) => {
-            oldInstance && oldInstance.nuxt.close()
-            // Jump to errorHandler
-            throw err
-          })
-          .then(() => oldInstance && oldInstance.nuxt.close())
-          // Start listening
-          .then(() => nuxt.server.listen())
-          // Show banner
-          .then(() => showBanner(nuxt))
-          // Start watching serverMiddleware changes
-          .then(() => builder.watchServer())
-          // Handle errors
-          .catch(err => errorHandler(err, { builder, nuxt }))
-      )
-    }
+    // Show banner after build
+    showBanner(nuxt)
 
-    await startDev()
+    // Return instance
+    return nuxt
+  },
+
+  logChanged({ event, path }) {
+    const { icon, color, action } = eventsMapping[event] || eventsMapping.change
+
+    consola.log({
+      type: event,
+      icon: chalk[color].bold(icon),
+      message: `${action} ${chalk.cyan(formatPath(path))}`
+    })
+  },
+
+  async onWatchRestart({ event, path }, { nuxt, cmd, argv }) {
+    this.logChanged({ event, path })
+
+    await nuxt.close()
+
+    await this.startDev(cmd, argv)
+  },
+
+  onBundlerChange(path) {
+    this.logChanged({ event: 'change', path })
   }
 }
diff --git a/packages/cli/src/commands/generate.js b/packages/cli/src/commands/generate.js
index 2632b59434..2de34cae2d 100644
--- a/packages/cli/src/commands/generate.js
+++ b/packages/cli/src/commands/generate.js
@@ -1,4 +1,3 @@
-import consola from 'consola'
 import { common } from '../options'
 import { normalizeArg } from '../utils'
 
@@ -13,6 +12,18 @@ export default {
       default: true,
       description: 'Only generate pages for dynamic routes. Nuxt has to be built once before using this option'
     },
+    devtools: {
+      type: 'boolean',
+      default: false,
+      description: 'Enable Vue devtools',
+      prepare(cmd, options, argv) {
+        options.vue = options.vue || {}
+        options.vue.config = options.vue.config || {}
+        if (argv.devtools) {
+          options.vue.config.devtools = true
+        }
+      }
+    },
     modern: {
       ...common.modern,
       description: 'Generate app in modern build (modern mode can be only client)',
@@ -24,19 +35,13 @@ export default {
     }
   },
   async run(cmd) {
-    const argv = cmd.getArgv()
+    const config = await cmd.getNuxtConfig({ dev: false })
+    const nuxt = await cmd.getNuxt(config)
+    const generator = await cmd.getGenerator(nuxt)
 
-    const generator = await cmd.getGenerator(
-      await cmd.getNuxt(
-        await cmd.getNuxtConfig(argv, { dev: false })
-      )
-    )
-
-    return generator.generate({
+    await generator.generate({
       init: true,
-      build: argv.build
-    }).then(() => {
-      process.exit(0)
-    }).catch(err => consola.fatal(err))
+      build: cmd.argv.build
+    })
   }
 }
diff --git a/packages/cli/src/commands/help.js b/packages/cli/src/commands/help.js
index 4316dbb1c7..d0cd297ee9 100644
--- a/packages/cli/src/commands/help.js
+++ b/packages/cli/src/commands/help.js
@@ -1,20 +1,25 @@
 import consola from 'consola'
-import NuxtCommand from '../command'
+import getCommand from '../commands'
 import listCommands from '../list'
+import { common } from '../options'
+import NuxtCommand from '../command'
 
 export default {
   name: 'help',
   description: 'Shows help for <command>',
   usage: 'help <command>',
+  options: {
+    help: common.help,
+    version: common.version
+  },
   async run(cmd) {
-    const argv = cmd.getArgv()._
-    const name = argv[0] || null
+    const [name] = cmd._argv
     if (!name) {
-      return listCommands().then(() => process.exit(0))
+      return listCommands()
     }
-    const command = await NuxtCommand.load(name)
+    const command = await getCommand(name)
     if (command) {
-      command.showHelp()
+      NuxtCommand.from(command).showHelp()
     } else {
       consola.info(`Unknown command: ${name}`)
     }
diff --git a/packages/cli/src/commands/index.js b/packages/cli/src/commands/index.js
index 70ad510a39..95c1fbcd71 100644
--- a/packages/cli/src/commands/index.js
+++ b/packages/cli/src/commands/index.js
@@ -1,5 +1,14 @@
-export const start = () => import('./start')
-export const dev = () => import('./dev')
-export const build = () => import('./build')
-export const generate = () => import('./generate')
-export const help = () => import('./help')
+const commands = {
+  start: () => import('./start'),
+  dev: () => import('./dev'),
+  build: () => import('./build'),
+  generate: () => import('./generate'),
+  help: () => import('./help')
+}
+
+export default function getCommand(name) {
+  if (!commands[name]) {
+    return Promise.resolve(null)
+  }
+  return commands[name]().then(m => m.default)
+}
diff --git a/packages/cli/src/commands/start.js b/packages/cli/src/commands/start.js
index e15e7228d9..fc78d89620 100644
--- a/packages/cli/src/commands/start.js
+++ b/packages/cli/src/commands/start.js
@@ -1,6 +1,3 @@
-import fs from 'fs'
-import path from 'path'
-import consola from 'consola'
 import { common, server } from '../options'
 import { showBanner } from '../utils'
 
@@ -13,38 +10,11 @@ export default {
     ...server
   },
   async run(cmd) {
-    const argv = cmd.getArgv()
+    const config = await cmd.getNuxtConfig({ dev: false, _start: true })
+    const nuxt = await cmd.getNuxt(config)
 
-    // Create production build when calling `nuxt build`
-    const nuxt = await cmd.getNuxt(
-      await cmd.getNuxtConfig(argv, { dev: false })
-    )
-
-    // Check if project is built for production
-    const distDir = path.resolve(
-      nuxt.options.rootDir,
-      nuxt.options.buildDir || '.nuxt',
-      'dist',
-      'server'
-    )
-    if (!fs.existsSync(distDir)) {
-      consola.fatal(
-        'No build files found, please run `nuxt build` before launching `nuxt start`'
-      )
-    }
-
-    // Check if SSR Bundle is required
-    if (nuxt.options.render.ssr === true) {
-      const ssrBundlePath = path.resolve(distDir, 'server-bundle.json')
-      if (!fs.existsSync(ssrBundlePath)) {
-        consola.fatal(
-          'No SSR build found.\nPlease start with `nuxt start --spa` or build using `nuxt build --universal`'
-        )
-      }
-    }
-
-    return nuxt.server.listen().then(() => {
-      showBanner(nuxt)
-    })
+    // Listen and show ready banner
+    await nuxt.server.listen()
+    showBanner(nuxt)
   }
 }
diff --git a/packages/cli/src/imports.js b/packages/cli/src/imports.js
index dcdd3254bc..cae3174aa6 100644
--- a/packages/cli/src/imports.js
+++ b/packages/cli/src/imports.js
@@ -1,14 +1,26 @@
 import path from 'path'
+import consola from 'consola'
 
 const localNodeModules = path.resolve(process.cwd(), 'node_modules')
 
 // Prefer importing modules from local node_modules (for NPX and global bin)
 async function _import(modulePath) {
   let m
-  try {
-    m = await import(path.resolve(localNodeModules, modulePath))
-  } catch (e) {
-    m = await import(modulePath)
+  for (const mp of [ path.resolve(localNodeModules, modulePath), modulePath ]) {
+    try {
+      m = await import(mp)
+    } catch (e) {
+      if (e.code !== 'MODULE_NOT_FOUND') {
+        throw e
+      } else if (mp === modulePath) {
+        consola.fatal(
+          `Module ${modulePath} not found.\n\n`,
+          `Please install missing dependency:\n\n`,
+          `Using npm:  npm i ${modulePath}\n\n`,
+          `Using yarn: yarn add ${modulePath}`
+        )
+      }
+    }
   }
   return m
 }
@@ -17,3 +29,4 @@ export const builder = () => _import('@nuxt/builder')
 export const webpack = () => _import('@nuxt/webpack')
 export const generator = () => _import('@nuxt/generator')
 export const core = () => _import('@nuxt/core')
+export const importModule = _import
diff --git a/packages/cli/src/list.js b/packages/cli/src/list.js
index 7c129fd037..7bd9aa2524 100644
--- a/packages/cli/src/list.js
+++ b/packages/cli/src/list.js
@@ -1,24 +1,24 @@
 import chalk from 'chalk'
-import NuxtCommand from './command'
 import { indent, foldLines, startSpaces, optionSpaces, colorize } from './utils/formatting'
+import getCommand from './commands'
 
 export default async function listCommands() {
   const commandsOrder = ['dev', 'build', 'generate', 'start', 'help']
 
   // Load all commands
   const _commands = await Promise.all(
-    commandsOrder.map(cmd => NuxtCommand.load(cmd))
+    commandsOrder.map(cmd => getCommand(cmd))
   )
 
   let maxLength = 0
   const commandsHelp = []
 
-  for (const name in _commands) {
-    commandsHelp.push([_commands[name].usage, _commands[name].description])
-    maxLength = Math.max(maxLength, _commands[name].usage.length)
+  for (const command of _commands) {
+    commandsHelp.push([command.usage, command.description])
+    maxLength = Math.max(maxLength, command.usage.length)
   }
 
-  const _cmmds = commandsHelp.map(([cmd, description]) => {
+  const _cmds = commandsHelp.map(([cmd, description]) => {
     const i = indent(maxLength + optionSpaces - cmd.length)
     return foldLines(
       chalk.green(cmd) + i + description,
@@ -28,7 +28,7 @@ export default async function listCommands() {
   }).join('\n')
 
   const usage = foldLines(`Usage: nuxt <command> [--help|-h]`, startSpaces)
-  const cmmds = foldLines(`Commands:`, startSpaces) + '\n\n' + _cmmds
+  const cmds = foldLines(`Commands:`, startSpaces) + '\n\n' + _cmds
 
-  process.stderr.write(colorize(`${usage}\n\n${cmmds}\n\n`))
+  process.stderr.write(colorize(`${usage}\n\n${cmds}\n\n`))
 }
diff --git a/packages/cli/src/options/common.js b/packages/cli/src/options/common.js
index bab7c20c24..3b4014f5de 100644
--- a/packages/cli/src/options/common.js
+++ b/packages/cli/src/options/common.js
@@ -1,3 +1,4 @@
+import { defaultNuxtConfigFile } from '@nuxt/config'
 import { normalizeArg } from '../utils'
 
 export default {
@@ -14,8 +15,8 @@ export default {
   'config-file': {
     alias: 'c',
     type: 'string',
-    default: 'nuxt.config.js',
-    description: 'Path to Nuxt.js config file (default: `nuxt.config.js`)'
+    default: defaultNuxtConfigFile,
+    description: `Path to Nuxt.js config file (default: \`${defaultNuxtConfigFile}\`)`
   },
   modern: {
     alias: 'm',
@@ -28,6 +29,7 @@ export default {
     }
   },
   version: {
+    alias: 'v',
     type: 'boolean',
     description: 'Display the Nuxt version'
   },
diff --git a/packages/cli/src/run.js b/packages/cli/src/run.js
index f3d1f3ad71..aed0e52f3a 100644
--- a/packages/cli/src/run.js
+++ b/packages/cli/src/run.js
@@ -1,31 +1,42 @@
-import consola from 'consola'
+import fs from 'fs'
+import execa from 'execa'
 import NuxtCommand from './command'
-import * as commands from './commands'
 import setup from './setup'
-import listCommands from './list'
+import getCommand from './commands'
 
-export default function run() {
-  const defaultCommand = 'dev'
-  let cmd = process.argv[2]
+export default async function run(_argv) {
+  // Read from process.argv
+  const argv = _argv ? Array.from(_argv) : process.argv.slice(2)
 
-  if (commands[cmd]) { // eslint-disable-line import/namespace
-    process.argv.splice(2, 1)
-  } else {
-    if (process.argv.includes('--help') || process.argv.includes('-h')) {
-      listCommands().then(() => process.exit(0))
-      return
-    }
-    cmd = defaultCommand
+  // Check for internal command
+  let cmd = await getCommand(argv[0])
+
+  // Matching `nuxt` or `nuxt [dir]` or `nuxt -*` for `nuxt dev` shortcut
+  if (!cmd && (!argv[0] || argv[0][0] === '-' || fs.existsSync(argv[0]))) {
+    argv.unshift('dev')
+    cmd = await getCommand('dev')
   }
 
-  // Setup runtime
-  setup({
-    dev: cmd === 'dev'
-  })
+  // Setup env
+  setup({ dev: argv[0] === 'dev' })
 
-  return NuxtCommand.load(cmd)
-    .then(command => command.run())
-    .catch((error) => {
-      consola.fatal(error)
+  // Try internal command
+  if (cmd) {
+    return NuxtCommand.run(cmd, argv.slice(1))
+  }
+
+  // Try external command
+  try {
+    await execa(`nuxt-${argv[0]}`, argv.slice(1), {
+      stdout: process.stdout,
+      stderr: process.stderr,
+      stdin: process.stdin
     })
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      throw String(`Command not found: nuxt-${argv[0]}`)
+    } else {
+      throw String(`Failed to run command \`nuxt-${argv[0]}\`:\n${error}`)
+    }
+  }
 }
diff --git a/packages/cli/src/utils/formatting.js b/packages/cli/src/utils/formatting.js
index 8c4ea86171..78b1c82cdc 100644
--- a/packages/cli/src/utils/formatting.js
+++ b/packages/cli/src/utils/formatting.js
@@ -31,7 +31,7 @@ export function foldLines(string, spaces, firstLineSpaces, maxCharsPerLine) {
 
 export function colorize(text) {
   return text
-    .replace(/\[[^ ]+\]/g, m => chalk.grey(m))
+    .replace(/\[[^ ]+]/g, m => chalk.grey(m))
     .replace(/<[^ ]+>/g, m => chalk.green(m))
     .replace(/ (-[-\w,]+)/g, m => chalk.bold(m))
     .replace(/`(.+)`/g, (_, m) => chalk.bold.cyan(m))
diff --git a/packages/cli/src/utils/index.js b/packages/cli/src/utils/index.js
index 5a1eca0f5e..55dd734e92 100644
--- a/packages/cli/src/utils/index.js
+++ b/packages/cli/src/utils/index.js
@@ -3,13 +3,13 @@ import { existsSync } from 'fs'
 import consola from 'consola'
 import esm from 'esm'
 import defaultsDeep from 'lodash/defaultsDeep'
-import { getDefaultNuxtConfig } from '@nuxt/config'
+import { defaultNuxtConfigFile, getDefaultNuxtConfig } from '@nuxt/config'
 import boxen from 'boxen'
 import chalk from 'chalk'
 import prettyBytes from 'pretty-bytes'
 import env from 'std-env'
 
-const _require = esm(module, {
+export const requireModule = process.env.NUXT_TS ? require : esm(module, {
   cache: false,
   cjs: {
     cache: true,
@@ -18,6 +18,12 @@ const _require = esm(module, {
   }
 })
 
+export const eventsMapping = {
+  add: { icon: '+', color: 'green', action: 'Created' },
+  change: { icon: env.windows ? '»' : '↻', color: 'blue', action: 'Updated' },
+  unlink: { icon: '-', color: 'red', action: 'Removed' }
+}
+
 const getRootDir = argv => path.resolve(argv._[0] || '.')
 const getNuxtConfigFile = argv => path.resolve(getRootDir(argv), argv['config-file'])
 
@@ -29,7 +35,7 @@ export async function loadNuxtConfig(argv) {
 
   if (existsSync(nuxtConfigFile)) {
     delete require.cache[nuxtConfigFile]
-    options = _require(nuxtConfigFile) || {}
+    options = requireModule(nuxtConfigFile) || {}
     if (options.default) {
       options = options.default
     }
@@ -45,7 +51,10 @@ export async function loadNuxtConfig(argv) {
         consola.fatal('Error while fetching async configuration')
       }
     }
-  } else if (argv['config-file'] !== 'nuxt.config.js') {
+
+    // Keep _nuxtConfigFile for watching
+    options._nuxtConfigFile = nuxtConfigFile
+  } else if (argv['config-file'] !== defaultNuxtConfigFile) {
     consola.fatal('Could not load config file: ' + argv['config-file'])
   }
   if (typeof options.rootDir !== 'string') {
@@ -81,7 +90,7 @@ export function showBanner(nuxt) {
   const lines = []
 
   // Name and version
-  lines.push(`${chalk.green.bold('Nuxt.js')} v${nuxt.constructor.version}`)
+  lines.push(`${chalk.green.bold('Nuxt.js')} ${nuxt.constructor.version}`)
 
   // Running mode
   lines.push(`Running in ${nuxt.options.dev ? chalk.bold.blue('development') : chalk.bold.green('production')} mode (${chalk.bold(nuxt.options.mode)})`)
@@ -111,6 +120,13 @@ export function showBanner(nuxt) {
   process.stdout.write(box + '\n')
 }
 
+export function formatPath(filePath) {
+  if (!filePath) {
+    return
+  }
+  return filePath.replace(process.cwd() + path.sep, '')
+}
+
 /**
  * Normalize string argument in command
  *
diff --git a/packages/cli/test/unit/__snapshots__/command.test.js.snap b/packages/cli/test/unit/__snapshots__/command.test.js.snap
index 0e2f57d57a..f6d1dd00cf 100644
--- a/packages/cli/test/unit/__snapshots__/command.test.js.snap
+++ b/packages/cli/test/unit/__snapshots__/command.test.js.snap
@@ -11,7 +11,7 @@ exports[`cli/command builds help text 1`] = `
     --universal, -u    Launch in Universal mode (default)
     --config-file, -c  Path to Nuxt.js config file (default: nuxt.config.js)
     --modern, -m       Build/Start app for modern browsers, e.g. server, client and false
-    --version          Display the Nuxt version
+    --version, -v      Display the Nuxt version
     --help, -h         Display this message
     --port, -p         Port number on which to start the application
     --hostname, -H     Hostname on which to start the application
@@ -20,23 +20,3 @@ exports[`cli/command builds help text 1`] = `
 
 "
 `;
-
-exports[`cli/command loads command from name 1`] = `
-"  Usage: nuxt dev <dir> [options]
-
-  Start the application in development mode (e.g. hot-code reloading, error reporting)
-
-  Options:
-
-    --spa, -s          Launch in SPA mode
-    --universal, -u    Launch in Universal mode (default)
-    --config-file, -c  Path to Nuxt.js config file (default: nuxt.config.js)
-    --modern, -m       Build/Start app for modern browsers, e.g. server, client and false
-    --version          Display the Nuxt version
-    --help, -h         Display this message
-    --port, -p         Port number on which to start the application
-    --hostname, -H     Hostname on which to start the application
-    --unix-socket, -n  Path to a UNIX socket
-
-"
-`;
diff --git a/packages/cli/test/unit/build.test.js b/packages/cli/test/unit/build.test.js
index 09d51058c1..c0ee730752 100644
--- a/packages/cli/test/unit/build.test.js
+++ b/packages/cli/test/unit/build.test.js
@@ -1,4 +1,4 @@
-import { consola, mockGetNuxt, mockGetBuilder, mockGetGenerator, NuxtCommand } from '../utils'
+import { mockGetNuxt, mockGetBuilder, mockGetGenerator, NuxtCommand } from '../utils'
 
 describe('build', () => {
   let build
@@ -8,7 +8,6 @@ describe('build', () => {
     jest.spyOn(process, 'exit').mockImplementation(code => code)
   })
 
-  afterAll(() => process.exit.mockRestore())
   afterEach(() => jest.resetAllMocks())
 
   test('has run function', () => {
@@ -41,7 +40,22 @@ describe('build', () => {
     await NuxtCommand.from(build).run()
 
     expect(generate).toHaveBeenCalled()
-    expect(process.exit).toHaveBeenCalled()
+  })
+
+  test('build with devtools', async () => {
+    mockGetNuxt({
+      mode: 'universal'
+    })
+    const builder = mockGetBuilder(Promise.resolve())
+
+    const cmd = NuxtCommand.from(build, ['build', '.', '--devtools'])
+
+    const options = await cmd.getNuxtConfig(cmd.argv)
+
+    await cmd.run()
+
+    expect(options.vue.config.devtools).toBe(true)
+    expect(builder).toHaveBeenCalled()
   })
 
   test('build with modern mode', async () => {
@@ -50,22 +64,12 @@ describe('build', () => {
     })
     mockGetBuilder(Promise.resolve())
 
-    const cmd = NuxtCommand.from(build)
-    const args = ['build', '.', '--m']
+    const cmd = NuxtCommand.from(build, ['build', '.', '--m'])
 
-    const options = await cmd.getNuxtConfig(cmd.getArgv(args))
+    const options = await cmd.getNuxtConfig()
 
     await cmd.run()
 
     expect(options.modern).toBe(true)
   })
-
-  test('catches error', async () => {
-    mockGetNuxt({ mode: 'universal' })
-    mockGetBuilder(Promise.reject(new Error('Builder Error')))
-
-    await NuxtCommand.from(build).run()
-
-    expect(consola.fatal).toHaveBeenCalledWith(new Error('Builder Error'))
-  })
 })
diff --git a/packages/cli/test/unit/cli.test.js b/packages/cli/test/unit/cli.test.js
index 8f597e7ba4..3690aeec91 100644
--- a/packages/cli/test/unit/cli.test.js
+++ b/packages/cli/test/unit/cli.test.js
@@ -1,87 +1,41 @@
-import { readdir } from 'fs'
-import { resolve } from 'path'
-import { promisify } from 'util'
-import { consola } from '../utils'
 import { run } from '../../src'
-import * as commands from '../../src/commands'
-
-const readDir = promisify(readdir)
+import getCommand from '../../src/commands'
 
 jest.mock('../../src/commands')
 
 describe('cli', () => {
   afterEach(() => jest.resetAllMocks())
 
-  test('exports for all commands defined', async () => {
-    const cmds = await readDir(resolve(__dirname, '..', '..', 'src', 'commands'))
-
-    for (let cmd of cmds) {
-      if (cmd === 'index.js') {
-        continue
-      }
-      cmd = cmd.substring(0, cmd.length - 3)
-
-      const cmdFn = commands[cmd] // eslint-disable-line import/namespace
-      expect(cmdFn).toBeDefined()
-      expect(typeof cmdFn).toBe('function')
-    }
-  })
-
   test('calls expected method', async () => {
-    const argv = process.argv
-    process.argv = ['', '', 'dev']
-    const defaultExport = {
-      run: jest.fn().mockImplementation(() => Promise.resolve())
+    const mockedCommand = {
+      run: jest.fn(() => Promise.resolve({}))
     }
-    commands.dev.mockImplementationOnce(() => Promise.resolve({ default: defaultExport }))
+    getCommand.mockImplementationOnce(() => Promise.resolve(mockedCommand))
 
     await run()
-
-    expect(defaultExport.run).toHaveBeenCalled()
-    process.argv = argv
-  })
-
-  test('unknown calls default method', async () => {
-    const argv = process.argv
-    process.argv = ['', '', 'test']
-    commands.dev.mockImplementationOnce(() => Promise.resolve())
-
-    await run()
-
-    expect(commands.dev).toHaveBeenCalled()
-    process.argv = argv
+    expect(mockedCommand.run).toHaveBeenCalled()
   })
 
   test('sets NODE_ENV=development for dev', async () => {
     const nodeEnv = process.env.NODE_ENV
     process.env.NODE_ENV = ''
-    commands.dev.mockImplementationOnce(() => Promise.resolve())
 
-    await run()
+    getCommand.mockImplementationOnce(() => Promise.resolve({}))
 
+    await run(['dev'])
     expect(process.env.NODE_ENV).toBe('development')
     process.env.NODE_ENV = nodeEnv
   })
 
   test('sets NODE_ENV=production for build', async () => {
-    const argv = process.argv
     const nodeEnv = process.env.NODE_ENV
-    process.argv = ['', '', 'build']
     process.env.NODE_ENV = ''
-    commands.build.mockImplementationOnce(() => Promise.resolve())
 
-    await run()
+    getCommand.mockImplementationOnce(() => Promise.resolve({}))
 
+    await run(['', '', 'build'])
     expect(process.env.NODE_ENV).toBe('production')
-    process.argv = argv
+
     process.env.NODE_ENV = nodeEnv
   })
-
-  test('catches fatal error', async () => {
-    commands.dev.mockImplementationOnce(() => Promise.reject(new Error('Command Error')))
-
-    await run()
-
-    expect(consola.fatal).toHaveBeenCalledWith(new Error('Command Error'))
-  })
 })
diff --git a/packages/cli/test/unit/command.test.js b/packages/cli/test/unit/command.test.js
index 237162167a..cba54c97f3 100644
--- a/packages/cli/test/unit/command.test.js
+++ b/packages/cli/test/unit/command.test.js
@@ -25,50 +25,38 @@ describe('cli/command', () => {
   })
 
   test('parses args', () => {
-    const cmd = new Command({ options: { ...common, ...server } })
+    const argv = ['-c', 'test-file', '-s', '-p', '3001']
+    const cmd = new Command({ options: { ...common, ...server } }, argv)
 
-    let args = ['-c', 'test-file', '-s', '-p', '3001']
-    let argv = cmd.getArgv(args)
+    expect(cmd.argv['config-file']).toBe(argv[1])
+    expect(cmd.argv.spa).toBe(true)
+    expect(cmd.argv.universal).toBe(false)
+    expect(cmd.argv.port).toBe('3001')
 
-    expect(argv['config-file']).toBe(args[1])
-    expect(argv.spa).toBe(true)
-    expect(argv.universal).toBe(false)
-    expect(argv.port).toBe('3001')
-
-    args = ['--no-build']
-    argv = cmd.getArgv(args)
-
-    expect(argv.build).toBe(false)
+    const cmd2 = new Command({ options: { ...common, ...server } }, ['--no-build'])
+    expect(cmd2.argv.build).toBe(false)
   })
 
-  test('prints version automatically', () => {
-    const cmd = new Command()
+  test('prints version automatically', async () => {
+    const cmd = new Command({}, ['--version'])
     cmd.showVersion = jest.fn()
-
-    const args = ['--version']
-    cmd.getArgv(args)
+    await cmd.run()
 
     expect(cmd.showVersion).toHaveBeenCalledTimes(1)
   })
 
-  test('prints help automatically', () => {
-    const cmd = new Command({ options: allOptions })
+  test('prints help automatically', async () => {
+    const cmd = new Command({ options: allOptions }, ['-h'])
     cmd.showHelp = jest.fn()
-
-    const args = ['-h']
-    cmd.getArgv(args)
+    await cmd.run()
 
     expect(cmd.showHelp).toHaveBeenCalledTimes(1)
   })
 
   test('returns nuxt config', async () => {
-    const cmd = new Command({ options: allOptions })
+    const cmd = new Command({ options: allOptions }, ['-c', 'test-file', '-a', '-p', '3001', '-q', '-H'])
 
-    const args = ['-c', 'test-file', '-a', '-p', '3001', '-q', '-H']
-    const argv = cmd.getArgv(args)
-    argv._ = ['.']
-
-    const options = await cmd.getNuxtConfig(argv, { testOption: true })
+    const options = await cmd.getNuxtConfig({ testOption: true })
 
     expect(options.testOption).toBe(true)
     expect(options.server.port).toBe(3001)
@@ -117,36 +105,19 @@ describe('cli/command', () => {
     expect(cmd._getHelp()).toMatchSnapshot()
   })
 
-  test('loads command from name', async () => {
-    const cmd = await Command.load('dev')
-    expect(cmd._getHelp()).toMatchSnapshot()
-  })
-
   test('show version prints to stdout and exits', () => {
     jest.spyOn(process.stdout, 'write').mockImplementation(() => {})
-    jest.spyOn(process, 'exit').mockImplementationOnce(code => code)
-
     const cmd = new Command()
     cmd.showVersion()
-
     expect(process.stdout.write).toHaveBeenCalled()
-    expect(process.exit).toHaveBeenCalled()
-
     process.stdout.write.mockRestore()
-    process.exit.mockRestore()
   })
 
   test('show help prints to stdout and exits', () => {
     jest.spyOn(process.stdout, 'write').mockImplementation(() => {})
-    jest.spyOn(process, 'exit').mockImplementationOnce(code => code)
-
     const cmd = new Command()
     cmd.showHelp()
-
     expect(process.stdout.write).toHaveBeenCalled()
-    expect(process.exit).toHaveBeenCalled()
-
     process.stdout.write.mockRestore()
-    process.exit.mockRestore()
   })
 })
diff --git a/packages/cli/test/unit/dev.test.js b/packages/cli/test/unit/dev.test.js
index 47b16906df..da52ebc2bd 100644
--- a/packages/cli/test/unit/dev.test.js
+++ b/packages/cli/test/unit/dev.test.js
@@ -13,7 +13,7 @@ describe('dev', () => {
     expect(typeof dev.run).toBe('function')
   })
 
-  test('reloads on fileChanged hook', async () => {
+  test('reloads on fileRestartHook', async () => {
     const Nuxt = mockNuxt()
     const Builder = mockBuilder()
 
@@ -23,21 +23,18 @@ describe('dev', () => {
 
     expect(Builder.prototype.build).toHaveBeenCalled()
     expect(Nuxt.prototype.server.listen).toHaveBeenCalled()
-    expect(Builder.prototype.watchServer).toHaveBeenCalled()
+    // expect(Builder.prototype.watchRestart).toHaveBeenCalled()
 
     jest.clearAllMocks()
 
     const builder = new Builder()
     builder.nuxt = new Nuxt()
-    await Nuxt.fileChangedHook(builder)
+    await Nuxt.fileRestartHook(builder)
     expect(consola.log).toHaveBeenCalled()
 
-    expect(Nuxt.prototype.clearHook).toHaveBeenCalled()
-    expect(Builder.prototype.unwatch).toHaveBeenCalled()
     expect(Builder.prototype.build).toHaveBeenCalled()
     expect(Nuxt.prototype.close).toHaveBeenCalled()
     expect(Nuxt.prototype.server.listen).toHaveBeenCalled()
-    expect(Builder.prototype.watchServer).toHaveBeenCalled()
 
     expect(consola.error).not.toHaveBeenCalled()
   })
@@ -53,13 +50,13 @@ describe('dev', () => {
     const builder = new Builder()
     builder.nuxt = new Nuxt()
     Builder.prototype.build = jest.fn().mockImplementationOnce(() => Promise.reject(new Error('Build Error')))
-    await Nuxt.fileChangedHook(builder)
+    await Nuxt.fileRestartHook(builder)
 
     expect(Nuxt.prototype.close).toHaveBeenCalled()
     expect(consola.error).toHaveBeenCalledWith(new Error('Build Error'))
   })
 
-  test('catches watchServer error', async () => {
+  test.skip('catches watchRestart error', async () => {
     const Nuxt = mockNuxt()
     const Builder = mockBuilder()
 
@@ -68,11 +65,11 @@ describe('dev', () => {
 
     const builder = new Builder()
     builder.nuxt = new Nuxt()
-    Builder.prototype.watchServer = jest.fn().mockImplementationOnce(() => Promise.reject(new Error('watchServer Error')))
-    await Nuxt.fileChangedHook(builder)
+    Builder.prototype.watchRestart = jest.fn().mockImplementationOnce(() => Promise.reject(new Error('watchRestart Error')))
+    await Nuxt.fileRestartHook(builder)
 
-    expect(consola.error).toHaveBeenCalledWith(new Error('watchServer Error'))
-    expect(Builder.prototype.watchServer).toHaveBeenCalledTimes(2)
+    expect(consola.error).toHaveBeenCalledWith(new Error('watchRestart Error'))
+    expect(Builder.prototype.watchRestart).toHaveBeenCalledTimes(2)
   })
 
   test('catches error on hook error', async () => {
@@ -87,10 +84,10 @@ describe('dev', () => {
     })
     const builder = new Builder()
     builder.nuxt = new Nuxt()
-    await Nuxt.fileChangedHook(builder)
+    await Nuxt.fileRestartHook(builder)
 
     expect(consola.error).toHaveBeenCalledWith(new Error('Config Error'))
-    expect(Builder.prototype.watchServer).toHaveBeenCalledTimes(1)
+    // expect(Builder.prototype.watchRestart).toHaveBeenCalledTimes(1)
   })
 
   test('catches error on startDev', async () => {
diff --git a/packages/cli/test/unit/generate.test.js b/packages/cli/test/unit/generate.test.js
index 5e57bfa84d..b41373871e 100644
--- a/packages/cli/test/unit/generate.test.js
+++ b/packages/cli/test/unit/generate.test.js
@@ -1,5 +1,4 @@
-import { consola, mockGetNuxt, mockGetGenerator, NuxtCommand } from '../utils'
-import Command from '../../src/command'
+import { mockGetNuxt, mockGetGenerator, NuxtCommand } from '../utils'
 
 describe('generate', () => {
   let generate
@@ -9,7 +8,6 @@ describe('generate', () => {
     jest.spyOn(process, 'exit').mockImplementation(code => code)
   })
 
-  afterAll(() => process.exit.mockRestore())
   afterEach(() => jest.resetAllMocks())
 
   test('has run function', () => {
@@ -28,44 +26,39 @@ describe('generate', () => {
 
   test('doesnt build with no-build', async () => {
     mockGetNuxt()
-    const getArgv = Command.prototype.getArgv
-    Command.prototype.getArgv = jest.fn().mockImplementationOnce(() => {
-      return {
-        '_': ['.'],
-        rootDir: '.',
-        'config-file': 'nuxt.config.js',
-        build: false
-      }
-    })
     const generator = mockGetGenerator(Promise.resolve())
 
-    await NuxtCommand.from(generate).run()
+    await NuxtCommand.run(generate, ['generate', '.', '--no-build'])
 
     expect(generator).toHaveBeenCalled()
     expect(generator.mock.calls[0][0].build).toBe(false)
-    Command.prototype.getArgv = getArgv
+  })
+
+  test('build with devtools', async () => {
+    mockGetNuxt()
+    const generator = mockGetGenerator(Promise.resolve())
+
+    const cmd = NuxtCommand.from(generate, ['generate', '.', '--devtools'])
+
+    const options = await cmd.getNuxtConfig()
+
+    await cmd.run()
+
+    expect(options.vue.config.devtools).toBe(true)
+    expect(generator).toHaveBeenCalled()
+    expect(generator.mock.calls[0][0].build).toBe(true)
   })
 
   test('generate with modern mode', async () => {
     mockGetNuxt()
     mockGetGenerator(Promise.resolve())
 
-    const cmd = NuxtCommand.from(generate)
-    const args = ['generate', '.', '--m']
+    const cmd = NuxtCommand.from(generate, ['generate', '.', '--m'])
 
-    const options = await cmd.getNuxtConfig(cmd.getArgv(args))
+    const options = await cmd.getNuxtConfig()
 
     await cmd.run()
 
     expect(options.modern).toBe('client')
   })
-
-  test('catches error', async () => {
-    mockGetNuxt()
-    mockGetGenerator(Promise.reject(new Error('Generator Error')))
-
-    await NuxtCommand.from(generate).run()
-
-    expect(consola.fatal).toHaveBeenCalledWith(new Error('Generator Error'))
-  })
 })
diff --git a/packages/cli/test/unit/imports.test.js b/packages/cli/test/unit/imports.test.js
new file mode 100644
index 0000000000..75f040f0c4
--- /dev/null
+++ b/packages/cli/test/unit/imports.test.js
@@ -0,0 +1,24 @@
+import consola from 'consola'
+import { importModule } from '../../src/imports'
+
+describe('imports', () => {
+  test('should import relative module', async () => {
+    await expect(importModule('jest')).resolves.toBeDefined()
+  })
+  test('should import core module', async () => {
+    await expect(importModule('path')).resolves.toBeDefined()
+  })
+  test('should print error when module not found', async () => {
+    await expect(importModule('not-found-module')).resolves.toBeUndefined()
+    expect(consola.fatal).toHaveBeenCalled()
+    expect(consola.fatal).toHaveBeenCalledWith(
+      `Module not-found-module not found.\n\n`,
+      `Please install missing dependency:\n\n`,
+      `Using npm:  npm i not-found-module\n\n`,
+      `Using yarn: yarn add not-found-module`
+    )
+  })
+  test('should throw error when error is not module not found', async () => {
+    await expect(importModule('jest/README.md')).rejects.toThrow()
+  })
+})
diff --git a/packages/cli/test/unit/list.test.js b/packages/cli/test/unit/list.test.js
new file mode 100644
index 0000000000..64f8623244
--- /dev/null
+++ b/packages/cli/test/unit/list.test.js
@@ -0,0 +1,57 @@
+
+import chalk from 'chalk'
+
+import listCommands from '../../src/list'
+import getCommand from '../../src/commands'
+import { indent, foldLines, colorize } from '../../src/utils/formatting'
+
+jest.mock('chalk', () => ({ green: jest.fn(text => text) }))
+jest.mock('../../src/commands')
+jest.mock('../../src/utils/formatting')
+
+describe('list', () => {
+  beforeAll(() => {
+    const commands = {
+      dev: { usage: 'dev', description: 'dev desc' },
+      build: { usage: 'build', description: 'build desc' },
+      generate: { usage: 'generate', description: 'generate desc' },
+      start: { usage: 'start', description: 'start desc' },
+      help: { usage: 'help', description: 'help desc' }
+    }
+    indent.mockReturnValue(' ')
+    colorize.mockImplementation(text => text)
+    getCommand.mockImplementation(cmd => commands[cmd])
+    process.stderr.write = jest.fn()
+  })
+
+  test('should list all commands', async () => {
+    await listCommands()
+
+    expect(indent).toBeCalledTimes(5)
+    expect(indent).nthCalledWith(1, 7)
+    expect(indent).nthCalledWith(2, 5)
+    expect(indent).nthCalledWith(3, 2)
+    expect(indent).nthCalledWith(4, 5)
+    expect(indent).nthCalledWith(5, 6)
+
+    expect(chalk.green).toBeCalledTimes(5)
+    expect(chalk.green).nthCalledWith(1, 'dev')
+    expect(chalk.green).nthCalledWith(2, 'build')
+    expect(chalk.green).nthCalledWith(3, 'generate')
+    expect(chalk.green).nthCalledWith(4, 'start')
+    expect(chalk.green).nthCalledWith(5, 'help')
+
+    const spaces = [14, 4]
+    expect(foldLines).toBeCalledTimes(7)
+    expect(foldLines).nthCalledWith(1, 'dev dev desc', ...spaces)
+    expect(foldLines).nthCalledWith(2, 'build build desc', ...spaces)
+    expect(foldLines).nthCalledWith(3, 'generate generate desc', ...spaces)
+    expect(foldLines).nthCalledWith(4, 'start start desc', ...spaces)
+    expect(foldLines).nthCalledWith(5, 'help help desc', ...spaces)
+    expect(foldLines).nthCalledWith(6, 'Usage: nuxt <command> [--help|-h]', 2)
+    expect(foldLines).nthCalledWith(7, 'Commands:', 2)
+
+    expect(colorize).toBeCalledTimes(1)
+    expect(process.stderr.write).toBeCalledTimes(1)
+  })
+})
diff --git a/packages/cli/test/unit/run.test.js b/packages/cli/test/unit/run.test.js
new file mode 100644
index 0000000000..4f60d11243
--- /dev/null
+++ b/packages/cli/test/unit/run.test.js
@@ -0,0 +1,65 @@
+import execa from 'execa'
+import run from '../../src/run'
+import getCommand from '../../src/commands'
+import NuxtCommand from '../../src/command'
+
+jest.mock('execa')
+jest.mock('../../src/commands')
+jest.mock('../../src/command')
+
+describe('run', () => {
+  beforeEach(() => {
+    jest.resetAllMocks()
+    getCommand.mockImplementation(cmd => cmd === 'dev' ? ({ name: 'dev', run: jest.fn() }) : undefined)
+  })
+
+  afterAll(() => {
+    jest.clearAllMocks()
+  })
+
+  test('nuxt aliases to nuxt dev', async () => {
+    await run([])
+    expect(getCommand).toHaveBeenCalledWith('dev')
+    expect(NuxtCommand.run).toHaveBeenCalledWith(expect.anything(), [])
+  })
+
+  test('nuxt --foo aliases to nuxt dev --foo', async () => {
+    await run(['--foo'])
+    expect(getCommand).toHaveBeenCalledWith('dev')
+    expect(NuxtCommand.run).toHaveBeenCalledWith(expect.anything(), ['--foo'])
+  })
+
+  test('nuxt <dir> aliases to nuxt dev <dir>', async () => {
+    await run([__dirname])
+    expect(getCommand).toHaveBeenCalledWith('dev')
+    expect(NuxtCommand.run).toHaveBeenCalledWith(expect.anything(), [__dirname])
+  })
+
+  test('external commands', async () => {
+    await run(['custom', 'command', '--args'])
+
+    expect(execa).toHaveBeenCalledWith('nuxt-custom', ['command', '--args'], {
+      stdout: process.stdout,
+      stderr: process.stderr,
+      stdin: process.stdin
+    })
+  })
+
+  test('throws error if external command not found', async () => {
+    execa.mockImplementationOnce(() => {
+      const e = new Error()
+      e.code = 'ENOENT'
+      throw e
+    })
+
+    await expect(run(['custom', 'command', '--args']))
+      .rejects.toBe('Command not found: nuxt-custom')
+  })
+
+  test('throws error if external command failed', async () => {
+    execa.mockImplementationOnce(() => { throw new Error('boo') })
+
+    await expect(run(['custom', 'command', '--args']))
+      .rejects.toBe('Failed to run command `nuxt-custom`:\nError: boo')
+  })
+})
diff --git a/packages/cli/test/unit/start.test.js b/packages/cli/test/unit/start.test.js
index e82745dd3a..507125b77f 100644
--- a/packages/cli/test/unit/start.test.js
+++ b/packages/cli/test/unit/start.test.js
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'fs-extra'
 import { consola, mockGetNuxtStart, mockGetNuxtConfig, NuxtCommand } from '../utils'
 
 describe('start', () => {
@@ -22,41 +22,14 @@ describe('start', () => {
   test('no error if dist dir exists', async () => {
     mockGetNuxtStart()
     mockGetNuxtConfig()
-    jest.spyOn(fs, 'existsSync').mockImplementationOnce(() => true)
-
     await NuxtCommand.from(start).run()
-
     expect(consola.fatal).not.toHaveBeenCalled()
   })
 
-  test('fatal error if dist dir doesnt exist', async () => {
-    mockGetNuxtStart()
-    jest.spyOn(fs, 'existsSync').mockImplementationOnce(() => false)
-
-    await NuxtCommand.from(start).run()
-
-    expect(consola.fatal).toHaveBeenCalledWith('No build files found, please run `nuxt build` before launching `nuxt start`')
-  })
-
   test('no error on ssr and server bundle exists', async () => {
     mockGetNuxtStart(true)
     mockGetNuxtConfig()
-    jest.spyOn(fs, 'existsSync').mockImplementation(() => true)
-
     await NuxtCommand.from(start).run()
-
     expect(consola.fatal).not.toHaveBeenCalled()
   })
-
-  test.skip('fatal error on ssr and server bundle doesnt exist', async () => {
-    mockGetNuxtStart(true)
-    let i = 0
-    jest.spyOn(fs, 'existsSync').mockImplementation(() => {
-      return ++i === 1
-    })
-
-    await NuxtCommand.from(start).run()
-
-    expect(consola.fatal).toHaveBeenCalledWith('No SSR build found.\nPlease start with `nuxt start --spa` or build using `nuxt build --universal`')
-  })
 })
diff --git a/packages/cli/test/utils/mocking.js b/packages/cli/test/utils/mocking.js
index 169fdbfd10..b30e94fbf6 100644
--- a/packages/cli/test/utils/mocking.js
+++ b/packages/cli/test/utils/mocking.js
@@ -84,13 +84,15 @@ export const mockNuxt = (implementation) => {
   const Nuxt = function () {}
   Object.assign(Nuxt.prototype, {
     hook(type, fn) {
-      if (type === 'watch:fileChanged') {
-        Nuxt.fileChangedHook = fn
+      if (type === 'watch:restart') {
+        Nuxt.fileRestartHook = fn
       }
     },
     options: {},
     clearHook: jest.fn(),
+    clearHooks: jest.fn(),
     close: jest.fn(),
+    ready: jest.fn(),
     server: {
       listeners: [],
       listen: jest.fn().mockImplementationOnce(() => Promise.resolve())
@@ -107,7 +109,7 @@ export const mockBuilder = (implementation) => {
   Object.assign(Builder.prototype, {
     build: jest.fn().mockImplementationOnce(() => Promise.resolve()),
     unwatch: jest.fn().mockImplementationOnce(() => Promise.resolve()),
-    watchServer: jest.fn().mockImplementationOnce(() => Promise.resolve())
+    watchRestart: jest.fn().mockImplementationOnce(() => Promise.resolve())
   }, implementation || {})
 
   imports.builder.mockImplementation(() => ({ Builder }))
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
deleted file mode 100644
index 128438c101..0000000000
--- a/packages/common/CHANGELOG.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
-
-
-### Performance Improvements
-
-* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([7e1beed](https://github.com/nuxt/nuxt.js/commit/7e1beed))
diff --git a/packages/common/data/modern-browsers.json b/packages/common/data/modern-browsers.json
deleted file mode 100644
index e1d2997e51..0000000000
--- a/packages/common/data/modern-browsers.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "edge": "16",
-  "firefox": "60",
-  "chrome": "61",
-  "safari": "10.1",
-  "opera": "48",
-  "ios_saf": "10.3",
-  "and_ff": "60"
-}
diff --git a/packages/common/src/index.js b/packages/common/src/index.js
deleted file mode 100644
index 41440566ca..0000000000
--- a/packages/common/src/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Hookable } from './hookable'
-export { default as ModernBrowsers } from '../data/modern-browsers.json'
-export * from './utils'
diff --git a/packages/common/src/utils.js b/packages/common/src/utils.js
deleted file mode 100644
index 07f0793152..0000000000
--- a/packages/common/src/utils.js
+++ /dev/null
@@ -1,459 +0,0 @@
-import path from 'path'
-import escapeRegExp from 'lodash/escapeRegExp'
-import get from 'lodash/get'
-import consola from 'consola'
-
-export const encodeHtml = function encodeHtml(str) {
-  return str.replace(/</g, '&lt;').replace(/>/g, '&gt;')
-}
-
-export const getContext = function getContext(req, res) {
-  return { req, res }
-}
-
-export const waitFor = function waitFor(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms || 0))
-}
-
-export const isString = obj => typeof obj === 'string' || obj instanceof String
-
-export const isNonEmptyString = obj => obj && isString(obj)
-
-export const startsWithAlias = aliasArray => str => aliasArray.some(c => str.startsWith(c))
-
-export const startsWithSrcAlias = startsWithAlias(['@', '~'])
-
-export const startsWithRootAlias = startsWithAlias(['@@', '~~'])
-
-async function promiseFinally(fn, finalFn) {
-  let result
-  try {
-    if (typeof fn === 'function') {
-      result = await fn()
-    } else {
-      result = await fn
-    }
-  } finally {
-    finalFn()
-  }
-  return result
-}
-
-export const timeout = function timeout(fn, ms, msg) {
-  let timerId
-  const warpPromise = promiseFinally(fn, () => clearTimeout(timerId))
-  const timerPromise = new Promise((resolve, reject) => {
-    timerId = setTimeout(() => reject(new Error(msg)), ms)
-  })
-  return Promise.race([warpPromise, timerPromise])
-}
-
-export const urlJoin = function urlJoin() {
-  return [].slice
-    .call(arguments)
-    .join('/')
-    .replace(/\/+/g, '/')
-    .replace(':/', '://')
-}
-
-export const isUrl = function isUrl(url) {
-  return ['http', '//'].some(str => url.startsWith(str))
-}
-
-export const promisifyRoute = function promisifyRoute(fn, ...args) {
-  // If routes is an array
-  if (Array.isArray(fn)) {
-    return Promise.resolve(fn)
-  }
-  // If routes is a function expecting a callback
-  if (fn.length === arguments.length) {
-    return new Promise((resolve, reject) => {
-      fn((err, routeParams) => {
-        if (err) {
-          reject(err)
-        }
-        resolve(routeParams)
-      }, ...args)
-    })
-  }
-  let promise = fn(...args)
-  if (
-    !promise ||
-    (!(promise instanceof Promise) && typeof promise.then !== 'function')
-  ) {
-    promise = Promise.resolve(promise)
-  }
-  return promise
-}
-
-export const sequence = function sequence(tasks, fn) {
-  return tasks.reduce(
-    (promise, task) => promise.then(() => fn(task)),
-    Promise.resolve()
-  )
-}
-
-export const parallel = function parallel(tasks, fn) {
-  return Promise.all(tasks.map(fn))
-}
-
-export const chainFn = function chainFn(base, fn) {
-  /* istanbul ignore if */
-  if (typeof fn !== 'function') {
-    return base
-  }
-  return function () {
-    if (typeof base !== 'function') {
-      return fn.apply(this, arguments)
-    }
-    let baseResult = base.apply(this, arguments)
-    // Allow function to mutate the first argument instead of returning the result
-    if (baseResult === undefined) {
-      baseResult = arguments[0]
-    }
-    const fnResult = fn.call(
-      this,
-      baseResult,
-      ...Array.prototype.slice.call(arguments, 1)
-    )
-    // Return mutated argument if no result was returned
-    if (fnResult === undefined) {
-      return baseResult
-    }
-    return fnResult
-  }
-}
-
-export const isPureObject = function isPureObject(o) {
-  return !Array.isArray(o) && typeof o === 'object'
-}
-
-export const isWindows = /^win/.test(process.platform)
-
-export const wp = function wp(p = '') {
-  /* istanbul ignore if */
-  if (isWindows) {
-    return p.replace(/\\/g, '\\\\')
-  }
-  return p
-}
-
-export const wChunk = function wChunk(p = '') {
-  /* istanbul ignore if */
-  if (isWindows) {
-    return p.replace(/\//g, '_')
-  }
-  return p
-}
-
-const reqSep = /\//g
-const sysSep = escapeRegExp(path.sep)
-const normalize = string => string.replace(reqSep, sysSep)
-
-export const r = function r(...args) {
-  const lastArg = args[args.length - 1]
-
-  if (startsWithSrcAlias(lastArg)) {
-    return wp(lastArg)
-  }
-
-  return wp(path.resolve(...args.map(normalize)))
-}
-
-export const relativeTo = function relativeTo() {
-  const args = Array.prototype.slice.apply(arguments)
-  const dir = args.shift()
-
-  // Keep webpack inline loader intact
-  if (args[0].includes('!')) {
-    const loaders = args.shift().split('!')
-
-    return loaders.concat(relativeTo(dir, loaders.pop(), ...args)).join('!')
-  }
-
-  // Resolve path
-  const _path = r(...args)
-
-  // Check if path is an alias
-  if (startsWithSrcAlias(_path)) {
-    return _path
-  }
-
-  // Make correct relative path
-  let rp = path.relative(dir, _path)
-  if (rp[0] !== '.') {
-    rp = './' + rp
-  }
-
-  return wp(rp)
-}
-
-export const flatRoutes = function flatRoutes(router, _path = '', routes = []) {
-  router.forEach((r) => {
-    if ([':', '*'].some(c => r.path.includes(c))) {
-      return
-    }
-    /* istanbul ignore if */
-    if (r.children) {
-      if (_path === '' && r.path === '/') {
-        routes.push('/')
-      }
-      return flatRoutes(r.children, _path + r.path + '/', routes)
-    }
-    _path = _path.replace(/^\/+$/, '/')
-    routes.push(
-      (r.path === '' && _path[_path.length - 1] === '/'
-        ? _path.slice(0, -1)
-        : _path) + r.path
-    )
-  })
-  return routes
-}
-
-function cleanChildrenRoutes(routes, isChild = false) {
-  let start = -1
-  const routesIndex = []
-  routes.forEach((route) => {
-    if (/-index$/.test(route.name) || route.name === 'index') {
-      // Save indexOf 'index' key in name
-      const res = route.name.split('-')
-      const 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.includes('?')) {
-      const names = route.name.split('-')
-      const paths = route.path.split('/')
-      if (!isChild) {
-        paths.shift()
-      } // clean first / for parents
-      routesIndex.forEach((r) => {
-        const 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
-}
-
-const DYNAMIC_ROUTE_REGEX = /^\/(:|\*)/
-
-const sortRoutes = function sortRoutes(routes) {
-  routes.sort((a, b) => {
-    if (!a.path.length) {
-      return -1
-    }
-    if (!b.path.length) {
-      return 1
-    }
-    // Order: /static, /index, /:dynamic
-    // Match exact route before index: /login before /index/_slug
-    if (a.path === '/') {
-      return DYNAMIC_ROUTE_REGEX.test(b.path) ? -1 : 1
-    }
-    if (b.path === '/') {
-      return DYNAMIC_ROUTE_REGEX.test(a.path) ? 1 : -1
-    }
-
-    let i
-    let res = 0
-    let y = 0
-    let z = 0
-    const _a = a.path.split('/')
-    const _b = b.path.split('/')
-    for (i = 0; i < _a.length; i++) {
-      if (res !== 0) {
-        break
-      }
-      y = _a[i] === '*' ? 2 : _a[i].includes(':') ? 1 : 0
-      z = _b[i] === '*' ? 2 : _b[i].includes(':') ? 1 : 0
-      res = y - z
-      // If a.length >= b.length
-      if (i === _b.length - 1 && res === 0) {
-        // unless * found sort by level, then alphabetically
-        res = _a[i] === '*' ? -1 : (
-          _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length)
-        )
-      }
-    }
-
-    if (res === 0) {
-      // unless * found sort by level, then alphabetically
-      res = _a[i - 1] === '*' && _b[i] ? 1 : (
-        _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length)
-      )
-    }
-    return res
-  })
-
-  routes.forEach((route) => {
-    if (route.children) {
-      sortRoutes(route.children)
-    }
-  })
-
-  return routes
-}
-
-export const createRoutes = function createRoutes(files, srcDir, pagesDir) {
-  const routes = []
-  files.forEach((file) => {
-    const keys = file
-      .replace(RegExp(`^${pagesDir}`), '')
-      .replace(/\.(vue|js)$/, '')
-      .replace(/\/{2,}/g, '/')
-      .split('/')
-      .slice(1)
-    const route = { name: '', path: '', component: r(srcDir, file) }
-    let parent = routes
-    keys.forEach((key, i) => {
-      // remove underscore only, if its the prefix
-      const sanitizedKey = key.startsWith('_') ? key.substr(1) : key
-
-      route.name = route.name
-        ? route.name + '-' + sanitizedKey
-        : sanitizedKey
-      route.name += key === '_' ? 'all' : ''
-      route.chunkName = file.replace(/\.(vue|js)$/, '')
-      const child = parent.find(parentRoute => parentRoute.name === route.name)
-
-      if (child) {
-        child.children = child.children || []
-        parent = child.children
-        route.path = ''
-      } else if (key === 'index' && i + 1 === keys.length) {
-        route.path += i > 0 ? '' : '/'
-      } else {
-        route.path += '/' + getRoutePathExtension(key)
-
-        if (key.startsWith('_') && key.length > 1) {
-          route.path += '?'
-        }
-      }
-    })
-    parent.push(route)
-  })
-
-  sortRoutes(routes)
-  return cleanChildrenRoutes(routes)
-}
-
-// Guard dir1 from dir2 which can be indiscriminately removed
-export const guardDir = function guardDir(options, key1, key2) {
-  const dir1 = get(options, key1, false)
-  const dir2 = get(options, key2, false)
-
-  if (
-    dir1 &&
-    dir2 &&
-    (
-      dir1 === dir2 ||
-      (
-        dir1.startsWith(dir2) &&
-        !path.basename(dir1).startsWith(path.basename(dir2))
-      )
-    )
-  ) {
-    const errorMessage = `options.${key2} cannot be a parent of or same as ${key1}`
-    consola.fatal(errorMessage)
-    throw new Error(errorMessage)
-  }
-}
-
-export const determineGlobals = function determineGlobals(globalName, globals) {
-  const _globals = {}
-  for (const global in globals) {
-    if (typeof globals[global] === 'function') {
-      _globals[global] = globals[global](globalName)
-    } else {
-      _globals[global] = globals[global]
-    }
-  }
-  return _globals
-}
-
-const getRoutePathExtension = (key) => {
-  if (key === '_') {
-    return '*'
-  }
-
-  if (key.startsWith('_')) {
-    return `:${key.substr(1)}`
-  }
-
-  return key
-}
-
-/**
- * Wraps value in array if it is not already an array
- *
- * @param  {any} value
- * @return {array}
- */
-export const wrapArray = value => Array.isArray(value) ? value : [value]
-
-const WHITESPACE_REPLACEMENTS = [
-  [/[ \t\f\r]+\n/g, '\n'], // strip empty indents
-  [/{\n{2,}/g, '{\n'], // strip start padding from blocks
-  [/\n{2,}([ \t\f\r]*})/g, '\n$1'], // strip end padding from blocks
-  [/\n{3,}/g, '\n\n'], // strip multiple blank lines (1 allowed)
-  [/\n{2,}$/g, '\n'] // strip blank lines EOF (0 allowed)
-]
-
-export const stripWhitespace = function stripWhitespace(string) {
-  WHITESPACE_REPLACEMENTS.forEach(([regex, newSubstr]) => {
-    string = string.replace(regex, newSubstr)
-  })
-  return string
-}
-
-export function defineAlias(src, target, prop, opts = {}) {
-  const { bind = true, warn = false } = opts
-
-  if (Array.isArray(prop)) {
-    for (const p of prop) {
-      defineAlias(src, target, p, opts)
-    }
-    return
-  }
-
-  let targetVal = target[prop]
-  if (bind && typeof targetVal === 'function') {
-    targetVal = targetVal.bind(target)
-  }
-
-  let warned = false
-
-  Object.defineProperty(src, prop, {
-    get: () => {
-      if (warn && !warned) {
-        warned = true
-        consola.warn({
-          message: `'${prop}' is deprecated'`,
-          additional: new Error().stack.split('\n').splice(2).join('\n')
-        })
-      }
-      return targetVal
-    }
-  })
-}
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
index 128438c101..27a6de3236 100644
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* add option to rewatch on path after raw fs event ([#4717](https://github.com/nuxt/nuxt.js/issues/4717)) ([9c6df49](https://github.com/nuxt/nuxt.js/commit/9c6df49))
+* fall back to default value when `publicPath` is falsy ([#4365](https://github.com/nuxt/nuxt.js/issues/4365)) ([e0537d5](https://github.com/nuxt/nuxt.js/commit/e0537d5))
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* replace nuxtDir with module.paths ([#4448](https://github.com/nuxt/nuxt.js/issues/4448)) ([d66e1ec](https://github.com/nuxt/nuxt.js/commit/d66e1ec))
+* **config:** define once default nuxt config filename ([#4814](https://github.com/nuxt/nuxt.js/issues/4814)) ([06a18ca](https://github.com/nuxt/nuxt.js/commit/06a18ca))
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* **test:** remove local paths ([d02eb2f](https://github.com/nuxt/nuxt.js/commit/d02eb2f))
+* **ts:** switch from babel preset to ts-loader ([#4563](https://github.com/nuxt/nuxt.js/issues/4563)) ([75e3df6](https://github.com/nuxt/nuxt.js/commit/75e3df6))
+
+
+### Features
+
+* **builder:** optional typescript support ([#4557](https://github.com/nuxt/nuxt.js/issues/4557)) ([7145c1a](https://github.com/nuxt/nuxt.js/commit/7145c1a))
+* **builder:** validate vue-app dependencies and suggest fix ([#4669](https://github.com/nuxt/nuxt.js/issues/4669)) ([7dd33fe](https://github.com/nuxt/nuxt.js/commit/7dd33fe))
+* **modern:** auto detect modern mode ([#4422](https://github.com/nuxt/nuxt.js/issues/4422)) ([fe492d8](https://github.com/nuxt/nuxt.js/commit/fe492d8))
+* **nuxt-link:** Smart prefetching and $nuxt.isOffline ([#4574](https://github.com/nuxt/nuxt.js/issues/4574)) ([f319033](https://github.com/nuxt/nuxt.js/commit/f319033))
+* **router:** custom route name splitter ([#4598](https://github.com/nuxt/nuxt.js/issues/4598)) ([add8000](https://github.com/nuxt/nuxt.js/commit/add8000))
+* **server:** timing option for `Server-Timing` header ([#4800](https://github.com/nuxt/nuxt.js/issues/4800)) ([b23f5c9](https://github.com/nuxt/nuxt.js/commit/b23f5c9))
+* **test:** unit tests for core/config module ([#4760](https://github.com/nuxt/nuxt.js/issues/4760)) ([a616c09](https://github.com/nuxt/nuxt.js/commit/a616c09))
+* **ts:** add TSX support ([#4613](https://github.com/nuxt/nuxt.js/issues/4613)) ([4d52742](https://github.com/nuxt/nuxt.js/commit/4d52742))
+* attach ts-loader options on build.loaders.ts ([#4572](https://github.com/nuxt/nuxt.js/issues/4572)) ([d723e49](https://github.com/nuxt/nuxt.js/commit/d723e49))
+* **ts:** provide type checking through `fork-ts-checker-webpack-plugin` ([#4611](https://github.com/nuxt/nuxt.js/issues/4611)) ([f1377a7](https://github.com/nuxt/nuxt.js/commit/f1377a7))
+* add an option to disable FriendlyErrorsWebpackPlugin ([#4498](https://github.com/nuxt/nuxt.js/issues/4498)) ([f1b2ca3](https://github.com/nuxt/nuxt.js/commit/f1b2ca3))
+* **webpack:** add experimental HardSourceWebpackPlugin support ([#4527](https://github.com/nuxt/nuxt.js/issues/4527)) ([c6d820a](https://github.com/nuxt/nuxt.js/commit/c6d820a))
+* add exclude regex array for generated pages ([#4754](https://github.com/nuxt/nuxt.js/issues/4754)) ([ec17804](https://github.com/nuxt/nuxt.js/commit/ec17804))
+* add styleExtensions ([#4671](https://github.com/nuxt/nuxt.js/issues/4671)) ([471a32a](https://github.com/nuxt/nuxt.js/commit/471a32a))
+* **webpack,cli:** standalone build mode ([#4661](https://github.com/nuxt/nuxt.js/issues/4661)) ([bdb6791](https://github.com/nuxt/nuxt.js/commit/bdb6791))
+* nuxt-ts ([#4658](https://github.com/nuxt/nuxt.js/issues/4658)) ([ee0096b](https://github.com/nuxt/nuxt.js/commit/ee0096b))
+* use runInNewContext: true for nuxt dev ([#4508](https://github.com/nuxt/nuxt.js/issues/4508)) ([1162f2d](https://github.com/nuxt/nuxt.js/commit/1162f2d))
+
+
+### Performance Improvements
+
+* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([d7851b3](https://github.com/nuxt/nuxt.js/commit/d7851b3))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/packages/config/package.json b/packages/config/package.json
index 4b4dd371ed..4eb168c295 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/config",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -8,8 +8,8 @@
   ],
   "main": "dist/config.js",
   "dependencies": {
-    "@nuxt/common": "2.3.4",
-    "consola": "^2.3.0",
+    "@nuxt/utils": "2.4.0",
+    "consola": "^2.3.2",
     "std-env": "^2.2.1"
   },
   "publishConfig": {
diff --git a/packages/config/src/config/_common.js b/packages/config/src/config/_common.js
index a5283f10f8..68988c4bd7 100644
--- a/packages/config/src/config/_common.js
+++ b/packages/config/src/config/_common.js
@@ -1,5 +1,3 @@
-import path from 'path'
-import fs from 'fs'
 import capitalize from 'lodash/capitalize'
 import env from 'std-env'
 
@@ -12,7 +10,7 @@ export default () => ({
 
   // Mode
   mode: 'universal',
-  modern: false,
+  modern: undefined,
 
   // Globals
   globalName: `nuxt`,
@@ -29,11 +27,9 @@ export default () => ({
   serverMiddleware: [],
 
   // Dirs and extensions
+  _nuxtConfigFile: undefined,
   srcDir: undefined,
   buildDir: '.nuxt',
-  nuxtDir: fs.existsSync(path.resolve(__dirname, '..', '..', 'package.js'))
-    ? path.resolve(__dirname, '..', '..') // src
-    : path.resolve(__dirname, '..'), // dist
   modulesDir: [
     'node_modules'
   ],
@@ -46,6 +42,7 @@ export default () => ({
     store: 'store'
   },
   extensions: [],
+  styleExtensions: ['css', 'pcss', 'postcss', 'styl', 'stylus', 'scss', 'sass', 'less'],
 
   // Ignores
   ignorePrefix: '-',
@@ -58,6 +55,7 @@ export default () => ({
   generate: {
     dir: 'dist',
     routes: [],
+    exclude: [],
     concurrency: 500,
     interval: 0,
     subFolders: true,
@@ -67,6 +65,7 @@ export default () => ({
   // Watch
   watch: [],
   watchers: {
+    rewatchOnRawEvents: env.linux ? ['rename'] : undefined,
     webpack: {},
     chokidar: {
       ignoreInitial: true
diff --git a/packages/config/src/config/build.js b/packages/config/src/config/build.js
index ce3706c92a..8b0919d37a 100644
--- a/packages/config/src/config/build.js
+++ b/packages/config/src/config/build.js
@@ -5,10 +5,12 @@ export default () => ({
   analyze: false,
   profile: process.argv.includes('--profile'),
   extractCSS: false,
+  crossorigin: undefined,
   cssSourceMap: undefined,
   ssr: undefined,
   parallel: false,
   cache: false,
+  standalone: false,
   publicPath: '/_nuxt/',
   filenames: {
     // { isDev, isClient, isServer }
@@ -42,11 +44,21 @@ export default () => ({
     },
     scss: {},
     stylus: {},
+    ts: {
+      transpileOnly: true,
+      appendTsSuffixTo: [/\.vue$/]
+    },
+    tsx: {
+      transpileOnly: true,
+      appendTsxSuffixTo: [/\.vue$/]
+    },
     vueStyle: {}
   },
+  useForkTsChecker: process.env.NUXT_TS === 'true',
   styleResources: {},
   plugins: [],
   terser: {},
+  hardSource: false,
   optimizeCSS: undefined,
   optimization: {
     runtimeChunk: 'single',
@@ -102,5 +114,6 @@ export default () => ({
       /index\..+\.html$/,
       /vue-ssr-(client|modern)-manifest.json/
     ]
-  }
+  },
+  friendlyErrors: true
 })
diff --git a/packages/config/src/config/index.js b/packages/config/src/config/index.js
index 571b29d8d1..0e6fe2fc75 100644
--- a/packages/config/src/config/index.js
+++ b/packages/config/src/config/index.js
@@ -10,20 +10,22 @@ import router from './router'
 import server from './server'
 import cli from './cli'
 
+export const defaultNuxtConfigFile = `nuxt.config${process.env.NUXT_TS === 'true' ? '.ts' : '.js'}`
+
 export function getDefaultNuxtConfig(options = {}) {
   if (!options.env) {
     options.env = process.env
   }
 
   return {
-    ..._app(options),
-    ..._common(options),
-    build: build(options),
-    messages: messages(options),
-    modes: modes(options),
-    render: render(options),
-    router: router(options),
+    ..._app(),
+    ..._common(),
+    build: build(),
+    messages: messages(),
+    modes: modes(),
+    render: render(),
+    router: router(),
     server: server(options),
-    cli: cli(options)
+    cli: cli()
   }
 }
diff --git a/packages/config/src/config/render.js b/packages/config/src/config/render.js
index 508197b549..1f9087996d 100644
--- a/packages/config/src/config/render.js
+++ b/packages/config/src/config/render.js
@@ -2,7 +2,9 @@
 
 export default () => ({
   bundleRenderer: {
-    shouldPrefetch: () => false
+    shouldPrefetch: () => false,
+    shouldPreload: (fileWithoutQuery, asType) => ['script', 'style'].includes(asType),
+    runInNewContext: undefined
   },
   resourceHints: true,
   ssr: undefined,
diff --git a/packages/config/src/config/router.js b/packages/config/src/config/router.js
index 28bbf404cd..200c22bfc8 100644
--- a/packages/config/src/config/router.js
+++ b/packages/config/src/config/router.js
@@ -2,12 +2,15 @@ export default () => ({
   mode: 'history',
   base: '/',
   routes: [],
+  routeNameSplitter: '-',
   middleware: [],
   linkActiveClass: 'nuxt-link-active',
   linkExactActiveClass: 'nuxt-link-exact-active',
+  linkPrefetchedClass: false,
   extendRoutes: null,
   scrollBehavior: null,
   parseQuery: false,
   stringifyQuery: false,
-  fallback: false
+  fallback: false,
+  prefetchLinks: true
 })
diff --git a/packages/config/src/config/server.js b/packages/config/src/config/server.js
index a037ae80ea..8d45fee77f 100644
--- a/packages/config/src/config/server.js
+++ b/packages/config/src/config/server.js
@@ -1,4 +1,4 @@
-export default ({ env }) => ({
+export default ({ env = {} } = {}) => ({
   https: false,
   port: env.NUXT_PORT ||
     env.PORT ||
@@ -9,5 +9,6 @@ export default ({ env }) => ({
     env.npm_package_config_nuxt_host ||
     'localhost',
   socket: env.UNIX_SOCKET ||
-    env.npm_package_config_unix_socket
+    env.npm_package_config_unix_socket,
+  timing: false
 })
diff --git a/packages/config/src/index.js b/packages/config/src/index.js
index 41a04bd804..b0f66745b1 100644
--- a/packages/config/src/index.js
+++ b/packages/config/src/index.js
@@ -1,2 +1,2 @@
-export { getDefaultNuxtConfig } from './config'
+export { defaultNuxtConfigFile, getDefaultNuxtConfig } from './config'
 export { getNuxtConfig } from './options'
diff --git a/packages/config/src/options.js b/packages/config/src/options.js
index dc242fbf75..90973da87f 100644
--- a/packages/config/src/options.js
+++ b/packages/config/src/options.js
@@ -4,13 +4,20 @@ import defaultsDeep from 'lodash/defaultsDeep'
 import defaults from 'lodash/defaults'
 import pick from 'lodash/pick'
 import isObject from 'lodash/isObject'
+import uniq from 'lodash/uniq'
 import consola from 'consola'
-import { guardDir, isNonEmptyString, isPureObject, isUrl } from '@nuxt/common'
-import { getDefaultNuxtConfig } from './config'
+import { guardDir, isNonEmptyString, isPureObject, isUrl, getMainModule } from '@nuxt/utils'
+import { defaultNuxtConfigFile, getDefaultNuxtConfig } from './config'
 
 export function getNuxtConfig(_options) {
+  // Prevent duplicate calls
+  if (_options.__normalized__) {
+    return _options
+  }
+
   // Clone options to prevent unwanted side-effects
   const options = Object.assign({}, _options)
+  options.__normalized__ = true
 
   // Normalize options
   if (options.loading === true) {
@@ -63,7 +70,7 @@ export function getNuxtConfig(_options) {
 
   defaultsDeep(options, nuxtConfig)
 
-  // Check srcDir and generate.dir excistence
+  // Check srcDir and generate.dir existence
   const hasSrcDir = isNonEmptyString(options.srcDir)
   const hasGenerateDir = isNonEmptyString(options.generate.dir)
 
@@ -75,6 +82,14 @@ export function getNuxtConfig(_options) {
   // Resolve buildDir
   options.buildDir = path.resolve(options.rootDir, options.buildDir)
 
+  // Default value for _nuxtConfigFile
+  if (!options._nuxtConfigFile) {
+    options._nuxtConfigFile = path.resolve(options.rootDir, defaultNuxtConfigFile)
+  }
+
+  // Watch for _nuxtConfigFile changes
+  options.watch.push(options._nuxtConfigFile)
+
   // Protect rootDir against buildDir
   guardDir(options, 'rootDir', 'buildDir')
 
@@ -97,12 +112,13 @@ export function getNuxtConfig(_options) {
   }
 
   // Populate modulesDir
-  options.modulesDir = []
-    .concat(options.modulesDir)
-    .concat(path.join(options.nuxtDir, 'node_modules')).filter(isNonEmptyString)
-    .map(dir => path.resolve(options.rootDir, dir))
+  options.modulesDir = uniq(
+    getMainModule().paths.concat(
+      [].concat(options.modulesDir).map(dir => path.resolve(options.rootDir, dir))
+    )
+  )
 
-  const mandatoryExtensions = ['js', 'mjs']
+  const mandatoryExtensions = ['js', 'mjs', 'ts']
 
   options.extensions = mandatoryExtensions
     .filter(ext => !options.extensions.includes(ext))
@@ -122,7 +138,6 @@ export function getNuxtConfig(_options) {
   options.build._publicPath = options.build._publicPath.replace(/([^/])$/, '$1/')
 
   // Ignore publicPath on dev
-  /* istanbul ignore if */
   if (options.dev && isUrl(options.build.publicPath)) {
     options.build.publicPath = options.build._publicPath
   }
@@ -164,7 +179,8 @@ export function getNuxtConfig(_options) {
   }
 
   // Apply default hash to CSP option
-  const csp = options.render.csp
+  const { csp } = options.render
+
   const cspDefaults = {
     hashAlgorithm: 'sha256',
     allowedSources: undefined,
@@ -237,14 +253,6 @@ export function getNuxtConfig(_options) {
     delete options.render.gzip
   }
 
-  if (options.nuxtAppDir) {
-    consola.warn('nuxtAppDir is deprecated and will be removed in a future version! Please switch to build.template')
-    options.build.template = {
-      templatesDir: options.nuxtAppDir
-    }
-    delete options.nuxtAppDir
-  }
-
   // Apply mode preset
   const modePreset = options.modes[options.mode || 'universal']
 
@@ -253,12 +261,7 @@ export function getNuxtConfig(_options) {
   }
   defaultsDeep(options, modePreset || options.modes.universal)
 
-  if (options.modern === true) {
-    options.modern = 'server'
-  }
-
   // If no server-side rendering, add appear true transition
-  /* istanbul ignore if */
   if (options.render.ssr === false && options.transition) {
     options.transition.appear = true
   }
@@ -283,11 +286,6 @@ export function getNuxtConfig(_options) {
     consola.warn('build.extractCSS.allChunks has no effect from v2.0.0. Please use build.optimization.splitChunks settings instead.')
   }
 
-  // TODO: remove when mini-css-extract-plugin supports HMR
-  if (options.dev) {
-    options.build.extractCSS = false
-  }
-
   // Enable minimize for production builds
   if (options.build.optimization.minimize === undefined) {
     options.build.optimization.minimize = !options.dev
@@ -298,25 +296,11 @@ export function getNuxtConfig(_options) {
     options.build.optimizeCSS = options.build.extractCSS ? {} : false
   }
 
-  const loaders = options.build.loaders
+  const { loaders } = options.build
   const vueLoader = loaders.vue
   if (vueLoader.productionMode === undefined) {
     vueLoader.productionMode = !options.dev
   }
-  // TODO: Remove when new release of Vue (https://github.com/nuxt/nuxt.js/issues/4312)
-  const staticClassHotfix = function (el) {
-    el.staticClass = el.staticClass && el.staticClass.replace(/\\[a-z]\b/g, '')
-    if (Array.isArray(el.children)) {
-      el.children.map(staticClassHotfix)
-    }
-  }
-  vueLoader.compilerOptions = vueLoader.compilerOptions || {}
-  vueLoader.compilerOptions.modules = [
-    ...(vueLoader.compilerOptions.modules || []),
-    {
-      postTransformNode: staticClassHotfix
-    }
-  ]
   const styleLoaders = [
     'css', 'cssModules', 'less',
     'sass', 'scss', 'stylus', 'vueStyle'
@@ -334,5 +318,11 @@ export function getNuxtConfig(_options) {
     consola.level = 0
   }
 
+  // Use runInNewContext for dev mode by default
+  const { bundleRenderer } = options.render
+  if (typeof bundleRenderer.runInNewContext === 'undefined') {
+    bundleRenderer.runInNewContext = options.dev
+  }
+
   return options
 }
diff --git a/packages/config/test/__snapshots__/options.test.js.snap b/packages/config/test/__snapshots__/options.test.js.snap
new file mode 100644
index 0000000000..f5803e59b4
--- /dev/null
+++ b/packages/config/test/__snapshots__/options.test.js.snap
@@ -0,0 +1,351 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`config: options should return default nuxt config 1`] = `
+Object {
+  "ErrorPage": null,
+  "__normalized__": true,
+  "_nuxtConfigFile": "/var/nuxt/test/nuxt.config.js",
+  "appTemplatePath": "/var/nuxt/test/.nuxt/views/app.template.html",
+  "build": Object {
+    "_publicPath": "/_nuxt/",
+    "analyze": false,
+    "babel": Object {
+      "babelrc": false,
+      "cacheDirectory": false,
+    },
+    "cache": false,
+    "crossorigin": undefined,
+    "cssSourceMap": false,
+    "devMiddleware": Object {},
+    "extractCSS": false,
+    "filenames": Object {
+      "app": [Function],
+      "chunk": [Function],
+      "css": [Function],
+      "font": [Function],
+      "img": [Function],
+      "video": [Function],
+    },
+    "friendlyErrors": true,
+    "hardSource": false,
+    "hotMiddleware": Object {},
+    "html": Object {
+      "minify": Object {
+        "collapseBooleanAttributes": true,
+        "decodeEntities": true,
+        "minifyCSS": true,
+        "minifyJS": true,
+        "processConditionalComments": true,
+        "removeEmptyAttributes": true,
+        "removeRedundantAttributes": true,
+        "trimCustomFragments": true,
+        "useShortDoctype": true,
+      },
+    },
+    "loaders": Object {
+      "css": Object {
+        "sourceMap": false,
+      },
+      "cssModules": Object {
+        "localIdentName": "[local]_[hash:base64:5]",
+        "sourceMap": false,
+      },
+      "file": Object {},
+      "fontUrl": Object {
+        "limit": 1000,
+      },
+      "imgUrl": Object {
+        "limit": 1000,
+      },
+      "less": Object {
+        "sourceMap": false,
+      },
+      "pugPlain": Object {},
+      "sass": Object {
+        "indentedSyntax": true,
+        "sourceMap": false,
+      },
+      "scss": Object {
+        "sourceMap": false,
+      },
+      "stylus": Object {
+        "sourceMap": false,
+      },
+      "ts": Object {
+        "appendTsSuffixTo": Array [
+          /\\\\\\.vue\\$/,
+        ],
+        "transpileOnly": true,
+      },
+      "tsx": Object {
+        "appendTsxSuffixTo": Array [
+          /\\\\\\.vue\\$/,
+        ],
+        "transpileOnly": true,
+      },
+      "vue": Object {
+        "productionMode": true,
+        "transformAssetUrls": Object {
+          "embed": "src",
+          "object": "src",
+          "source": "src",
+          "video": "src",
+        },
+      },
+      "vueStyle": Object {
+        "sourceMap": false,
+      },
+    },
+    "optimization": Object {
+      "minimize": true,
+      "minimizer": undefined,
+      "runtimeChunk": "single",
+      "splitChunks": Object {
+        "automaticNameDelimiter": ".",
+        "cacheGroups": Object {},
+        "chunks": "all",
+        "name": undefined,
+      },
+    },
+    "optimizeCSS": false,
+    "parallel": false,
+    "plugins": Array [],
+    "postcss": Object {
+      "preset": Object {
+        "stage": 2,
+      },
+    },
+    "profile": false,
+    "publicPath": "/_nuxt/",
+    "quiet": true,
+    "splitChunks": Object {
+      "commons": true,
+      "layouts": false,
+      "pages": true,
+    },
+    "ssr": true,
+    "standalone": false,
+    "stats": false,
+    "styleResources": Object {},
+    "template": undefined,
+    "templates": Array [],
+    "terser": Object {},
+    "transpile": Array [],
+    "useForkTsChecker": false,
+    "watch": Array [],
+  },
+  "buildDir": "/var/nuxt/test/.nuxt",
+  "cli": Object {
+    "badgeMessages": Array [],
+  },
+  "css": Array [],
+  "debug": false,
+  "dev": false,
+  "dir": Object {
+    "assets": "assets",
+    "layouts": "layouts",
+    "middleware": "middleware",
+    "pages": "pages",
+    "static": "static",
+    "store": "store",
+  },
+  "editor": undefined,
+  "env": Object {},
+  "extensions": Array [
+    "js",
+    "mjs",
+    "ts",
+  ],
+  "generate": Object {
+    "concurrency": 500,
+    "dir": "/var/nuxt/test/dist",
+    "exclude": Array [],
+    "fallback": "200.html",
+    "interval": 0,
+    "routes": Array [],
+    "subFolders": true,
+  },
+  "globalName": "nuxt",
+  "globals": Object {
+    "context": [Function],
+    "id": [Function],
+    "loadedCallback": [Function],
+    "nuxt": [Function],
+    "pluginPrefix": [Function],
+    "readyCallback": [Function],
+  },
+  "head": Object {
+    "link": Array [],
+    "meta": Array [],
+    "script": Array [],
+    "style": Array [],
+  },
+  "hooks": null,
+  "ignore": Array [
+    "**/*.test.*",
+    "**/*.spec.*",
+    "**/-*.*",
+  ],
+  "ignorePrefix": "-",
+  "layoutTransition": Object {
+    "mode": "out-in",
+    "name": "layout",
+  },
+  "layouts": Object {},
+  "loading": Object {
+    "color": "black",
+    "continuous": false,
+    "css": true,
+    "duration": 5000,
+    "failedColor": "red",
+    "height": "2px",
+    "rtl": false,
+    "throttle": 200,
+  },
+  "loadingIndicator": Object {
+    "background": "white",
+    "color": "black",
+    "color2": "#F5F5F5",
+    "dev": false,
+    "loading": "Loading...",
+    "name": "default",
+  },
+  "messages": Object {
+    "back_to_home": "Back to the home page",
+    "client_error": "Error",
+    "client_error_details": "An error occurred while rendering the page. Check developer tools console for details.",
+    "error_404": "This page could not be found",
+    "loading": "Loading...",
+    "nuxtjs": "Nuxt.js",
+    "server_error": "Server error",
+    "server_error_details": "An error occurred in the application and your page could not be served. If you are the application owner, check your logs for details.",
+  },
+  "mode": "universal",
+  "modern": undefined,
+  "modes": Object {
+    "spa": Object {
+      "build": Object {
+        "ssr": false,
+      },
+      "render": Object {
+        "ssr": false,
+      },
+    },
+    "universal": Object {
+      "build": Object {
+        "ssr": true,
+      },
+      "render": Object {
+        "ssr": true,
+      },
+    },
+  },
+  "modules": Array [],
+  "modulesDir": Array [
+    "/var/nuxt/node_modules",
+    "/var/nuxt/test/node_modules",
+  ],
+  "plugins": Array [],
+  "render": Object {
+    "bundleRenderer": Object {
+      "runInNewContext": false,
+      "shouldPrefetch": [Function],
+      "shouldPreload": [Function],
+    },
+    "compressor": Object {
+      "threshold": 0,
+    },
+    "csp": false,
+    "dist": Object {
+      "index": false,
+      "maxAge": "1y",
+    },
+    "etag": Object {
+      "weak": false,
+    },
+    "fallback": Object {
+      "dist": Object {},
+      "static": Object {
+        "handlers": Object {
+          ".htm": false,
+          ".html": false,
+        },
+        "skipUnknown": true,
+      },
+    },
+    "http2": Object {
+      "push": false,
+      "pushAssets": null,
+      "shouldPush": null,
+    },
+    "resourceHints": true,
+    "ssr": true,
+    "static": Object {
+      "prefix": true,
+    },
+  },
+  "rootDir": "/var/nuxt/test",
+  "router": Object {
+    "base": "/",
+    "extendRoutes": null,
+    "fallback": false,
+    "linkActiveClass": "nuxt-link-active",
+    "linkExactActiveClass": "nuxt-link-exact-active",
+    "linkPrefetchedClass": false,
+    "middleware": Array [],
+    "mode": "history",
+    "parseQuery": false,
+    "prefetchLinks": true,
+    "routeNameSplitter": "-",
+    "routes": Array [],
+    "scrollBehavior": null,
+    "stringifyQuery": false,
+  },
+  "server": Object {
+    "host": "localhost",
+    "https": false,
+    "port": 3000,
+    "socket": undefined,
+    "timing": false,
+  },
+  "serverMiddleware": Array [],
+  "srcDir": "/var/nuxt/test",
+  "styleExtensions": Array [
+    "css",
+    "pcss",
+    "postcss",
+    "styl",
+    "stylus",
+    "scss",
+    "sass",
+    "less",
+  ],
+  "test": true,
+  "transition": Object {
+    "appear": false,
+    "appearActiveClass": "appear-active",
+    "appearClass": "appear",
+    "appearToClass": "appear-to",
+    "mode": "out-in",
+    "name": "page",
+  },
+  "vue": Object {
+    "config": Object {
+      "performance": false,
+      "silent": true,
+    },
+  },
+  "watch": Array [
+    "/var/nuxt/test/nuxt.config.js",
+  ],
+  "watchers": Object {
+    "chokidar": Object {
+      "ignoreInitial": true,
+    },
+    "rewatchOnRawEvents": Array [
+      "rename",
+    ],
+    "webpack": Object {},
+  },
+}
+`;
diff --git a/packages/config/test/config/__snapshots__/index.test.js.snap b/packages/config/test/config/__snapshots__/index.test.js.snap
new file mode 100644
index 0000000000..23837bdcc4
--- /dev/null
+++ b/packages/config/test/config/__snapshots__/index.test.js.snap
@@ -0,0 +1,649 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`config should return default nuxt configurations 1`] = `
+Object {
+  "ErrorPage": null,
+  "_nuxtConfigFile": undefined,
+  "build": Object {
+    "analyze": false,
+    "babel": Object {
+      "babelrc": false,
+      "cacheDirectory": undefined,
+    },
+    "cache": false,
+    "crossorigin": undefined,
+    "cssSourceMap": undefined,
+    "devMiddleware": Object {},
+    "extractCSS": false,
+    "filenames": Object {
+      "app": [Function],
+      "chunk": [Function],
+      "css": [Function],
+      "font": [Function],
+      "img": [Function],
+      "video": [Function],
+    },
+    "friendlyErrors": true,
+    "hardSource": false,
+    "hotMiddleware": Object {},
+    "html": Object {
+      "minify": Object {
+        "collapseBooleanAttributes": true,
+        "decodeEntities": true,
+        "minifyCSS": true,
+        "minifyJS": true,
+        "processConditionalComments": true,
+        "removeEmptyAttributes": true,
+        "removeRedundantAttributes": true,
+        "trimCustomFragments": true,
+        "useShortDoctype": true,
+      },
+    },
+    "loaders": Object {
+      "css": Object {},
+      "cssModules": Object {
+        "localIdentName": "[local]_[hash:base64:5]",
+      },
+      "file": Object {},
+      "fontUrl": Object {
+        "limit": 1000,
+      },
+      "imgUrl": Object {
+        "limit": 1000,
+      },
+      "less": Object {},
+      "pugPlain": Object {},
+      "sass": Object {
+        "indentedSyntax": true,
+      },
+      "scss": Object {},
+      "stylus": Object {},
+      "ts": Object {
+        "appendTsSuffixTo": Array [
+          /\\\\\\.vue\\$/,
+        ],
+        "transpileOnly": true,
+      },
+      "tsx": Object {
+        "appendTsxSuffixTo": Array [
+          /\\\\\\.vue\\$/,
+        ],
+        "transpileOnly": true,
+      },
+      "vue": Object {
+        "transformAssetUrls": Object {
+          "embed": "src",
+          "object": "src",
+          "source": "src",
+          "video": "src",
+        },
+      },
+      "vueStyle": Object {},
+    },
+    "optimization": Object {
+      "minimize": undefined,
+      "minimizer": undefined,
+      "runtimeChunk": "single",
+      "splitChunks": Object {
+        "automaticNameDelimiter": ".",
+        "cacheGroups": Object {},
+        "chunks": "all",
+        "name": undefined,
+      },
+    },
+    "optimizeCSS": undefined,
+    "parallel": false,
+    "plugins": Array [],
+    "postcss": Object {
+      "preset": Object {
+        "stage": 2,
+      },
+    },
+    "profile": false,
+    "publicPath": "/_nuxt/",
+    "quiet": true,
+    "splitChunks": Object {
+      "commons": true,
+      "layouts": false,
+      "pages": true,
+    },
+    "ssr": undefined,
+    "standalone": false,
+    "stats": Object {
+      "excludeAssets": Array [
+        /\\.map\\$/,
+        /index\\\\\\.\\.\\+\\\\\\.html\\$/,
+        /vue-ssr-\\(client\\|modern\\)-manifest\\.json/,
+      ],
+    },
+    "styleResources": Object {},
+    "template": undefined,
+    "templates": Array [],
+    "terser": Object {},
+    "transpile": Array [],
+    "useForkTsChecker": false,
+    "watch": Array [],
+  },
+  "buildDir": ".nuxt",
+  "cli": Object {
+    "badgeMessages": Array [],
+  },
+  "css": Array [],
+  "debug": undefined,
+  "dev": false,
+  "dir": Object {
+    "assets": "assets",
+    "layouts": "layouts",
+    "middleware": "middleware",
+    "pages": "pages",
+    "static": "static",
+    "store": "store",
+  },
+  "editor": undefined,
+  "env": Object {},
+  "extensions": Array [],
+  "generate": Object {
+    "concurrency": 500,
+    "dir": "dist",
+    "exclude": Array [],
+    "fallback": "200.html",
+    "interval": 0,
+    "routes": Array [],
+    "subFolders": true,
+  },
+  "globalName": "nuxt",
+  "globals": Object {
+    "context": [Function],
+    "id": [Function],
+    "loadedCallback": [Function],
+    "nuxt": [Function],
+    "pluginPrefix": [Function],
+    "readyCallback": [Function],
+  },
+  "head": Object {
+    "link": Array [],
+    "meta": Array [],
+    "script": Array [],
+    "style": Array [],
+  },
+  "hooks": null,
+  "ignore": Array [
+    "**/*.test.*",
+    "**/*.spec.*",
+  ],
+  "ignorePrefix": "-",
+  "layoutTransition": Object {
+    "mode": "out-in",
+    "name": "layout",
+  },
+  "layouts": Object {},
+  "loading": Object {
+    "color": "black",
+    "continuous": false,
+    "css": true,
+    "duration": 5000,
+    "failedColor": "red",
+    "height": "2px",
+    "rtl": false,
+    "throttle": 200,
+  },
+  "loadingIndicator": "default",
+  "messages": Object {
+    "back_to_home": "Back to the home page",
+    "client_error": "Error",
+    "client_error_details": "An error occurred while rendering the page. Check developer tools console for details.",
+    "error_404": "This page could not be found",
+    "loading": "Loading...",
+    "nuxtjs": "Nuxt.js",
+    "server_error": "Server error",
+    "server_error_details": "An error occurred in the application and your page could not be served. If you are the application owner, check your logs for details.",
+  },
+  "mode": "universal",
+  "modern": undefined,
+  "modes": Object {
+    "spa": Object {
+      "build": Object {
+        "ssr": false,
+      },
+      "render": Object {
+        "ssr": false,
+      },
+    },
+    "universal": Object {
+      "build": Object {
+        "ssr": true,
+      },
+      "render": Object {
+        "ssr": true,
+      },
+    },
+  },
+  "modules": Array [],
+  "modulesDir": Array [
+    "node_modules",
+  ],
+  "plugins": Array [],
+  "render": Object {
+    "bundleRenderer": Object {
+      "runInNewContext": undefined,
+      "shouldPrefetch": [Function],
+      "shouldPreload": [Function],
+    },
+    "compressor": Object {
+      "threshold": 0,
+    },
+    "csp": false,
+    "dist": Object {
+      "index": false,
+      "maxAge": "1y",
+    },
+    "etag": Object {
+      "weak": false,
+    },
+    "fallback": Object {
+      "dist": Object {},
+      "static": Object {
+        "handlers": Object {
+          ".htm": false,
+          ".html": false,
+        },
+        "skipUnknown": true,
+      },
+    },
+    "http2": Object {
+      "push": false,
+      "pushAssets": null,
+      "shouldPush": null,
+    },
+    "resourceHints": true,
+    "ssr": undefined,
+    "static": Object {
+      "prefix": true,
+    },
+  },
+  "router": Object {
+    "base": "/",
+    "extendRoutes": null,
+    "fallback": false,
+    "linkActiveClass": "nuxt-link-active",
+    "linkExactActiveClass": "nuxt-link-exact-active",
+    "linkPrefetchedClass": false,
+    "middleware": Array [],
+    "mode": "history",
+    "parseQuery": false,
+    "prefetchLinks": true,
+    "routeNameSplitter": "-",
+    "routes": Array [],
+    "scrollBehavior": null,
+    "stringifyQuery": false,
+  },
+  "server": Object {
+    "host": "localhost",
+    "https": false,
+    "port": 3000,
+    "socket": undefined,
+    "timing": false,
+  },
+  "serverMiddleware": Array [],
+  "srcDir": undefined,
+  "styleExtensions": Array [
+    "css",
+    "pcss",
+    "postcss",
+    "styl",
+    "stylus",
+    "scss",
+    "sass",
+    "less",
+  ],
+  "test": true,
+  "transition": Object {
+    "appear": false,
+    "appearActiveClass": "appear-active",
+    "appearClass": "appear",
+    "appearToClass": "appear-to",
+    "mode": "out-in",
+    "name": "page",
+  },
+  "vue": Object {
+    "config": Object {
+      "performance": undefined,
+      "silent": undefined,
+    },
+  },
+  "watch": Array [],
+  "watchers": Object {
+    "chokidar": Object {
+      "ignoreInitial": true,
+    },
+    "rewatchOnRawEvents": Array [
+      "rename",
+    ],
+    "webpack": Object {},
+  },
+}
+`;
+
+exports[`config should return nuxt configurations with custom env 1`] = `
+Object {
+  "ErrorPage": null,
+  "_nuxtConfigFile": undefined,
+  "build": Object {
+    "analyze": false,
+    "babel": Object {
+      "babelrc": false,
+      "cacheDirectory": undefined,
+    },
+    "cache": false,
+    "crossorigin": undefined,
+    "cssSourceMap": undefined,
+    "devMiddleware": Object {},
+    "extractCSS": false,
+    "filenames": Object {
+      "app": [Function],
+      "chunk": [Function],
+      "css": [Function],
+      "font": [Function],
+      "img": [Function],
+      "video": [Function],
+    },
+    "friendlyErrors": true,
+    "hardSource": false,
+    "hotMiddleware": Object {},
+    "html": Object {
+      "minify": Object {
+        "collapseBooleanAttributes": true,
+        "decodeEntities": true,
+        "minifyCSS": true,
+        "minifyJS": true,
+        "processConditionalComments": true,
+        "removeEmptyAttributes": true,
+        "removeRedundantAttributes": true,
+        "trimCustomFragments": true,
+        "useShortDoctype": true,
+      },
+    },
+    "loaders": Object {
+      "css": Object {},
+      "cssModules": Object {
+        "localIdentName": "[local]_[hash:base64:5]",
+      },
+      "file": Object {},
+      "fontUrl": Object {
+        "limit": 1000,
+      },
+      "imgUrl": Object {
+        "limit": 1000,
+      },
+      "less": Object {},
+      "pugPlain": Object {},
+      "sass": Object {
+        "indentedSyntax": true,
+      },
+      "scss": Object {},
+      "stylus": Object {},
+      "ts": Object {
+        "appendTsSuffixTo": Array [
+          /\\\\\\.vue\\$/,
+        ],
+        "transpileOnly": true,
+      },
+      "tsx": Object {
+        "appendTsxSuffixTo": Array [
+          /\\\\\\.vue\\$/,
+        ],
+        "transpileOnly": true,
+      },
+      "vue": Object {
+        "transformAssetUrls": Object {
+          "embed": "src",
+          "object": "src",
+          "source": "src",
+          "video": "src",
+        },
+      },
+      "vueStyle": Object {},
+    },
+    "optimization": Object {
+      "minimize": undefined,
+      "minimizer": undefined,
+      "runtimeChunk": "single",
+      "splitChunks": Object {
+        "automaticNameDelimiter": ".",
+        "cacheGroups": Object {},
+        "chunks": "all",
+        "name": undefined,
+      },
+    },
+    "optimizeCSS": undefined,
+    "parallel": false,
+    "plugins": Array [],
+    "postcss": Object {
+      "preset": Object {
+        "stage": 2,
+      },
+    },
+    "profile": false,
+    "publicPath": "/_nuxt/",
+    "quiet": true,
+    "splitChunks": Object {
+      "commons": true,
+      "layouts": false,
+      "pages": true,
+    },
+    "ssr": undefined,
+    "standalone": false,
+    "stats": Object {
+      "excludeAssets": Array [
+        /\\.map\\$/,
+        /index\\\\\\.\\.\\+\\\\\\.html\\$/,
+        /vue-ssr-\\(client\\|modern\\)-manifest\\.json/,
+      ],
+    },
+    "styleResources": Object {},
+    "template": undefined,
+    "templates": Array [],
+    "terser": Object {},
+    "transpile": Array [],
+    "useForkTsChecker": false,
+    "watch": Array [],
+  },
+  "buildDir": ".nuxt",
+  "cli": Object {
+    "badgeMessages": Array [],
+  },
+  "css": Array [],
+  "debug": undefined,
+  "dev": false,
+  "dir": Object {
+    "assets": "assets",
+    "layouts": "layouts",
+    "middleware": "middleware",
+    "pages": "pages",
+    "static": "static",
+    "store": "store",
+  },
+  "editor": undefined,
+  "env": Object {},
+  "extensions": Array [],
+  "generate": Object {
+    "concurrency": 500,
+    "dir": "dist",
+    "exclude": Array [],
+    "fallback": "200.html",
+    "interval": 0,
+    "routes": Array [],
+    "subFolders": true,
+  },
+  "globalName": "nuxt",
+  "globals": Object {
+    "context": [Function],
+    "id": [Function],
+    "loadedCallback": [Function],
+    "nuxt": [Function],
+    "pluginPrefix": [Function],
+    "readyCallback": [Function],
+  },
+  "head": Object {
+    "link": Array [],
+    "meta": Array [],
+    "script": Array [],
+    "style": Array [],
+  },
+  "hooks": null,
+  "ignore": Array [
+    "**/*.test.*",
+    "**/*.spec.*",
+  ],
+  "ignorePrefix": "-",
+  "layoutTransition": Object {
+    "mode": "out-in",
+    "name": "layout",
+  },
+  "layouts": Object {},
+  "loading": Object {
+    "color": "black",
+    "continuous": false,
+    "css": true,
+    "duration": 5000,
+    "failedColor": "red",
+    "height": "2px",
+    "rtl": false,
+    "throttle": 200,
+  },
+  "loadingIndicator": "default",
+  "messages": Object {
+    "back_to_home": "Back to the home page",
+    "client_error": "Error",
+    "client_error_details": "An error occurred while rendering the page. Check developer tools console for details.",
+    "error_404": "This page could not be found",
+    "loading": "Loading...",
+    "nuxtjs": "Nuxt.js",
+    "server_error": "Server error",
+    "server_error_details": "An error occurred in the application and your page could not be served. If you are the application owner, check your logs for details.",
+  },
+  "mode": "universal",
+  "modern": undefined,
+  "modes": Object {
+    "spa": Object {
+      "build": Object {
+        "ssr": false,
+      },
+      "render": Object {
+        "ssr": false,
+      },
+    },
+    "universal": Object {
+      "build": Object {
+        "ssr": true,
+      },
+      "render": Object {
+        "ssr": true,
+      },
+    },
+  },
+  "modules": Array [],
+  "modulesDir": Array [
+    "node_modules",
+  ],
+  "plugins": Array [],
+  "render": Object {
+    "bundleRenderer": Object {
+      "runInNewContext": undefined,
+      "shouldPrefetch": [Function],
+      "shouldPreload": [Function],
+    },
+    "compressor": Object {
+      "threshold": 0,
+    },
+    "csp": false,
+    "dist": Object {
+      "index": false,
+      "maxAge": "1y",
+    },
+    "etag": Object {
+      "weak": false,
+    },
+    "fallback": Object {
+      "dist": Object {},
+      "static": Object {
+        "handlers": Object {
+          ".htm": false,
+          ".html": false,
+        },
+        "skipUnknown": true,
+      },
+    },
+    "http2": Object {
+      "push": false,
+      "pushAssets": null,
+      "shouldPush": null,
+    },
+    "resourceHints": true,
+    "ssr": undefined,
+    "static": Object {
+      "prefix": true,
+    },
+  },
+  "router": Object {
+    "base": "/",
+    "extendRoutes": null,
+    "fallback": false,
+    "linkActiveClass": "nuxt-link-active",
+    "linkExactActiveClass": "nuxt-link-exact-active",
+    "linkPrefetchedClass": false,
+    "middleware": Array [],
+    "mode": "history",
+    "parseQuery": false,
+    "prefetchLinks": true,
+    "routeNameSplitter": "-",
+    "routes": Array [],
+    "scrollBehavior": null,
+    "stringifyQuery": false,
+  },
+  "server": Object {
+    "host": "localhost",
+    "https": false,
+    "port": "3001",
+    "socket": "/var/run/nuxt.sock",
+    "timing": false,
+  },
+  "serverMiddleware": Array [],
+  "srcDir": undefined,
+  "styleExtensions": Array [
+    "css",
+    "pcss",
+    "postcss",
+    "styl",
+    "stylus",
+    "scss",
+    "sass",
+    "less",
+  ],
+  "test": true,
+  "transition": Object {
+    "appear": false,
+    "appearActiveClass": "appear-active",
+    "appearClass": "appear",
+    "appearToClass": "appear-to",
+    "mode": "out-in",
+    "name": "page",
+  },
+  "vue": Object {
+    "config": Object {
+      "performance": undefined,
+      "silent": undefined,
+    },
+  },
+  "watch": Array [],
+  "watchers": Object {
+    "chokidar": Object {
+      "ignoreInitial": true,
+    },
+    "rewatchOnRawEvents": Array [
+      "rename",
+    ],
+    "webpack": Object {},
+  },
+}
+`;
diff --git a/packages/config/test/config/_common.test.js b/packages/config/test/config/_common.test.js
new file mode 100644
index 0000000000..f1e4650440
--- /dev/null
+++ b/packages/config/test/config/_common.test.js
@@ -0,0 +1,14 @@
+import commonConfig from '../../src/config/_common'
+
+describe('config: common', () => {
+  test('should return globals with given globalName', () => {
+    const globalName = 'nuxt_global'
+    const { globals } = commonConfig()
+    expect(globals.id(globalName)).toEqual(`__nuxt_global`)
+    expect(globals.nuxt(globalName)).toEqual(`$nuxt_global`)
+    expect(globals.context(globalName)).toEqual(`__NUXT_GLOBAL__`)
+    expect(globals.pluginPrefix(globalName)).toEqual('nuxt_global')
+    expect(globals.readyCallback(globalName)).toEqual(`onNuxt_globalReady`)
+    expect(globals.loadedCallback(globalName)).toEqual(`_onNuxt_globalLoaded`)
+  })
+})
diff --git a/packages/config/test/config/build.test.js b/packages/config/test/config/build.test.js
new file mode 100644
index 0000000000..accec320e9
--- /dev/null
+++ b/packages/config/test/config/build.test.js
@@ -0,0 +1,32 @@
+import buildConfig from '../../src/config/build'
+
+describe('config: build', () => {
+  test('should return dev filenames', () => {
+    const { filenames } = buildConfig()
+    const env = { isDev: true }
+    expect(filenames.app(env)).toEqual('[name].js')
+    expect(filenames.chunk(env)).toEqual('[name].js')
+    expect(filenames.css(env)).toEqual('[name].css')
+    expect(filenames.img(env)).toEqual('[path][name].[ext]')
+    expect(filenames.font(env)).toEqual('[path][name].[ext]')
+    expect(filenames.video(env)).toEqual('[path][name].[ext]')
+  })
+
+  test('should return prod filenames', () => {
+    const { filenames } = buildConfig()
+    const env = { isDev: false }
+    expect(filenames.app(env)).toEqual('[chunkhash].js')
+    expect(filenames.chunk(env)).toEqual('[chunkhash].js')
+    expect(filenames.css(env)).toEqual('[contenthash].css')
+    expect(filenames.img(env)).toEqual('img/[hash:7].[ext]')
+    expect(filenames.font(env)).toEqual('fonts/[hash:7].[ext]')
+    expect(filenames.video(env)).toEqual('videos/[hash:7].[ext]')
+  })
+
+  test('should return modern filenames', () => {
+    const { filenames } = buildConfig()
+    const env = { isDev: true, isModern: true }
+    expect(filenames.app(env)).toEqual('modern-[name].js')
+    expect(filenames.chunk(env)).toEqual('modern-[name].js')
+  })
+})
diff --git a/packages/config/test/config/index.test.js b/packages/config/test/config/index.test.js
new file mode 100644
index 0000000000..d32c809aa4
--- /dev/null
+++ b/packages/config/test/config/index.test.js
@@ -0,0 +1,28 @@
+import { getDefaultNuxtConfig } from '../../src/config'
+
+jest.mock('std-env', () => ({
+  browser: false,
+  test: 'test',
+  dev: false,
+  production: true,
+  debug: false,
+  ci: true,
+  windows: false,
+  darwin: false,
+  linux: true
+}))
+
+describe('config', () => {
+  test('should return default nuxt configurations', () => {
+    expect(getDefaultNuxtConfig()).toMatchSnapshot()
+  })
+
+  test('should return nuxt configurations with custom env', () => {
+    const env = {
+      NUXT_PORT: '3001',
+      NUXT_HOST: 'localhost',
+      UNIX_SOCKET: '/var/run/nuxt.sock'
+    }
+    expect(getDefaultNuxtConfig({ env })).toMatchSnapshot()
+  })
+})
diff --git a/packages/config/test/config/render.test.js b/packages/config/test/config/render.test.js
new file mode 100644
index 0000000000..0223125d8a
--- /dev/null
+++ b/packages/config/test/config/render.test.js
@@ -0,0 +1,19 @@
+import renderConfig from '../../src/config/render'
+
+describe('config: render', () => {
+  test('should return false in default shouldPrefetch', () => {
+    const { bundleRenderer: { shouldPrefetch } } = renderConfig()
+    expect(shouldPrefetch()).toEqual(false)
+  })
+
+  test('should return true in script/style shouldPreload', () => {
+    const { bundleRenderer: { shouldPreload } } = renderConfig()
+    expect(shouldPreload(undefined, 'script')).toEqual(true)
+    expect(shouldPreload(undefined, 'style')).toEqual(true)
+  })
+
+  test('should return false in other shouldPreload', () => {
+    const { bundleRenderer: { shouldPreload } } = renderConfig()
+    expect(shouldPreload(undefined, 'font')).toEqual(false)
+  })
+})
diff --git a/packages/config/test/config/server.test.js b/packages/config/test/config/server.test.js
new file mode 100644
index 0000000000..ee59034a82
--- /dev/null
+++ b/packages/config/test/config/server.test.js
@@ -0,0 +1,45 @@
+import serverConfig from '../../src/config/server'
+
+const serverDefaults = serverConfig()
+
+describe('config: server', () => {
+  test('should return server configurations with NUXT_* env', () => {
+    const env = {
+      NUXT_PORT: 3001,
+      NUXT_HOST: '127.0.0.1'
+    }
+    expect(serverConfig({ env })).toEqual({
+      ...serverDefaults,
+      port: env.NUXT_PORT,
+      host: env.NUXT_HOST
+    })
+  })
+
+  test('should return server configurations with env', () => {
+    const env = {
+      PORT: 3002,
+      HOST: 'local.env',
+      UNIX_SOCKET: '/var/run/env.sock'
+    }
+    expect(serverConfig({ env })).toEqual({
+      ...serverDefaults,
+      port: env.PORT,
+      host: env.HOST,
+      socket: env.UNIX_SOCKET
+    })
+  })
+
+  test('should return server configurations with npm_* env', () => {
+    const env = {
+      npm_package_config_nuxt_port: 3003,
+      npm_package_config_nuxt_host: 'local.npm',
+      npm_package_config_unix_socket: '/var/run/env.npm.sock'
+    }
+    expect(serverConfig({ env })).toEqual({
+      ...serverDefaults,
+      port: env.npm_package_config_nuxt_port,
+      host: env.npm_package_config_nuxt_host,
+      socket: env.npm_package_config_unix_socket
+    })
+  })
+})
diff --git a/packages/config/test/fixtures/app.html b/packages/config/test/fixtures/app.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/config/test/fixtures/store/index.js b/packages/config/test/fixtures/store/index.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/config/test/index.test.js b/packages/config/test/index.test.js
new file mode 100644
index 0000000000..7779b5c0b7
--- /dev/null
+++ b/packages/config/test/index.test.js
@@ -0,0 +1,16 @@
+import { getDefaultNuxtConfig, getNuxtConfig } from '../src'
+
+jest.mock('../src/options', () => ({
+  getNuxtConfig: jest.fn(() => 'nuxt config')
+}))
+
+jest.mock('../src/config', () => ({
+  getDefaultNuxtConfig: jest.fn(() => 'default nuxt config')
+}))
+
+describe('config: entry', () => {
+  test('should export getDefaultNuxtConfig and getNuxtConfig', () => {
+    expect(getNuxtConfig()).toEqual('nuxt config')
+    expect(getDefaultNuxtConfig()).toEqual('default nuxt config')
+  })
+})
diff --git a/packages/config/test/options.test.js b/packages/config/test/options.test.js
new file mode 100644
index 0000000000..d0d4d826bf
--- /dev/null
+++ b/packages/config/test/options.test.js
@@ -0,0 +1,220 @@
+import path from 'path'
+import consola from 'consola'
+import { getNuxtConfig } from '../src/options'
+
+jest.mock('std-env', () => ({
+  browser: false,
+  test: 'test',
+  dev: false,
+  production: true,
+  debug: false,
+  ci: true,
+  windows: false,
+  darwin: false,
+  linux: true
+}))
+
+jest.mock('@nuxt/utils', () => ({
+  ...jest.requireActual('@nuxt/utils'),
+  getMainModule: () => ({ paths: ['/var/nuxt/node_modules'] })
+}))
+
+describe('config: options', () => {
+  test('should return default nuxt config', () => {
+    jest.spyOn(process, 'cwd').mockReturnValue('/var/nuxt/test')
+    jest.spyOn(path, 'resolve').mockImplementation((...args) => args.join('/').replace(/\\+/, '/'))
+
+    expect(getNuxtConfig({})).toMatchSnapshot()
+
+    process.cwd.mockRestore()
+    path.resolve.mockRestore()
+  })
+
+  test('should prevent duplicate calls with same options', () => {
+    const options = {}
+    const firstConfig = getNuxtConfig(options)
+    const secondConfig = getNuxtConfig(firstConfig)
+
+    expect(firstConfig).toBe(secondConfig)
+    expect(firstConfig.__normalized__).toBe(true)
+  })
+
+  test('should return default loading when loading is true', () => {
+    const { loading } = getNuxtConfig({ loading: true })
+    expect(loading).toEqual({
+      color: 'black',
+      failedColor: 'red',
+      height: '2px',
+      throttle: 200,
+      duration: 5000,
+      continuous: false,
+      rtl: false,
+      css: true
+    })
+  })
+
+  test('should transform transition/layoutTransition to name', () => {
+    const { transition, layoutTransition } = getNuxtConfig({
+      transition: 'test-tran',
+      layoutTransition: 'test-layout-tran'
+    })
+    expect(transition).toMatchObject({ name: 'test-tran' })
+    expect(layoutTransition).toMatchObject({ name: 'test-layout-tran' })
+  })
+
+  test('should transform extensions to array', () => {
+    const { extensions } = getNuxtConfig({ extensions: 'ext' })
+    expect(extensions).toEqual(['js', 'mjs', 'ts', 'ext'])
+  })
+
+  test('should support custom global name', () => {
+    const { globalName } = getNuxtConfig({ globalName: 'globalNuxt' })
+    expect(globalName).toEqual('globalnuxt')
+  })
+
+  test('should detect store dir', () => {
+    const { store } = getNuxtConfig({ rootDir: path.resolve(__dirname, 'fixtures') })
+    expect(store).toEqual(true)
+  })
+
+  test('should enable csp', () => {
+    const { render: { csp } } = getNuxtConfig({ render: { csp: { allowedSources: true, test: true } } })
+    expect(csp).toEqual({
+      hashAlgorithm: 'sha256',
+      allowedSources: true,
+      policies: undefined,
+      reportOnly: false,
+      test: true
+    })
+  })
+
+  test('should check unknown mode', () => {
+    const { build, render } = getNuxtConfig({ mode: 'test' })
+    expect(consola.warn).toHaveBeenCalledWith('Unknown mode: test. Falling back to universal')
+    expect(build.ssr).toEqual(true)
+    expect(render.ssr).toEqual(true)
+  })
+
+  test('should add appear true in transition when no ssr', () => {
+    const { transition } = getNuxtConfig({ render: { ssr: false } })
+    expect(transition.appear).toEqual(true)
+  })
+
+  test('should return 404.html as default generate.fallback', () => {
+    const { generate: { fallback } } = getNuxtConfig({ generate: { fallback: true } })
+    expect(fallback).toEqual('404.html')
+  })
+
+  describe('config: router dir', () => {
+    test('should transform middleware to array', () => {
+      const { router: { middleware } } = getNuxtConfig({ router: { middleware: 'midd' } })
+      expect(middleware).toEqual(['midd'])
+    })
+
+    test('should set _routerBaseSpecified when base is specified', () => {
+      const { _routerBaseSpecified } = getNuxtConfig({ router: { base: '/test' } })
+      expect(_routerBaseSpecified).toEqual(true)
+    })
+  })
+
+  describe('config: options dir', () => {
+    test('should support custom root dir', () => {
+      const { rootDir } = getNuxtConfig({
+        rootDir: 'root'
+      })
+      expect(rootDir).toEqual(path.resolve('root'))
+    })
+
+    test('should support custom src dir', () => {
+      const { srcDir } = getNuxtConfig({
+        rootDir: 'root',
+        srcDir: 'src'
+      })
+      expect(srcDir).toEqual(path.resolve('root', 'src'))
+    })
+
+    test('should support custom generate dir', () => {
+      const { generate: { dir } } = getNuxtConfig({
+        rootDir: 'root',
+        generate: { dir: 'generate' }
+      })
+      expect(dir).toEqual(path.resolve('root', 'generate'))
+    })
+  })
+
+  describe('config: options template', () => {
+    test('should use default appTemplatePath', () => {
+      const { appTemplatePath } = getNuxtConfig({})
+      expect(appTemplatePath).toEqual(path.resolve('.nuxt', 'views', 'app.template.html'))
+    })
+
+    test('should use custom appTemplatePath', () => {
+      const { appTemplatePath } = getNuxtConfig({ appTemplatePath: 'templates' })
+      expect(appTemplatePath).toEqual(path.resolve('templates'))
+    })
+
+    test('should use custom app.html', () => {
+      const { appTemplatePath } = getNuxtConfig({ rootDir: path.resolve(__dirname, 'fixtures') })
+      expect(appTemplatePath).toEqual(path.resolve(__dirname, 'fixtures', 'app.html'))
+    })
+  })
+
+  describe('config: options publicPath', () => {
+    test('should fallback to default when publicPath is falsy', () => {
+      const { build: { publicPath } } = getNuxtConfig({ build: { publicPath: false } })
+      expect(publicPath).toEqual('/_nuxt/')
+    })
+
+    test('should append slash in publicPath', () => {
+      const { build: { publicPath } } = getNuxtConfig({ build: { publicPath: '/nuxt_public' } })
+      expect(publicPath).toEqual('/nuxt_public/')
+    })
+
+    test('should ignore url publicPath in dev', () => {
+      const { build: { publicPath } } = getNuxtConfig({ dev: true, build: { publicPath: 'http://nuxt_public' } })
+      expect(publicPath).toEqual('/_nuxt/')
+    })
+  })
+
+  describe('config: options babel', () => {
+    test('should replace and deprecate @nuxtjs/babel-preset-app', () => {
+      const { build: { babel } } = getNuxtConfig({
+        build: { babel: { presets: ['@nuxtjs/babel-preset-app'] } }
+      })
+      expect(consola.warn).toHaveBeenCalledWith('@nuxtjs/babel-preset-app has been deprecated, please use @nuxt/babel-preset-app.')
+      expect(babel).toEqual({
+        'babelrc': false,
+        'cacheDirectory': false,
+        'presets': ['@nuxt/babel-preset-app']
+      })
+    })
+
+    test('should support options in babel presets', () => {
+      const { build: { babel } } = getNuxtConfig({
+        build: { babel: { presets: [['@nuxt/babel-preset-app', { test: true }]] } }
+      })
+      expect(babel).toEqual({
+        'babelrc': false,
+        'cacheDirectory': false,
+        'presets': [['@nuxt/babel-preset-app', { test: true }]]
+      })
+    })
+  })
+
+  describe('config: options deprecated', () => {
+    test('should deprecate render.gzip', () => {
+      getNuxtConfig({ render: { gzip: true } })
+      expect(consola.warn).toHaveBeenCalledWith('render.gzip is deprecated and will be removed in a future version! Please switch to render.compressor')
+    })
+
+    test('should deprecate build.vendor', () => {
+      getNuxtConfig({ build: { vendor: ['lodash'] } })
+      expect(consola.warn).toHaveBeenCalledWith('vendor has been deprecated due to webpack4 optimization')
+    })
+
+    test('should deprecate build.extractCSS.allChunks', () => {
+      getNuxtConfig({ build: { extractCSS: { allChunks: true } } })
+      expect(consola.warn).toHaveBeenCalledWith('build.extractCSS.allChunks has no effect from v2.0.0. Please use build.optimization.splitChunks settings instead.')
+    })
+  })
+})
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 3be2538a47..01dd199ff9 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* **builder, module:** addLayout and nuxt.config precedence over auto-scanned layouts ([#4702](https://github.com/nuxt/nuxt.js/issues/4702)) ([f85ac94](https://github.com/nuxt/nuxt.js/commit/f85ac94))
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* **pkg:** move opencollective dependency nuxt and nuxt-legacy ([#4415](https://github.com/nuxt/nuxt.js/issues/4415)) ([f680e36](https://github.com/nuxt/nuxt.js/commit/f680e36))
+* **resolver:** resolve dir if no index found [#4568](https://github.com/nuxt/nuxt.js/issues/4568) ([#4569](https://github.com/nuxt/nuxt.js/issues/4569)) ([85b5359](https://github.com/nuxt/nuxt.js/commit/85b5359))
+* **resolver:** resolvedPath/index.[ext] resolution ([#4548](https://github.com/nuxt/nuxt.js/issues/4548)) ([b413bc1](https://github.com/nuxt/nuxt.js/commit/b413bc1))
+* not use deprecated option esm in resolver ([5f6361f](https://github.com/nuxt/nuxt.js/commit/5f6361f))
+* wait error hook ([36ca945](https://github.com/nuxt/nuxt.js/commit/36ca945))
+
+
+### Features
+
+* add styleExtensions ([#4671](https://github.com/nuxt/nuxt.js/issues/4671)) ([471a32a](https://github.com/nuxt/nuxt.js/commit/471a32a))
+* mode for plugins ([#4592](https://github.com/nuxt/nuxt.js/issues/4592)) ([e71c455](https://github.com/nuxt/nuxt.js/commit/e71c455))
+* nuxt-ts ([#4658](https://github.com/nuxt/nuxt.js/issues/4658)) ([ee0096b](https://github.com/nuxt/nuxt.js/commit/ee0096b))
+* **test:** unit tests for core/config module ([#4760](https://github.com/nuxt/nuxt.js/issues/4760)) ([a616c09](https://github.com/nuxt/nuxt.js/commit/a616c09))
+
+
+### Performance Improvements
+
+* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([d7851b3](https://github.com/nuxt/nuxt.js/commit/d7851b3))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/packages/core/package.json b/packages/core/package.json
index 17967b3fd9..ae4f4e929d 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/core",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -8,14 +8,14 @@
   ],
   "main": "dist/core.js",
   "dependencies": {
-    "@nuxt/common": "2.3.4",
-    "@nuxt/config": "2.3.4",
-    "@nuxt/server": "2.3.4",
-    "@nuxt/vue-renderer": "2.3.4",
-    "@nuxtjs/devalue": "^1.1.0",
-    "consola": "^2.3.0",
-    "debug": "^4.1.0",
-    "esm": "^3.0.84",
+    "@nuxt/config": "2.4.0",
+    "@nuxt/devalue": "^1.2.0",
+    "@nuxt/server": "2.4.0",
+    "@nuxt/utils": "2.4.0",
+    "@nuxt/vue-renderer": "2.4.0",
+    "consola": "^2.3.2",
+    "debug": "^4.1.1",
+    "esm": "^3.1.4",
     "fs-extra": "^7.0.1",
     "hash-sum": "^1.0.2",
     "std-env": "^2.2.1"
diff --git a/packages/common/src/hookable.js b/packages/core/src/hookable.js
similarity index 91%
rename from packages/common/src/hookable.js
rename to packages/core/src/hookable.js
index a29f33b65d..10c94eb180 100644
--- a/packages/common/src/hookable.js
+++ b/packages/core/src/hookable.js
@@ -1,7 +1,7 @@
 
 import consola from 'consola'
 
-import { sequence } from './utils'
+import { sequence } from '@nuxt/utils'
 
 export default class Hookable {
   constructor() {
@@ -34,7 +34,7 @@ export default class Hookable {
     try {
       await sequence(this._hooks[name], fn => fn(...args))
     } catch (err) {
-      name !== 'error' && this.callHook('error', err)
+      name !== 'error' && await this.callHook('error', err)
       consola.fatal(err)
     }
   }
@@ -45,6 +45,10 @@ export default class Hookable {
     }
   }
 
+  clearHooks() {
+    this._hooks = {}
+  }
+
   flatHooks(configHooks, hooks = {}, parentName) {
     Object.keys(configHooks).forEach((key) => {
       const subHook = configHooks[key]
diff --git a/packages/core/src/module.js b/packages/core/src/module.js
index 3f244dcf5e..3ae1279d1d 100644
--- a/packages/core/src/module.js
+++ b/packages/core/src/module.js
@@ -3,7 +3,7 @@ import fs from 'fs'
 import hash from 'hash-sum'
 import consola from 'consola'
 
-import { chainFn, sequence } from '@nuxt/common'
+import { chainFn, sequence } from '@nuxt/utils'
 
 export default class ModuleContainer {
   constructor(nuxt) {
@@ -28,17 +28,16 @@ export default class ModuleContainer {
   }
 
   addTemplate(template) {
-    /* istanbul ignore if */
     if (!template) {
-      throw new Error('Invalid template:' + JSON.stringify(template))
+      throw new Error('Invalid template: ' + JSON.stringify(template))
     }
 
     // Validate & parse source
     const src = template.src || template
     const srcPath = path.parse(src)
-    /* istanbul ignore if */
+
     if (typeof src !== 'string' || !fs.existsSync(src)) {
-      throw new Error('Template src not found:' + src)
+      throw new Error('Template src not found: ' + src)
     }
 
     // Generate unique and human readable dst filename
@@ -63,15 +62,23 @@ export default class ModuleContainer {
     // Add to nuxt plugins
     this.options.plugins.unshift({
       src: path.join(this.options.buildDir, dst),
-      ssr: template.ssr
+      // TODO: remove deprecated option in Nuxt 3
+      ssr: template.ssr,
+      mode: template.mode
     })
   }
 
   addLayout(template, name) {
     const { dst, src } = this.addTemplate(template)
+    const layoutName = name || path.parse(src).name
+    const layout = this.options.layouts[layoutName]
+
+    if (layout) {
+      consola.warn(`Duplicate layout registration, "${layoutName}" has been registered as "${layout}"`)
+    }
 
     // Add to nuxt layouts
-    this.options.layouts[name || path.parse(src).name] = `./${dst}`
+    this.options.layouts[layoutName] = `./${dst}`
 
     // If error layout, set ErrorPage
     if (name === 'error') {
@@ -103,7 +110,7 @@ export default class ModuleContainer {
     return this.addModule(moduleOpts, true /* require once */)
   }
 
-  addModule(moduleOpts, requireOnce) {
+  async addModule(moduleOpts, requireOnce) {
     let src
     let options
     let handler
@@ -113,13 +120,10 @@ export default class ModuleContainer {
       src = moduleOpts
     } else if (Array.isArray(moduleOpts)) {
       // Type 2: Babel style array
-      src = moduleOpts[0]
-      options = moduleOpts[1]
+      [src, options] = moduleOpts
     } else if (typeof moduleOpts === 'object') {
       // Type 3: Pure object
-      src = moduleOpts.src
-      options = moduleOpts.options
-      handler = moduleOpts.handler
+      ({ src, options, handler } = moduleOpts)
     }
 
     // Resolve handler
@@ -128,7 +132,6 @@ export default class ModuleContainer {
     }
 
     // Validate handler
-    /* istanbul ignore if */
     if (typeof handler !== 'function') {
       throw new Error('Module should export a function: ' + src)
     }
@@ -148,18 +151,7 @@ export default class ModuleContainer {
     if (options === undefined) {
       options = {}
     }
-
-    return new Promise((resolve) => {
-      // Call module with `this` context and pass options
-      const result = handler.call(this, options)
-
-      // If module send back a promise
-      if (result && result.then) {
-        return resolve(result)
-      }
-
-      // synchronous
-      return resolve()
-    })
+    const result = await handler.call(this, options)
+    return result
   }
 }
diff --git a/packages/core/src/nuxt.js b/packages/core/src/nuxt.js
index f4f943b72c..fcd011ea73 100644
--- a/packages/core/src/nuxt.js
+++ b/packages/core/src/nuxt.js
@@ -2,12 +2,14 @@
 import isPlainObject from 'lodash/isPlainObject'
 import consola from 'consola'
 
-import { Hookable, defineAlias } from '@nuxt/common'
+import { defineAlias } from '@nuxt/utils'
 import { getNuxtConfig } from '@nuxt/config'
 import { Server } from '@nuxt/server'
 
 import { version } from '../package.json'
+
 import ModuleContainer from './module'
+import Hookable from './hookable'
 import Resolver from './resolver'
 
 export default class Nuxt extends Hookable {
@@ -43,7 +45,7 @@ export default class Nuxt extends Hookable {
   }
 
   static get version() {
-    return version
+    return (global.__NUXT && global.__NUXT.version) || `v${version}`
   }
 
   async ready() {
@@ -75,9 +77,10 @@ export default class Nuxt extends Hookable {
   async close(callback) {
     await this.callHook('close', this)
 
-    /* istanbul ignore if */
     if (typeof callback === 'function') {
       await callback()
     }
+
+    this.clearHooks()
   }
 }
diff --git a/packages/core/src/resolver.js b/packages/core/src/resolver.js
index 4fe7500dd4..684e543df9 100644
--- a/packages/core/src/resolver.js
+++ b/packages/core/src/resolver.js
@@ -1,9 +1,10 @@
 import Module from 'module'
 import { resolve, join } from 'path'
 import fs from 'fs-extra'
+import consola from 'consola'
 import esm from 'esm'
 
-import { startsWithRootAlias, startsWithSrcAlias } from '@nuxt/common'
+import { startsWithRootAlias, startsWithSrcAlias } from '@nuxt/utils'
 
 export default class Resolver {
   constructor(nuxt) {
@@ -22,10 +23,9 @@ export default class Resolver {
 
   resolveModule(path) {
     try {
-      const resolvedPath = Module._resolveFilename(path, {
+      return Module._resolveFilename(path, {
         paths: this.options.modulesDir
       })
-      return resolvedPath
     } catch (error) {
       if (error.code === 'MODULE_NOT_FOUND') {
         return undefined
@@ -47,7 +47,15 @@ export default class Resolver {
     return resolve(this.options.srcDir, path)
   }
 
-  resolvePath(path, { alias, module } = {}) {
+  resolvePath(path, { alias, isAlias = alias, module, isModule = module, isStyle } = {}) {
+    // TODO: Remove in Nuxt 3
+    if (alias) {
+      consola.warn('Using alias is deprecated and will be removed in Nuxt 3. Use `isAlias` instead.')
+    }
+    if (module) {
+      consola.warn('Using module is deprecated and will be removed in Nuxt 3. Use `isModule` instead.')
+    }
+
     // Fast return in case of path exists
     if (fs.existsSync(path)) {
       return path
@@ -56,12 +64,12 @@ export default class Resolver {
     let resolvedPath
 
     // Try to resolve it as a regular module
-    if (module !== false) {
+    if (isModule !== false) {
       resolvedPath = this.resolveModule(path)
     }
 
     // Try to resolve alias
-    if (!resolvedPath && alias !== false) {
+    if (!resolvedPath && isAlias !== false) {
       resolvedPath = this.resolveAlias(path)
     }
 
@@ -70,44 +78,74 @@ export default class Resolver {
       resolvedPath = path
     }
 
-    // Check if resolvedPath exits
+    let isDirectory
+
+    // Check if resolvedPath exits and is not a directory
     if (fs.existsSync(resolvedPath)) {
-      return resolvedPath
+      isDirectory = fs.lstatSync(resolvedPath).isDirectory()
+
+      if (!isDirectory) {
+        return resolvedPath
+      }
     }
 
-    // Check if any resolvedPath.[ext] exists
-    for (const ext of this.options.extensions) {
-      if (fs.existsSync(resolvedPath + '.' + ext)) {
+    const extensions = isStyle ? this.options.styleExtensions : this.options.extensions
+
+    // Check if any resolvedPath.[ext] or resolvedPath/index.[ext] exists
+    for (const ext of extensions) {
+      if (!isDirectory && fs.existsSync(resolvedPath + '.' + ext)) {
         return resolvedPath + '.' + ext
       }
+
+      if (isDirectory && fs.existsSync(resolvedPath + '/index.' + ext)) {
+        return resolvedPath + '/index.' + ext
+      }
+    }
+
+    // If there's no index.[ext] we just return the directory path
+    if (isDirectory) {
+      return resolvedPath
     }
 
     // Give up
     throw new Error(`Cannot resolve "${path}" from "${resolvedPath}"`)
   }
 
-  requireModule(path, { esm, alias, intropDefault } = {}) {
+  requireModule(path, { esm, useESM = esm, alias, isAlias = alias, intropDefault } = {}) {
     let resolvedPath = path
     let requiredModule
 
-    const errors = []
+    // TODO: Remove in Nuxt 3
+    if (alias) {
+      consola.warn('Using alias is deprecated and will be removed in Nuxt 3. Use `isAlias` instead.')
+    }
+    if (esm) {
+      consola.warn('Using esm is deprecated and will be removed in Nuxt 3. Use `useESM` instead.')
+    }
+
+    let lastError
 
     // Try to resolve path
     try {
-      resolvedPath = this.resolvePath(path, { alias })
+      resolvedPath = this.resolvePath(path, { isAlias })
     } catch (e) {
-      errors.push(e)
+      lastError = e
+    }
+
+    // Disable esm for ts files by default
+    if (useESM === undefined && /.ts$/.test(resolvedPath)) {
+      useESM = false
     }
 
     // Try to require
     try {
-      if (esm === false) {
+      if (useESM === false) {
         requiredModule = require(resolvedPath)
       } else {
         requiredModule = this.esm(resolvedPath)
       }
     } catch (e) {
-      errors.push(e)
+      lastError = e
     }
 
     // Introp default
@@ -116,8 +154,8 @@ export default class Resolver {
     }
 
     // Throw error if failed to require
-    if (requiredModule === undefined && errors.length) {
-      throw errors
+    if (requiredModule === undefined && lastError) {
+      throw lastError
     }
 
     return requiredModule
diff --git a/packages/core/test/hookable.test.js b/packages/core/test/hookable.test.js
new file mode 100644
index 0000000000..6d8305444e
--- /dev/null
+++ b/packages/core/test/hookable.test.js
@@ -0,0 +1,162 @@
+import consola from 'consola'
+import Hookable from '../src/hookable'
+
+describe('core: hookable', () => {
+  beforeEach(() => {
+    consola.debug.mockClear()
+    consola.log.mockClear()
+    consola.error.mockClear()
+    consola.fatal.mockClear()
+  })
+
+  test('should construct hook object', () => {
+    const hook = new Hookable()
+
+    expect(hook._hooks).toEqual({})
+    expect(hook._deprecatedHooks).toEqual({})
+    expect(hook.hook).toBeInstanceOf(Function)
+    expect(hook.callHook).toBeInstanceOf(Function)
+  })
+
+  test('should register hook successfully', () => {
+    const hook = new Hookable()
+    hook.hook('test:hook', () => {})
+    hook.hook('test:hook', () => {})
+
+    expect(hook._hooks['test:hook']).toHaveLength(2)
+    expect(hook._hooks['test:hook']).toBeInstanceOf(Array)
+    expect(hook._hooks['test:hook']).toEqual([expect.any(Function), expect.any(Function)])
+  })
+
+  test('should ignore empty hook name', () => {
+    const hook = new Hookable()
+    hook.hook(0, () => {})
+    hook.hook('', () => {})
+    hook.hook(undefined, () => {})
+
+    expect(hook._hooks[0]).toBeUndefined()
+    expect(hook._hooks['']).toBeUndefined()
+    expect(hook._hooks[undefined]).toBeUndefined()
+  })
+
+  test('should ignore non-function hook', () => {
+    const hook = new Hookable()
+    hook.hook('test:hook', '')
+    hook.hook('test:hook', undefined)
+
+    expect(hook._hooks['test:hook']).toBeUndefined()
+  })
+
+  test('should convert and display deprecated hook', () => {
+    const hook = new Hookable()
+    hook._deprecatedHooks['test:hook'] = 'test:before'
+
+    hook.hook('test:hook', () => {})
+
+    expect(consola.warn).toBeCalledWith('test:hook hook has been deprecated, please use test:before')
+    expect(hook._hooks['test:hook']).toBeUndefined()
+    expect(hook._hooks['test:before']).toEqual([expect.any(Function)])
+  })
+
+  test('should call registered hook', async () => {
+    const hook = new Hookable()
+    hook.hook('test:hook', () => consola.log('test:hook called'))
+
+    await hook.callHook('test:hook')
+
+    expect(consola.debug).toBeCalledWith('Call test:hook hooks (1)')
+    expect(consola.log).toBeCalledWith('test:hook called')
+  })
+
+  test('should ignore unregistered hook', async () => {
+    const hook = new Hookable()
+
+    await hook.callHook('test:hook')
+
+    expect(consola.debug).not.toBeCalled()
+  })
+
+  test('should report hook error', async () => {
+    const hook = new Hookable()
+    const error = new Error('Hook Error')
+    hook.hook('test:hook', () => { throw error })
+
+    await hook.callHook('test:hook')
+
+    expect(consola.fatal).toBeCalledWith(error)
+  })
+
+  test('should call error hook', async () => {
+    const hook = new Hookable()
+    const error = new Error('Hook Error')
+    hook.hook('error', jest.fn())
+    hook.hook('test:hook', () => { throw error })
+
+    await hook.callHook('test:hook')
+
+    expect(hook._hooks.error[0]).toBeCalledWith(error)
+    expect(consola.fatal).toBeCalledWith(error)
+  })
+
+  test('should clear registered hooks', () => {
+    const hook = new Hookable()
+    hook.hook('test:hook', () => {})
+
+    expect(hook._hooks['test:hook']).toHaveLength(1)
+    expect(hook._hooks['test:before']).toBeUndefined()
+
+    hook.clearHook('test:hook')
+    hook.clearHook('test:before')
+
+    expect(hook._hooks['test:hook']).toBeUndefined()
+    expect(hook._hooks['test:before']).toBeUndefined()
+  })
+
+  test('should clear all registered hooks', () => {
+    const hook = new Hookable()
+    hook.hook('test:hook', () => {})
+
+    expect(hook._hooks['test:hook']).toHaveLength(1)
+    expect(hook._hooks['test:before']).toBeUndefined()
+
+    hook.clearHooks()
+
+    expect(hook._hooks['test:hook']).toBeUndefined()
+    expect(hook._hooks['test:before']).toBeUndefined()
+    expect(hook._hooks).toEqual({})
+  })
+
+  test('should return flat hooks', () => {
+    const hook = new Hookable()
+    const hooks = hook.flatHooks({
+      test: {
+        hook: () => {},
+        before: () => {}
+      }
+    })
+
+    expect(hooks).toEqual({
+      'test:hook': expect.any(Function),
+      'test:before': expect.any(Function)
+    })
+  })
+
+  test('should add object hooks', () => {
+    const hook = new Hookable()
+    hook.addHooks({
+      test: {
+        hook: () => {},
+        before: () => {},
+        after: null
+      }
+    })
+
+    expect(hook._hooks).toEqual({
+      'test:hook': expect.any(Array),
+      'test:before': expect.any(Array),
+      'test:after': undefined
+    })
+    expect(hook._hooks['test:hook']).toHaveLength(1)
+    expect(hook._hooks['test:before']).toHaveLength(1)
+  })
+})
diff --git a/packages/core/test/index.test.js b/packages/core/test/index.test.js
new file mode 100644
index 0000000000..c5e31a016f
--- /dev/null
+++ b/packages/core/test/index.test.js
@@ -0,0 +1,17 @@
+import { Module, Nuxt, Resolver } from '../src'
+
+jest.mock('../src/module', () => ({
+  module: true
+})).mock('../src/nuxt', () => ({
+  nuxt: true
+})).mock('../src/resolver', () => ({
+  resolver: true
+}))
+
+describe('core: entry', () => {
+  test('should export Module, Nuxt and Resolver', () => {
+    expect(Module.module).toEqual(true)
+    expect(Nuxt.nuxt).toEqual(true)
+    expect(Resolver.resolver).toEqual(true)
+  })
+})
diff --git a/packages/core/test/module.test.js b/packages/core/test/module.test.js
new file mode 100644
index 0000000000..20265f44f4
--- /dev/null
+++ b/packages/core/test/module.test.js
@@ -0,0 +1,389 @@
+import fs from 'fs'
+import path from 'path'
+import consola from 'consola'
+import { chainFn } from '@nuxt/utils'
+import ModuleContainer from '../src/module'
+
+jest.mock('fs', () => ({
+  existsSync: Boolean
+}))
+
+jest.mock('hash-sum', () => src => `hash(${src})`)
+
+jest.mock('@nuxt/utils', () => ({
+  ...jest.requireActual('@nuxt/utils'),
+  chainFn: jest.fn(() => 'chainedFn')
+}))
+
+describe('core: module', () => {
+  const requireModule = jest.fn(src => options => Promise.resolve({ src, options }))
+
+  beforeEach(() => {
+    consola.debug.mockClear()
+    consola.log.mockClear()
+    consola.warn.mockClear()
+    consola.error.mockClear()
+    consola.fatal.mockClear()
+    chainFn.mockClear()
+    requireModule.mockClear()
+  })
+
+  test('should construct module container', () => {
+    const nuxt = jest.fn()
+    nuxt.options = jest.fn()
+    const module = new ModuleContainer(nuxt)
+
+    expect(module.nuxt).toBe(nuxt)
+    expect(module.options).toBe(nuxt.options)
+    expect(module.requiredModules).toEqual({})
+  })
+
+  test('should call hooks and addModule when ready', async () => {
+    const nuxt = {
+      options: {
+        modules: [jest.fn(), jest.fn()]
+      },
+      callHook: jest.fn()
+    }
+    const module = new ModuleContainer(nuxt)
+    module.addModule = jest.fn()
+
+    await module.ready()
+
+    expect(nuxt.callHook).toBeCalledTimes(2)
+    expect(nuxt.callHook).nthCalledWith(1, 'modules:before', module, module.options.modules)
+    expect(nuxt.callHook).nthCalledWith(2, 'modules:done', module)
+
+    expect(module.addModule).toBeCalledTimes(2)
+    expect(module.addModule).nthCalledWith(1, module.options.modules[0])
+    expect(module.addModule).nthCalledWith(2, module.options.modules[1])
+  })
+
+  test('should display deprecated message for addVendor', () => {
+    new ModuleContainer({}).addVendor()
+
+    expect(consola.warn).toBeCalledTimes(1)
+    expect(consola.warn).toBeCalledWith('addVendor has been deprecated due to webpack4 optimization')
+  })
+
+  test('should add string template', () => {
+    const module = new ModuleContainer({
+      options: {
+        build: {
+          templates: []
+        }
+      }
+    })
+
+    const template = module.addTemplate('/var/nuxt/test')
+    const expected = {
+      'dst': 'nuxt.test.hash(/var/nuxt/test)',
+      'options': undefined,
+      'src': '/var/nuxt/test'
+    }
+    expect(template).toEqual(expected)
+    expect(module.options.build.templates).toEqual([expected])
+  })
+
+  test('should add object template', () => {
+    const module = new ModuleContainer({
+      options: {
+        build: {
+          templates: []
+        }
+      }
+    })
+
+    const template = module.addTemplate({
+      src: '/var/nuxt/test',
+      options: { test: true }
+    })
+    const expected = {
+      'dst': 'nuxt.test.hash(/var/nuxt/test)',
+      'options': { test: true },
+      'src': '/var/nuxt/test'
+    }
+    expect(template).toEqual(expected)
+    expect(module.options.build.templates).toEqual([expected])
+  })
+
+  test('should use filename in preference to calculation', () => {
+    const module = new ModuleContainer({
+      options: {
+        build: {
+          templates: []
+        }
+      }
+    })
+
+    const template = module.addTemplate({
+      src: '/var/nuxt/test',
+      fileName: '/var/nuxt/dist/test'
+    })
+    const expected = {
+      'dst': '/var/nuxt/dist/test',
+      'options': undefined,
+      'src': '/var/nuxt/test'
+    }
+    expect(template).toEqual(expected)
+    expect(module.options.build.templates).toEqual([expected])
+  })
+
+  test('should throw error when template invalid', () => {
+    const module = new ModuleContainer({})
+
+    expect(() => module.addTemplate()).toThrow('Invalid template: undefined')
+  })
+
+  test('should throw error when template not found', () => {
+    const module = new ModuleContainer({})
+    fs.existsSync = jest.fn(() => false)
+
+    expect(() => module.addTemplate('/var/nuxt/test')).toThrow('Template src not found: /var/nuxt/test')
+
+    fs.existsSync = jest.fn(Boolean)
+  })
+
+  test('should add plugin into module', () => {
+    const module = new ModuleContainer({
+      options: {
+        buildDir: '/var/nuxt/build',
+        plugins: []
+      }
+    })
+    module.addTemplate = jest.fn(() => ({ dst: 'nuxt.test.template' }))
+
+    module.addPlugin({ ssr: false, mode: 'client' })
+
+    expect(module.options.plugins).toEqual([{
+      src: path.join('/var/nuxt/build', 'nuxt.test.template'),
+      ssr: false,
+      mode: 'client'
+    }])
+  })
+
+  test('should add layout into module', () => {
+    const module = new ModuleContainer({
+      options: {
+        layouts: {}
+      }
+    })
+    module.addTemplate = jest.fn(() => ({
+      dst: 'nuxt.test.template',
+      src: '/var/nuxt/src'
+    }))
+
+    module.addLayout({}, 'test-layout')
+
+    expect(module.options.layouts).toEqual({ 'test-layout': './nuxt.test.template' })
+  })
+
+  test('should display deprecated message when registration is duplicate', () => {
+    const module = new ModuleContainer({
+      options: {
+        layouts: {
+          'test-layout': 'test.template'
+        }
+      }
+    })
+    module.addTemplate = jest.fn(() => ({
+      dst: 'nuxt.test.template',
+      src: '/var/nuxt/src'
+    }))
+
+    module.addLayout({}, 'test-layout')
+
+    expect(consola.warn).toBeCalledTimes(1)
+    expect(consola.warn).toBeCalledWith('Duplicate layout registration, "test-layout" has been registered as "test.template"')
+  })
+
+  test('should register error layout at same time', () => {
+    const module = new ModuleContainer({
+      options: {
+        layouts: {}
+      }
+    })
+    module.addErrorLayout = jest.fn()
+    module.addTemplate = jest.fn(() => ({
+      dst: 'nuxt.test.template',
+      src: '/var/nuxt/src'
+    }))
+
+    module.addLayout({}, 'error')
+
+    expect(module.options.layouts).toEqual({ 'error': './nuxt.test.template' })
+    expect(module.addErrorLayout).toBeCalledTimes(1)
+    expect(module.addErrorLayout).toBeCalledWith('nuxt.test.template')
+  })
+
+  test('should add error layout', () => {
+    const module = new ModuleContainer({
+      options: {
+        rootDir: '/var/nuxt',
+        buildDir: '/var/nuxt/build',
+        layouts: {}
+      }
+    })
+
+    module.addErrorLayout('error.template')
+
+    expect(module.options.ErrorPage).toEqual('~/build/error.template')
+  })
+
+  test('should add server middleware', () => {
+    const module = new ModuleContainer({
+      options: {
+        serverMiddleware: []
+      }
+    })
+
+    module.addServerMiddleware(() => {})
+    module.addServerMiddleware(() => {})
+
+    expect(module.options.serverMiddleware).toHaveLength(2)
+    expect(module.options.serverMiddleware).toEqual([expect.any(Function), expect.any(Function)])
+  })
+
+  test('should chain build.extend', () => {
+    const extend = () => {}
+    const module = new ModuleContainer({
+      options: {
+        build: { extend }
+      }
+    })
+
+    const newExtend = () => {}
+    module.extendBuild(newExtend)
+
+    expect(chainFn).toBeCalledTimes(1)
+    expect(chainFn).toBeCalledWith(extend, newExtend)
+    expect(module.options.build.extend).toEqual('chainedFn')
+  })
+
+  test('should chain router.extendRoutes', () => {
+    const extendRoutes = () => {}
+    const module = new ModuleContainer({
+      options: {
+        router: { extendRoutes }
+      }
+    })
+
+    const newExtendRoutes = () => {}
+    module.extendRoutes(newExtendRoutes)
+
+    expect(chainFn).toBeCalledTimes(1)
+    expect(chainFn).toBeCalledWith(extendRoutes, newExtendRoutes)
+    expect(module.options.router.extendRoutes).toEqual('chainedFn')
+  })
+
+  test('should call addModule when require module', () => {
+    const module = new ModuleContainer({
+      options: {}
+    })
+    module.addModule = jest.fn()
+
+    const moduleOpts = {}
+    module.requireModule(moduleOpts)
+
+    expect(module.addModule).toBeCalledTimes(1)
+    expect(module.addModule).toBeCalledWith(moduleOpts, true)
+  })
+
+  test('should add string module', async () => {
+    const module = new ModuleContainer({
+      resolver: { requireModule },
+      options: {}
+    })
+
+    const result = await module.addModule('moduleTest')
+
+    expect(requireModule).toBeCalledTimes(1)
+    expect(requireModule).toBeCalledWith('moduleTest')
+    expect(module.requiredModules).toEqual({
+      moduleTest: {
+        handler: expect.any(Function),
+        options: undefined,
+        src: 'moduleTest'
+      }
+    })
+    expect(result).toEqual({ src: 'moduleTest', options: {} })
+  })
+
+  test('should add array module', async () => {
+    const module = new ModuleContainer({
+      resolver: { requireModule },
+      options: {}
+    })
+
+    const result = await module.addModule(['moduleTest', { test: true }])
+
+    expect(requireModule).toBeCalledTimes(1)
+    expect(requireModule).toBeCalledWith('moduleTest')
+    expect(module.requiredModules).toEqual({
+      moduleTest: {
+        handler: expect.any(Function),
+        options: {
+          test: true
+        },
+        src: 'moduleTest'
+      }
+    })
+    expect(result).toEqual({ src: 'moduleTest', options: { test: true } })
+  })
+
+  test('should add object module', async () => {
+    const module = new ModuleContainer({
+      resolver: { requireModule },
+      options: {}
+    })
+
+    const result = await module.addModule({
+      src: 'moduleTest',
+      options: { test: true },
+      handler: function objectModule(options) {
+        return Promise.resolve(options)
+      }
+    })
+
+    expect(requireModule).not.toBeCalled()
+    expect(module.requiredModules).toEqual({
+      objectModule: {
+        handler: expect.any(Function),
+        options: {
+          test: true
+        },
+        src: 'moduleTest'
+      }
+    })
+    expect(result).toEqual({ test: true })
+  })
+
+  test('should throw error when handler is not function', () => {
+    const module = new ModuleContainer({
+      resolver: { requireModule: () => false },
+      options: {}
+    })
+
+    expect(module.addModule('moduleTest')).rejects.toThrow('Module should export a function: moduleTest')
+  })
+
+  test('should prevent multiple adding when requireOnce is enabled', async () => {
+    const module = new ModuleContainer({
+      resolver: { requireModule },
+      options: {}
+    })
+
+    const handler = jest.fn(() => true)
+    handler.meta = {
+      name: 'moduleTest'
+    }
+
+    const first = await module.addModule({ handler }, true)
+    const second = await module.addModule({ handler }, true)
+
+    expect(first).toEqual(true)
+    expect(second).toBeUndefined()
+    expect(handler).toBeCalledTimes(1)
+    expect(module.requiredModules.moduleTest).toBeDefined()
+  })
+})
diff --git a/packages/core/test/nuxt.test.js b/packages/core/test/nuxt.test.js
new file mode 100644
index 0000000000..9e3db8d79d
--- /dev/null
+++ b/packages/core/test/nuxt.test.js
@@ -0,0 +1,203 @@
+import consola from 'consola'
+import { defineAlias } from '@nuxt/utils'
+import { getNuxtConfig } from '@nuxt/config'
+import { Server } from '@nuxt/server'
+
+import Nuxt from '../src/nuxt'
+import ModuleContainer from '../src/module'
+import Hookable from '../src/hookable'
+import Resolver from '../src/resolver'
+import { version } from '../package.json'
+
+jest.mock('@nuxt/utils')
+jest.mock('@nuxt/config', () => ({
+  getNuxtConfig: jest.fn(() => ({}))
+}))
+jest.mock('@nuxt/server')
+
+describe('core: nuxt', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    jest.spyOn(Nuxt.prototype, 'ready').mockImplementation(() => Promise.resolve())
+  })
+
+  afterEach(() => {
+    if (Nuxt.prototype.ready.mockRestore) {
+      Nuxt.prototype.ready.mockRestore()
+    }
+  })
+
+  test('should construct nuxt with options', () => {
+    const options = {}
+    const nuxt = new Nuxt(options)
+
+    expect(nuxt).toBeInstanceOf(Hookable)
+    expect(getNuxtConfig).toBeCalledTimes(1)
+    expect(getNuxtConfig).toBeCalledWith(options)
+
+    expect(nuxt.resolver).toBeInstanceOf(Resolver)
+    expect(nuxt.moduleContainer).toBeInstanceOf(ModuleContainer)
+    expect(nuxt.server).toBeInstanceOf(Server)
+
+    expect(nuxt._deprecatedHooks).toEqual({
+      'render:context': 'render:routeContext',
+      'showReady': 'webpack:done'
+    })
+
+    expect(defineAlias).toBeCalledTimes(2)
+    expect(defineAlias).nthCalledWith(1, nuxt, nuxt.server, ['renderRoute', 'renderAndGetWindow', 'listen'])
+    expect(defineAlias).nthCalledWith(2, nuxt, nuxt.resolver, ['resolveAlias', 'resolvePath'])
+
+    expect(nuxt.renderer).toBe(nuxt.server)
+    expect(nuxt.render).toBe(nuxt.server.app)
+    expect(nuxt.showReady).toBeInstanceOf(Function)
+    expect(nuxt.initialized).toEqual(false)
+
+    expect(nuxt.ready).toBeCalledTimes(1)
+  })
+
+  test('should call hook webpack:done in showReady', () => {
+    const nuxt = new Nuxt()
+    nuxt.callHook = jest.fn()
+
+    nuxt.showReady()
+
+    expect(nuxt.callHook).toBeCalledTimes(1)
+    expect(nuxt.callHook).toBeCalledWith('webpack:done')
+  })
+
+  test('should display fatal message if ready failed', async () => {
+    const err = new Error('nuxt ready failed')
+    Nuxt.prototype.ready.mockImplementation(() => Promise.reject(err))
+    const nuxt = new Nuxt()
+
+    await nuxt._ready
+
+    expect(consola.fatal).toBeCalledTimes(1)
+    expect(consola.fatal).toBeCalledWith(err)
+  })
+
+  test('should return nuxt version from package.json', () => {
+    expect(Nuxt.version).toEqual(`v${version}`)
+  })
+
+  test('should return nuxt version from global.__NUXT', () => {
+    global.__NUXT = {
+      version: 'latest'
+    }
+
+    expect(Nuxt.version).toEqual('latest')
+
+    delete global.__NUXT
+  })
+
+  test('should call module/server ready in nuxt.ready', async () => {
+    const nuxt = new Nuxt()
+    delete nuxt._ready
+    Nuxt.prototype.ready.mockRestore()
+
+    nuxt.callHook = jest.fn()
+    nuxt.server = { ready: jest.fn() }
+    nuxt.moduleContainer = { ready: jest.fn() }
+
+    const result = await nuxt.ready()
+
+    expect(result).toBe(nuxt)
+    expect(nuxt.moduleContainer.ready).toBeCalledTimes(1)
+    expect(nuxt.server.ready).toBeCalledTimes(1)
+    expect(nuxt.initialized).toEqual(true)
+    expect(nuxt.callHook).toBeCalledTimes(1)
+    expect(nuxt.callHook).toBeCalledWith('ready', nuxt)
+  })
+
+  test('should ignore ready when _ready exists', async () => {
+    const nuxt = new Nuxt()
+    Nuxt.prototype.ready.mockRestore()
+    const _ready = nuxt._ready = jest.fn()
+    nuxt.server = { ready: jest.fn() }
+
+    const result = await nuxt.ready()
+
+    expect(result).toBe(_ready)
+    expect(nuxt.server.ready).not.toBeCalled()
+  })
+
+  test('should add object hooks', async () => {
+    const hooks = {}
+    getNuxtConfig.mockReturnValueOnce({ hooks })
+    const nuxt = new Nuxt()
+    delete nuxt._ready
+    Nuxt.prototype.ready.mockRestore()
+
+    nuxt.addHooks = jest.fn()
+    nuxt.server = { ready: jest.fn() }
+    nuxt.moduleContainer = { ready: jest.fn() }
+
+    await nuxt.ready()
+
+    expect(nuxt.addHooks).toBeCalledTimes(1)
+    expect(nuxt.addHooks).toBeCalledWith(hooks)
+  })
+
+  test('should add function hooks', async () => {
+    const hooks = jest.fn()
+    getNuxtConfig.mockReturnValueOnce({ hooks })
+    const nuxt = new Nuxt()
+    delete nuxt._ready
+    Nuxt.prototype.ready.mockRestore()
+
+    nuxt.addHooks = jest.fn()
+    nuxt.server = { ready: jest.fn() }
+    nuxt.moduleContainer = { ready: jest.fn() }
+
+    await nuxt.ready()
+
+    expect(nuxt.addHooks).not.toBeCalled()
+    expect(hooks).toBeCalledTimes(1)
+  })
+
+  test('should close nuxt with hook triggered', async () => {
+    const nuxt = new Nuxt()
+    nuxt.callHook = jest.fn()
+    nuxt.clearHooks = jest.fn()
+
+    const cb = jest.fn()
+    await nuxt.close(cb)
+
+    expect(cb).toBeCalledTimes(1)
+    expect(nuxt.callHook).toBeCalledTimes(1)
+    expect(nuxt.callHook).toBeCalledWith('close', nuxt)
+    expect(nuxt.clearHooks).toBeCalledTimes(1)
+  })
+
+  test('should ignore non-function callback in close', async () => {
+    const nuxt = new Nuxt()
+    delete nuxt._ready
+    Nuxt.prototype.ready.mockRestore()
+
+    nuxt.callHook = jest.fn()
+    nuxt.server = { ready: jest.fn() }
+    nuxt.moduleContainer = { ready: jest.fn() }
+
+    const result = await nuxt.ready()
+
+    expect(result).toBe(nuxt)
+    expect(nuxt.moduleContainer.ready).toBeCalledTimes(1)
+    expect(nuxt.server.ready).toBeCalledTimes(1)
+    expect(nuxt.initialized).toEqual(true)
+    expect(nuxt.callHook).toBeCalledTimes(1)
+    expect(nuxt.callHook).toBeCalledWith('ready', nuxt)
+  })
+
+  test('should ignore non-function callback in close', async () => {
+    const nuxt = new Nuxt()
+    nuxt.callHook = jest.fn()
+    nuxt.clearHooks = jest.fn()
+
+    const cb = {}
+    await nuxt.close(cb)
+
+    expect(nuxt.callHook).toBeCalledTimes(1)
+    expect(nuxt.clearHooks).toBeCalledTimes(1)
+  })
+})
diff --git a/packages/core/test/resolver.test.js b/packages/core/test/resolver.test.js
new file mode 100644
index 0000000000..44f1c5c0a8
--- /dev/null
+++ b/packages/core/test/resolver.test.js
@@ -0,0 +1,469 @@
+import Module from 'module'
+import path from 'path'
+import esm from 'esm'
+import fs from 'fs-extra'
+import consola from 'consola'
+import { startsWithRootAlias, startsWithSrcAlias } from '@nuxt/utils'
+
+import Resolver from '../src/resolver'
+
+jest.mock('module')
+jest.mock('path')
+jest.mock('esm', () => jest.fn(() => jest.fn()))
+jest.mock('fs-extra')
+jest.mock('@nuxt/utils')
+
+describe('core: resolver', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  test('should construct resolver', () => {
+    const nuxt = jest.fn()
+    nuxt.options = jest.fn()
+    const resolver = new Resolver(nuxt)
+
+    expect(resolver.nuxt).toBe(nuxt)
+    expect(resolver.options).toBe(nuxt.options)
+    expect(resolver.resolvePath).toBeInstanceOf(Function)
+    expect(resolver.resolveAlias).toBeInstanceOf(Function)
+    expect(resolver.resolveModule).toBeInstanceOf(Function)
+    expect(resolver.requireModule).toBeInstanceOf(Function)
+    expect(resolver.esm).toEqual(expect.any(Function))
+    expect(esm).toBeCalledTimes(1)
+    expect(esm).toBeCalledWith(expect.any(Object), {})
+  })
+
+  test('should call _resolveFilename in resolveModule', () => {
+    const resolver = new Resolver({
+      options: { modulesDir: '/var/nuxt/node_modules' }
+    })
+    Module._resolveFilename = jest.fn(() => '/var/nuxt/resolver/module')
+
+    const modulePath = resolver.resolveModule('/var/nuxt/resolver')
+
+    expect(modulePath).toEqual('/var/nuxt/resolver/module')
+    expect(Module._resolveFilename).toBeCalledTimes(1)
+    expect(Module._resolveFilename).toBeCalledWith('/var/nuxt/resolver', { paths: '/var/nuxt/node_modules' })
+  })
+
+  test('should return undefined when module is not found', () => {
+    const resolver = new Resolver({
+      options: { modulesDir: '/var/nuxt/node_modules' }
+    })
+    Module._resolveFilename = jest.fn(() => {
+      const err = new Error()
+      err.code = 'MODULE_NOT_FOUND'
+      throw err
+    })
+
+    const modulePath = resolver.resolveModule('/var/nuxt/resolver')
+
+    expect(modulePath).toBeUndefined()
+    expect(Module._resolveFilename).toBeCalledTimes(1)
+  })
+
+  test('should throw error when _resolveFilename failed', () => {
+    const resolver = new Resolver({
+      options: { modulesDir: '/var/nuxt/node_modules' }
+    })
+    Module._resolveFilename = jest.fn(() => {
+      throw new Error('resolve failed')
+    })
+
+    expect(() => resolver.resolveModule('/var/nuxt/resolver')).toThrow('resolve failed')
+  })
+
+  test('should throw error when _resolveFilename failed', () => {
+    const resolver = new Resolver({
+      options: { modulesDir: '/var/nuxt/node_modules' }
+    })
+    Module._resolveFilename = jest.fn(() => {
+      throw new Error('resolve failed')
+    })
+
+    expect(() => resolver.resolveModule('/var/nuxt/resolver')).toThrow('resolve failed')
+  })
+
+  test('should resolve root alias', () => {
+    const resolver = new Resolver({
+      options: { rootDir: '/var/nuxt' }
+    })
+    startsWithRootAlias.mockReturnValue(true)
+
+    const aliasPath = { substr: jest.fn(p => String(p)) }
+    resolver.resolveAlias(aliasPath)
+
+    expect(path.join).toBeCalledTimes(1)
+    expect(path.join).toBeCalledWith('/var/nuxt', '2')
+    expect(aliasPath.substr).toBeCalledTimes(1)
+    expect(aliasPath.substr).toBeCalledWith(2)
+  })
+
+  test('should resolve src alias', () => {
+    const resolver = new Resolver({
+      options: { srcDir: '/var/nuxt/src' }
+    })
+    startsWithRootAlias.mockReturnValue(false)
+    startsWithSrcAlias.mockReturnValue(true)
+
+    const aliasPath = { substr: jest.fn(p => String(p)) }
+    resolver.resolveAlias(aliasPath)
+
+    expect(path.join).toBeCalledTimes(1)
+    expect(path.join).toBeCalledWith('/var/nuxt/src', '1')
+    expect(aliasPath.substr).toBeCalledTimes(1)
+    expect(aliasPath.substr).toBeCalledWith(1)
+  })
+
+  test('should resolve other alias', () => {
+    const resolver = new Resolver({
+      options: { srcDir: '/var/nuxt/src' }
+    })
+    startsWithRootAlias.mockReturnValue(false)
+    startsWithSrcAlias.mockReturnValue(false)
+
+    const aliasPath = { substr: jest.fn(p => String(p)) }
+    resolver.resolveAlias(aliasPath)
+
+    expect(path.resolve).toBeCalledTimes(1)
+    expect(path.resolve).toBeCalledWith('/var/nuxt/src', aliasPath)
+  })
+
+  describe('core: resolver resolvePath', () => {
+    test('should resolve existed path', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      fs.existsSync = jest.fn(() => true)
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver/file')
+
+      expect(fs.existsSync).toBeCalledTimes(1)
+      expect(fs.existsSync).toBeCalledWith('/var/nuxt/resolver/file')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/file')
+    })
+
+    test('should resolve a module path', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      fs.existsSync = jest.fn(path => path === '/var/nuxt/resolver/module')
+      fs.lstatSync = jest.fn(() => ({ isDirectory: () => false }))
+      resolver.resolveModule = jest.fn(() => '/var/nuxt/resolver/module')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver')
+
+      expect(fs.existsSync).toBeCalledTimes(2)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/module')
+      expect(fs.lstatSync).toBeCalledTimes(1)
+      expect(fs.lstatSync).nthCalledWith(1, '/var/nuxt/resolver/module')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/module')
+    })
+
+    test('should resolve a alias path', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      fs.existsSync = jest.fn(path => path === '/var/nuxt/resolver/alias')
+      fs.lstatSync = jest.fn(() => ({
+        isDirectory: () => false
+      }))
+      resolver.resolveModule = jest.fn(() => false)
+      resolver.resolveAlias = jest.fn(() => '/var/nuxt/resolver/alias')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver')
+
+      expect(fs.existsSync).toBeCalledTimes(2)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/alias')
+      expect(fs.lstatSync).toBeCalledTimes(1)
+      expect(fs.lstatSync).nthCalledWith(1, '/var/nuxt/resolver/alias')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/alias')
+    })
+
+    test('should resolve path with extension', () => {
+      const resolver = new Resolver({
+        options: {
+          extensions: ['js']
+        }
+      })
+      fs.existsSync = jest.fn(path => path === '/var/nuxt/resolver/file.js')
+      resolver.resolveModule = jest.fn(() => false)
+      resolver.resolveAlias = jest.fn(() => false)
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver/file')
+
+      expect(fs.existsSync).toBeCalledTimes(3)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver/file')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/file')
+      expect(fs.existsSync).nthCalledWith(3, '/var/nuxt/resolver/file.js')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/file.js')
+    })
+
+    test('should resolve module path with extension', () => {
+      const resolver = new Resolver({
+        options: {
+          extensions: ['js']
+        }
+      })
+      fs.existsSync = jest.fn(path => path === '/var/nuxt/resolver/module.js')
+      resolver.resolveModule = jest.fn(() => '/var/nuxt/resolver/module')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver/file')
+
+      expect(fs.existsSync).toBeCalledTimes(3)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver/file')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/module')
+      expect(fs.existsSync).nthCalledWith(3, '/var/nuxt/resolver/module.js')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/module.js')
+    })
+
+    test('should resolve alias path with extension', () => {
+      const resolver = new Resolver({
+        options: {
+          extensions: ['js']
+        }
+      })
+      fs.existsSync = jest.fn(path => path === '/var/nuxt/resolver/alias.js')
+      resolver.resolveModule = jest.fn(() => false)
+      resolver.resolveAlias = jest.fn(() => '/var/nuxt/resolver/alias')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver/file')
+
+      expect(fs.existsSync).toBeCalledTimes(3)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver/file')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/alias')
+      expect(fs.existsSync).nthCalledWith(3, '/var/nuxt/resolver/alias.js')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/alias.js')
+    })
+
+    test('should resolve index.[ext] when path is directory', () => {
+      const resolver = new Resolver({
+        options: {
+          extensions: ['js']
+        }
+      })
+      fs.existsSync = jest.fn(path => ['/var/nuxt/resolver/alias', '/var/nuxt/resolver/alias/index.js'].includes(path))
+      fs.lstatSync = jest.fn(() => ({ isDirectory: () => true }))
+      resolver.resolveModule = jest.fn(() => false)
+      resolver.resolveAlias = jest.fn(() => '/var/nuxt/resolver/alias')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver')
+
+      expect(fs.existsSync).toBeCalledTimes(3)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/alias')
+      expect(fs.existsSync).nthCalledWith(3, '/var/nuxt/resolver/alias/index.js')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/alias/index.js')
+    })
+
+    test('should resolve style path', () => {
+      const resolver = new Resolver({
+        options: {
+          extensions: ['js'],
+          styleExtensions: ['css', 'scss']
+        }
+      })
+      fs.existsSync = jest.fn(path => ['/var/nuxt/resolver/alias', '/var/nuxt/resolver/alias/index.scss'].includes(path))
+      fs.lstatSync = jest.fn(path => ({ isDirectory: () => path === '/var/nuxt/resolver/alias' }))
+      resolver.resolveModule = jest.fn(() => false)
+      resolver.resolveAlias = jest.fn(() => '/var/nuxt/resolver/alias')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver', { isStyle: true })
+
+      expect(fs.existsSync).toBeCalledTimes(4)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/alias')
+      expect(fs.existsSync).nthCalledWith(3, '/var/nuxt/resolver/alias/index.css')
+      expect(fs.existsSync).nthCalledWith(4, '/var/nuxt/resolver/alias/index.scss')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/alias/index.scss')
+    })
+
+    test('should resolve the directory path if no file', () => {
+      const resolver = new Resolver({
+        options: {
+          extensions: ['js', 'vue']
+        }
+      })
+      fs.existsSync = jest.fn(path => path === '/var/nuxt/resolver/alias')
+      fs.lstatSync = jest.fn(() => ({ isDirectory: () => true }))
+      resolver.resolveModule = jest.fn(() => false)
+      resolver.resolveAlias = jest.fn(() => '/var/nuxt/resolver/alias')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver')
+
+      expect(fs.existsSync).toBeCalledTimes(4)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/alias')
+      expect(fs.existsSync).nthCalledWith(3, '/var/nuxt/resolver/alias/index.js')
+      expect(fs.existsSync).nthCalledWith(4, '/var/nuxt/resolver/alias/index.vue')
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/alias')
+    })
+
+    test('should throw error if no dir and file', () => {
+      const resolver = new Resolver({
+        options: {
+          extensions: ['js', 'vue']
+        }
+      })
+      fs.existsSync = jest.fn(() => false)
+      fs.lstatSync = jest.fn(() => ({ isDirectory: () => false }))
+      resolver.resolveModule = jest.fn(() => false)
+      resolver.resolveAlias = jest.fn(() => '/var/nuxt/resolver/alias')
+
+      const errMsg = 'Cannot resolve "/var/nuxt/resolver/file" from "/var/nuxt/resolver/alias"'
+      expect(() => resolver.resolvePath('/var/nuxt/resolver/file')).toThrow(errMsg)
+    })
+
+    test('should ignore module resolve if isModule is false', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      fs.existsSync = jest.fn(path => path === '/var/nuxt/resolver/alias')
+      resolver.resolveModule = jest.fn(() => '/var/nuxt/resolver/module')
+      resolver.resolveAlias = jest.fn(() => '/var/nuxt/resolver/alias')
+
+      const resolvedPath = resolver.resolvePath('/var/nuxt/resolver/file', { isModule: false })
+
+      expect(fs.existsSync).toBeCalledTimes(2)
+      expect(fs.existsSync).nthCalledWith(1, '/var/nuxt/resolver/file')
+      expect(fs.existsSync).nthCalledWith(2, '/var/nuxt/resolver/alias')
+      expect(resolver.resolveModule).not.toBeCalled()
+      expect(resolvedPath).toEqual('/var/nuxt/resolver/alias')
+    })
+
+    test('should display deprecated alias options', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      fs.existsSync = jest.fn(() => true)
+
+      resolver.resolvePath('/var/nuxt/resolver/file', { alias: true })
+      const warnMsg = 'Using alias is deprecated and will be removed in Nuxt 3. Use `isAlias` instead.'
+      expect(consola.warn).toBeCalledTimes(1)
+      expect(consola.warn).toBeCalledWith(warnMsg)
+    })
+
+    test('should display deprecated module options', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      fs.existsSync = jest.fn(() => true)
+
+      resolver.resolvePath('/var/nuxt/resolver/file', { module: true })
+      const warnMsg = 'Using module is deprecated and will be removed in Nuxt 3. Use `isModule` instead.'
+      expect(consola.warn).toBeCalledTimes(1)
+      expect(consola.warn).toBeCalledWith(warnMsg)
+    })
+  })
+
+  describe('core: resolver resolveModule', () => {
+    test('should require es modules with default export', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn()
+      resolver.esm = jest.fn(() => ({ default: 'resolved module' }))
+
+      const resolvedModule = resolver.requireModule('/var/nuxt/resolver/module')
+
+      expect(resolvedModule).toEqual('resolved module')
+    })
+
+    test('should require es modules without default export', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn()
+      resolver.esm = jest.fn(() => 'resolved module')
+
+      const resolvedModule = resolver.requireModule('/var/nuxt/resolver/module')
+
+      expect(resolvedModule).toEqual('resolved module')
+    })
+
+    test('should require es modules without default export when intropDefault is disabled', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn()
+      resolver.esm = jest.fn(() => ({ default: 'resolved module' }))
+
+      const resolvedModule = resolver.requireModule('/var/nuxt/resolver/module', { intropDefault: false })
+
+      expect(resolvedModule).toEqual({ default: 'resolved module' })
+    })
+
+    test('should require common module', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn(() => 'path')
+      resolver.esm = jest.fn(() => ({ default: 'resolved module' }))
+
+      const resolvedModule = resolver.requireModule('path', { esm: false })
+
+      expect(resolvedModule).toBe(path)
+    })
+
+    test('should resolve with commonjs for ts module', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn(() => '/var/nuxt/resolver/module.ts')
+      resolver.esm = jest.fn(() => ({ default: 'resolved ts module' }))
+
+      expect(() => resolver.requireModule('/var/nuxt/resolver/module')).toThrow(
+        "Cannot find module '/var/nuxt/resolver/module.ts'"
+      )
+    })
+
+    test('should throw error if resolvePath failed', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn(() => { throw new Error('resolve failed') })
+      resolver.esm = jest.fn(() => undefined)
+
+      expect(() => resolver.requireModule('/var/nuxt/resolver/module')).toThrow('resolve failed')
+    })
+
+    test('should throw last error', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn(() => { throw new Error('resolve failed') })
+      resolver.esm = jest.fn(() => { throw new Error('resolve esm failed') })
+
+      expect(() => resolver.requireModule('/var/nuxt/resolver/module')).toThrow('resolve esm failed')
+    })
+
+    test('should display deprecated alias options', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn()
+      resolver.esm = jest.fn()
+
+      resolver.requireModule('/var/nuxt/resolver/file', { alias: true })
+      const warnMsg = 'Using alias is deprecated and will be removed in Nuxt 3. Use `isAlias` instead.'
+      expect(consola.warn).toBeCalledTimes(1)
+      expect(consola.warn).toBeCalledWith(warnMsg)
+    })
+
+    test('should display deprecated esm options', () => {
+      const resolver = new Resolver({
+        options: {}
+      })
+      resolver.resolvePath = jest.fn()
+      resolver.esm = jest.fn()
+
+      resolver.requireModule('/var/nuxt/resolver/file', { esm: true })
+      const warnMsg = 'Using esm is deprecated and will be removed in Nuxt 3. Use `useESM` instead.'
+      expect(consola.warn).toBeCalledTimes(1)
+      expect(consola.warn).toBeCalledWith(warnMsg)
+    })
+  })
+})
diff --git a/packages/generator/CHANGELOG.md b/packages/generator/CHANGELOG.md
index 3fd1b73a39..903412504b 100644
--- a/packages/generator/CHANGELOG.md
+++ b/packages/generator/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+
+
+### Features
+
+* add exclude regex array for generated pages ([#4754](https://github.com/nuxt/nuxt.js/issues/4754)) ([ec17804](https://github.com/nuxt/nuxt.js/commit/ec17804))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 **Note:** Version bump only for package @nuxt/generator
diff --git a/packages/generator/package.json b/packages/generator/package.json
index 81031d7bb2..75fc1909ff 100644
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/generator",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -8,9 +8,9 @@
   ],
   "main": "dist/generator.js",
   "dependencies": {
-    "@nuxt/common": "2.3.4",
-    "chalk": "^2.4.1",
-    "consola": "^2.3.0",
+    "@nuxt/utils": "2.4.0",
+    "chalk": "^2.4.2",
+    "consola": "^2.3.2",
     "fs-extra": "^7.0.1",
     "html-minifier": "^3.5.21"
   },
diff --git a/packages/generator/src/generator.js b/packages/generator/src/generator.js
index 00ed147a87..0616a0c85d 100644
--- a/packages/generator/src/generator.js
+++ b/packages/generator/src/generator.js
@@ -4,7 +4,7 @@ import consola from 'consola'
 import fsExtra from 'fs-extra'
 import htmlMinifier from 'html-minifier'
 
-import { flatRoutes, isUrl, promisifyRoute, waitFor, isString } from '@nuxt/common'
+import { flatRoutes, isString, isUrl, promisifyRoute, waitFor } from '@nuxt/utils'
 
 export default class Generator {
   constructor(nuxt, builder) {
@@ -83,6 +83,9 @@ export default class Generator {
       this.options.router.mode === 'hash'
         ? ['/']
         : flatRoutes(this.options.router.routes)
+
+    routes = routes.filter(route => this.options.generate.exclude.every(regex => !regex.test(route)))
+
     routes = this.decorateWithPayloads(routes, generateRoutes)
 
     // extendRoutes hook
@@ -137,7 +140,9 @@ export default class Generator {
     const { fallback } = this.options.generate
 
     // Disable SPA fallback if value isn't a non-empty string
-    if (typeof fallback !== 'string' || !fallback) return
+    if (typeof fallback !== 'string' || !fallback) {
+      return
+    }
 
     const fallbackPath = path.join(this.distPath, fallback)
 
@@ -200,7 +205,7 @@ export default class Generator {
         _generate: true,
         payload
       })
-      html = res.html
+      ;({ html } = res)
       if (res.error) {
         pageErrors.push({ type: 'handled', route, error: res.error })
       }
diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md
index bfb2af2099..3982de9f7e 100644
--- a/packages/server/CHANGELOG.md
+++ b/packages/server/CHANGELOG.md
@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* **server:** allow listening on number 0 port ([#4781](https://github.com/nuxt/nuxt.js/issues/4781)) ([602cf12](https://github.com/nuxt/nuxt.js/commit/602cf12))
+* **server:** allow rendering urls with unicode characters ([#4512](https://github.com/nuxt/nuxt.js/issues/4512)) ([c3128ea](https://github.com/nuxt/nuxt.js/commit/c3128ea))
+* **server:** Cannot read property client of null when webpackHMR & restarting Nuxt ([8a200f7](https://github.com/nuxt/nuxt.js/commit/8a200f7))
+* **server:** process browser version with non semver versions ([#4673](https://github.com/nuxt/nuxt.js/issues/4673)) ([d3b9396](https://github.com/nuxt/nuxt.js/commit/d3b9396))
+* **server, jsdom:** fix timeout error message ([#4412](https://github.com/nuxt/nuxt.js/issues/4412)) ([ab6367b](https://github.com/nuxt/nuxt.js/commit/ab6367b))
+* **server, vue-app:** allow unicode page names ([#4402](https://github.com/nuxt/nuxt.js/issues/4402)) ([949785f](https://github.com/nuxt/nuxt.js/commit/949785f))
+* add iron browser as modern ([#4775](https://github.com/nuxt/nuxt.js/issues/4775)) ([9eab558](https://github.com/nuxt/nuxt.js/commit/9eab558))
+* csp SHA hashes accumulate when using custom script-src rules ([#4519](https://github.com/nuxt/nuxt.js/issues/4519)) ([683dbba](https://github.com/nuxt/nuxt.js/commit/683dbba))
+* hmr in modern mode ([#4623](https://github.com/nuxt/nuxt.js/issues/4623)) ([df9b32a](https://github.com/nuxt/nuxt.js/commit/df9b32a))
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* offer a new port and listen if already used, use consola on server error ([#4428](https://github.com/nuxt/nuxt.js/issues/4428)) ([1d78027](https://github.com/nuxt/nuxt.js/commit/1d78027))
+* require serverMiddleware object with path and handler ([#4656](https://github.com/nuxt/nuxt.js/issues/4656)) ([8786ff7](https://github.com/nuxt/nuxt.js/commit/8786ff7))
+* wrong devMiddleware in non-modern dev mode ([3515115](https://github.com/nuxt/nuxt.js/commit/3515115))
+
+
+### Features
+
+* **modern:** auto detect modern mode ([#4422](https://github.com/nuxt/nuxt.js/issues/4422)) ([fe492d8](https://github.com/nuxt/nuxt.js/commit/fe492d8))
+* **server:** export Listener ([#4577](https://github.com/nuxt/nuxt.js/issues/4577)) ([2f0ed85](https://github.com/nuxt/nuxt.js/commit/2f0ed85))
+* better stack traces for SSR error, show error with correct URL and use eventsource-polyfill ([#4600](https://github.com/nuxt/nuxt.js/issues/4600)) ([498c4f1](https://github.com/nuxt/nuxt.js/commit/498c4f1))
+* disable compressor if set to false/undefined ([#4381](https://github.com/nuxt/nuxt.js/issues/4381)) ([e4140ce](https://github.com/nuxt/nuxt.js/commit/e4140ce))
+* improve SSR bundle ([#4439](https://github.com/nuxt/nuxt.js/issues/4439)) ([0f104aa](https://github.com/nuxt/nuxt.js/commit/0f104aa)), closes [#4225](https://github.com/nuxt/nuxt.js/issues/4225) [#3465](https://github.com/nuxt/nuxt.js/issues/3465) [#1728](https://github.com/nuxt/nuxt.js/issues/1728) [#1601](https://github.com/nuxt/nuxt.js/issues/1601) [#1481](https://github.com/nuxt/nuxt.js/issues/1481)
+* nuxt-ts ([#4658](https://github.com/nuxt/nuxt.js/issues/4658)) ([ee0096b](https://github.com/nuxt/nuxt.js/commit/ee0096b))
+* **server:** timing option for `Server-Timing` header ([#4800](https://github.com/nuxt/nuxt.js/issues/4800)) ([b23f5c9](https://github.com/nuxt/nuxt.js/commit/b23f5c9))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/packages/server/package.json b/packages/server/package.json
index 26cb0931a6..294d0c77c7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/server",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -8,23 +8,25 @@
   ],
   "main": "dist/server.js",
   "dependencies": {
-    "@nuxt/common": "2.3.4",
-    "@nuxt/config": "2.3.4",
+    "@nuxt/config": "2.4.0",
+    "@nuxt/utils": "2.4.0",
     "@nuxtjs/youch": "^4.2.3",
-    "browserslist-useragent": "^2.0.1",
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
     "compression": "^1.7.3",
     "connect": "^3.6.6",
-    "consola": "^2.3.0",
+    "consola": "^2.3.2",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
     "fs-extra": "^7.0.1",
     "ip": "^1.1.5",
     "launch-editor-middleware": "^2.2.1",
+    "on-headers": "^1.0.1",
     "pify": "^4.0.1",
+    "semver": "^5.6.0",
     "serve-placeholder": "^1.1.0",
     "serve-static": "^1.13.2",
-    "server-destroy": "^1.0.1"
+    "server-destroy": "^1.0.1",
+    "ua-parser-js": "^0.7.19"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/server/src/index.js b/packages/server/src/index.js
index fcf1442ba3..854a01a63b 100644
--- a/packages/server/src/index.js
+++ b/packages/server/src/index.js
@@ -1 +1,2 @@
 export { default as Server } from './server'
+export { default as Listener } from './listener'
diff --git a/packages/server/src/jsdom.js b/packages/server/src/jsdom.js
index c632cbbdfa..3f4511a40b 100644
--- a/packages/server/src/jsdom.js
+++ b/packages/server/src/jsdom.js
@@ -1,5 +1,5 @@
 import consola from 'consola'
-import { timeout } from '@nuxt/common'
+import { timeout } from '@nuxt/utils'
 
 export default async function renderAndGetWindow(
   url = 'http://localhost:3000',
diff --git a/packages/server/src/listener.js b/packages/server/src/listener.js
index 6556a665f4..d3d753c88a 100644
--- a/packages/server/src/listener.js
+++ b/packages/server/src/listener.js
@@ -6,13 +6,14 @@ import consola from 'consola'
 import pify from 'pify'
 
 export default class Listener {
-  constructor({ port, host, socket, https, app }) {
+  constructor({ port, host, socket, https, app, dev }) {
     // Options
     this.port = port
     this.host = host
     this.socket = socket
     this.https = https
     this.app = app
+    this.dev = dev
 
     // After listen
     this.listening = false
@@ -24,10 +25,17 @@ export default class Listener {
 
   async close() {
     // Destroy server by forcing every connection to be closed
-    if (this.server.listening) {
+    if (this.server && this.server.listening) {
       await this.server.destroy()
       consola.debug('server closed')
     }
+
+    // Delete references
+    this.listening = false
+    this._server = null
+    this.server = null
+    this.address = null
+    this.url = null
   }
 
   computeURL() {
@@ -37,6 +45,7 @@ export default class Listener {
         case '127.0.0.1': this.host = 'localhost'; break
         case '0.0.0.0': this.host = ip.address(); break
       }
+      this.port = address.port
       this.url = `http${this.https ? 's' : ''}://${this.host}:${this.port}`
       return
     }
@@ -51,25 +60,53 @@ export default class Listener {
 
     // Initialize underlying http(s) server
     const protocol = this.https ? https : http
-    const protocolOpts = typeof this.https === 'object' ? [ this.https ] : []
+    const protocolOpts = typeof this.https === 'object' ? [this.https] : []
     this._server = protocol.createServer.apply(protocol, protocolOpts.concat(this.app))
 
+    // Call server.listen
     // Prepare listenArgs
     const listenArgs = this.socket ? { path: this.socket } : { host: this.host, port: this.port }
     listenArgs.exclusive = false
 
     // Call server.listen
-    this.server = await new Promise((resolve, reject) => {
-      const s = this._server.listen(listenArgs, error => error ? reject(error) : resolve(s))
-    })
+    try {
+      this.server = await new Promise((resolve, reject) => {
+        this._server.on('error', error => reject(error))
+        const s = this._server.listen(listenArgs, error => error ? reject(error) : resolve(s))
+      })
+    } catch (error) {
+      return this.serverErrorHandler(error)
+    }
 
     // Enable destroy support
     enableDestroy(this.server)
     pify(this.server.destroy)
 
+    // Compute listen URL
     this.computeURL()
 
     // Set this.listening to true
     this.listening = true
   }
+
+  serverErrorHandler(error) {
+    // Detect if port is not available
+    const addressInUse = error.code === 'EADDRINUSE'
+
+    // Use better error message
+    if (addressInUse) {
+      error.message = `Address \`${this.host}:${this.port}\` is already in use.`
+    }
+
+    // Listen to a random port on dev as a fallback
+    if (addressInUse && this.dev && this.port !== '0') {
+      consola.warn(error.message)
+      consola.info('Trying a random port...')
+      this.port = '0'
+      return this.close().then(() => this.listen())
+    }
+
+    // Throw error
+    throw error
+  }
 }
diff --git a/packages/server/src/middleware/error.js b/packages/server/src/middleware/error.js
index 2361ef12de..9932cb4b6d 100644
--- a/packages/server/src/middleware/error.js
+++ b/packages/server/src/middleware/error.js
@@ -14,6 +14,7 @@ export default ({ resources, options }) => function errorMiddleware(err, req, re
   }
   const errorFull = err instanceof Error ? err : typeof err === 'string'
     ? new Error(err) : new Error(err.message || JSON.stringify(err))
+  if (err.stack) errorFull.stack = err.stack
   errorFull.name = error.name
   errorFull.statusCode = error.statusCode
 
@@ -64,8 +65,7 @@ export default ({ resources, options }) => function errorMiddleware(err, req, re
     readSourceFactory({
       srcDir: options.srcDir,
       rootDir: options.rootDir,
-      buildDir: options.buildDir,
-      resources
+      buildDir: options.buildDir
     }),
     options.router.base,
     true
@@ -79,7 +79,7 @@ export default ({ resources, options }) => function errorMiddleware(err, req, re
   }
 }
 
-const readSourceFactory = ({ srcDir, rootDir, buildDir, resources }) => async function readSource(frame) {
+const readSourceFactory = ({ srcDir, rootDir, buildDir }) => async function readSource(frame) {
   // Remove webpack:/// & query string from the end
   const sanitizeName = name =>
     name ? name.replace('webpack:///', '').split('?')[0] : null
@@ -113,11 +113,4 @@ const readSourceFactory = ({ srcDir, rootDir, buildDir, resources }) => async fu
       return
     }
   }
-
-  // Fallback: use server bundle
-  // TODO: restore to if after https://github.com/istanbuljs/nyc/issues/595 fixed
-  /* istanbul ignore next */
-  if (!frame.contents) {
-    frame.contents = resources.serverBundle.files[frame.fileName]
-  }
 }
diff --git a/packages/server/src/middleware/modern-browsers.js b/packages/server/src/middleware/modern-browsers.js
new file mode 100644
index 0000000000..bac751565f
--- /dev/null
+++ b/packages/server/src/middleware/modern-browsers.js
@@ -0,0 +1,13 @@
+export default {
+  Edge: '16',
+  Firefox: '60',
+  Chrome: '61',
+  'Chrome Headless': '61',
+  Chromium: '61',
+  Iron: '61',
+  Safari: '10.1',
+  Opera: '48',
+  Yandex: '18',
+  Vivaldi: '1.14',
+  'Mobile Safari': '10.3'
+}
diff --git a/packages/server/src/middleware/modern.js b/packages/server/src/middleware/modern.js
index 46d17fdfa9..e4862c3516 100644
--- a/packages/server/src/middleware/modern.js
+++ b/packages/server/src/middleware/modern.js
@@ -1,22 +1,63 @@
-import { ModernBrowsers } from '@nuxt/common'
-import { matchesUA } from 'browserslist-useragent'
+import chalk from 'chalk'
+import consola from 'consola'
+import UAParser from 'ua-parser-js'
+import semver from 'semver'
+
+import ModernBrowsers from './modern-browsers'
 
 const modernBrowsers = Object.keys(ModernBrowsers)
-  .map(browser => `${browser} >= ${ModernBrowsers[browser]}`)
+  .reduce((allBrowsers, browser) => {
+    allBrowsers[browser] = semver.coerce(ModernBrowsers[browser])
+    return allBrowsers
+  }, {})
 
 const isModernBrowser = (ua) => {
-  return Boolean(ua) && matchesUA(ua, {
-    allowHigherVersions: true,
-    browsers: modernBrowsers
-  })
+  if (!ua) {
+    return false
+  }
+  const { browser } = UAParser(ua)
+  const browserVersion = semver.coerce(browser.version)
+  if (!browserVersion) {
+    return false
+  }
+  return modernBrowsers[browser.name] && semver.gte(browserVersion, modernBrowsers[browser.name])
 }
 
-export default function (req, res, next) {
-  const { socket = {}, headers } = req
-  if (socket.modernMode === undefined) {
-    const ua = headers && headers['user-agent']
-    socket.modernMode = isModernBrowser(ua)
+let detected = false
+
+const detectModernBuild = ({ options, resources }) => {
+  if (detected === false && ![false, 'client', 'server'].includes(options.modern)) {
+    detected = true
+    if (resources.modernManifest) {
+      options.modern = options.render.ssr ? 'server' : 'client'
+      consola.info(`Modern bundles are detected. Modern mode (${chalk.green.bold(options.modern)}) is enabled now.`)
+    } else {
+      options.modern = false
+    }
   }
-  req.modernMode = socket.modernMode
+}
+
+const detectModernBrowser = ({ socket = {}, headers }) => {
+  if (socket.isModernBrowser === undefined) {
+    const ua = headers && headers['user-agent']
+    socket.isModernBrowser = isModernBrowser(ua)
+  }
+}
+
+const setModernMode = (req, options) => {
+  const { socket = {} } = req
+  const { isModernBrowser } = socket
+  if (options.modern === 'server') {
+    req.modernMode = isModernBrowser
+  }
+  if (options.dev && !!options.modern) {
+    req.devModernMode = isModernBrowser
+  }
+}
+
+export default ({ context }) => (req, res, next) => {
+  detectModernBuild(context)
+  detectModernBrowser(req)
+  setModernMode(req, context.options)
   next()
 }
diff --git a/packages/server/src/middleware/nuxt.js b/packages/server/src/middleware/nuxt.js
index 8908301d37..fe96370d6e 100644
--- a/packages/server/src/middleware/nuxt.js
+++ b/packages/server/src/middleware/nuxt.js
@@ -2,12 +2,12 @@ import generateETag from 'etag'
 import fresh from 'fresh'
 import consola from 'consola'
 
-import { getContext } from '@nuxt/common'
+import { getContext } from '@nuxt/utils'
 
 export default ({ options, nuxt, renderRoute, resources }) => async function nuxtMiddleware(req, res, next) {
   // Get context
   const context = getContext(req, res)
-  const url = req.url
+  const url = decodeURI(req.url)
 
   res.statusCode = 200
   try {
@@ -15,7 +15,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
     await nuxt.callHook('render:route', url, result, context)
     const {
       html,
-      cspScriptSrcHashSet,
+      cspScriptSrcHashes,
       error,
       redirected,
       getPreloadFiles
@@ -52,7 +52,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
 
       const links = pushAssets
         ? pushAssets(req, res, publicPath, preloadFiles)
-        : defaultPushAssets(preloadFiles, shouldPush, publicPath, options.dev)
+        : defaultPushAssets(preloadFiles, shouldPush, publicPath, options)
 
       // Pass with single Link header
       // https://blog.cloudflare.com/http-2-server-push-with-multiple-assets-per-link-header
@@ -66,7 +66,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
       const { allowedSources, policies } = options.render.csp
       const cspHeader = options.render.csp.reportOnly ? 'Content-Security-Policy-Report-Only' : 'Content-Security-Policy'
 
-      res.setHeader(cspHeader, getCspString({ cspScriptSrcHashSet, allowedSources, policies, isDev: options.dev }))
+      res.setHeader(cspHeader, getCspString({ cspScriptSrcHashes, allowedSources, policies, isDev: options.dev }))
     }
 
     // Send response
@@ -87,13 +87,13 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
   }
 }
 
-const defaultPushAssets = (preloadFiles, shouldPush, publicPath, isDev) => {
-  if (shouldPush && isDev) {
+const defaultPushAssets = (preloadFiles, shouldPush, publicPath, options) => {
+  if (shouldPush && options.dev) {
     consola.warn('http2.shouldPush is deprecated. Use http2.pushAssets function')
   }
 
   const links = []
-  preloadFiles.forEach(({ file, asType, fileWithoutQuery }) => {
+  preloadFiles.forEach(({ file, asType, fileWithoutQuery, modern }) => {
     // By default, we only preload scripts or css
     /* istanbul ignore if */
     if (!shouldPush && asType !== 'script' && asType !== 'style') {
@@ -105,14 +105,18 @@ const defaultPushAssets = (preloadFiles, shouldPush, publicPath, isDev) => {
       return
     }
 
-    links.push(`<${publicPath}${file}>; rel=preload; as=${asType}`)
+    const { crossorigin } = options.build
+    const cors = `${crossorigin ? ` crossorigin=${crossorigin};` : ''}`
+    const ref = modern ? 'modulepreload' : 'preload'
+
+    links.push(`<${publicPath}${file}>; rel=${ref};${cors} as=${asType}`)
   })
   return links
 }
 
-const getCspString = ({ cspScriptSrcHashSet, allowedSources, policies, isDev }) => {
-  const joinedHashSet = Array.from(cspScriptSrcHashSet).join(' ')
-  const baseCspStr = `script-src 'self'${isDev ? ` 'unsafe-eval'` : ''} ${joinedHashSet}`
+const getCspString = ({ cspScriptSrcHashes, allowedSources, policies, isDev }) => {
+  const joinedHashes = cspScriptSrcHashes.join(' ')
+  const baseCspStr = `script-src 'self'${isDev ? ` 'unsafe-eval'` : ''} ${joinedHashes}`
 
   if (Array.isArray(allowedSources)) {
     return `${baseCspStr} ${allowedSources.join(' ')}`
@@ -121,7 +125,7 @@ const getCspString = ({ cspScriptSrcHashSet, allowedSources, policies, isDev })
   const policyObjectAvailable = typeof policies === 'object' && policies !== null && !Array.isArray(policies)
 
   if (policyObjectAvailable) {
-    const transformedPolicyObject = transformPolicyObject(policies, cspScriptSrcHashSet)
+    const transformedPolicyObject = transformPolicyObject(policies, cspScriptSrcHashes)
 
     return Object.entries(transformedPolicyObject).map(([k, v]) => `${k} ${v.join(' ')}`).join('; ')
   }
@@ -129,22 +133,13 @@ const getCspString = ({ cspScriptSrcHashSet, allowedSources, policies, isDev })
   return baseCspStr
 }
 
-const transformPolicyObject = (policies, cspScriptSrcHashSet) => {
+const transformPolicyObject = (policies, cspScriptSrcHashes) => {
   const userHasDefinedScriptSrc = policies['script-src'] && Array.isArray(policies['script-src'])
 
+  const additionalPolicies = userHasDefinedScriptSrc ? policies['script-src'] : []
+
   // Self is always needed for inline-scripts, so add it, no matter if the user specified script-src himself.
+  const hashAndPolicyList = cspScriptSrcHashes.concat(`'self'`, additionalPolicies)
 
-  const hashAndPolicySet = cspScriptSrcHashSet
-  hashAndPolicySet.add(`'self'`)
-
-  if (!userHasDefinedScriptSrc) {
-    policies['script-src'] = Array.from(hashAndPolicySet)
-    return policies
-  }
-
-  new Set(policies['script-src']).forEach(src => hashAndPolicySet.add(src))
-
-  policies['script-src'] = Array.from(hashAndPolicySet)
-
-  return policies
+  return { ...policies, 'script-src': hashAndPolicyList }
 }
diff --git a/packages/server/src/middleware/timing.js b/packages/server/src/middleware/timing.js
new file mode 100644
index 0000000000..b2b27fd8a7
--- /dev/null
+++ b/packages/server/src/middleware/timing.js
@@ -0,0 +1,51 @@
+import consola from 'consola'
+import onHeaders from 'on-headers'
+import { Timer } from '@nuxt/utils'
+
+export default options => (req, res, next) => {
+  if (res.timing) {
+    consola.warn('server-timing is already registered.')
+  }
+  res.timing = new ServerTiming()
+
+  if (options && options.total) {
+    res.timing.start('total', 'Nuxt Server Time')
+  }
+
+  onHeaders(res, () => {
+    res.timing.end('total')
+
+    res.setHeader(
+      'Server-Timing',
+      []
+        .concat(res.getHeader('Server-Timing') || [])
+        .concat(res.timing.headers)
+        .join(', ')
+    )
+  })
+
+  next()
+}
+
+class ServerTiming extends Timer {
+  constructor(...args) {
+    super(...args)
+    this.headers = []
+  }
+
+  end(...args) {
+    const time = super.end(...args)
+    this.headers.push(this.formatHeader(time))
+    return time
+  }
+
+  clear() {
+    super.clear()
+    this.headers.length = 0
+  }
+
+  formatHeader(time) {
+    const desc = time.description ? `;desc="${time.description}"` : ''
+    return `${time.name};dur=${time.duration}${desc}`
+  }
+}
diff --git a/packages/server/src/server.js b/packages/server/src/server.js
index bd5cfea2f1..c2f92c37d0 100644
--- a/packages/server/src/server.js
+++ b/packages/server/src/server.js
@@ -1,16 +1,18 @@
 import path from 'path'
+import consola from 'consola'
 import launchMiddleware from 'launch-editor-middleware'
 import serveStatic from 'serve-static'
 import servePlaceholder from 'serve-placeholder'
 import connect from 'connect'
-import { determineGlobals, isUrl } from '@nuxt/common'
+import { determineGlobals, isUrl } from '@nuxt/utils'
 
 import ServerContext from './context'
 import renderAndGetWindow from './jsdom'
 import nuxtMiddleware from './middleware/nuxt'
 import errorMiddleware from './middleware/error'
 import Listener from './listener'
-import modernMiddleware from './middleware/modern'
+import createModernMiddleware from './middleware/modern'
+import createTimingMiddleware from './middleware/timing'
 
 export default class Server {
   constructor(nuxt) {
@@ -35,6 +37,9 @@ export default class Server {
 
     // Create new connect instance
     this.app = connect()
+
+    // Close hook
+    this.nuxt.hook('close', () => this.close())
   }
 
   async ready() {
@@ -52,14 +57,6 @@ export default class Server {
 
     // Call done hook
     await this.nuxt.callHook('render:done', this)
-
-    // Close all listeners after nuxt close
-    this.nuxt.hook('close', async () => {
-      for (const listener of this.listeners) {
-        await listener.close()
-      }
-      this.listeners = []
-    })
   }
 
   async setupMiddleware() {
@@ -68,29 +65,34 @@ export default class Server {
 
     // Compression middleware for production
     if (!this.options.dev) {
-      const compressor = this.options.render.compressor
+      const { compressor } = this.options.render
       if (typeof compressor === 'object') {
         // If only setting for `compression` are provided, require the module and insert
         const compression = this.nuxt.resolver.requireModule('compression')
         this.useMiddleware(compression(compressor))
-      } else {
-        // Else, require own compression middleware
+      } else if (compressor) {
+        // Else, require own compression middleware if compressor is actually truthy
         this.useMiddleware(compressor)
       }
     }
 
-    if (this.options.modern === 'server') {
-      this.useMiddleware(modernMiddleware)
+    if (this.options.server.timing) {
+      this.useMiddleware(createTimingMiddleware(this.options.server.timing))
     }
 
+    const modernMiddleware = createModernMiddleware({
+      context: this.renderer.context
+    })
+
     // Add webpack middleware support only for development
     if (this.options.dev) {
+      this.useMiddleware(modernMiddleware)
       this.useMiddleware(async (req, res, next) => {
-        const name = req.modernMode ? 'modern' : 'client'
-        if (this.devMiddleware[name]) {
+        const name = req.devModernMode ? 'modern' : 'client'
+        if (this.devMiddleware && this.devMiddleware[name]) {
           await this.devMiddleware[name](req, res)
         }
-        if (this.hotMiddleware[name]) {
+        if (this.hotMiddleware && this.hotMiddleware[name]) {
           await this.hotMiddleware[name](req, res)
         }
         next()
@@ -124,12 +126,13 @@ export default class Server {
           this.options.render.dist
         )
       })
+      this.useMiddleware(modernMiddleware)
     }
 
     // Add user provided middleware
-    this.options.serverMiddleware.forEach((m) => {
+    for (const m of this.options.serverMiddleware) {
       this.useMiddleware(m)
-    })
+    }
 
     const { fallback } = this.options.render
     if (fallback) {
@@ -173,16 +176,30 @@ export default class Server {
   }
 
   useMiddleware(middleware) {
-    // Resolve middleware
-    if (typeof middleware === 'string') {
-      middleware = this.nuxt.resolver.requireModule(middleware)
-    }
+    let handler = middleware.handler || middleware
 
-    // Resolve handler
-    if (typeof middleware.handler === 'string') {
-      middleware.handler = this.nuxt.resolver.requireModule(middleware.handler)
+    // Resolve handler setup as string (path)
+    if (typeof handler === 'string') {
+      try {
+        const requiredModuleFromHandlerPath = this.nuxt.resolver.requireModule(handler)
+
+        // In case the "handler" is not derived from an object but is a normal string, another object with
+        // path and handler could be the result
+
+        // If the required module has handler, treat the module as new "middleware" object
+        if (requiredModuleFromHandlerPath.handler) {
+          middleware = requiredModuleFromHandlerPath
+        }
+
+        handler = requiredModuleFromHandlerPath.handler || requiredModuleFromHandlerPath
+      } catch (err) {
+        consola.error(err)
+        // Throw error in production mode
+        if (!this.options.dev) {
+          throw err
+        }
+      }
     }
-    const handler = middleware.handler || middleware
 
     // Resolve path
     const path = (
@@ -213,11 +230,12 @@ export default class Server {
   async listen(port, host, socket) {
     // Create a new listener
     const listener = new Listener({
-      port: port || this.options.server.port,
+      port: isNaN(parseInt(port)) ? this.options.server.port : port,
       host: host || this.options.server.host,
       socket: socket || this.options.server.socket,
       https: this.options.server.https,
-      app: this.app
+      app: this.app,
+      dev: this.options.dev
     })
 
     // Listen
@@ -228,4 +246,27 @@ export default class Server {
 
     await this.nuxt.callHook('listen', listener.server, listener)
   }
+
+  async close() {
+    if (this.__closed) {
+      return
+    }
+    this.__closed = true
+
+    for (const listener of this.listeners) {
+      await listener.close()
+    }
+    this.listeners = []
+
+    if (typeof this.renderer.close === 'function') {
+      await this.renderer.close()
+    }
+
+    this.app.removeAllListeners()
+    this.app = null
+
+    for (const key in this.resources) {
+      delete this.resources[key]
+    }
+  }
 }
diff --git a/packages/typescript/CHANGELOG.md b/packages/typescript/CHANGELOG.md
new file mode 100644
index 0000000000..a048aeec10
--- /dev/null
+++ b/packages/typescript/CHANGELOG.md
@@ -0,0 +1,19 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **ts:** better `tsconfig.json` handling & improve tests ([#4856](https://github.com/nuxt/nuxt.js/issues/4856)) ([f18ce4e](https://github.com/nuxt/nuxt.js/commit/f18ce4e))
+* **ts:** fix default `tsconfig.json` ([#4842](https://github.com/nuxt/nuxt.js/issues/4842)) ([c39cf84](https://github.com/nuxt/nuxt.js/commit/c39cf84))
+* **ts:** keep baseUrl property in generated tsconfig.json ([#4843](https://github.com/nuxt/nuxt.js/issues/4843)) ([55dc7f4](https://github.com/nuxt/nuxt.js/commit/55dc7f4))
+* **ts:** missing `tsconfig.json` on npm published version ([#4840](https://github.com/nuxt/nuxt.js/issues/4840)) ([e57c20a](https://github.com/nuxt/nuxt.js/commit/e57c20a))
+
+
+### Features
+
+* **ts:** auto generate tsconfig.json ([#4776](https://github.com/nuxt/nuxt.js/issues/4776)) ([2a1ee96](https://github.com/nuxt/nuxt.js/commit/2a1ee96))
diff --git a/packages/common/package.js b/packages/typescript/package.js
similarity index 100%
rename from packages/common/package.js
rename to packages/typescript/package.js
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
new file mode 100644
index 0000000000..438f8796fa
--- /dev/null
+++ b/packages/typescript/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "@nuxt/typescript",
+  "version": "2.4.0",
+  "repository": "nuxt/nuxt.js",
+  "license": "MIT",
+  "files": [
+    "dist",
+    "tsconfig.json"
+  ],
+  "main": "dist/typescript.js",
+  "dependencies": {
+    "@types/node": "^10.12.18",
+    "chalk": "^2.4.2",
+    "consola": "^2.3.2",
+    "enquirer": "^2.3.0",
+    "fork-ts-checker-webpack-plugin": "^0.5.2",
+    "fs-extra": "^7.0.1",
+    "std-env": "^2.2.1",
+    "ts-loader": "^5.3.3",
+    "ts-node": "^8.0.2",
+    "tslint": "^5.12.1",
+    "typescript": "^3.2.4"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}
diff --git a/packages/typescript/src/index.js b/packages/typescript/src/index.js
new file mode 100644
index 0000000000..c6ec5f4a5c
--- /dev/null
+++ b/packages/typescript/src/index.js
@@ -0,0 +1,49 @@
+import chalk from 'chalk'
+import consola from 'consola'
+import env from 'std-env'
+import { prompt } from 'enquirer'
+import { existsSync, writeJSON } from 'fs-extra'
+import { register } from 'ts-node'
+
+async function generateTsConfig(tsConfigPath) {
+  const configToExtend = '@nuxt/typescript'
+  await writeJSON(tsConfigPath, {
+    extends: configToExtend,
+    compilerOptions: {
+      baseUrl: '.',
+      types: [
+        '@types/node',
+        '@nuxt/vue-app'
+      ]
+    }
+  }, { spaces: 2 })
+  consola.info(`Extending ${chalk.bold.blue(`node_modules/${configToExtend}/tsconfig.json`)}`)
+  consola.success(`Generated successfully at ${chalk.bold.green(tsConfigPath)}`)
+}
+
+let _setup = false
+
+export async function setup(tsConfigPath) {
+  if (_setup) {
+    return
+  }
+  _setup = true
+
+  if (!existsSync(tsConfigPath)) {
+    const { confirmGeneration } = await prompt({
+      type: 'confirm',
+      name: 'confirmGeneration',
+      message: `${chalk.bold.blue(tsConfigPath)} is missing, generate it ?`,
+      initial: true,
+      skip: env.minimal
+    })
+
+    if (confirmGeneration) {
+      await generateTsConfig(tsConfigPath)
+    }
+  }
+  // https://github.com/TypeStrong/ts-node
+  register({
+    project: tsConfigPath
+  })
+}
diff --git a/packages/typescript/test/setup.test.js b/packages/typescript/test/setup.test.js
new file mode 100644
index 0000000000..f111a33fd8
--- /dev/null
+++ b/packages/typescript/test/setup.test.js
@@ -0,0 +1,46 @@
+import { resolve } from 'path'
+import { exists, mkdirp, readJSON, remove } from 'fs-extra'
+import { register } from 'ts-node'
+import { setup as setupTypeScript } from '@nuxt/typescript'
+
+jest.mock('ts-node')
+
+describe('typescript setup', () => {
+  const rootDir = 'tmp'
+  const tsConfigPath = resolve(rootDir, 'tsconfig.json')
+
+  beforeAll(async () => {
+    // We're assuming that rootDir provided to setupTypeScript is existing so we create the tested one
+    await mkdirp(rootDir)
+    await setupTypeScript(tsConfigPath)
+  })
+
+  test('tsconfig.json has been generated if missing', async () => {
+    expect(await exists(tsConfigPath)).toBe(true)
+    expect(await readJSON(tsConfigPath)).toEqual({
+      extends: '@nuxt/typescript',
+      compilerOptions: {
+        baseUrl: '.',
+        types: [
+          '@types/node',
+          '@nuxt/vue-app'
+        ]
+      }
+    })
+  })
+
+  test('ts-node has been registered once', async () => {
+    // Call setupTypeScript a second time to test guard
+    await setupTypeScript(tsConfigPath)
+
+    expect(register).toHaveBeenCalledTimes(1)
+    expect(register).toHaveBeenCalledWith({
+      project: tsConfigPath
+    })
+  })
+
+  afterAll(async () => {
+    // Clean workspace by removing the temporary folder (and the generated tsconfig.json at the same time)
+    await remove(tsConfigPath)
+  })
+})
diff --git a/packages/typescript/tsconfig.json b/packages/typescript/tsconfig.json
new file mode 100644
index 0000000000..bd217e8b00
--- /dev/null
+++ b/packages/typescript/tsconfig.json
@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "moduleResolution": "node",
+    "lib": [
+      "esnext",
+      "esnext.asynciterable",
+      "dom"
+    ],
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "jsx": "preserve",
+    "sourceMap": true,
+    "strict": true,
+    "noImplicitAny": true,
+    "noEmit": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": [
+        "./*"
+      ],
+      "@/*": [
+        "./*"
+      ]
+    }
+  }
+}
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
new file mode 100644
index 0000000000..47ce0a3968
--- /dev/null
+++ b/packages/utils/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* no false positives for plugins with index.js ([#4714](https://github.com/nuxt/nuxt.js/issues/4714)) ([eef2af3](https://github.com/nuxt/nuxt.js/commit/eef2af3)), closes [#4713](https://github.com/nuxt/nuxt.js/issues/4713)
+
+
+### Features
+
+* **server:** timing option for `Server-Timing` header ([#4800](https://github.com/nuxt/nuxt.js/issues/4800)) ([b23f5c9](https://github.com/nuxt/nuxt.js/commit/b23f5c9))
+* **ts:** add TSX support ([#4613](https://github.com/nuxt/nuxt.js/issues/4613)) ([4d52742](https://github.com/nuxt/nuxt.js/commit/4d52742))
diff --git a/packages/utils/package.js b/packages/utils/package.js
new file mode 100644
index 0000000000..19d0ef6e2d
--- /dev/null
+++ b/packages/utils/package.js
@@ -0,0 +1,3 @@
+export default {
+  build: true
+}
diff --git a/packages/common/package.json b/packages/utils/package.json
similarity index 53%
rename from packages/common/package.json
rename to packages/utils/package.json
index 6f236d630f..41708916e5 100644
--- a/packages/common/package.json
+++ b/packages/utils/package.json
@@ -1,14 +1,15 @@
 {
-  "name": "@nuxt/common",
-  "version": "2.3.4",
+  "name": "@nuxt/utils",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist"
   ],
-  "main": "dist/common.js",
+  "main": "dist/utils.js",
   "dependencies": {
-    "consola": "^2.3.0"
+    "consola": "^2.3.2",
+    "serialize-javascript": "^1.6.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/utils/src/context.js b/packages/utils/src/context.js
new file mode 100644
index 0000000000..d73187696f
--- /dev/null
+++ b/packages/utils/src/context.js
@@ -0,0 +1,16 @@
+
+export const getContext = function getContext(req, res) {
+  return { req, res }
+}
+
+export const determineGlobals = function determineGlobals(globalName, globals) {
+  const _globals = {}
+  for (const global in globals) {
+    if (typeof globals[global] === 'function') {
+      _globals[global] = globals[global](globalName)
+    } else {
+      _globals[global] = globals[global]
+    }
+  }
+  return _globals
+}
diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js
new file mode 100644
index 0000000000..64028fd3ac
--- /dev/null
+++ b/packages/utils/src/index.js
@@ -0,0 +1,7 @@
+export * from './context'
+export * from './lang'
+export * from './resolve'
+export * from './route'
+export * from './serialize'
+export * from './task'
+export * from './timer'
diff --git a/packages/utils/src/lang.js b/packages/utils/src/lang.js
new file mode 100644
index 0000000000..4a3c68ca81
--- /dev/null
+++ b/packages/utils/src/lang.js
@@ -0,0 +1,46 @@
+export const encodeHtml = function encodeHtml(str) {
+  return str.replace(/</g, '&lt;').replace(/>/g, '&gt;')
+}
+
+export const isString = obj => typeof obj === 'string' || obj instanceof String
+
+export const isNonEmptyString = obj => obj && isString(obj)
+
+export const isPureObject = function isPureObject(o) {
+  return !Array.isArray(o) && typeof o === 'object'
+}
+
+export const isUrl = function isUrl(url) {
+  return ['http', '//'].some(str => url.startsWith(str))
+}
+
+export const urlJoin = function urlJoin() {
+  return [].slice
+    .call(arguments)
+    .join('/')
+    .replace(/\/+/g, '/')
+    .replace(':/', '://')
+}
+
+/**
+ * Wraps value in array if it is not already an array
+ *
+ * @param  {any} value
+ * @return {array}
+ */
+export const wrapArray = value => Array.isArray(value) ? value : [value]
+
+const WHITESPACE_REPLACEMENTS = [
+  [/[ \t\f\r]+\n/g, '\n'], // strip empty indents
+  [/{\n{2,}/g, '{\n'], // strip start padding from blocks
+  [/\n{2,}([ \t\f\r]*})/g, '\n$1'], // strip end padding from blocks
+  [/\n{3,}/g, '\n\n'], // strip multiple blank lines (1 allowed)
+  [/\n{2,}$/g, '\n'] // strip blank lines EOF (0 allowed)
+]
+
+export const stripWhitespace = function stripWhitespace(string) {
+  WHITESPACE_REPLACEMENTS.forEach(([regex, newSubstr]) => {
+    string = string.replace(regex, newSubstr)
+  })
+  return string
+}
diff --git a/packages/utils/src/resolve.js b/packages/utils/src/resolve.js
new file mode 100644
index 0000000000..1d63c5a880
--- /dev/null
+++ b/packages/utils/src/resolve.js
@@ -0,0 +1,112 @@
+import path from 'path'
+import consola from 'consola'
+import escapeRegExp from 'lodash/escapeRegExp'
+
+export const startsWithAlias = aliasArray => str => aliasArray.some(c => str.startsWith(c))
+
+export const startsWithSrcAlias = startsWithAlias(['@', '~'])
+
+export const startsWithRootAlias = startsWithAlias(['@@', '~~'])
+
+export const isWindows = /^win/.test(process.platform)
+
+export const wp = function wp(p = '') {
+  /* istanbul ignore if */
+  if (isWindows) {
+    return p.replace(/\\/g, '\\\\')
+  }
+  return p
+}
+
+export const wChunk = function wChunk(p = '') {
+  /* istanbul ignore if */
+  if (isWindows) {
+    return p.replace(/\//g, '_')
+  }
+  return p
+}
+
+const reqSep = /\//g
+const sysSep = escapeRegExp(path.sep)
+const normalize = string => string.replace(reqSep, sysSep)
+
+export const r = function r(...args) {
+  const lastArg = args[args.length - 1]
+
+  if (startsWithSrcAlias(lastArg)) {
+    return wp(lastArg)
+  }
+
+  return wp(path.resolve(...args.map(normalize)))
+}
+
+export const relativeTo = function relativeTo() {
+  const args = Array.prototype.slice.apply(arguments)
+  const dir = args.shift()
+
+  // Keep webpack inline loader intact
+  if (args[0].includes('!')) {
+    const loaders = args.shift().split('!')
+
+    return loaders.concat(relativeTo(dir, loaders.pop(), ...args)).join('!')
+  }
+
+  // Resolve path
+  const _path = r(...args)
+
+  // Check if path is an alias
+  if (startsWithSrcAlias(_path)) {
+    return _path
+  }
+
+  // Make correct relative path
+  let rp = path.relative(dir, _path)
+  if (rp[0] !== '.') {
+    rp = './' + rp
+  }
+
+  return wp(rp)
+}
+
+export function defineAlias(src, target, prop, opts = {}) {
+  const { bind = true, warn = false } = opts
+
+  if (Array.isArray(prop)) {
+    for (const p of prop) {
+      defineAlias(src, target, p, opts)
+    }
+    return
+  }
+
+  let targetVal = target[prop]
+  if (bind && typeof targetVal === 'function') {
+    targetVal = targetVal.bind(target)
+  }
+
+  let warned = false
+
+  Object.defineProperty(src, prop, {
+    get: () => {
+      if (warn && !warned) {
+        warned = true
+        consola.warn({
+          message: `'${prop}' is deprecated'`,
+          additional: new Error().stack.split('\n').splice(2).join('\n')
+        })
+      }
+      return targetVal
+    }
+  })
+}
+
+const isIndex = s => /(.*)\/index\.[^/]+$/.test(s)
+
+export function isIndexFileAndFolder(pluginFiles) {
+  // Return early in case the matching file count exceeds 2 (index.js + folder)
+  if (pluginFiles.length !== 2) {
+    return false
+  }
+  return pluginFiles.some(isIndex)
+}
+
+export const getMainModule = () => require.main
diff --git a/packages/utils/src/route.js b/packages/utils/src/route.js
new file mode 100644
index 0000000000..e75bbaf09c
--- /dev/null
+++ b/packages/utils/src/route.js
@@ -0,0 +1,237 @@
+import path from 'path'
+import get from 'lodash/get'
+import consola from 'consola'
+
+import { r } from './resolve'
+
+export const flatRoutes = function flatRoutes(router, _path = '', routes = []) {
+  router.forEach((r) => {
+    if ([':', '*'].some(c => r.path.includes(c))) {
+      return
+    }
+    /* istanbul ignore if */
+    if (r.children) {
+      if (_path === '' && r.path === '/') {
+        routes.push('/')
+      }
+      return flatRoutes(r.children, _path + r.path + '/', routes)
+    }
+    _path = _path.replace(/^\/+$/, '/')
+    routes.push(
+      (r.path === '' && _path[_path.length - 1] === '/'
+        ? _path.slice(0, -1)
+        : _path) + r.path
+    )
+  })
+  return routes
+}
+
+function cleanChildrenRoutes(routes, isChild = false, routeNameSplitter = '-') {
+  let start = -1
+  const regExpIndex = new RegExp(`${routeNameSplitter}index$`)
+  const routesIndex = []
+  routes.forEach((route) => {
+    if (regExpIndex.test(route.name) || route.name === 'index') {
+      // Save indexOf 'index' key in name
+      const res = route.name.split(routeNameSplitter)
+      const 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.includes('?')) {
+      const names = route.name.split(routeNameSplitter)
+      const paths = route.path.split('/')
+      if (!isChild) {
+        paths.shift()
+      } // clean first / for parents
+      routesIndex.forEach((r) => {
+        const 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(regExpIndex, '')
+    if (route.children) {
+      if (route.children.find(child => child.path === '')) {
+        delete route.name
+      }
+      route.children = cleanChildrenRoutes(route.children, true, routeNameSplitter)
+    }
+  })
+  return routes
+}
+
+const DYNAMIC_ROUTE_REGEX = /^\/([:*])/
+
+const sortRoutes = function sortRoutes(routes) {
+  routes.sort((a, b) => {
+    if (!a.path.length) {
+      return -1
+    }
+    if (!b.path.length) {
+      return 1
+    }
+    // Order: /static, /index, /:dynamic
+    // Match exact route before index: /login before /index/_slug
+    if (a.path === '/') {
+      return DYNAMIC_ROUTE_REGEX.test(b.path) ? -1 : 1
+    }
+    if (b.path === '/') {
+      return DYNAMIC_ROUTE_REGEX.test(a.path) ? 1 : -1
+    }
+
+    let i
+    let res = 0
+    let y = 0
+    let z = 0
+    const _a = a.path.split('/')
+    const _b = b.path.split('/')
+    for (i = 0; i < _a.length; i++) {
+      if (res !== 0) {
+        break
+      }
+      y = _a[i] === '*' ? 2 : _a[i].includes(':') ? 1 : 0
+      z = _b[i] === '*' ? 2 : _b[i].includes(':') ? 1 : 0
+      res = y - z
+      // If a.length >= b.length
+      if (i === _b.length - 1 && res === 0) {
+        // unless * found sort by level, then alphabetically
+        res = _a[i] === '*' ? -1 : (
+          _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length)
+        )
+      }
+    }
+
+    if (res === 0) {
+      // unless * found sort by level, then alphabetically
+      res = _a[i - 1] === '*' && _b[i] ? 1 : (
+        _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length)
+      )
+    }
+    return res
+  })
+
+  routes.forEach((route) => {
+    if (route.children) {
+      sortRoutes(route.children)
+    }
+  })
+
+  return routes
+}
+
+export const createRoutes = function createRoutes(files, srcDir, pagesDir = '', routeNameSplitter = '-') {
+  const supportedExtensions = ['vue', 'js', 'ts', 'tsx']
+  const routes = []
+  files.forEach((file) => {
+    const keys = file
+      .replace(new RegExp(`^${pagesDir}`), '')
+      .replace(new RegExp(`\\.(${supportedExtensions.join('|')})$`), '')
+      .replace(/\/{2,}/g, '/')
+      .split('/')
+      .slice(1)
+    const route = { name: '', path: '', component: r(srcDir, file) }
+    let parent = routes
+    keys.forEach((key, i) => {
+      // remove underscore only, if its the prefix
+      const sanitizedKey = key.startsWith('_') ? key.substr(1) : key
+
+      route.name = route.name
+        ? route.name + routeNameSplitter + sanitizedKey
+        : sanitizedKey
+      route.name += key === '_' ? 'all' : ''
+      route.chunkName = file.replace(new RegExp(`\\.(${supportedExtensions.join('|')})$`), '')
+      const child = parent.find(parentRoute => parentRoute.name === route.name)
+
+      if (child) {
+        child.children = child.children || []
+        parent = child.children
+        route.path = ''
+      } else if (key === 'index' && i + 1 === keys.length) {
+        route.path += i > 0 ? '' : '/'
+      } else {
+        route.path += '/' + getRoutePathExtension(key)
+
+        if (key.startsWith('_') && key.length > 1) {
+          route.path += '?'
+        }
+      }
+    })
+    parent.push(route)
+  })
+
+  sortRoutes(routes)
+  return cleanChildrenRoutes(routes, false, routeNameSplitter)
+}
+
+// Guard dir1 from dir2 which can be indiscriminately removed
+export const guardDir = function guardDir(options, key1, key2) {
+  const dir1 = get(options, key1, false)
+  const dir2 = get(options, key2, false)
+
+  if (
+    dir1 &&
+    dir2 &&
+    (
+      dir1 === dir2 ||
+      (
+        dir1.startsWith(dir2) &&
+        !path.basename(dir1).startsWith(path.basename(dir2))
+      )
+    )
+  ) {
+    const errorMessage = `options.${key2} cannot be a parent of or same as ${key1}`
+    consola.fatal(errorMessage)
+    throw new Error(errorMessage)
+  }
+}
+
+const getRoutePathExtension = (key) => {
+  if (key === '_') {
+    return '*'
+  }
+
+  if (key.startsWith('_')) {
+    return `:${key.substr(1)}`
+  }
+
+  return key
+}
+
+export const promisifyRoute = function promisifyRoute(fn, ...args) {
+  // If routes is an array
+  if (Array.isArray(fn)) {
+    return Promise.resolve(fn)
+  }
+  // If routes is a function expecting a callback
+  if (fn.length === arguments.length) {
+    return new Promise((resolve, reject) => {
+      fn((err, routeParams) => {
+        if (err) {
+          reject(err)
+        }
+        resolve(routeParams)
+      }, ...args)
+    })
+  }
+  let promise = fn(...args)
+  if (
+    !promise ||
+    (!(promise instanceof Promise) && typeof promise.then !== 'function')
+  ) {
+    promise = Promise.resolve(promise)
+  }
+  return promise
+}
diff --git a/packages/utils/src/serialize.js b/packages/utils/src/serialize.js
new file mode 100644
index 0000000000..d04bd31194
--- /dev/null
+++ b/packages/utils/src/serialize.js
@@ -0,0 +1,22 @@
+
+import serialize from 'serialize-javascript'
+
+export function serializeFunction(func) {
+  let open = false
+  return serialize(func)
+    .replace(serializeFunction.assignmentRE, (_, spaces) => {
+      return `${spaces}: function (`
+    })
+    .replace(serializeFunction.internalFunctionRE, (_, spaces, name, args) => {
+      if (open) {
+        return `${spaces}${name}: function (${args}) {`
+      } else {
+        open = true
+        return _
+      }
+    })
+    .replace(`${func.name}(`, 'function (')
+}
+
+serializeFunction.internalFunctionRE = /^(\s*)(?!(?:if)|(?:for)|(?:while)|(?:switch))(\w+)\s*\((.*?)\)\s*\{/gm
+serializeFunction.assignmentRE = /^(\s*):(\w+)\(/gm
diff --git a/packages/utils/src/task.js b/packages/utils/src/task.js
new file mode 100644
index 0000000000..412096d119
--- /dev/null
+++ b/packages/utils/src/task.js
@@ -0,0 +1,37 @@
+export const sequence = function sequence(tasks, fn) {
+  return tasks.reduce(
+    (promise, task) => promise.then(() => fn(task)),
+    Promise.resolve()
+  )
+}
+
+export const parallel = function parallel(tasks, fn) {
+  return Promise.all(tasks.map(fn))
+}
+
+export const chainFn = function chainFn(base, fn) {
+  /* istanbul ignore if */
+  if (typeof fn !== 'function') {
+    return base
+  }
+  return function (...args) {
+    if (typeof base !== 'function') {
+      return fn.apply(this, args)
+    }
+    let baseResult = base.apply(this, args)
+    // Allow function to mutate the first argument instead of returning the result
+    if (baseResult === undefined) {
+      [baseResult] = args
+    }
+    const fnResult = fn.call(
+      this,
+      baseResult,
+      ...Array.prototype.slice.call(args, 1)
+    )
+    // Return mutated argument if no result was returned
+    if (fnResult === undefined) {
+      return baseResult
+    }
+    return fnResult
+  }
+}
diff --git a/packages/utils/src/timer.js b/packages/utils/src/timer.js
new file mode 100644
index 0000000000..bb7152751c
--- /dev/null
+++ b/packages/utils/src/timer.js
@@ -0,0 +1,65 @@
+async function promiseFinally(fn, finalFn) {
+  let result
+  try {
+    if (typeof fn === 'function') {
+      result = await fn()
+    } else {
+      result = await fn
+    }
+  } finally {
+    finalFn()
+  }
+  return result
+}
+
+export const timeout = function timeout(fn, ms, msg) {
+  let timerId
+  const warpPromise = promiseFinally(fn, () => clearTimeout(timerId))
+  const timerPromise = new Promise((resolve, reject) => {
+    timerId = setTimeout(() => reject(new Error(msg)), ms)
+  })
+  return Promise.race([warpPromise, timerPromise])
+}
+
+export const waitFor = function waitFor(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms || 0))
+}
+export class Timer {
+  constructor() {
+    this._times = new Map()
+  }
+
+  start(name, description) {
+    const time = {
+      name,
+      description,
+      start: this.hrtime()
+    }
+    this._times.set(name, time)
+    return time
+  }
+
+  end(name) {
+    if (this._times.has(name)) {
+      const time = this._times.get(name)
+      time.duration = this.hrtime(time.start)
+      this._times.delete(name)
+      return time
+    }
+  }
+
+  hrtime(start) {
+    const useBigInt = typeof process.hrtime.bigint === 'function'
+    if (start) {
+      const end = useBigInt ? process.hrtime.bigint() : process.hrtime(start)
+      return useBigInt
+        ? (end - start) / BigInt(1000000)
+        : (end[0] * 1e3) + (end[1] * 1e-6)
+    }
+    return useBigInt ? process.hrtime.bigint() : process.hrtime()
+  }
+
+  clear() {
+    this._times.clear()
+  }
+}
diff --git a/packages/vue-app/CHANGELOG.md b/packages/vue-app/CHANGELOG.md
index 1d4e3e6e22..41f3941a8b 100644
--- a/packages/vue-app/CHANGELOG.md
+++ b/packages/vue-app/CHANGELOG.md
@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* $nuxt is used instead of globalName ([#4743](https://github.com/nuxt/nuxt.js/issues/4743)) ([fe57a5a](https://github.com/nuxt/nuxt.js/commit/fe57a5a))
+* allow keepAliveProps for nuxt component ([#4610](https://github.com/nuxt/nuxt.js/issues/4610)) ([8dc15d0](https://github.com/nuxt/nuxt.js/commit/8dc15d0))
+* apply store HMR to whole store ([#4589](https://github.com/nuxt/nuxt.js/issues/4589)) ([81cf09c](https://github.com/nuxt/nuxt.js/commit/81cf09c))
+* hotfix for vuex hmr ([#4801](https://github.com/nuxt/nuxt.js/issues/4801)) ([5f0b34f](https://github.com/nuxt/nuxt.js/commit/5f0b34f))
+* keepAliveProps broken in <nuxt-child> ([#4521](https://github.com/nuxt/nuxt.js/issues/4521)) ([431cc15](https://github.com/nuxt/nuxt.js/commit/431cc15))
+* loading.throttle can not be 0 ([2d74804](https://github.com/nuxt/nuxt.js/commit/2d74804))
+* merge route.meta into options.meta ([#4479](https://github.com/nuxt/nuxt.js/issues/4479)) ([5a8e6e4](https://github.com/nuxt/nuxt.js/commit/5a8e6e4))
+* properly serialize head functions ([#4558](https://github.com/nuxt/nuxt.js/issues/4558)) ([7831e57](https://github.com/nuxt/nuxt.js/commit/7831e57)), closes [#4079](https://github.com/nuxt/nuxt.js/issues/4079)
+* **vue-app:** Set window. equals to window.{globalName} when defined ([951e745](https://github.com/nuxt/nuxt.js/commit/951e745))
+* remove unnecessary isDev in template/server ([a51ba8d](https://github.com/nuxt/nuxt.js/commit/a51ba8d))
+* **vue-app:** Fix Vuex HMR & refactor for better modules usage ([#4791](https://github.com/nuxt/nuxt.js/issues/4791)) ([deadc48](https://github.com/nuxt/nuxt.js/commit/deadc48))
+* router Expected "0" to be defined ([#4394](https://github.com/nuxt/nuxt.js/issues/4394)) ([39b1b8e](https://github.com/nuxt/nuxt.js/commit/39b1b8e))
+* **vue-app:** Fix route meta to handle order ([45be638](https://github.com/nuxt/nuxt.js/commit/45be638))
+* use triple equals in loading.throttle [release] ([e77c2db](https://github.com/nuxt/nuxt.js/commit/e77c2db))
+* Vue.component(RouterLink) is undefined in vue-router 3.0.0 ([#4668](https://github.com/nuxt/nuxt.js/issues/4668)) ([7ff4058](https://github.com/nuxt/nuxt.js/commit/7ff4058))
+* **ts:** fix missing process type definitions and refactor types tests ([#4798](https://github.com/nuxt/nuxt.js/issues/4798)) ([45afc3f](https://github.com/nuxt/nuxt.js/commit/45afc3f))
+* wrong type checking for loading.duration ([0c15b29](https://github.com/nuxt/nuxt.js/commit/0c15b29))
+* **layout-middleware:** Fix issue [#4724](https://github.com/nuxt/nuxt.js/issues/4724) ([521ac20](https://github.com/nuxt/nuxt.js/commit/521ac20))
+* **progress-bar:** allow 0 for values and remove duplicate defaults ([#4397](https://github.com/nuxt/nuxt.js/issues/4397)) ([ecdc7bc](https://github.com/nuxt/nuxt.js/commit/ecdc7bc))
+* **scrollBehavior:** emit triggerScroll event after changing layer ([#4399](https://github.com/nuxt/nuxt.js/issues/4399)) ([330301c](https://github.com/nuxt/nuxt.js/commit/330301c)), closes [#4080](https://github.com/nuxt/nuxt.js/issues/4080)
+* **server, vue-app:** allow unicode page names ([#4402](https://github.com/nuxt/nuxt.js/issues/4402)) ([949785f](https://github.com/nuxt/nuxt.js/commit/949785f))
+* **ts:** Add missing `loading` property to Component options ([#4786](https://github.com/nuxt/nuxt.js/issues/4786)) ([db4001d](https://github.com/nuxt/nuxt.js/commit/db4001d))
+* **ts:** fix `$nuxt.$loading` typedefs ([#4778](https://github.com/nuxt/nuxt.js/issues/4778)) ([6694cf7](https://github.com/nuxt/nuxt.js/commit/6694cf7))
+* **vue-app:** add type definition for `ComponentOptions.middleware` ([#4531](https://github.com/nuxt/nuxt.js/issues/4531)) ([da0a379](https://github.com/nuxt/nuxt.js/commit/da0a379))
+* **vue-app:** allow passing custom props to error function ([#4462](https://github.com/nuxt/nuxt.js/issues/4462)) ([a6fed0a](https://github.com/nuxt/nuxt.js/commit/a6fed0a)), closes [#4460](https://github.com/nuxt/nuxt.js/issues/4460)
+* **vue-app:** Call Vue.config.errorHandler instead of simply logging the error ([6c4280f](https://github.com/nuxt/nuxt.js/commit/6c4280f))
+* **vue-app:** Fix default error handler in production ([96892c5](https://github.com/nuxt/nuxt.js/commit/96892c5))
+* **vue-app:** router.meta is null on extendRoutes([#4478](https://github.com/nuxt/nuxt.js/issues/4478)) ([e2ab1b4](https://github.com/nuxt/nuxt.js/commit/e2ab1b4)), closes [#4154](https://github.com/nuxt/nuxt.js/issues/4154)
+
+
+### Features
+
+* **builder:** validate vue-app dependencies and suggest fix ([#4669](https://github.com/nuxt/nuxt.js/issues/4669)) ([7dd33fe](https://github.com/nuxt/nuxt.js/commit/7dd33fe))
+* **nuxt-link:** Smart prefetching and $nuxt.isOffline ([#4574](https://github.com/nuxt/nuxt.js/issues/4574)) ([f319033](https://github.com/nuxt/nuxt.js/commit/f319033))
+* **ts:** provide type definitions ([#4164](https://github.com/nuxt/nuxt.js/issues/4164)) ([d5716eb](https://github.com/nuxt/nuxt.js/commit/d5716eb))
+* **ts:** typescript examples + improve `vue-app` typings ([#4695](https://github.com/nuxt/nuxt.js/issues/4695)) ([b38e0aa](https://github.com/nuxt/nuxt.js/commit/b38e0aa))
+* **vue-app:** <n-link> and <n-child> component aliases ([#4525](https://github.com/nuxt/nuxt.js/issues/4525)) ([1505197](https://github.com/nuxt/nuxt.js/commit/1505197))
+* **vue-app:** Add deprecating for classic mode and handle mutations/actions HMR to store/index.js ([c8b920a](https://github.com/nuxt/nuxt.js/commit/c8b920a))
+* add store module HMR ([#4582](https://github.com/nuxt/nuxt.js/issues/4582)) ([b2eee17](https://github.com/nuxt/nuxt.js/commit/b2eee17))
+* **vue-app:** add vetur helpers for components auto-complete on VS Code ([#4524](https://github.com/nuxt/nuxt.js/issues/4524)) ([59aee74](https://github.com/nuxt/nuxt.js/commit/59aee74))
+* **vue-app:** support named views ([#4410](https://github.com/nuxt/nuxt.js/issues/4410)) ([b1b9e0b](https://github.com/nuxt/nuxt.js/commit/b1b9e0b))
+* **vue-app, vue-renderer:** support meta `headAttrs` ([#4536](https://github.com/nuxt/nuxt.js/issues/4536)) ([9961453](https://github.com/nuxt/nuxt.js/commit/9961453))
+* add styleExtensions ([#4671](https://github.com/nuxt/nuxt.js/issues/4671)) ([471a32a](https://github.com/nuxt/nuxt.js/commit/471a32a))
+* allow scrollToTop to be explicitly disabled ([#4564](https://github.com/nuxt/nuxt.js/issues/4564)) ([669fecc](https://github.com/nuxt/nuxt.js/commit/669fecc))
+* better stack traces for SSR error, show error with correct URL and use eventsource-polyfill ([#4600](https://github.com/nuxt/nuxt.js/issues/4600)) ([498c4f1](https://github.com/nuxt/nuxt.js/commit/498c4f1))
+* improve SSR bundle ([#4439](https://github.com/nuxt/nuxt.js/issues/4439)) ([0f104aa](https://github.com/nuxt/nuxt.js/commit/0f104aa)), closes [#4225](https://github.com/nuxt/nuxt.js/issues/4225) [#3465](https://github.com/nuxt/nuxt.js/issues/3465) [#1728](https://github.com/nuxt/nuxt.js/issues/1728) [#1601](https://github.com/nuxt/nuxt.js/issues/1601) [#1481](https://github.com/nuxt/nuxt.js/issues/1481)
+* mode for plugins ([#4592](https://github.com/nuxt/nuxt.js/issues/4592)) ([e71c455](https://github.com/nuxt/nuxt.js/commit/e71c455))
+
+
+### Performance Improvements
+
+* **ssr:** remove extra imprts from server.js ([6178c47](https://github.com/nuxt/nuxt.js/commit/6178c47))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json
index a15fc106e9..273e5a42a6 100644
--- a/packages/vue-app/package.json
+++ b/packages/vue-app/package.json
@@ -1,13 +1,24 @@
 {
   "name": "@nuxt/vue-app",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist",
-    "template"
+    "template",
+    "types/*.d.ts",
+    "vetur"
   ],
   "main": "dist/vue-app.js",
+  "typings": "types/index.d.ts",
+  "dependencies": {
+    "vue": "^2.5.22",
+    "vue-meta": "^1.5.8",
+    "vue-no-ssr": "^1.1.1",
+    "vue-router": "^3.0.2",
+    "vue-template-compiler": "^2.5.22",
+    "vuex": "^3.1.0"
+  },
   "publishConfig": {
     "access": "public"
   }
diff --git a/packages/vue-app/src/index.js b/packages/vue-app/src/index.js
index 9ce5163e8c..aa4160c958 100644
--- a/packages/vue-app/src/index.js
+++ b/packages/vue-app/src/index.js
@@ -1,25 +1,26 @@
 import path from 'path'
-import pkg from '../package.json'
+import { dependencies } from '../package.json'
 
-export const meta = pkg
-
-export const templatesDir = path.join(__dirname, '..', 'template')
-
-export const templatesFiles = [
-  'App.js',
-  'client.js',
-  'index.js',
-  'middleware.js',
-  'router.js',
-  'server.js',
-  'utils.js',
-  'empty.js',
-  'components/nuxt-error.vue',
-  'components/nuxt-loading.vue',
-  'components/nuxt-child.js',
-  'components/nuxt-link.js',
-  'components/nuxt.js',
-  'components/no-ssr.js',
-  'views/app.template.html',
-  'views/error.html'
-]
+export const template = {
+  dependencies,
+  dir: path.join(__dirname, '..', 'template'),
+  files: [
+    'App.js',
+    'client.js',
+    'index.js',
+    'middleware.js',
+    'router.js',
+    'server.js',
+    'utils.js',
+    'empty.js',
+    'components/nuxt-error.vue',
+    'components/nuxt-loading.vue',
+    'components/nuxt-child.js',
+    'components/nuxt-link.server.js',
+    'components/nuxt-link.client.js',
+    'components/nuxt.js',
+    'components/no-ssr.js',
+    'views/app.template.html',
+    'views/error.html'
+  ]
+}
diff --git a/packages/vue-app/template/App.js b/packages/vue-app/template/App.js
index b79fac1772..4b362a4600 100644
--- a/packages/vue-app/template/App.js
+++ b/packages/vue-app/template/App.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 <% if (loading) { %>import NuxtLoading from '<%= (typeof loading === "string" ? loading : "./components/nuxt-loading.vue") %>'<% } %>
 <% css.forEach((c) => { %>
-import '<%= relativeToBuild(resolvePath(c.src || c)) %>'
+import '<%= relativeToBuild(resolvePath(c.src || c, { isStyle: true })) %>'
 <% }) %>
 
 <%= Object.keys(layouts).map((key) => {
@@ -17,11 +17,11 @@ const layouts = { <%= Object.keys(layouts).map(key => `"_${key}": _${hash(key)}`
 <% if (splitChunks.layouts) { %>let resolvedLayouts = {}<% } %>
 
 export default {
-  <%= isTest ? '/* eslint-disable quotes, semi, indent, comma-spacing, key-spacing, object-curly-spacing, object-property-newline, arrow-parens */' : '' %>
-  head: <%= serialize(head).replace(/:\w+\(/gm, ':function(').replace('head(', 'function(') %>,
-  <%= isTest ? '/* eslint-enable quotes, semi, indent, comma-spacing, key-spacing, object-curly-spacing, object-property-newline, arrow-parens */' : '' %>
+  <%= isTest ? '/* eslint-disable quotes, semi, indent, comma-spacing, key-spacing, object-curly-spacing, space-before-function-paren  */' : '' %>
+  head: <%= serializeFunction(head) %>,
+  <%= isTest ? '/* eslint-enable quotes, semi, indent, comma-spacing, key-spacing, object-curly-spacing, space-before-function-paren */' : '' %>
   render(h, props) {
-    <% if (loading) { %>const loadingEl = h('nuxt-loading', { ref: 'loading' })<% } %>
+    <% if (loading) { %>const loadingEl = h('NuxtLoading', { ref: 'loading' })<% } %>
     const layoutEl = h(this.layout || 'nuxt')
     const templateEl = h('div', {
       domProps: {
@@ -55,6 +55,7 @@ export default {
     ])
   },
   data: () => ({
+    isOnline: true,
     layout: null,
     layoutName: ''
   }),
@@ -65,11 +66,12 @@ export default {
     // Add this.$nuxt in child instances
     Vue.prototype.<%= globals.nuxt %> = this
     // add to window so we can listen when ready
-    if (typeof window !== 'undefined') {
-      window.<%= globals.nuxt %> = this
-      <% if (globals.nuxt !== '$nuxt') { %>
-      window.$nuxt = { $root: { constructor: this.$root.constructor } }
-      <% } %>
+    if (process.client) {
+      window.<%= globals.nuxt %> = <%= (globals.nuxt !== '$nuxt' ? 'window.$nuxt = ' : '') %>this
+      this.refreshOnlineStatus()
+      // Setup the listeners
+      window.addEventListener('online', this.refreshOnlineStatus)
+      window.addEventListener('offline', this.refreshOnlineStatus)
     }
     // Add $nuxt.error()
     this.error = this.nuxt.error
@@ -82,7 +84,24 @@ export default {
     'nuxt.err': 'errorChanged'
   },
   <% } %>
+  computed: {
+    isOffline() {
+      return !this.isOnline
+    }
+  },
   methods: {
+    refreshOnlineStatus() {
+      if (process.client) {
+        if (typeof window.navigator.onLine === 'undefined') {
+          // If the browser doesn't support connection status reports
+          // assume that we are online because most apps' only react
+          // when they now that the connection has been interrupted
+          this.isOnline = true
+        } else {
+          this.isOnline = window.navigator.onLine
+        }
+      }
+    },
     <% if (loading) { %>
     errorChanged() {
       if (this.nuxt.err && this.$loading) {
@@ -104,8 +123,8 @@ export default {
     },
     loadLayout(layout) {
       const undef = !layout
-      const inexisting = !(layouts['_' + layout] || resolvedLayouts['_' + layout])
-      let _layout = '_' + ((undef || inexisting) ? 'default' : layout)
+      const nonexistent = !(layouts['_' + layout] || resolvedLayouts['_' + layout])
+      let _layout = '_' + ((undef || nonexistent) ? 'default' : layout)
       if (resolvedLayouts[_layout]) {
         return Promise.resolve(resolvedLayouts[_layout])
       }
diff --git a/packages/vue-app/template/client.js b/packages/vue-app/template/client.js
index 8036612cf4..f207d3c594 100644
--- a/packages/vue-app/template/client.js
+++ b/packages/vue-app/template/client.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import middleware from './middleware'
+import middleware from './middleware.js'
 import {
   applyAsyncData,
   sanitizeComponent,
@@ -14,24 +14,26 @@ import {
   compile,
   getQueryDiff,
   globalHandleError
-} from './utils'
-import { createApp, NuxtError } from './index'
+} from './utils.js'
+import { createApp, NuxtError } from './index.js'
+import NuxtLink from './components/nuxt-link.<%= router.prefetchLinks ? "client" : "server" %>.js' // should be included after ./index.js
 
-const noopData = () => { return {} }
-const noopFetch = () => {}
+// Component: <NuxtLink>
+Vue.component(NuxtLink.name, NuxtLink)
+Vue.component('NLink', NuxtLink)
 
 // Global shared references
 let _lastPaths = []
 let app
 let router
-<% if (store) { %>let store<% } %>
+<% if (store) { %>let store<%= isTest ? '// eslint-disable-line no-unused-vars' : '' %><% } %>
 
 // Try to rehydrate SSR data from window
 const NUXT = window.<%= globals.context %> || {}
 
 Object.assign(Vue.config, <%= serialize(vue.config) %>)<%= isTest ? '// eslint-disable-line' : '' %>
 
-<% if (debug || mode === 'spa') { %>
+<% if (debug) { %>
 // Setup global Vue error handler
 if (!Vue.config.$nuxt) {
   const defaultErrorHandler = Vue.config.errorHandler
@@ -69,14 +71,15 @@ if (!Vue.config.$nuxt) {
   Vue.config.$nuxt = {}
 }
 Vue.config.$nuxt.<%= globals.nuxt %> = true
-
 <% } %>
+const errorHandler = Vue.config.errorHandler || console.error
 
 // Create and mount App
 createApp()
   .then(mountApp)
   .catch((err) => {
-    console.error('[nuxt] Error while initializing app', err)
+    err.message = '[nuxt] Error while mounting app: ' + err.message
+    errorHandler(err)
   })
 
 function componentOption(component, key, ...args) {
@@ -144,10 +147,21 @@ async function loadAsyncComponents(to, from, next) {
     <% } %>
     // Call next()
     next()
-  } catch (err) {
-    const error = this.error(err)
-    this.<%= globals.nuxt %>.$emit('routeChanged', to, from, error)
-    next(false)
+  } catch (error) {
+    const err = error || {}
+    const statusCode = err.statusCode || err.status || (err.response && err.response.status) || 500
+    const message = err.message || ''
+
+    // Handle chunk loading errors
+    // This may be due to a new deployment or a network problem
+    if (/^Loading chunk (\d)+ failed\./.test(message)) {
+      window.location.reload(true /* skip cache */)
+      return // prevent error page blinking for user
+    }
+
+    this.error({ statusCode, message })
+    this.<%= globals.nuxt %>.$emit('routeChanged', to, from, err)
+    next()
   }
 }
 
@@ -182,8 +196,9 @@ function callMiddleware(Components, context, layout) {
   // If layout is undefined, only call global middleware
   if (typeof layout !== 'undefined') {
     midd = [] // Exclude global middleware if layout defined (already called before)
-    if (layout.middleware) {
-      midd = midd.concat(layout.middleware)
+    layout = sanitizeComponent(layout)
+    if (layout.options.middleware) {
+      midd = midd.concat(layout.options.middleware)
     }
     Components.forEach((Component) => {
       if (Component.options.middleware) {
@@ -419,7 +434,7 @@ async function render(to, from, next) {
 
     this.error(error)
     this.<%= globals.nuxt %>.$emit('routeChanged', to, from, error)
-    next(false)
+    next()
   }
 }
 
@@ -507,6 +522,9 @@ function nuxtReady(_app) {
 }
 
 <% if (isDev) { %>
+const noopData = () => { return {} }
+const noopFetch = () => {}
+
 // Special hot reload with asyncData(context)
 function getNuxtChildComponents($parent, $components = []) {
   $parent.$children.forEach(($child) => {
@@ -674,7 +692,7 @@ async function mountApp(__app) {
     // Push the path and then mount app
     router.push(path, () => mount(), (err) => {
       if (!err) return mount()
-      console.error(err)
+      errorHandler(err)
     })
   })
 }
diff --git a/packages/vue-app/template/components/no-ssr.js b/packages/vue-app/template/components/no-ssr.js
index ea27ead1b4..b4d9e7cc53 100644
--- a/packages/vue-app/template/components/no-ssr.js
+++ b/packages/vue-app/template/components/no-ssr.js
@@ -2,5 +2,8 @@
 ** From https://github.com/egoist/vue-no-ssr
 ** With the authorization of @egoist
 */
-import NoSSR from 'vue-no-ssr'
-export default NoSSR
+import NoSsr from 'vue-no-ssr'
+export default {
+  ...NoSsr,
+  name: 'NoSsr'
+}
diff --git a/packages/vue-app/template/components/nuxt-child.js b/packages/vue-app/template/components/nuxt-child.js
index 11d45887ef..b6e8595a06 100644
--- a/packages/vue-app/template/components/nuxt-child.js
+++ b/packages/vue-app/template/components/nuxt-child.js
@@ -1,6 +1,6 @@
 <%= isTest ? '// @vue/component' : '' %>
 export default {
-  name: 'nuxt-child',
+  name: 'NuxtChild',
   functional: true,
   props: {
     nuxtChildKey: {
@@ -8,7 +8,10 @@ export default {
       default: ''
     },
     keepAlive: Boolean,
-    keepAliveProps: Object
+    keepAliveProps: {
+      type: Object,
+      default: undefined
+    }
   },
   render(h, { parent, data, props }) {
     data.nuxtChild = true
diff --git a/packages/vue-app/template/components/nuxt-error.vue b/packages/vue-app/template/components/nuxt-error.vue
index 301cca0ff3..a84cbd475a 100644
--- a/packages/vue-app/template/components/nuxt-error.vue
+++ b/packages/vue-app/template/components/nuxt-error.vue
@@ -1,11 +1,13 @@
 <template>
   <div class="__nuxt-error-page">
     <div class="error">
-      <svg xmlns="http://www.w3.org/2000/svg" width="90" height="90" fill="#DBE1EC" viewBox="0 0 48 48"><path d="M22 30h4v4h-4zm0-16h4v12h-4zm1.99-10C12.94 4 4 12.95 4 24s8.94 20 19.99 20S44 35.05 44 24 35.04 4 23.99 4zM24 40c-8.84 0-16-7.16-16-16S15.16 8 24 8s16 7.16 16 16-7.16 16-16 16z" /></svg>
+      <svg xmlns="http://www.w3.org/2000/svg" width="90" height="90" fill="#DBE1EC" viewBox="0 0 48 48">
+        <path d="M22 30h4v4h-4zm0-16h4v12h-4zm1.99-10C12.94 4 4 12.95 4 24s8.94 20 19.99 20S44 35.05 44 24 35.04 4 23.99 4zM24 40c-8.84 0-16-7.16-16-16S15.16 8 24 8s16 7.16 16 16-7.16 16-16 16z" />
+      </svg>
 
       <div class="title">{{ message }}</div>
       <p v-if="statusCode === 404" class="description">
-        <nuxt-link class="error-link" to="/"><%= messages.back_to_home %></nuxt-link>
+        <NuxtLink class="error-link" to="/"><%= messages.back_to_home %></NuxtLink>
       </p>
       <% if(debug) { %>
       <p class="description" v-else><%= messages.client_error_details %></p>
@@ -20,7 +22,7 @@
 
 <script>
 export default {
-  name: 'nuxt-error',
+  name: 'NuxtError',
   props: {
     error: {
       type: Object,
diff --git a/packages/vue-app/template/components/nuxt-link.client.js b/packages/vue-app/template/components/nuxt-link.client.js
new file mode 100644
index 0000000000..7e4b35585e
--- /dev/null
+++ b/packages/vue-app/template/components/nuxt-link.client.js
@@ -0,0 +1,101 @@
+import Vue from 'vue'
+
+const requestIdleCallback = window.requestIdleCallback ||
+  function (cb) {
+    const start = Date.now()
+    return setTimeout(function () {
+      cb({
+        didTimeout: false,
+        timeRemaining: function () {
+          return Math.max(0, 50 - (Date.now() - start))
+        }
+      })
+    }, 1)
+  }
+const observer = window.IntersectionObserver && new window.IntersectionObserver((entries) => {
+  entries.forEach(({ intersectionRatio, target: link }) => {
+    if (intersectionRatio <= 0) {
+      return
+    }
+    link.__prefetch()
+  })
+})
+
+<%= isTest ? '// @vue/component' : '' %>
+export default {
+  name: 'NuxtLink',
+  extends: Vue.component('RouterLink'),
+  props: {
+    noPrefetch: {
+      type: Boolean,
+      default: false
+    }<% if (router.linkPrefetchedClass) { %>,
+    prefetchedClass: {
+      type: String,
+      default: '<%= router.linkPrefetchedClass %>'
+    }<% } %>
+  },
+  mounted() {
+    if (!this.noPrefetch) {
+      requestIdleCallback(this.observe, { timeout: 2e3 })
+    }
+  },
+  beforeDestroy() {
+    if (this.__observed) {
+      observer.unobserve(this.$el)
+      delete this.$el.__prefetch
+    }
+  },
+  methods: {
+    observe() {
+      // If no IntersectionObserver, avoid prefetching
+      if (!observer) {
+        return
+      }
+      // Add to observer
+      if (this.shouldPrefetch()) {
+        this.$el.__prefetch = this.prefetch.bind(this)
+        observer.observe(this.$el)
+        this.__observed = true
+      }<% if (router.linkPrefetchedClass) { %> else {
+        this.addPrefetchedClass()
+      }<% } %>
+    },
+    shouldPrefetch() {
+      return this.getPrefetchComponents().length > 0
+    },
+    canPrefetch() {
+      const conn = navigator.connection
+      const hasBadConnection = this.<%= globals.nuxt %>.isOffline || (conn && ((conn.effectiveType || '').includes('2g') || conn.saveData))
+
+      return !hasBadConnection
+    },
+    getPrefetchComponents() {
+      const ref = this.$router.resolve(this.to, this.$route, this.append)
+      const Components = ref.resolved.matched.map(r => r.components.default)
+
+      return Components.filter(Component => typeof Component === 'function' && !Component.options && !Component.__prefetched)
+    },
+    prefetch() {
+      if (!this.canPrefetch()) {
+        return
+      }
+      // Stop obersing this link (in case of internet connection changes)
+      observer.unobserve(this.$el)
+      const Components = this.getPrefetchComponents()
+
+      for (const Component of Components) {
+        try {
+          Component()
+          Component.__prefetched = true
+        } catch (e) {}
+      }<% if (router.linkPrefetchedClass) { %>
+      this.addPrefetchedClass()<% } %>
+    }<% if (router.linkPrefetchedClass) { %>,
+    addPrefetchedClass() {
+      if (this.prefetchedClass !== 'false') {
+        this.$el.className += (this.$el.className + ' ' + this.prefetchedClass).trim()
+      }
+    }<% } %>
+  }
+}
diff --git a/packages/vue-app/template/components/nuxt-link.js b/packages/vue-app/template/components/nuxt-link.js
deleted file mode 100644
index 74fe256181..0000000000
--- a/packages/vue-app/template/components/nuxt-link.js
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= isTest ? '// @vue/component' : '' %>
-export default {
-  name: 'nuxt-link',
-  functional: true,
-  render(h, { data, children }) {
-    return h('router-link', data, children)
-  }
-}
diff --git a/packages/vue-app/template/components/nuxt-link.server.js b/packages/vue-app/template/components/nuxt-link.server.js
new file mode 100644
index 0000000000..bd00f7ed31
--- /dev/null
+++ b/packages/vue-app/template/components/nuxt-link.server.js
@@ -0,0 +1,13 @@
+import Vue from 'vue'
+
+<%= isTest ? '// @vue/component' : '' %>
+export default {
+  name: 'NuxtLink',
+  extends: Vue.component('RouterLink'),
+  props: {
+    noPrefetch: {
+      type: Boolean,
+      default: false
+    }
+  }
+}
diff --git a/packages/vue-app/template/components/nuxt-loading.vue b/packages/vue-app/template/components/nuxt-loading.vue
index 72e8d29850..5551fcd502 100644
--- a/packages/vue-app/template/components/nuxt-loading.vue
+++ b/packages/vue-app/template/components/nuxt-loading.vue
@@ -1,6 +1,6 @@
 <script>
 export default {
-  name: 'nuxt-loading',
+  name: 'NuxtLoading',
   data() {
     return {
       percent: 0,
@@ -9,8 +9,8 @@ export default {
       reversed: false,
       skipTimerCount: 0,
       rtl: <%= Boolean(loading.rtl) %>,
-      throttle: <%= Number(loading.throttle) ? loading.throttle : 200 %>,
-      duration: <%= Number(loading.duration) ? loading.duration : 3000 %>,
+      throttle: <%= typeof loading.throttle === 'number' ? loading.throttle : 200 %>,
+      duration: <%= typeof loading.duration === 'number' ? loading.duration : 3000 %>,
       continuous: <%= Boolean(loading.continuous) %>
     }
   },
diff --git a/packages/vue-app/template/components/nuxt.js b/packages/vue-app/template/components/nuxt.js
index 1e859adba2..f4c8d7d69e 100644
--- a/packages/vue-app/template/components/nuxt.js
+++ b/packages/vue-app/template/components/nuxt.js
@@ -1,4 +1,3 @@
-<%= isTest ? '// @vue/component' : '' %>
 import Vue from 'vue'
 import { compile } from '../utils'
 
@@ -13,29 +12,27 @@ import NuxtError from './nuxt-error.vue'
 <% } %>
 import NuxtChild from './nuxt-child'
 
+<%= isTest ? '// @vue/component' : '' %>
 export default {
-  name: 'nuxt',
+  name: 'Nuxt',
+  components: {
+    NuxtChild,
+    NuxtError
+  },
   props: {
-    nuxtChildKey: String,
-    keepAlive: Boolean
-  },
-  render(h) {
-    // If there is some error
-    if (this.nuxt.err) {
-      return h('nuxt-error', {
-        props: {
-          error: this.nuxt.err
-        }
-      })
+    nuxtChildKey: {
+      type: String,
+      default: undefined
+    },
+    keepAlive: Boolean,
+    keepAliveProps: {
+      type: Object,
+      default: undefined
+    },
+    name: {
+      type: String,
+      default: 'default'
     }
-    // Directly return nuxt child
-    return h('nuxt-child', {
-      key: this.routerViewKey,
-      props: this.$props
-    })
-  },
-  beforeCreate() {
-    Vue.util.defineReactive(this, 'nuxt', this.$root.$options.nuxt)
   },
   computed: {
     routerViewKey() {
@@ -50,8 +47,22 @@ export default {
       return this.$route.path
     }
   },
-  components: {
-    NuxtChild,
-    NuxtError
+  beforeCreate() {
+    Vue.util.defineReactive(this, 'nuxt', this.$root.$options.nuxt)
+  },
+  render(h) {
+    // If there is some error
+    if (this.nuxt.err) {
+      return h('NuxtError', {
+        props: {
+          error: this.nuxt.err
+        }
+      })
+    }
+    // Directly return nuxt child
+    return h('NuxtChild', {
+      key: this.routerViewKey,
+      props: this.$props
+    })
   }
 }
diff --git a/packages/vue-app/template/index.js b/packages/vue-app/template/index.js
index 36aac1757b..2d3bb9a31e 100644
--- a/packages/vue-app/template/index.js
+++ b/packages/vue-app/template/index.js
@@ -1,9 +1,8 @@
 import Vue from 'vue'
 import Meta from 'vue-meta'
 import { createRouter } from './router.js'
-import NoSSR from './components/no-ssr.js'
+import NoSsr from './components/no-ssr.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.js'
 import App from '<%= appPath %>'
@@ -12,20 +11,20 @@ import { setContext, getLocation, getRouteData, normalizeError } from './utils'
 
 /* Plugins */
 <%= isTest ? '/* eslint-disable camelcase */' : '' %>
-<% plugins.forEach((plugin) => { %>import <%= plugin.name %> from '<%= plugin.name %>' // Source: <%= relativeToBuild(plugin.src) %><%= (plugin.ssr===false) ? ' (ssr: false)' : '' %>
+<% plugins.forEach((plugin) => { %>import <%= plugin.name %> from '<%= plugin.name %>' // Source: <%= relativeToBuild(plugin.src) %> (mode: '<%= plugin.mode %>')
 <% }) %>
 <%= isTest ? '/* eslint-enable camelcase */' : '' %>
 
-// Component: <no-ssr>
-Vue.component(NoSSR.name, NoSSR)
+// Component: <NoSsr>
+Vue.component(NoSsr.name, NoSsr)
 
-// Component: <nuxt-child>
+// Component: <NuxtChild>
 Vue.component(NuxtChild.name, NuxtChild)
+Vue.component('NChild', NuxtChild)
 
-// Component: <nuxt-link>
-Vue.component(NuxtLink.name, NuxtLink)
+// Component NuxtLink is imported in server.js or client.js
 
-// Component: <nuxt>`
+// Component: <Nuxt>`
 Vue.component(Nuxt.name, Nuxt)
 
 // vue-meta configuration
@@ -166,11 +165,18 @@ async function createApp(ssrContext) {
 
   // Plugin execution
   <%= isTest ? '/* eslint-disable camelcase */' : '' %>
-  <% plugins.filter(p => p.ssr).forEach((plugin) => { %>
+  <% plugins.filter(p => p.mode === 'all').forEach((plugin) => { %>
   if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(app.context, inject)<% }) %>
-  <% if (plugins.filter(p => !p.ssr).length) { %>
+
+  <% if (plugins.filter(p => p.mode === 'client').length) { %>
   if (process.client) {
-    <% plugins.filter((p) => !p.ssr).forEach((plugin) => { %>
+    <% plugins.filter(p => p.mode === 'client').forEach((plugin) => { %>
+    if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(app.context, inject)<% }) %>
+  }<% } %>
+
+  <% if (plugins.filter(p => p.mode === 'server').length) { %>
+  if (process.server) {
+    <% plugins.filter(p => p.mode === 'server').forEach((plugin) => { %>
     if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(app.context, inject)<% }) %>
   }<% } %>
   <%= isTest ? '/* eslint-enable camelcase */' : '' %>
diff --git a/packages/vue-app/template/layouts/default.vue b/packages/vue-app/template/layouts/default.vue
index 772a283e54..5d3ae9c407 100644
--- a/packages/vue-app/template/layouts/default.vue
+++ b/packages/vue-app/template/layouts/default.vue
@@ -1,3 +1,3 @@
 <template>
-  <nuxt />
+  <Nuxt />
 </template>
diff --git a/packages/vue-app/template/router.js b/packages/vue-app/template/router.js
index dcc74b155c..d8c67c3492 100644
--- a/packages/vue-app/template/router.js
+++ b/packages/vue-app/template/router.js
@@ -1,18 +1,52 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import { interopDefault } from './utils'
+import { interopDefault } from './utils'<%= isTest ? '// eslint-disable-line no-unused-vars' : '' %>
 
 <% function recursiveRoutes(routes, tab, components, indentCount) {
-  let res = ''
+  let res = '', resMap = ''
   const baseIndent = tab.repeat(indentCount)
   const firstIndent = '\n' + tab.repeat(indentCount + 1)
   const nextIndent = ',' + firstIndent
   routes.forEach((route, i) => {
-    route._name = '_' + hash(route.component)
-    components.push({ _name: route._name, component: route.component, name: route.name, chunkName: route.chunkName })
+    // If need to handle named views
+    if (route.components) {
+      let _name = '_' + hash(route.components.default)
+      if (splitChunks.pages) {
+        resMap += `${firstIndent}${tab}default: ${_name}`
+      } else {
+        resMap += `${firstIndent}${tab}default: () => ${_name}.default || ${_name}`
+      }
+      for (const k in route.components) {
+        _name = '_' + hash(route.components[k])
+        const component = { _name, component: route.components[k] }
+        if (k === 'default') {
+          components.push({
+            ...component,
+            name: route.name,
+            chunkName: route.chunkName
+          })
+        } else {
+          components.push({
+            ...component,
+            name: `${route.name}-${k}`,
+            chunkName: route.chunkNames[k]
+          })
+          if (splitChunks.pages) {
+            resMap += `${nextIndent}${tab}${k}: ${_name}`
+          } else {
+            resMap += `${nextIndent}${tab}${k}: () => ${_name}.default || ${_name}`
+          }
+        }
+      }
+      route.component = false
+    } else {
+      route._name = '_' + hash(route.component)
+      components.push({ _name: route._name, component: route.component, name: route.name, chunkName: route.chunkName })
+    }
     // @see: https://router.vuejs.org/api/#router-construction-options
     res += '{'
     res += firstIndent + 'path: ' + JSON.stringify(route.path)
+    res += (route.components) ? nextIndent + 'components: {' + resMap + '\n' + baseIndent + tab + '}' : ''
     res += (route.component) ? nextIndent + 'component: ' + (splitChunks.pages ? route._name : `() => ${route._name}.default || ${route._name}`) : ''
     res += (route.redirect) ? nextIndent + 'redirect: ' + JSON.stringify(route.redirect) : ''
     res += (route.meta) ? nextIndent + 'meta: ' + JSON.stringify(route.meta) : ''
@@ -49,7 +83,7 @@ const _routes = recursiveRoutes(router.routes, '  ', _components, 2)
 Vue.use(Router)
 
 <% if (router.scrollBehavior) { %>
-const scrollBehavior = <%= serialize(router.scrollBehavior).replace(/scrollBehavior\s*\(/, 'function(').replace('function function', 'function') %>
+const scrollBehavior = <%= serializeFunction(router.scrollBehavior) %>
 <% } else { %>
 if (process.client) {
   window.history.scrollRestoration = 'manual'
@@ -59,8 +93,11 @@ const scrollBehavior = function (to, from, savedPosition) {
   // will retain current scroll position.
   let position = false
 
-  // if no children detected
-  if (to.matched.length < 2) {
+  // if no children detected and scrollToTop is not explicitly disabled
+  if (
+    to.matched.length < 2 &&
+    to.matched.every(r => r.components.default.options.scrollToTop !== false)
+  ) {
     // scroll to the top of the page
     position = { x: 0, y: 0 }
   } else if (to.matched.some(r => r.components.default.options.scrollToTop)) {
@@ -106,11 +143,11 @@ export function createRouter() {
     linkActiveClass: '<%= router.linkActiveClass %>',
     linkExactActiveClass: '<%= router.linkExactActiveClass %>',
     scrollBehavior,
-    <%= isTest ? '/* eslint-disable quotes */' : '' %>
+    <%= isTest ? '/* eslint-disable quotes, object-curly-spacing, key-spacing */' : '' %>
     routes: [<%= _routes %>],
-    <%= isTest ? '/* eslint-enable quotes */' : '' %>
-    <% if (router.parseQuery) { %>parseQuery: <%= serialize(router.parseQuery).replace('parseQuery(', 'function(') %>,<% } %>
-    <% if (router.stringifyQuery) { %>stringifyQuery: <%= serialize(router.stringifyQuery).replace('stringifyQuery(', 'function(') %>,<% } %>
+    <%= isTest ? '/* eslint-enable quotes, object-curly-spacing, key-spacing */' : '' %>
+    <% if (router.parseQuery) { %>parseQuery: <%= serializeFunction(router.parseQuery) %>,<% } %>
+    <% if (router.stringifyQuery) { %>stringifyQuery: <%= serializeFunction(router.stringifyQuery) %>,<% } %>
     fallback: <%= router.fallback %>
   })
 }
diff --git a/packages/vue-app/template/server.js b/packages/vue-app/template/server.js
index 6b68834ac5..3e49084d1f 100644
--- a/packages/vue-app/template/server.js
+++ b/packages/vue-app/template/server.js
@@ -1,15 +1,17 @@
 import { stringify } from 'querystring'
 import Vue from 'vue'
-import omit from 'lodash/omit'
-import middleware from './middleware'
-import { applyAsyncData, sanitizeComponent, getMatchedComponents, getContext, middlewareSeries, promisify, urlJoin } from './utils'
-import { createApp, NuxtError } from './index'
+import middleware from './middleware.js'
+import { applyAsyncData, getMatchedComponents, middlewareSeries, promisify, urlJoin, sanitizeComponent } from './utils.js'
+import { createApp, NuxtError } from './index.js'
+import NuxtLink from './components/nuxt-link.server.js' // should be included after ./index.js
+
+// Component: <NuxtLink>
+Vue.component(NuxtLink.name, NuxtLink)
+Vue.component('NLink', NuxtLink)
 
 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 = ssrContext => (opts) => {
@@ -80,7 +82,7 @@ export default async (ssrContext) => {
     return renderErrorPage()
   }
 
-  <% if (isDev) { %>const s = isDev && Date.now()<% } %>
+  <% if (isDev) { %>const s = Date.now()<% } %>
 
   // Components are already resolved by setContext -> getRouteData (app/utils.js)
   const Components = getMatchedComponents(router.match(ssrContext.url))
@@ -132,7 +134,8 @@ export default async (ssrContext) => {
   ** Call middleware (layout + pages)
   */
   midd = []
-  if (layout.middleware) midd = midd.concat(layout.middleware)
+  layout = sanitizeComponent(layout)
+  if (layout.options.middleware) midd = midd.concat(layout.options.middleware)
   Components.forEach((Component) => {
     if (Component.options.middleware) {
       midd = midd.concat(Component.options.middleware)
diff --git a/packages/vue-app/template/store.js b/packages/vue-app/template/store.js
index 9ca04e3306..2dca5d22aa 100644
--- a/packages/vue-app/template/store.js
+++ b/packages/vue-app/template/store.js
@@ -3,113 +3,145 @@ import Vuex from 'vuex'
 
 Vue.use(Vuex)
 
-const files = require.context('@/<%= dir.store %>', true, /^\.\/(?!<%= ignorePrefix %>)[^.]+\.(<%= extensions %>)$/)
-const filenames = files.keys()
+const log = console // on server-side, consola will catch all console.log
+const VUEX_PROPERTIES = ['state', 'getters', 'actions', 'mutations']
+let store = {}
+let fileResolver
 
-// Store
-let storeData = {}
+void (function updateModules() {
+  fileResolver = require.context('@/<%= dir.store %>', true, /^\.\/(?!<%= ignorePrefix %>)[^.]+\.(<%= extensions %>)$/)
 
-// Check if {dir.store}/index.js exists
-const indexFilename = filenames.find(filename => filename.includes('./index.'))
+  // Paths are sorted from low to high priority (for overwriting properties)
+  const paths = fileResolver.keys().sort((p1, p2) => {
+    let res = p1.split('/').length - p2.split('/').length
 
-if (indexFilename) {
-  storeData = getModule(indexFilename)
-}
+    if (res === 0 && p1.includes('/index.')) {
+      res = -1
+    } else if (res === 0 && p2.includes('/index.')) {
+      res = 1
+    }
+    return res
+  })
 
-// If store is not an exported method = modules store
-if (typeof storeData !== 'function') {
-  // Store modules
-  if (!storeData.modules) {
-    storeData.modules = {}
+  // Check if {dir.store}/index.js exists
+  const indexPath = paths.find(path => path.includes('./index.'))
+
+  if (indexPath) {
+    store = requireModule(indexPath, { isRoot: true })
   }
 
-  for (const filename of filenames) {
-    let name = filename.replace(/^\.\//, '').replace(/\.(<%= extensions %>)$/, '')
-    if (name === 'index') continue
+  // If store is an exported method = classic mode (deprecated)
+  if (typeof store === 'function') {
+    return log.warn('Classic mode for store/ is deprecated and will be removed in Nuxt 3.')
+  }
 
-    const namePath = name.split(/\//)
+  // Enforce store modules
+  store.modules = store.modules || {}
 
-    name = namePath[namePath.length - 1]
-    if (['state', 'getters', 'actions', 'mutations'].includes(name)) {
-      const module = getModuleNamespace(storeData, namePath, true)
-      appendModule(module, filename, name)
+  for (const path of paths) {
+    // Remove store path + extension (./foo/index.js -> foo/index)
+    const namespace = path.replace(/^\.\//, '').replace(/\.(<%= extensions %>)$/, '')
+
+    // Ignore indexFile, handled before
+    if (namespace === 'index') {
+      continue
+    }
+
+    const namespaces = namespace.split('/')
+    let moduleName = namespaces[namespaces.length - 1]
+    const moduleData = requireModule(path, { isState: moduleName === 'state' })
+
+    // If path is a known Vuex property
+    if (VUEX_PROPERTIES.includes(moduleName)) {
+      const property = moduleName
+      const storeModule = getStoreModule(store, namespaces, { isProperty: true })
+
+      // Replace state since it's a function
+      mergeProperty(storeModule, moduleData, property)
       continue
     }
 
     // If file is foo/index.js, it should be saved as foo
-    const isIndex = (name === 'index')
-    if (isIndex) {
-      namePath.pop()
+    const isIndexModule = (moduleName === 'index')
+    if (isIndexModule) {
+      namespaces.pop()
+      moduleName = namespaces[namespaces.length - 1]
     }
 
-    const module = getModuleNamespace(storeData, namePath)
-    const fileModule = getModule(filename)
+    const storeModule = getStoreModule(store, namespaces)
 
-    name = namePath.pop()
-    module[name] = module[name] || {}
-
-    // if file is foo.js, existing properties take priority
-    // because it's the least specific case
-    if (!isIndex) {
-      module[name] = Object.assign({}, fileModule, module[name])
-      module[name].namespaced = true
-      continue
+    for (const property of VUEX_PROPERTIES) {
+      mergeProperty(storeModule, moduleData[property], property)
     }
-
-    // if file is foo/index.js we want to overwrite properties from foo.js
-    // but not from appended mods like foo/actions.js
-    const appendedMods = {}
-    if (module[name].appends) {
-      appendedMods.appends = module[name].appends
-      for (const append of module[name].appends) {
-        appendedMods[append] = module[name][append]
-      }
-    }
-
-    module[name] = Object.assign({}, module[name], fileModule, appendedMods)
-    module[name].namespaced = true
   }
-}
+  // If the environment supports hot reloading...
+  <% if (isDev) { %>
+  if (process.client && module.hot) {
+    // Whenever any Vuex module is updated...
+    module.hot.accept(fileResolver.id, () => {
+      // Update `root.modules` with the latest definitions.
+      updateModules()
+      // Trigger a hot update in the store.
+      window.<%= globals.nuxt %>.$store.hotUpdate(store)
+    })
+  }<% } %>
+})()
 
 // createStore
-export const createStore = storeData instanceof Function ? storeData : () => {
+export const createStore = store instanceof Function ? store : () => {
   return new Vuex.Store(Object.assign({
     strict: (process.env.NODE_ENV !== 'production')
-  }, storeData, {
-    state: storeData.state instanceof Function ? storeData.state() : {}
-  }))
+  }, store))
 }
 
 // Dynamically require module
-function getModule(filename) {
-  const file = files(filename)
-  const module = file.default || file
-  if (module.commit) {
-    throw new Error('[nuxt] <%= dir.store %>/' + filename.replace('./', '') + ' should export a method which returns a Vuex instance.')
+function requireModule(path, { isRoot = false, isState = false } = {}) {
+  const file = fileResolver(path)
+  let moduleData = file.default || file
+
+  if (isState && typeof moduleData !== 'function') {
+    log.warn(`${path} should export a method that returns an object`)
+    const state = Object.assign({}, moduleData)
+    return () => state
   }
-  if (module.state && typeof module.state !== 'function') {
-    throw new Error('[nuxt] state should be a function in <%= dir.store %>/' + filename.replace('./', ''))
+  if (isRoot && moduleData.commit) {
+    throw new Error('[nuxt] <%= dir.store %>/' + path.replace('./', '') + ' should export a method that returns a Vuex instance.')
   }
-  return module
+
+  if (isRoot && typeof moduleData !== 'function') {
+    // Avoid TypeError: setting a property that has only a getter when overwriting top level keys
+    moduleData = Object.assign({}, moduleData)
+  }
+  if (moduleData.state && typeof moduleData.state !== 'function') {
+    log.warn(`'state' should be a method that returns an object in ${path}`)
+    const state = Object.assign({}, moduleData.state)
+    // Avoid TypeError: setting a property that has only a getter when overwriting top level keys
+    moduleData = Object.assign({}, moduleData, { state: () => state })
+  }
+  return moduleData
 }
 
-function getModuleNamespace(storeData, namePath, forAppend = false) {
-  if (namePath.length === 1) {
-    if (forAppend) {
-      return storeData
-    }
-    return storeData.modules
+function getStoreModule(storeModule, namespaces, { isProperty = false } = {}) {
+  // If ./mutations.js
+  if (!namespaces.length || (isProperty && namespaces.length === 1)) {
+    return storeModule
   }
-  const namespace = namePath.shift()
-  storeData.modules[namespace] = storeData.modules[namespace] || {}
-  storeData.modules[namespace].namespaced = true
-  storeData.modules[namespace].modules = storeData.modules[namespace].modules || {}
-  return getModuleNamespace(storeData.modules[namespace], namePath, forAppend)
+
+  const namespace = namespaces.shift()
+
+  storeModule.modules[namespace] = storeModule.modules[namespace] || {}
+  storeModule.modules[namespace].namespaced = true
+  storeModule.modules[namespace].modules = storeModule.modules[namespace].modules || {}
+
+  return getStoreModule(storeModule.modules[namespace], namespaces, { isProperty })
 }
 
-function appendModule(module, filename, name) {
-  const file = files(filename)
-  module.appends = module.appends || []
-  module.appends.push(name)
-  module[name] = file.default || file
+function mergeProperty(storeModule, moduleData, property) {
+  if (!moduleData) return
+
+  if (property === 'state') {
+    storeModule.state = moduleData || storeModule.state
+  } else {
+    storeModule[property] = Object.assign({}, storeModule[property], moduleData)
+  }
 }
diff --git a/packages/vue-app/template/utils.js b/packages/vue-app/template/utils.js
index 066400915c..1b7f7bfee1 100644
--- a/packages/vue-app/template/utils.js
+++ b/packages/vue-app/template/utils.js
@@ -111,8 +111,8 @@ export async function getRouteData(route) {
   // Send back a copy of route with meta based on Component definition
   return {
     ...route,
-    meta: getMatchedComponents(route).map((Component) => {
-      return Component.options.meta || {}
+    meta: getMatchedComponents(route).map((Component, index) => {
+      return { ...Component.options.meta, ...(route.matched[index] || {}).meta }
     })
   }
 }
@@ -285,6 +285,7 @@ export function normalizeError(err) {
     message = err.message || err
   }
   return {
+    ...err,
     message: message,
     statusCode: (err.statusCode || err.status || (err.response && err.response.status) || 500)
   }
@@ -565,4 +566,3 @@ function formatQuery(query) {
     return key + '=' + val
   }).filter(Boolean).join('&')
 }
-
diff --git a/packages/vue-app/template/views/app.template.html b/packages/vue-app/template/views/app.template.html
index 3ef8d3b0fc..3427d3ea23 100644
--- a/packages/vue-app/template/views/app.template.html
+++ b/packages/vue-app/template/views/app.template.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html {{ HTML_ATTRS }}>
-  <head>
+  <head {{ HEAD_ATTRS }}>
     {{ HEAD }}
   </head>
   <body {{ BODY_ATTRS }}>
diff --git a/packages/vue-app/types/index.d.ts b/packages/vue-app/types/index.d.ts
new file mode 100644
index 0000000000..5b7cb48537
--- /dev/null
+++ b/packages/vue-app/types/index.d.ts
@@ -0,0 +1,77 @@
+import Vue from "vue";
+import VueRouter, { Route } from "vue-router";
+import { Store } from "vuex";
+
+// augment typings of NodeJS.Process
+import "./process";
+
+// augment typings of Vue.js
+import "./vue";
+
+type Dictionary<T> = { [key: string]: T };
+
+type NuxtState = Dictionary<any>;
+
+export interface Context {
+  app: Vue;
+  isClient: boolean;
+  isServer: boolean;
+  isStatic: boolean;
+  isDev: boolean;
+  isHMR: boolean;
+  route: Route;
+  store: Store<any>;
+  env: Dictionary<any>;
+  params: Route['params'];
+  query: Route['query'];
+  req: Request;
+  res: Response;
+  redirect(status: number, path: string, query?: Route['query']): void;
+  redirect(path: string, query?: Route['query']): void;
+  error(params: ErrorParams): void;
+  nuxtState: NuxtState;
+  beforeNuxtRender(fn: (params: { Components: VueRouter['getMatchedComponents'], nuxtState: NuxtState }) => void): void
+}
+
+export type Middleware = string | ((ctx: Context, cb: Function) => Promise<void> | void)
+
+export interface Transition {
+  name?: string;
+  mode?: string;
+  css?: boolean;
+  duration?: number;
+  type?: string;
+  enterClass?: string;
+  enterToClass?: string;
+  enterActiveClass?: string;
+  leaveClass?: string;
+  leaveToClass?: string;
+  leaveActiveClass?: string;
+  beforeEnter?(el: HTMLElement): void;
+  enter?(el: HTMLElement, done: Function): void;
+  afterEnter?(el: HTMLElement): void;
+  enterCancelled?(el: HTMLElement): void;
+  beforeLeave?(el: HTMLElement): void;
+  leave?(el: HTMLElement, done: Function): void;
+  afterLeave?(el: HTMLElement): void;
+  leaveCancelled?(el: HTMLElement): void;
+}
+
+export interface ErrorParams {
+  statusCode?: number;
+  message?: string;
+}
+
+export interface NuxtLoading extends Vue {
+  fail?(): void;
+  finish(): void;
+  increase?(num: number): void;
+  pause?(): void;
+  start(): void;
+}
+
+export interface NuxtApp extends Vue {
+  $loading: NuxtLoading;
+  isOffline: boolean;
+  isOnline: boolean;
+}
diff --git a/packages/vue-app/types/process.d.ts b/packages/vue-app/types/process.d.ts
new file mode 100644
index 0000000000..385924b0a2
--- /dev/null
+++ b/packages/vue-app/types/process.d.ts
@@ -0,0 +1,14 @@
+/**
+ * Extends NodeJS.Process interface
+ */
+
+declare namespace NodeJS {
+  interface Process {
+    browser: boolean;
+    client: boolean;
+    mode: 'universal' | 'spa';
+    modern: boolean;
+    server: boolean;
+    static: boolean;
+  }
+}
diff --git a/packages/vue-app/types/vue.d.ts b/packages/vue-app/types/vue.d.ts
new file mode 100644
index 0000000000..222dd9521c
--- /dev/null
+++ b/packages/vue-app/types/vue.d.ts
@@ -0,0 +1,30 @@
+/**
+ * Extends interfaces in Vue.js
+ */
+
+import Vue, { ComponentOptions } from "vue";
+import { Route } from "vue-router";
+import { MetaInfo } from "vue-meta";
+import { Context, Middleware, Transition, NuxtApp } from "./index";
+
+declare module "vue/types/options" {
+  interface ComponentOptions<V extends Vue> {
+    asyncData?(ctx: Context): object | undefined;
+    fetch?(ctx: Context): Promise<void> | void;
+    head?: MetaInfo | (() => MetaInfo);
+    key?: string | ((to: Route) => string);
+    layout?: string | ((ctx: Context) => string);
+    loading?: boolean;
+    middleware?: Middleware | Middleware[];
+    scrollToTop?: boolean;
+    transition?: string | Transition | ((to: Route, from: Route) => string);
+    validate?(ctx: Context): Promise<boolean> | boolean;
+    watchQuery?: boolean | string[];
+  }
+}
+
+declare module "vue/types/vue" {
+  interface Vue {
+    $nuxt: NuxtApp;
+  }
+}
diff --git a/packages/vue-app/vetur/nuxt-attributes.json b/packages/vue-app/vetur/nuxt-attributes.json
new file mode 100644
index 0000000000..a95944b881
--- /dev/null
+++ b/packages/vue-app/vetur/nuxt-attributes.json
@@ -0,0 +1,34 @@
+{
+  "nuxtChildKey": {
+    "description": "This prop will be set to <router-view/>, useful to make transitions inside a dynamic page and different route. Default: `$route.fullPath`"
+  },
+  "to": {
+    "description": "Denotes the target route of the link. When clicked, the value of the to prop will be passed to router.push() internally, so the value can be either a string or a location descriptor object."
+  },
+  "no-prefetch": {
+    "description": "Avoid prefetching route target."
+  },
+  "replace": {
+    "type": "boolean",
+    "description": "Setting replace prop will call router.replace() instead of router.push() when clicked, so the navigation will not leave a history record."
+  },
+  "append": {
+    "type": "boolean",
+    "description": "Setting append prop always appends the relative path to the current path. For example, assuming we are navigating from /a to a relative link b, without append we will end up at /b, but with append we will end up at /a/b."
+  },
+  "tag": {
+    "description": "Specify which tag to render to, and it will still listen to click events for navigation."
+  },
+  "active-class": {
+    "description": "Configure the active CSS class applied when the link is active."
+  },
+  "exact": {
+    "description": "The default active class matching behavior is inclusive match. For example, <router-link to=\"/a\"> will get this class applied as long as the current path starts with /a/ or is /a.\nOne consequence of this is that <router-link to=\"/\"> will be active for every route! To force the link into \"exact match mode\", use the exact prop: <router-link to=\"/\" exact>"
+  },
+  "event": {
+    "description": "Specify the event(s) that can trigger the link navigation."
+  },
+  "exact-active-class": {
+    "description": "Configure the active CSS class applied when the link is active with exact match. Note the default value can also be configured globally via the linkExactActiveClass router constructor option."
+  }
+}
diff --git a/packages/vue-app/vetur/nuxt-tags.json b/packages/vue-app/vetur/nuxt-tags.json
new file mode 100644
index 0000000000..a2d05df3f0
--- /dev/null
+++ b/packages/vue-app/vetur/nuxt-tags.json
@@ -0,0 +1,45 @@
+{
+  "nuxt": {
+    "attributes": [
+      "nuxtChildKey"
+    ],
+    "description": "Component to render the current nuxt page."
+  },
+  "n-child": {
+    "description": "Component for displaying the children components in a nested route."
+  },
+  "nuxt-child": {
+    "description": "Component for displaying the children components in a nested route."
+  },
+  "n-link": {
+    "attributes": [
+      "to",
+      "replace",
+      "append",
+      "tag",
+      "active-class",
+      "exact",
+      "event",
+      "exact-active-class",
+      "no-prefetch"
+    ],
+    "description": "Component for navigating between Nuxt pages."
+  },
+  "nuxt-link": {
+    "attributes": [
+      "to",
+      "replace",
+      "append",
+      "tag",
+      "active-class",
+      "exact",
+      "event",
+      "exact-active-class",
+      "no-prefetch"
+    ],
+    "description": "Component for navigating between Nuxt pages."
+  },
+  "no-ssr": {
+    "description": "Component for excluding a part of your app from server-side rendering."
+  }
+}
diff --git a/packages/vue-renderer/CHANGELOG.md b/packages/vue-renderer/CHANGELOG.md
index d6b4010d30..36ae04c5ac 100644
--- a/packages/vue-renderer/CHANGELOG.md
+++ b/packages/vue-renderer/CHANGELOG.md
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* **deps:** update dependency vue-no-ssr to ^1.1.0 ([#4372](https://github.com/nuxt/nuxt.js/issues/4372)) ([e731250](https://github.com/nuxt/nuxt.js/commit/e731250))
+* correct renderer.noSSR name ([6990efc](https://github.com/nuxt/nuxt.js/commit/6990efc))
+* **renderer:** ignore invalid sourcemaps ([4b643b9](https://github.com/nuxt/nuxt.js/commit/4b643b9))
+* **vue-renderer:** improve ready handling ([#4511](https://github.com/nuxt/nuxt.js/issues/4511)) ([f0cb654](https://github.com/nuxt/nuxt.js/commit/f0cb654))
+* **vue-renderer:** parse JSON values before passing to bundle-renderer ([c0721c0](https://github.com/nuxt/nuxt.js/commit/c0721c0)), closes [#4439](https://github.com/nuxt/nuxt.js/issues/4439)
+* csp SHA hashes accumulate when using custom script-src rules ([#4519](https://github.com/nuxt/nuxt.js/issues/4519)) ([683dbba](https://github.com/nuxt/nuxt.js/commit/683dbba))
+* hmr in modern mode ([#4623](https://github.com/nuxt/nuxt.js/issues/4623)) ([df9b32a](https://github.com/nuxt/nuxt.js/commit/df9b32a))
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* undefined script in modern mode ([0a21d4b](https://github.com/nuxt/nuxt.js/commit/0a21d4b))
+
+
+### Features
+
+* **modern:** auto detect modern mode ([#4422](https://github.com/nuxt/nuxt.js/issues/4422)) ([fe492d8](https://github.com/nuxt/nuxt.js/commit/fe492d8))
+* check modern build file in modern mode ([#4467](https://github.com/nuxt/nuxt.js/issues/4467)) ([14fe679](https://github.com/nuxt/nuxt.js/commit/14fe679))
+* improve SSR bundle ([#4439](https://github.com/nuxt/nuxt.js/issues/4439)) ([0f104aa](https://github.com/nuxt/nuxt.js/commit/0f104aa)), closes [#4225](https://github.com/nuxt/nuxt.js/issues/4225) [#3465](https://github.com/nuxt/nuxt.js/issues/3465) [#1728](https://github.com/nuxt/nuxt.js/issues/1728) [#1601](https://github.com/nuxt/nuxt.js/issues/1601) [#1481](https://github.com/nuxt/nuxt.js/issues/1481)
+* preload and push modern resources in modern mode ([#4362](https://github.com/nuxt/nuxt.js/issues/4362)) ([701190d](https://github.com/nuxt/nuxt.js/commit/701190d))
+* use runInNewContext: true for nuxt dev ([#4508](https://github.com/nuxt/nuxt.js/issues/4508)) ([1162f2d](https://github.com/nuxt/nuxt.js/commit/1162f2d))
+* **vue-app, vue-renderer:** support meta `headAttrs` ([#4536](https://github.com/nuxt/nuxt.js/issues/4536)) ([9961453](https://github.com/nuxt/nuxt.js/commit/9961453))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 **Note:** Version bump only for package @nuxt/vue-renderer
diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
index afa6a245f1..8a1c3b37f1 100644
--- a/packages/vue-renderer/package.json
+++ b/packages/vue-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-renderer",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -8,18 +8,14 @@
   ],
   "main": "dist/vue-renderer.js",
   "dependencies": {
-    "@nuxt/common": "2.3.4",
-    "@nuxtjs/devalue": "^1.1.0",
-    "consola": "^2.3.0",
+    "@nuxt/devalue": "^1.2.0",
+    "@nuxt/utils": "2.4.0",
+    "consola": "^2.3.2",
     "fs-extra": "^7.0.1",
-    "lru-cache": "^4.1.3",
-    "vue": "^2.5.17",
-    "vue-meta": "^1.5.6",
-    "vue-no-ssr": "^1.1.0",
-    "vue-router": "^3.0.2",
-    "vue-server-renderer": "^2.5.17",
-    "vue-template-compiler": "^2.5.17",
-    "vuex": "^3.0.1"
+    "lru-cache": "^5.1.1",
+    "vue": "^2.5.22",
+    "vue-meta": "^1.5.8",
+    "vue-server-renderer": "^2.5.22"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/vue-renderer/src/renderer.js b/packages/vue-renderer/src/renderer.js
index 02b586c6dd..5f3021f9c8 100644
--- a/packages/vue-renderer/src/renderer.js
+++ b/packages/vue-renderer/src/renderer.js
@@ -1,11 +1,11 @@
 import path from 'path'
 import crypto from 'crypto'
-import fs from 'fs-extra'
+import fs from 'fs'
 import consola from 'consola'
-import devalue from '@nuxtjs/devalue'
+import devalue from '@nuxt/devalue'
 import invert from 'lodash/invert'
 import template from 'lodash/template'
-import { waitFor } from '@nuxt/common'
+import { waitFor } from '@nuxt/utils'
 import { createBundleRenderer } from 'vue-server-renderer'
 
 import SPAMetaRenderer from './spa-meta'
@@ -16,24 +16,26 @@ export default class VueRenderer {
 
     // Will be set by createRenderer
     this.renderer = {
-      ssr: null,
-      modern: null,
-      spa: null
+      ssr: undefined,
+      modern: undefined,
+      spa: undefined
     }
 
     // Renderer runtime resources
     Object.assign(this.context.resources, {
-      clientManifest: null,
-      modernManifest: null,
-      serverBundle: null,
-      ssrTemplate: null,
-      spaTemplate: null,
-      errorTemplate: this.constructor.parseTemplate('Nuxt.js Internal Server Error')
+      clientManifest: undefined,
+      modernManifest: undefined,
+      serverManifest: undefined,
+      ssrTemplate: undefined,
+      spaTemplate: undefined,
+      errorTemplate: this.parseTemplate('Nuxt.js Internal Server Error')
     })
   }
 
   get assetsMapping() {
-    if (this._assetsMapping) return this._assetsMapping
+    if (this._assetsMapping) {
+      return this._assetsMapping
+    }
 
     const legacyAssets = this.context.resources.clientManifest.assetsMapping
     const modernAssets = invert(this.context.resources.modernManifest.assetsMapping)
@@ -50,86 +52,151 @@ export default class VueRenderer {
 
   renderScripts(context) {
     if (this.context.options.modern === 'client') {
-      const publicPath = this.context.options.build.publicPath
-      const scriptPattern = /<script[^>]*?src="([^"]*)"[^>]*>[^<]*<\/script>/g
+      const { publicPath, crossorigin } = this.context.options.build
+      const scriptPattern = /<script[^>]*?src="([^"]*?)"[^>]*?>[^<]*?<\/script>/g
       return context.renderScripts().replace(scriptPattern, (scriptTag, jsFile) => {
         const legacyJsFile = jsFile.replace(publicPath, '')
         const modernJsFile = this.assetsMapping[legacyJsFile]
-        const moduleTag = scriptTag.replace('<script', '<script type="module"').replace(legacyJsFile, modernJsFile)
-        const noModuleTag = scriptTag.replace('<script', '<script nomodule')
+        const cors = `${crossorigin ? ` crossorigin="${crossorigin}"` : ''}`
+        const moduleTag = modernJsFile
+          ? scriptTag
+            .replace('<script', `<script type="module"${cors}`)
+            .replace(legacyJsFile, modernJsFile)
+          : ''
+        const noModuleTag = scriptTag.replace('<script', `<script nomodule${cors}`)
         return noModuleTag + moduleTag
       })
     }
     return context.renderScripts()
   }
 
+  getModernFiles(legacyFiles = []) {
+    const modernFiles = []
+    for (const legacyJsFile of legacyFiles) {
+      const modernFile = { ...legacyJsFile, modern: true }
+      if (modernFile.asType === 'script') {
+        const file = this.assetsMapping[legacyJsFile.file]
+        modernFile.file = file
+        modernFile.fileWithoutQuery = file.replace(/\?.*/, '')
+      }
+      modernFiles.push(modernFile)
+    }
+    return modernFiles
+  }
+
+  getPreloadFiles(context) {
+    const preloadFiles = context.getPreloadFiles()
+    const modernMode = this.context.options.modern
+    // In eligible server modern mode, preloadFiles are modern bundles from modern renderer
+    return modernMode === 'client' ? this.getModernFiles(preloadFiles) : preloadFiles
+  }
+
   renderResourceHints(context) {
     if (this.context.options.modern === 'client') {
-      const modulePreloadTags = []
-      for (const legacyJsFile of context.getPreloadFiles()) {
-        if (legacyJsFile.asType === 'script') {
-          const publicPath = this.context.options.build.publicPath
-          const modernJsFile = this.assetsMapping[legacyJsFile.file]
-          modulePreloadTags.push(`<link rel="modulepreload" href="${publicPath}${modernJsFile}" as="script">`)
+      const { publicPath, crossorigin } = this.context.options.build
+      const linkPattern = /<link[^>]*?href="([^"]*?)"[^>]*?as="script"[^>]*?>/g
+      return context.renderResourceHints().replace(linkPattern, (linkTag, jsFile) => {
+        const legacyJsFile = jsFile.replace(publicPath, '')
+        const modernJsFile = this.assetsMapping[legacyJsFile]
+        if (!modernJsFile) {
+          return ''
         }
-      }
-      return modulePreloadTags.join('')
+        const cors = `${crossorigin ? ` crossorigin="${crossorigin}"` : ''}`
+        return linkTag.replace('rel="preload"', `rel="modulepreload"${cors}`).replace(legacyJsFile, modernJsFile)
+      })
     }
     return context.renderResourceHints()
   }
 
   async ready() {
-    // Production: Load SSR resources from fs
-    if (!this.context.options.dev) {
-      await this.loadResources()
+    // -- Development mode --
+
+    if (this.context.options.dev) {
+      this.context.nuxt.hook('build:resources', mfs => this.loadResources(mfs, true))
+      return
+    }
+
+    // -- Production mode --
+
+    // Try once to load SSR resources from fs
+    await this.loadResources(fs)
+
+    // Without using`nuxt start` (Programatic, Tests and Generate)
+    if (!this.context.options._start) {
+      this.context.nuxt.hook('build:resources', () => this.loadResources(fs))
+    }
+
+    // Verify resources
+    if (this.context.options._start) {
+      if (!this.isReady) {
+        throw new Error(
+          'No build files found. Use either `nuxt build` or `builder.build()` or start nuxt in development mode.'
+        )
+      } else if (this.context.options.modern && !this.context.resources.modernManifest) {
+        throw new Error(
+          'No modern build files found. Use either `nuxt build --modern` or `modern` option to build modern files.'
+        )
+      }
     }
   }
 
-  async loadResources(_fs = fs) {
+  loadResources(_fs, isMFS = false) {
     const distPath = path.resolve(this.context.options.buildDir, 'dist', 'server')
     const updated = []
+    const { resourceMap } = this
 
-    this.constructor.resourceMap.forEach(({ key, fileName, transform }) => {
-      const rawKey = '$$' + key
-      const _path = path.join(distPath, fileName)
+    const readResource = (fileName, encoding) => {
+      try {
+        const fullPath = path.resolve(distPath, fileName)
+        if (!_fs.existsSync(fullPath)) {
+          return
+        }
+        const contents = _fs.readFileSync(fullPath, encoding)
+        if (isMFS) {
+          // Cleanup MFS as soon as possible to save memory
+          _fs.unlinkSync(fullPath)
+          delete this._assetsMapping
+        }
+        return contents
+      } catch (err) {
+        consola.error('Unable to load resource:', fileName, err)
+      }
+    }
 
-      // Fail when no build found and using programmatic usage
-      if (!_fs.existsSync(_path)) {
-        // TODO: Enable baack when renderer initialzation was disabled for build only scripts
-        // Currently this breaks normal nuxt build for first time
-        // if (!this.context.options.dev) {
-        //   const invalidSSR = !this.noSSR && key === 'serverBundle'
-        //   const invalidSPA = this.noSSR && key === 'spaTemplate'
-        //   if (invalidSPA || invalidSSR) {
-        //     consola.fatal(`Could not load Nuxt renderer, make sure to build for production: builder.build() with dev option set to false.`)
-        //   }
-        // }
-        return // Resource not exists
+    for (const resourceName in resourceMap) {
+      const { fileName, transform, encoding } = resourceMap[resourceName]
+
+      // Load resource
+      let resource = readResource(fileName, encoding)
+
+      // Skip unavailable resources
+      if (!resource) {
+        consola.debug('Resource not available:', resourceName)
+        continue
       }
 
-      const rawData = _fs.readFileSync(_path, 'utf8')
-      if (!rawData || rawData === this.context.resources[rawKey]) {
-        return // No changes
+      // Apply transforms
+      if (typeof transform === 'function') {
+        resource = transform(resource, {
+          readResource,
+          oldValue: this.context.resources[resourceName]
+        })
       }
-      this.context.resources[rawKey] = rawData
-      const data = transform(rawData)
-      /* istanbul ignore if */
-      if (!data) {
-        return // Invalid data ?
-      }
-      this.context.resources[key] = data
-      updated.push(key)
-    })
+
+      // Update resource
+      this.context.resources[resourceName] = resource
+      updated.push(resourceName)
+    }
 
     // Reload error template
     const errorTemplatePath = path.resolve(this.context.options.buildDir, 'views/error.html')
     if (fs.existsSync(errorTemplatePath)) {
-      this.context.resources.errorTemplate = this.constructor.parseTemplate(
+      this.context.resources.errorTemplate = this.parseTemplate(
         fs.readFileSync(errorTemplatePath, 'utf8')
       )
     }
 
-    // Load loading template
+    // Reload loading template
     const loadingHTMLPath = path.resolve(this.context.options.buildDir, 'loading.html')
     if (fs.existsSync(loadingHTMLPath)) {
       this.context.resources.loadingHTML = fs.readFileSync(loadingHTMLPath, 'utf8')
@@ -139,59 +206,61 @@ export default class VueRenderer {
       this.context.resources.loadingHTML = ''
     }
 
-    // Call resourcesLoaded plugin
-    await this.context.nuxt.callHook('render:resourcesLoaded', this.context.resources)
-
+    // Call createRenderer if any resource changed
     if (updated.length > 0) {
       this.createRenderer()
     }
+
+    // Call resourcesLoaded hook
+    consola.debug('Resources loaded:', updated.join(','))
+    return this.context.nuxt.callHook('render:resourcesLoaded', this.context.resources)
   }
 
-  get noSSR() {
+  get noSSR() { /* Backward compatibility */
     return this.context.options.render.ssr === false
   }
 
-  get isReady() {
-    if (this.noSSR) {
-      return Boolean(this.context.resources.spaTemplate)
-    }
-
-    return Boolean(this.renderer.ssr && this.context.resources.ssrTemplate)
+  get SSR() {
+    return this.context.options.render.ssr === true
   }
 
-  get isResourcesAvailable() {
-    // Required for both
-    /* istanbul ignore if */
-    if (!this.context.resources.clientManifest) {
+  get isReady() {
+    // SPA
+    if (!this.context.resources.spaTemplate || !this.renderer.spa) {
       return false
     }
 
-    // Required for SPA rendering
-    if (this.noSSR) {
-      return Boolean(this.context.resources.spaTemplate)
+    // SSR
+    if (this.SSR && (!this.context.resources.ssrTemplate || !this.renderer.ssr)) {
+      return false
     }
 
-    // Required for bundle renderer
-    return Boolean(this.context.resources.ssrTemplate && this.context.resources.serverBundle)
+    return true
+  }
+
+  get isResourcesAvailable() { /* Backward compatibility */
+    return this.isReady
   }
 
   createRenderer() {
-    // Ensure resources are available
-    if (!this.isResourcesAvailable) {
+    // Resource clientManifest is always required
+    if (!this.context.resources.clientManifest) {
       return
     }
 
-    // Create Meta Renderer
-    this.renderer.spa = new SPAMetaRenderer(this)
+    // Create SPA renderer
+    if (this.context.resources.spaTemplate) {
+      this.renderer.spa = new SPAMetaRenderer(this)
+    }
 
-    // Skip following steps if noSSR mode
-    if (this.noSSR) {
+    // Skip the rest if SSR resources are not available
+    if (!this.context.resources.ssrTemplate || !this.context.resources.serverManifest) {
       return
     }
 
     const hasModules = fs.existsSync(path.resolve(this.context.options.rootDir, 'node_modules'))
+
     const rendererOptions = {
-      runInNewContext: false,
       clientManifest: this.context.resources.clientManifest,
       // for globally installed nuxt command, search dependencies in global dir
       basedir: hasModules ? this.context.options.rootDir : __dirname,
@@ -200,13 +269,14 @@ export default class VueRenderer {
 
     // Create bundle renderer for SSR
     this.renderer.ssr = createBundleRenderer(
-      this.context.resources.serverBundle,
+      this.context.resources.serverManifest,
       rendererOptions
     )
 
-    if (this.context.options.modern === 'server') {
+    if (this.context.resources.modernManifest &&
+      !['client', false].includes(this.context.options.modern)) {
       this.renderer.modern = createBundleRenderer(
-        this.context.resources.serverBundle,
+        this.context.resources.serverManifest,
         {
           ...rendererOptions,
           clientManifest: this.context.resources.modernManifest
@@ -218,6 +288,7 @@ export default class VueRenderer {
   renderTemplate(ssr, opts) {
     // Fix problem with HTMLPlugin's minify option (#3392)
     opts.html_attrs = opts.HTML_ATTRS
+    opts.head_attrs = opts.HEAD_ATTRS
     opts.body_attrs = opts.BODY_ATTRS
 
     const fn = ssr ? this.context.resources.ssrTemplate : this.context.resources.spaTemplate
@@ -225,11 +296,16 @@ export default class VueRenderer {
     return fn(opts)
   }
 
-  async renderRoute(url, context = {}) {
+  async renderRoute(url, context = {}, retries = 5) {
     /* istanbul ignore if */
     if (!this.isReady) {
-      await waitFor(1000)
-      return this.renderRoute(url, context)
+      if (this.context.options.dev && retries > 0) {
+        consola.info('Waiting for server resources...')
+        await waitFor(1000)
+        return this.renderRoute(url, context, retries - 1)
+      } else {
+        throw new Error('Server resources are not available!')
+      }
     }
 
     // Log rendered url
@@ -238,14 +314,15 @@ export default class VueRenderer {
     // Add url and isSever to the context
     context.url = url
 
-    // Basic response if SSR is disabled or spa data provided
+    // Basic response if SSR is disabled or SPA data provided
     const { req, res } = context
     const spa = context.spa || (res && res.spa)
     const ENV = this.context.options.env
 
-    if (this.noSSR || spa) {
+    if (!this.SSR || spa) {
       const {
         HTML_ATTRS,
+        HEAD_ATTRS,
         BODY_ATTRS,
         HEAD,
         BODY_SCRIPTS,
@@ -256,13 +333,14 @@ export default class VueRenderer {
 
       const html = this.renderTemplate(false, {
         HTML_ATTRS,
+        HEAD_ATTRS,
         BODY_ATTRS,
         HEAD,
         APP,
         ENV
       })
 
-      return { html, getPreloadFiles }
+      return { html, getPreloadFiles: this.getPreloadFiles.bind(this, { getPreloadFiles }) }
     }
 
     let APP
@@ -296,12 +374,12 @@ export default class VueRenderer {
 
     const serializedSession = `window.${this.context.globals.context}=${devalue(context.nuxt)};`
 
-    const cspScriptSrcHashSet = new Set()
+    const cspScriptSrcHashes = []
     if (this.context.options.render.csp) {
       const { hashAlgorithm } = this.context.options.render.csp
       const hash = crypto.createHash(hashAlgorithm)
       hash.update(serializedSession)
-      cspScriptSrcHashSet.add(`'${hashAlgorithm}-${hash.digest('base64')}'`)
+      cspScriptSrcHashes.push(`'${hashAlgorithm}-${hash.digest('base64')}'`)
     }
 
     APP += `<script>${serializedSession}</script>`
@@ -313,6 +391,7 @@ export default class VueRenderer {
 
     const html = this.renderTemplate(true, {
       HTML_ATTRS: 'data-n-head-ssr ' + m.htmlAttrs.text(),
+      HEAD_ATTRS: m.headAttrs.text(),
       BODY_ATTRS: m.bodyAttrs.text(),
       HEAD,
       APP,
@@ -321,46 +400,87 @@ export default class VueRenderer {
 
     return {
       html,
-      cspScriptSrcHashSet,
-      getPreloadFiles: context.getPreloadFiles,
+      cspScriptSrcHashes,
+      getPreloadFiles: this.getPreloadFiles.bind(this, context),
       error: context.nuxt.error,
       redirected: context.redirected
     }
   }
 
-  static parseTemplate(templateStr) {
+  get resourceMap() {
+    return {
+      clientManifest: {
+        fileName: 'client.manifest.json',
+        transform: src => JSON.parse(src)
+      },
+      modernManifest: {
+        fileName: 'modern.manifest.json',
+        transform: src => JSON.parse(src)
+      },
+      serverManifest: {
+        fileName: 'server.manifest.json',
+        // BundleRenderer needs resolved contents
+        transform: (src, { readResource, oldValue = { files: {}, maps: {} } }) => {
+          const serverManifest = JSON.parse(src)
+
+          const resolveAssets = (obj, oldObj) => {
+            Object.keys(obj).forEach((name) => {
+              obj[name] = readResource(obj[name])
+              // Try to reuse deleted MFS files if no new version exists
+              if (!obj[name]) {
+                obj[name] = oldObj[name]
+              }
+            })
+            return obj
+          }
+
+          const files = resolveAssets(serverManifest.files, oldValue.files)
+          const maps = resolveAssets(serverManifest.maps, oldValue.maps)
+
+          // Try to parse sourcemaps
+          for (const map in maps) {
+            if (maps[map] && maps[map].version) {
+              continue
+            }
+            try {
+              maps[map] = JSON.parse(maps[map])
+            } catch (e) {
+              maps[map] = { version: 3, sources: [], mappings: '' }
+            }
+          }
+
+          return {
+            ...serverManifest,
+            files,
+            maps
+          }
+        }
+      },
+      ssrTemplate: {
+        fileName: 'index.ssr.html',
+        transform: src => this.parseTemplate(src)
+      },
+      spaTemplate: {
+        fileName: 'index.spa.html',
+        transform: src => this.parseTemplate(src)
+      }
+    }
+  }
+
+  parseTemplate(templateStr) {
     return template(templateStr, {
       interpolate: /{{([\s\S]+?)}}/g
     })
   }
 
-  static get resourceMap() {
-    return [
-      {
-        key: 'clientManifest',
-        fileName: 'vue-ssr-client-manifest.json',
-        transform: JSON.parse
-      },
-      {
-        key: 'modernManifest',
-        fileName: 'vue-ssr-modern-manifest.json',
-        transform: JSON.parse
-      },
-      {
-        key: 'serverBundle',
-        fileName: 'server-bundle.json',
-        transform: JSON.parse
-      },
-      {
-        key: 'ssrTemplate',
-        fileName: 'index.ssr.html',
-        transform: this.parseTemplate
-      },
-      {
-        key: 'spaTemplate',
-        fileName: 'index.spa.html',
-        transform: this.parseTemplate
-      }
-    ]
+  close() {
+    if (this.__closed) {
+      return
+    }
+    this.__closed = true
+
+    for (const key in this.renderer) {
+      delete this.renderer[key]
+    }
   }
 }
diff --git a/packages/vue-renderer/src/spa-meta.js b/packages/vue-renderer/src/spa-meta.js
index 4940477085..f2cf1ac4bf 100644
--- a/packages/vue-renderer/src/spa-meta.js
+++ b/packages/vue-renderer/src/spa-meta.js
@@ -1,3 +1,4 @@
+import { extname } from 'path'
 import Vue from 'vue'
 import VueMeta from 'vue-meta'
 import { createRenderer } from 'vue-server-renderer'
@@ -8,7 +9,7 @@ export default class SPAMetaRenderer {
     this.renderer = renderer
     this.options = this.renderer.context.options
     this.vueRenderer = createRenderer()
-    this.cache = LRU({})
+    this.cache = new LRU()
 
     // Add VueMeta to Vue (this is only for SPA mode)
     // See app/index.js
@@ -20,7 +21,7 @@ export default class SPAMetaRenderer {
     })
   }
 
-  async getMeta(url) {
+  async getMeta() {
     const vm = new Vue({
       render: h => h(), // Render empty html tag
       head: this.options.head || {}
@@ -38,17 +39,21 @@ export default class SPAMetaRenderer {
 
     meta = {
       HTML_ATTRS: '',
+      HEAD_ATTRS: '',
       BODY_ATTRS: '',
       HEAD: '',
       BODY_SCRIPTS: ''
     }
 
     // Get vue-meta context
-    const m = await this.getMeta(url)
+    const m = await this.getMeta()
 
     // HTML_ATTRS
     meta.HTML_ATTRS = m.htmlAttrs.text()
 
+    // HEAD_ATTRS
+    meta.HEAD_ATTRS = m.headAttrs.text()
+
     // BODY_ATTRS
     meta.BODY_ATTRS = m.bodyAttrs.text()
 
@@ -68,10 +73,9 @@ export default class SPAMetaRenderer {
 
     meta.resourceHints = ''
 
-    const clientManifest = this.renderer.context.resources.clientManifest
+    const { clientManifest } = this.renderer.context.resources
 
-    const shouldPreload = this.options.render.bundleRenderer.shouldPreload || (() => true)
-    const shouldPrefetch = this.options.render.bundleRenderer.shouldPrefetch || (() => true)
+    const { shouldPreload, shouldPrefetch } = this.options.render.bundleRenderer
 
     if (this.options.render.resourceHints && clientManifest) {
       const publicPath = clientManifest.publicPath || '/_nuxt/'
@@ -79,18 +83,25 @@ export default class SPAMetaRenderer {
       // Preload initial resources
       if (Array.isArray(clientManifest.initial)) {
         meta.resourceHints += clientManifest.initial
-          .filter(file => shouldPreload(file))
-          .map(
-            r => `<link rel="preload" href="${publicPath}${r}" as="script" />`
-          )
+          .map(SPAMetaRenderer.normalizeFile)
+          .filter(({ fileWithoutQuery, asType }) => shouldPreload(fileWithoutQuery, asType))
+          .map(({ file, extension, fileWithoutQuery, asType }) => {
+            let extra = ''
+            if (asType === 'font') {
+              extra = ` type="font/${extension}" crossorigin`
+            }
+            return `<link rel="preload" href="${publicPath}${file}"${
+              asType !== '' ? ` as="${asType}"` : ''}${extra}>`
+          })
           .join('')
       }
 
       // Prefetch async resources
       if (Array.isArray(clientManifest.async)) {
         meta.resourceHints += clientManifest.async
-          .filter(file => shouldPrefetch(file))
-          .map(r => `<link rel="prefetch" href="${publicPath}${r}" />`)
+          .map(SPAMetaRenderer.normalizeFile)
+          .filter(({ fileWithoutQuery, asType }) => shouldPrefetch(fileWithoutQuery, asType))
+          .map(({ file }) => `<link rel="prefetch" href="${publicPath}${file}">`)
           .join('')
       }
 
@@ -103,17 +114,37 @@ export default class SPAMetaRenderer {
     // Emulate getPreloadFiles from vue-server-renderer (works for JS chunks only)
     meta.getPreloadFiles = () =>
       clientManifest.initial
-        .filter(file => shouldPreload(file))
-        .map(r => ({
-          file: r,
-          fileWithoutQuery: r,
-          asType: 'script',
-          extension: 'js'
-        }))
+        .map(SPAMetaRenderer.normalizeFile)
+        .filter(({ fileWithoutQuery, asType }) => shouldPreload(fileWithoutQuery, asType))
 
     // Set meta tags inside cache
     this.cache.set(url, meta)
 
     return meta
   }
+
+  static normalizeFile(file) {
+    const withoutQuery = file.replace(/\?.*/, '')
+    const extension = extname(withoutQuery).slice(1)
+    return {
+      file,
+      extension,
+      fileWithoutQuery: withoutQuery,
+      asType: SPAMetaRenderer.getPreloadType(extension)
+    }
+  }
+
+  static getPreloadType(ext) {
+    if (ext === 'js') {
+      return 'script'
+    } else if (ext === 'css') {
+      return 'style'
+    } else if (/jpe?g|png|svg|gif|webp|ico/.test(ext)) {
+      return 'image'
+    } else if (/woff2?|ttf|otf|eot/.test(ext)) {
+      return 'font'
+    } else {
+      return ''
+    }
+  }
 }
diff --git a/packages/webpack/CHANGELOG.md b/packages/webpack/CHANGELOG.md
index fa0ac6972f..6a3cdb2352 100644
--- a/packages/webpack/CHANGELOG.md
+++ b/packages/webpack/CHANGELOG.md
@@ -3,6 +3,61 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/nuxt/nuxt.js/compare/v2.3.4...v2.4.0) (2019-01-28)
+
+
+### Bug Fixes
+
+* thread-loader slow building ([4fb220c](https://github.com/nuxt/nuxt.js/commit/4fb220c))
+* **deps:** update all non-major dependencies ([#4358](https://github.com/nuxt/nuxt.js/issues/4358)) ([45fdae0](https://github.com/nuxt/nuxt.js/commit/45fdae0))
+* allow pcss ending for webpack loader ([#4530](https://github.com/nuxt/nuxt.js/issues/4530)) ([8e0b508](https://github.com/nuxt/nuxt.js/commit/8e0b508))
+* empty error message in dev mode ([3d990fe](https://github.com/nuxt/nuxt.js/commit/3d990fe))
+* enable FriendlyErrorsPlugin when build.friendlyErrors is true ([30fef5d](https://github.com/nuxt/nuxt.js/commit/30fef5d))
+* hmr in modern mode ([#4623](https://github.com/nuxt/nuxt.js/issues/4623)) ([df9b32a](https://github.com/nuxt/nuxt.js/commit/df9b32a))
+* improvements for build and dev stability ([#4470](https://github.com/nuxt/nuxt.js/issues/4470)) ([fe05169](https://github.com/nuxt/nuxt.js/commit/fe05169))
+* match subdir under node_module  in transpile ([#4850](https://github.com/nuxt/nuxt.js/issues/4850)) ([43ce8e9](https://github.com/nuxt/nuxt.js/commit/43ce8e9))
+* plugins for modern mode ([#4659](https://github.com/nuxt/nuxt.js/issues/4659)) ([867e8e1](https://github.com/nuxt/nuxt.js/commit/867e8e1))
+* require postcss module via resolver ([#4737](https://github.com/nuxt/nuxt.js/issues/4737)) ([4b9e8e7](https://github.com/nuxt/nuxt.js/commit/4b9e8e7))
+* SafariFix is not injected in client modern mode ([ecf76d9](https://github.com/nuxt/nuxt.js/commit/ecf76d9))
+* server build failed in dev mode ([89f8866](https://github.com/nuxt/nuxt.js/commit/89f8866))
+* thread-loader memory leak ([d34a9e2](https://github.com/nuxt/nuxt.js/commit/d34a9e2))
+* use case insensitive regex for webpack loader rules ([#4728](https://github.com/nuxt/nuxt.js/issues/4728)) ([68d8d54](https://github.com/nuxt/nuxt.js/commit/68d8d54))
+* **server:** delete all non-js assets ([6589670](https://github.com/nuxt/nuxt.js/commit/6589670))
+* **ts:** prevent checking types twice in modern mode & use consola as logger ([#4803](https://github.com/nuxt/nuxt.js/issues/4803)) ([b202361](https://github.com/nuxt/nuxt.js/commit/b202361))
+* **ts:** switch from babel preset to ts-loader ([#4563](https://github.com/nuxt/nuxt.js/issues/4563)) ([75e3df6](https://github.com/nuxt/nuxt.js/commit/75e3df6))
+* **webpack:** allow changing devtool with extend ([#4515](https://github.com/nuxt/nuxt.js/issues/4515)) ([33edef2](https://github.com/nuxt/nuxt.js/commit/33edef2))
+* **webpack:** deepClone before calling extendConfig ([#4464](https://github.com/nuxt/nuxt.js/issues/4464)) ([06ddfbb](https://github.com/nuxt/nuxt.js/commit/06ddfbb))
+* **webpack:** prevent terser mangling html/vue reserved tags ([#4821](https://github.com/nuxt/nuxt.js/issues/4821)) ([6a68f4e](https://github.com/nuxt/nuxt.js/commit/6a68f4e))
+
+
+### Features
+
+* add an option to disable FriendlyErrorsWebpackPlugin ([#4498](https://github.com/nuxt/nuxt.js/issues/4498)) ([f1b2ca3](https://github.com/nuxt/nuxt.js/commit/f1b2ca3))
+* add process.modern ([#4532](https://github.com/nuxt/nuxt.js/issues/4532)) ([f1ff634](https://github.com/nuxt/nuxt.js/commit/f1ff634))
+* allow `lang="postcss"` in Vue SFCs ([#4417](https://github.com/nuxt/nuxt.js/issues/4417)) ([71136fc](https://github.com/nuxt/nuxt.js/commit/71136fc))
+* attach ts-loader options on build.loaders.ts ([#4572](https://github.com/nuxt/nuxt.js/issues/4572)) ([d723e49](https://github.com/nuxt/nuxt.js/commit/d723e49))
+* **builder:** optional typescript support ([#4557](https://github.com/nuxt/nuxt.js/issues/4557)) ([7145c1a](https://github.com/nuxt/nuxt.js/commit/7145c1a))
+* **nuxt-ts:** typescript support improvements ([#4750](https://github.com/nuxt/nuxt.js/issues/4750)) ([dfaffc0](https://github.com/nuxt/nuxt.js/commit/dfaffc0))
+* **ts:** add TSX support ([#4613](https://github.com/nuxt/nuxt.js/issues/4613)) ([4d52742](https://github.com/nuxt/nuxt.js/commit/4d52742))
+* **ts:** provide type checking through `fork-ts-checker-webpack-plugin` ([#4611](https://github.com/nuxt/nuxt.js/issues/4611)) ([f1377a7](https://github.com/nuxt/nuxt.js/commit/f1377a7))
+* **webpack:** add experimental HardSourceWebpackPlugin support ([#4527](https://github.com/nuxt/nuxt.js/issues/4527)) ([c6d820a](https://github.com/nuxt/nuxt.js/commit/c6d820a))
+* **webpack:** options.build.loaders.vueStyle ([#4837](https://github.com/nuxt/nuxt.js/issues/4837)) ([762305b](https://github.com/nuxt/nuxt.js/commit/762305b))
+* **webpack:** support `build.hotMiddleware.client` ([#4796](https://github.com/nuxt/nuxt.js/issues/4796)) ([dcdbaba](https://github.com/nuxt/nuxt.js/commit/dcdbaba))
+* **webpack,cli:** standalone build mode ([#4661](https://github.com/nuxt/nuxt.js/issues/4661)) ([bdb6791](https://github.com/nuxt/nuxt.js/commit/bdb6791))
+* better stack traces for SSR error, show error with correct URL and use eventsource-polyfill ([#4600](https://github.com/nuxt/nuxt.js/issues/4600)) ([498c4f1](https://github.com/nuxt/nuxt.js/commit/498c4f1))
+* improve SSR bundle ([#4439](https://github.com/nuxt/nuxt.js/issues/4439)) ([0f104aa](https://github.com/nuxt/nuxt.js/commit/0f104aa)), closes [#4225](https://github.com/nuxt/nuxt.js/issues/4225) [#3465](https://github.com/nuxt/nuxt.js/issues/3465) [#1728](https://github.com/nuxt/nuxt.js/issues/1728) [#1601](https://github.com/nuxt/nuxt.js/issues/1601) [#1481](https://github.com/nuxt/nuxt.js/issues/1481)
+* mode for plugins ([#4592](https://github.com/nuxt/nuxt.js/issues/4592)) ([e71c455](https://github.com/nuxt/nuxt.js/commit/e71c455))
+* upgrade css loader to v2 ([#4503](https://github.com/nuxt/nuxt.js/issues/4503)) ([af9b30c](https://github.com/nuxt/nuxt.js/commit/af9b30c))
+
+
+### Performance Improvements
+
+* **pkg:** remove lodash dependency from packages ([#4411](https://github.com/nuxt/nuxt.js/issues/4411)) ([d7851b3](https://github.com/nuxt/nuxt.js/commit/d7851b3))
+
+
+
+
+
 ## [2.3.4](https://github.com/nuxt/nuxt.js/compare/v2.3.2...v2.3.4) (2018-11-26)
 
 
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 00636b2cae..59be896de5 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -8,46 +8,48 @@
   ],
   "main": "dist/webpack.js",
   "dependencies": {
-    "@babel/core": "^7.1.6",
-    "@babel/polyfill": "^7.0.0",
-    "@nuxt/babel-preset-app": "2.3.4",
-    "@nuxt/common": "2.3.4",
-    "@nuxt/friendly-errors-webpack-plugin": "^2.3.2",
-    "babel-loader": "^8.0.4",
-    "cache-loader": "^1.2.5",
-    "caniuse-lite": "^1.0.30000910",
-    "chalk": "^2.4.1",
-    "consola": "^2.3.0",
-    "css-loader": "^1.0.1",
-    "cssnano": "^4.1.7",
-    "file-loader": "^2.0.0",
+    "@babel/core": "^7.2.2",
+    "@babel/polyfill": "^7.2.5",
+    "@nuxt/babel-preset-app": "2.4.0",
+    "@nuxt/friendly-errors-webpack-plugin": "^2.4.0",
+    "@nuxt/utils": "2.4.0",
+    "babel-loader": "^8.0.5",
+    "cache-loader": "^2.0.1",
+    "caniuse-lite": "^1.0.30000932",
+    "chalk": "^2.4.2",
+    "consola": "^2.3.2",
+    "css-loader": "^2.1.0",
+    "cssnano": "^4.1.8",
+    "eventsource-polyfill": "^0.9.6",
+    "extract-css-chunks-webpack-plugin": "^3.3.2",
+    "file-loader": "^3.0.1",
     "fs-extra": "^7.0.1",
     "glob": "^7.1.3",
+    "hard-source-webpack-plugin": "^0.13.1",
     "hash-sum": "^1.0.2",
     "html-webpack-plugin": "^3.2.0",
     "memory-fs": "^0.4.1",
-    "mini-css-extract-plugin": "^0.4.5",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "pify": "^4.0.1",
-    "postcss": "^7.0.6",
+    "postcss": "^7.0.14",
     "postcss-import": "^12.0.1",
     "postcss-import-resolver": "^1.1.0",
     "postcss-loader": "^3.0.0",
-    "postcss-preset-env": "^6.4.0",
+    "postcss-preset-env": "^6.5.0",
     "postcss-url": "^8.0.0",
     "std-env": "^2.2.1",
     "style-resources-loader": "^1.2.1",
-    "terser-webpack-plugin": "^1.1.0",
+    "terser-webpack-plugin": "^1.2.1",
     "thread-loader": "^1.2.0",
     "time-fix-plugin": "^2.0.5",
     "url-loader": "^1.1.2",
-    "vue-loader": "^15.4.2",
-    "webpack": "^4.26.1",
+    "vue-loader": "^15.6.2",
+    "webpack": "^4.29.0",
     "webpack-bundle-analyzer": "^3.0.3",
-    "webpack-dev-middleware": "^3.4.0",
+    "webpack-dev-middleware": "^3.5.1",
     "webpack-hot-middleware": "^2.24.3",
     "webpack-node-externals": "^1.7.2",
-    "webpackbar": "^3.1.3"
+    "webpackbar": "^3.1.5"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/webpack/src/builder.js b/packages/webpack/src/builder.js
index e700e78937..d0b7c73699 100644
--- a/packages/webpack/src/builder.js
+++ b/packages/webpack/src/builder.js
@@ -1,4 +1,3 @@
-import fs from 'fs'
 import path from 'path'
 import pify from 'pify'
 import webpack from 'webpack'
@@ -12,9 +11,10 @@ import {
   parallel,
   sequence,
   wrapArray
-} from '@nuxt/common'
+} from '@nuxt/utils'
 
-import { ClientConfig, ModernConfig, ServerConfig, PerfLoader } from './config'
+import { ClientConfig, ModernConfig, ServerConfig } from './config'
+import PerfLoader from './utils/perf-loader'
 
 const glob = pify(Glob)
 
@@ -27,14 +27,18 @@ export class WebpackBundler {
     this.devMiddleware = {}
     this.hotMiddleware = {}
 
-    // Initialize shared FS and Cache
+    // Initialize shared MFS for dev
     if (this.context.options.dev) {
       this.mfs = new MFS()
+
+      // TODO: Enable when async FS required
+      // this.mfs.exists = function (...args) { return Promise.resolve(this.existsSync(...args)) }
+      // this.mfs.readFile = function (...args) { return Promise.resolve(this.readFileSync(...args)) }
     }
   }
 
   async build() {
-    const options = this.context.options
+    const { options } = this.context
 
     const compilersOptions = []
 
@@ -59,38 +63,37 @@ export class WebpackBundler {
     for (const p of this.context.plugins) {
       // Client config
       if (!clientConfig.resolve.alias[p.name]) {
-        clientConfig.resolve.alias[p.name] = p.src
-      }
-
-      // Server config
-      if (serverConfig && !serverConfig.resolve.alias[p.name]) {
-        // Alias to noop for ssr:false plugins
-        serverConfig.resolve.alias[p.name] = p.ssr ? p.src : './empty.js'
+        clientConfig.resolve.alias[p.name] = p.mode === 'server' ? './empty.js' : p.src
       }
 
       // Modern config
       if (modernConfig && !modernConfig.resolve.alias[p.name]) {
-        modernConfig.resolve.alias[p.name] = p.src
+        modernConfig.resolve.alias[p.name] = p.mode === 'server' ? './empty.js' : p.src
+      }
+
+      // Server config
+      if (serverConfig && !serverConfig.resolve.alias[p.name]) {
+        serverConfig.resolve.alias[p.name] = p.mode === 'client' ? './empty.js' : p.src
       }
     }
 
     // Check styleResource existence
-    const styleResources = this.context.options.build.styleResources
+    const { styleResources } = this.context.options.build
     if (styleResources && Object.keys(styleResources).length) {
       consola.warn(
         'Using styleResources without the nuxt-style-resources-module is not suggested and can lead to severe performance issues.',
         'Please use https://github.com/nuxt-community/style-resources-module'
       )
-    }
-    Object.keys(styleResources).forEach(async (ext) => {
-      await Promise.all(wrapArray(styleResources[ext]).map(async (p) => {
-        const styleResourceFiles = await glob(path.resolve(this.context.options.rootDir, p))
+      for (const ext of Object.keys(styleResources)) {
+        await Promise.all(wrapArray(styleResources[ext]).map(async (p) => {
+          const styleResourceFiles = await glob(path.resolve(this.context.options.rootDir, p))
 
-        if (!styleResourceFiles || styleResourceFiles.length === 0) {
-          throw new Error(`Style Resource not found: ${p}`)
-        }
-      }))
-    })
+          if (!styleResourceFiles || styleResourceFiles.length === 0) {
+            throw new Error(`Style Resource not found: ${p}`)
+          }
+        }))
+      }
+    }
 
     // Configure compilers
     this.compilers = compilersOptions.map((compilersOption) => {
@@ -104,7 +107,7 @@ export class WebpackBundler {
       return compiler
     })
 
-    // Warmup perfLoader before build
+    // Warm up perfLoader before build
     if (options.build.parallel) {
       consola.info('Warming up worker pools')
       PerfLoader.warmupAll({ dev: options.dev })
@@ -119,70 +122,67 @@ export class WebpackBundler {
     })
   }
 
-  webpackCompile(compiler) {
-    return new Promise(async (resolve, reject) => {
-      const name = compiler.options.name
-      const { nuxt, options } = this.context
+  async webpackCompile(compiler) {
+    const { name } = compiler.options
+    const { nuxt, options } = this.context
 
-      await nuxt.callHook('build:compile', { name, compiler })
+    await nuxt.callHook('build:compile', { name, compiler })
 
-      // Load renderer resources after build
-      compiler.hooks.done.tap('load-resources', async (stats) => {
-        await nuxt.callHook('build:compiled', {
-          name,
-          compiler,
-          stats
-        })
-
-        // Reload renderer if available
-        nuxt.server.loadResources(this.mfs || fs)
-
-        // Resolve on next tick
-        process.nextTick(resolve)
+    // Load renderer resources after build
+    compiler.hooks.done.tap('load-resources', async (stats) => {
+      await nuxt.callHook('build:compiled', {
+        name,
+        compiler,
+        stats
       })
 
-      if (options.dev) {
-        // --- Dev Build ---
-        // Client Build, watch is started by dev-middleware
-        if (['client', 'modern'].includes(name)) {
-          return this.webpackDev(compiler)
-        }
-        // Server, build and watch for changes
-        this.compilersWatching.push(
-          compiler.watch(options.watchers.webpack, (err) => {
-            /* istanbul ignore if */
-            if (err) return reject(err)
-          })
-        )
-      } else {
-        // --- Production Build ---
-        compiler.run((err, stats) => {
-          /* istanbul ignore next */
-          if (err) {
-            return reject(err)
-          } else if (stats.hasErrors()) {
-            if (options.build.quiet === true) {
-              err = stats.toString(options.build.stats)
-            }
-            if (!err) {
-              // actual errors will be printed by webpack itself
-              err = 'Nuxt Build Error'
-            }
+      // Reload renderer
+      await nuxt.callHook('build:resources', this.mfs)
+    })
 
-            return reject(err)
-          }
-
-          resolve()
+    // --- Dev Build ---
+    if (options.dev) {
+      // Client Build, watch is started by dev-middleware
+      if (['client', 'modern'].includes(name)) {
+        return new Promise((resolve, reject) => {
+          compiler.hooks.done.tap('nuxt-dev', () => resolve())
+          this.webpackDev(compiler)
         })
       }
-    })
+
+      // Server, build and watch for changes
+      return new Promise((resolve, reject) => {
+        const watching = compiler.watch(options.watchers.webpack, (err) => {
+          if (err) {
+            return reject(err)
+          }
+          watching.close = pify(watching.close)
+          this.compilersWatching.push(watching)
+          resolve()
+        })
+      })
+    }
+
+    // --- Production Build ---
+    compiler.run = pify(compiler.run)
+    const stats = await compiler.run()
+
+    if (stats.hasErrors()) {
+      if (options.build.quiet === true) {
+        return Promise.reject(stats.toString(options.build.stats))
+      } else {
+        // Actual error will be printed by webpack
+        throw new Error('Nuxt Build Error')
+      }
+    }
   }
 
   webpackDev(compiler) {
     consola.debug('Adding webpack middleware...')
 
-    const name = [compiler.options.name]
+    const { name } = compiler.options
     const { nuxt: { server }, options } = this.context
+    const { client, ...hotMiddlewareOptions } = options.build.hotMiddleware || {}
 
     // Create webpack dev middleware
     this.devMiddleware[name] = pify(
@@ -210,7 +210,7 @@ export class WebpackBundler {
             log: false,
             heartbeat: 10000
           },
-          options.build.hotMiddleware,
+          hotMiddlewareOptions,
           {
             path: `/__webpack_hmr/${name}`
           }
@@ -227,12 +227,35 @@ export class WebpackBundler {
 
   async unwatch() {
     for (const watching of this.compilersWatching) {
-      watching.close()
+      await watching.close()
     }
+  }
+
+  async close() {
+    if (this.__closed) {
+      return
+    }
+    this.__closed = true
+
+    // Unwatch
+    await this.unwatch()
+
     // Stop webpack middleware
     for (const devMiddleware of Object.values(this.devMiddleware)) {
       await devMiddleware.close()
     }
+
+    // Cleanup MFS
+    if (this.mfs) {
+      delete this.mfs.data
+      delete this.mfs
+    }
+
+    // Cleanup more resources
+    delete this.compilers
+    delete this.compilersWatching
+    delete this.devMiddleware
+    delete this.hotMiddleware
   }
 
   forGenerate() {
diff --git a/packages/webpack/src/config/base.js b/packages/webpack/src/config/base.js
index 7ea514593a..13bfe40aad 100644
--- a/packages/webpack/src/config/base.js
+++ b/packages/webpack/src/config/base.js
@@ -5,15 +5,19 @@ import clone from 'lodash/clone'
 import cloneDeep from 'lodash/cloneDeep'
 import escapeRegExp from 'lodash/escapeRegExp'
 import VueLoader from 'vue-loader'
-import MiniCssExtractPlugin from 'mini-css-extract-plugin'
+import ExtractCssChunksPlugin from 'extract-css-chunks-webpack-plugin'
+import HardSourcePlugin from 'hard-source-webpack-plugin'
+import TerserWebpackPlugin from 'terser-webpack-plugin'
 import WebpackBar from 'webpackbar'
 import env from 'std-env'
 
-import { isUrl, urlJoin } from '@nuxt/common'
+import { isUrl, urlJoin } from '@nuxt/utils'
 
-import PerfLoader from './utils/perf-loader'
-import StyleLoader from './utils/style-loader'
-import WarnFixPlugin from './plugins/warnfix'
+import PerfLoader from '../utils/perf-loader'
+import StyleLoader from '../utils/style-loader'
+import WarnFixPlugin from '../plugins/warnfix'
+
+import { reservedVueTags } from '../utils/reserved-tags'
 
 export default class WebpackBaseConfig {
   constructor(builder, options) {
@@ -24,7 +28,6 @@ export default class WebpackBaseConfig {
     this.nuxt = builder.context.nuxt
     this.isStatic = builder.context.isStatic
     this.options = builder.context.options
-    this.spinner = builder.spinner
     this.loaders = this.options.build.loaders
     this.buildMode = this.options.dev ? 'development' : 'production'
     this.modulesToTranspile = this.normalizeTranspile()
@@ -49,7 +52,7 @@ export default class WebpackBaseConfig {
 
   normalizeTranspile() {
     // include SFCs in node_modules
-    const items = [/\.vue\.js/]
+    const items = [/\.vue\.js/i]
     for (const pattern of this.options.build.transpile) {
       if (pattern instanceof RegExp) {
         items.push(pattern)
@@ -88,7 +91,7 @@ export default class WebpackBaseConfig {
       fileName = fileName(this.nuxtEnv)
     }
     if (this.options.dev) {
-      const hash = /\[(chunkhash|contenthash|hash)(?::(\d+))?\]/.exec(fileName)
+      const hash = /\[(chunkhash|contenthash|hash)(?::(\d+))?]/.exec(fileName)
       if (hash) {
         consola.warn(`Notice: Please do not use ${hash[1]} in dev mode to prevent memory leak`)
       }
@@ -96,7 +99,7 @@ export default class WebpackBaseConfig {
     return fileName
   }
 
-  devtool() {
+  get devtool() {
     return false
   }
 
@@ -127,7 +130,44 @@ export default class WebpackBaseConfig {
   }
 
   optimization() {
-    return this.options.build.optimization
+    const optimization = cloneDeep(this.options.build.optimization)
+
+    if (optimization.minimize && optimization.minimizer === undefined) {
+      optimization.minimizer = this.minimizer()
+    }
+
+    return optimization
+  }
+
+  minimizer() {
+    const minimizer = []
+
+    // https://github.com/webpack-contrib/terser-webpack-plugin
+    if (this.options.build.terser) {
+      minimizer.push(
+        new TerserWebpackPlugin(Object.assign({
+          parallel: true,
+          cache: this.options.build.cache,
+          sourceMap: this.devtool && /source-?map/.test(this.devtool),
+          extractComments: {
+            filename: 'LICENSES'
+          },
+          terserOptions: {
+            compress: {
+              ecma: this.isModern ? 6 : undefined
+            },
+            output: {
+              comments: /^\**!|@preserve|@license|@cc_on/
+            },
+            mangle: {
+              reserved: reservedVueTags
+            }
+          }
+        }, this.options.build.terser))
+      )
+    }
+
+    return minimizer
   }
 
   alias() {
@@ -150,18 +190,22 @@ export default class WebpackBaseConfig {
       this.nuxt,
       { isServer: this.isServer, perfLoader }
     )
+    const babelLoader = {
+      loader: require.resolve('babel-loader'),
+      options: this.getBabelOptions()
+    }
 
     return [
       {
-        test: /\.vue$/,
+        test: /\.vue$/i,
         loader: 'vue-loader',
         options: this.loaders.vue
       },
       {
-        test: /\.pug$/,
+        test: /\.pug$/i,
         oneOf: [
           {
-            resourceQuery: /^\?vue/,
+            resourceQuery: /^\?vue/i,
             use: [{
               loader: 'pug-plain-loader',
               options: this.loaders.pugPlain
@@ -179,55 +223,78 @@ export default class WebpackBaseConfig {
         ]
       },
       {
-        test: /\.jsx?$/,
+        test: /\.jsx?$/i,
         exclude: (file) => {
+          file = file.split('node_modules', 2)[1]
+
           // not exclude files outside node_modules
-          if (!/node_modules/.test(file)) {
+          if (!file) {
             return false
           }
 
           // item in transpile can be string or regex object
           return !this.modulesToTranspile.some(module => module.test(file))
         },
-        use: perfLoader.js().concat({
-          loader: require.resolve('babel-loader'),
-          options: this.getBabelOptions()
-        })
+        use: perfLoader.js().concat(babelLoader)
       },
       {
-        test: /\.css$/,
+        test: /\.ts$/i,
+        use: [
+          babelLoader,
+          {
+            loader: 'ts-loader',
+            options: this.loaders.ts
+          }
+        ]
+      },
+      {
+        test: /\.tsx$/i,
+        use: [
+          babelLoader,
+          {
+            loader: 'ts-loader',
+            options: this.loaders.tsx
+          }
+        ]
+      },
+      {
+        test: /\.css$/i,
         oneOf: styleLoader.apply('css')
       },
       {
-        test: /\.less$/,
+        test: /\.p(ost)?css$/i,
+        oneOf: styleLoader.apply('postcss')
+      },
+      {
+        test: /\.less$/i,
         oneOf: styleLoader.apply('less', {
           loader: 'less-loader',
           options: this.loaders.less
         })
       },
       {
-        test: /\.sass$/,
+        test: /\.sass$/i,
         oneOf: styleLoader.apply('sass', {
           loader: 'sass-loader',
           options: this.loaders.sass
         })
       },
       {
-        test: /\.scss$/,
+        test: /\.scss$/i,
         oneOf: styleLoader.apply('scss', {
           loader: 'sass-loader',
           options: this.loaders.scss
         })
       },
       {
-        test: /\.styl(us)?$/,
+        test: /\.styl(us)?$/i,
         oneOf: styleLoader.apply('stylus', {
           loader: 'stylus-loader',
           options: this.loaders.stylus
         })
       },
       {
-        test: /\.(png|jpe?g|gif|svg|webp)$/,
+        test: /\.(png|jpe?g|gif|svg|webp)$/i,
         use: perfLoader.asset().concat({
           loader: 'url-loader',
           options: Object.assign(
@@ -237,7 +304,7 @@ export default class WebpackBaseConfig {
         })
       },
       {
-        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/i,
         use: perfLoader.asset().concat({
           loader: 'url-loader',
           options: Object.assign(
@@ -247,7 +314,7 @@ export default class WebpackBaseConfig {
         })
       },
       {
-        test: /\.(webm|mp4|ogv)$/,
+        test: /\.(webm|mp4|ogv)$/i,
         use: perfLoader.asset().concat({
           loader: 'file-loader',
           options: Object.assign(
@@ -303,17 +370,20 @@ export default class WebpackBaseConfig {
       }
     }))
 
-    // CSS extraction
-    // MiniCssExtractPlugin does not currently supports SSR
-    // https://github.com/webpack-contrib/mini-css-extract-plugin/issues/48
-    // So we use css-loader/locals as a fallback (utils/style-loader)
-    if (this.options.build.extractCSS && !this.isServer) {
-      plugins.push(new MiniCssExtractPlugin(Object.assign({
+    // CSS extraction)
+    if (this.options.build.extractCSS) {
+      plugins.push(new ExtractCssChunksPlugin(Object.assign({
         filename: this.getFileName('css'),
-        chunkFilename: this.getFileName('css')
+        chunkFilename: this.getFileName('css'),
+        // TODO: https://github.com/faceyspacey/extract-css-chunks-webpack-plugin/issues/132
+        reloadAll: true
       }, this.options.build.extractCSS)))
     }
 
+    if (this.options.build.hardSource) {
+      plugins.push(new HardSourcePlugin(Object.assign({}, this.options.build.hardSource)))
+    }
+
     return plugins
   }
 
@@ -333,10 +403,11 @@ export default class WebpackBaseConfig {
   config() {
     // Prioritize nested node_modules in webpack search path (#2558)
     const webpackModulesDir = ['node_modules'].concat(this.options.modulesDir)
+
     const config = {
       name: this.name,
       mode: this.buildMode,
-      devtool: this.devtool(),
+      devtool: this.devtool,
       optimization: this.optimization(),
       output: this.output(),
       performance: {
@@ -344,7 +415,7 @@ export default class WebpackBaseConfig {
         hints: this.options.dev ? false : 'warning'
       },
       resolve: {
-        extensions: ['.wasm', '.mjs', '.js', '.json', '.vue', '.jsx'],
+        extensions: ['.wasm', '.mjs', '.js', '.json', '.vue', '.jsx', '.ts', '.tsx'],
         alias: this.alias(),
         modules: webpackModulesDir
       },
@@ -357,9 +428,17 @@ export default class WebpackBaseConfig {
       plugins: this.plugins()
     }
 
-    const extendedConfig = this.extendConfig(config)
-
     // Clone deep avoid leaking config between Client and Server
-    return cloneDeep(extendedConfig)
+    const extendedConfig = this.extendConfig(cloneDeep(config))
+    const { optimization } = extendedConfig
+    // Todo remove in nuxt 3 in favor of devtool config property or https://webpack.js.org/plugins/source-map-dev-tool-plugin
+    if (optimization && optimization.minimizer && extendedConfig.devtool) {
+      const terser = optimization.minimizer.find(p => p instanceof TerserWebpackPlugin)
+      if (terser) {
+        terser.options.sourceMap = /source-?map/.test(extendedConfig.devtool)
+      }
+    }
+
+    return extendedConfig
   }
 }
diff --git a/packages/webpack/src/config/client.js b/packages/webpack/src/config/client.js
index 94671a9542..68589eb44a 100644
--- a/packages/webpack/src/config/client.js
+++ b/packages/webpack/src/config/client.js
@@ -1,13 +1,16 @@
 import path from 'path'
+import fs from 'fs'
+import querystring from 'querystring'
+import consola from 'consola'
 import webpack from 'webpack'
 import HTMLPlugin from 'html-webpack-plugin'
 import BundleAnalyzer from 'webpack-bundle-analyzer'
-import TerserWebpackPlugin from 'terser-webpack-plugin'
 import OptimizeCSSAssetsPlugin from 'optimize-css-assets-webpack-plugin'
 import FriendlyErrorsWebpackPlugin from '@nuxt/friendly-errors-webpack-plugin'
 
-import ModernModePlugin from './plugins/vue/modern'
-import VueSSRClientPlugin from './plugins/vue/client'
+import CorsPlugin from '../plugins/vue/cors'
+import ModernModePlugin from '../plugins/vue/modern'
+import VueSSRClientPlugin from '../plugins/vue/client'
 import WebpackBaseConfig from './base'
 
 export default class WebpackClientConfig extends WebpackBaseConfig {
@@ -17,7 +20,7 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
 
   getFileName(...args) {
     if (this.options.build.analyze) {
-      const key = args[0]
+      const [key] = args
       if (['app', 'chunk'].includes(key)) {
         return `${this.isModern ? 'modern-' : ''}[name].js`
       }
@@ -30,7 +33,8 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
       'process.env.VUE_ENV': JSON.stringify('client'),
       'process.browser': true,
       'process.client': true,
-      'process.server': false
+      'process.server': false,
+      'process.modern': false
     })
   }
 
@@ -54,6 +58,21 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
     return optimization
   }
 
+  minimizer() {
+    const minimizer = super.minimizer()
+
+    // https://github.com/NMFR/optimize-css-assets-webpack-plugin
+    // https://github.com/webpack-contrib/mini-css-extract-plugin#minimizing-for-production
+    // TODO: Remove OptimizeCSSAssetsPlugin when upgrading to webpack 5
+    if (this.options.build.optimizeCSS) {
+      minimizer.push(
+        new OptimizeCSSAssetsPlugin(Object.assign({}, this.options.build.optimizeCSS))
+      )
+    }
+
+    return minimizer
+  }
+
   plugins() {
     const plugins = super.plugins()
 
@@ -78,7 +97,7 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
         chunksSortMode: 'dependency'
       }),
       new VueSSRClientPlugin({
-        filename: `../server/vue-ssr-${this.name}-manifest.json`
+        filename: `../server/${this.name}.manifest.json`
       }),
       new webpack.DefinePlugin(this.env())
     )
@@ -110,54 +129,51 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
       }))
     }
 
-    return plugins
-  }
+    if (this.options.build.crossorigin) {
+      plugins.push(new CorsPlugin({
+        crossorigin: this.options.build.crossorigin
+      }))
+    }
 
-  extendConfig() {
-    const config = super.extendConfig(...arguments)
-
-    // Add minimizer plugins
-    if (config.optimization.minimize && config.optimization.minimizer === undefined) {
-      config.optimization.minimizer = []
-
-      // https://github.com/webpack-contrib/terser-webpack-plugin
-      if (this.options.build.terser) {
-        config.optimization.minimizer.push(
-          new TerserWebpackPlugin(Object.assign({
-            parallel: true,
-            cache: this.options.build.cache,
-            sourceMap: config.devtool && /source-?map/.test(config.devtool),
-            extractComments: {
-              filename: 'LICENSES'
-            },
-            terserOptions: {
-              compress: {
-                ecma: this.isModern ? 6 : undefined
-              },
-              output: {
-                comments: /^\**!|@preserve|@license|@cc_on/
-              }
-            }
-          }, this.options.build.terser))
-        )
-      }
-
-      // https://github.com/NMFR/optimize-css-assets-webpack-plugin
-      // https://github.com/webpack-contrib/mini-css-extract-plugin#minimizing-for-production
-      // TODO: Remove OptimizeCSSAssetsPlugin when upgrading to webpack 5
-      if (this.options.build.optimizeCSS) {
-        config.optimization.minimizer.push(
-          new OptimizeCSSAssetsPlugin(Object.assign({}, this.options.build.optimizeCSS))
-        )
+    // TypeScript type checker
+    // Only performs once per client compilation and only if `ts-loader` checker is not used (transpileOnly: true)
+    if (!this.isModern && this.loaders.ts.transpileOnly && this.options.build.useForkTsChecker) {
+      const forkTsCheckerResolvedPath = this.nuxt.resolver.resolveModule('fork-ts-checker-webpack-plugin')
+      if (forkTsCheckerResolvedPath) {
+        const ForkTsCheckerWebpackPlugin = require(forkTsCheckerResolvedPath)
+        plugins.push(new ForkTsCheckerWebpackPlugin(Object.assign({
+          vue: true,
+          tsconfig: path.resolve(this.options.rootDir, 'tsconfig.json'),
+          // https://github.com/Realytics/fork-ts-checker-webpack-plugin#options - tslint: boolean | string - So we set it false if file not found
+          tslint: (tslintPath => fs.existsSync(tslintPath) && tslintPath)(path.resolve(this.options.rootDir, 'tslint.json')),
+          formatter: 'codeframe',
+          logger: consola
+        }, this.options.build.useForkTsChecker)))
+      } else {
+        consola.warn('You need to install `fork-ts-checker-webpack-plugin` as devDependency to enable TypeScript type checking !')
       }
     }
 
-    return config
+    return plugins
   }
 
   config() {
     const config = super.config()
 
+    const { client = {} } = this.options.build.hotMiddleware || {}
+    const { ansiColors, overlayStyles, ...options } = client
+    const hotMiddlewareClientOptions = {
+      reload: true,
+      timeout: 30000,
+      ansiColors: JSON.stringify(ansiColors),
+      overlayStyles: JSON.stringify(overlayStyles),
+      ...options,
+      name: this.name
+    }
+    const clientPath = `${this.options.router.base}/__webpack_hmr/${this.name}`
+    const hotMiddlewareClientOptionsStr =
+      `${querystring.stringify(hotMiddlewareClientOptions)}&path=${clientPath}`.replace(/\/\//g, '/')
+
     // Entry points
     config.entry = {
       app: [path.resolve(this.options.buildDir, 'client.js')]
@@ -166,15 +182,15 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
     // Add HMR support
     if (this.options.dev) {
       config.entry.app.unshift(
+        // https://github.com/webpack-contrib/webpack-hot-middleware/issues/53#issuecomment-162823945
+        'eventsource-polyfill',
         // https://github.com/glenjamin/webpack-hot-middleware#config
-        `webpack-hot-middleware/client?name=${this.name}&reload=true&timeout=30000&path=${
-          this.options.router.base
-        }/__webpack_hmr/${this.name}`.replace(/\/\//g, '/')
+        `webpack-hot-middleware/client?${hotMiddlewareClientOptionsStr}`
       )
     }
 
     // Add friendly error plugin
-    if (this.options.dev && !this.options.build.quiet) {
+    if (this.options.dev && !this.options.build.quiet && this.options.build.friendlyErrors) {
       config.plugins.push(
         new FriendlyErrorsWebpackPlugin({
           clearConsole: false,
diff --git a/packages/webpack/src/config/index.js b/packages/webpack/src/config/index.js
index c0d7538bce..265594922f 100644
--- a/packages/webpack/src/config/index.js
+++ b/packages/webpack/src/config/index.js
@@ -1,4 +1,3 @@
 export { default as ClientConfig } from './client'
 export { default as ModernConfig } from './modern'
 export { default as ServerConfig } from './server'
-export { default as PerfLoader } from './utils/perf-loader'
diff --git a/packages/webpack/src/config/modern.js b/packages/webpack/src/config/modern.js
index 9bbcf92177..8431de5820 100644
--- a/packages/webpack/src/config/modern.js
+++ b/packages/webpack/src/config/modern.js
@@ -6,6 +6,12 @@ export default class WebpackModernConfig extends WebpackClientConfig {
     super(builder, { name: 'modern', isServer: false, isModern: true })
   }
 
+  env() {
+    return Object.assign(super.env(), {
+      'process.modern': true
+    })
+  }
+
   getBabelOptions() {
     const options = clone(this.options.build.babel)
 
diff --git a/packages/webpack/src/config/server.js b/packages/webpack/src/config/server.js
index 9722b3cf69..0fb29ac6ae 100644
--- a/packages/webpack/src/config/server.js
+++ b/packages/webpack/src/config/server.js
@@ -4,8 +4,9 @@ import webpack from 'webpack'
 import escapeRegExp from 'lodash/escapeRegExp'
 import nodeExternals from 'webpack-node-externals'
 
+import VueSSRServerPlugin from '../plugins/vue/server'
+
 import WebpackBaseConfig from './base'
-import VueSSRServerPlugin from './plugins/vue/server'
 
 export default class WebpackServerConfig extends WebpackBaseConfig {
   constructor(builder) {
@@ -29,8 +30,8 @@ export default class WebpackServerConfig extends WebpackBaseConfig {
     return whitelist
   }
 
-  devtool() {
-    return 'cheap-module-inline-source-map'
+  get devtool() {
+    return 'cheap-module-source-map'
   }
 
   env() {
@@ -38,14 +39,15 @@ export default class WebpackServerConfig extends WebpackBaseConfig {
       'process.env.VUE_ENV': JSON.stringify('server'),
       'process.browser': false,
       'process.client': false,
-      'process.server': true
+      'process.server': true,
+      'process.modern': false
     })
   }
 
   optimization() {
     return {
       splitChunks: false,
-      minimizer: []
+      minimizer: this.minimizer()
     }
   }
 
@@ -53,7 +55,7 @@ export default class WebpackServerConfig extends WebpackBaseConfig {
     const plugins = super.plugins()
     plugins.push(
       new VueSSRServerPlugin({
-        filename: 'server-bundle.json'
+        filename: `${this.name}.manifest.json`
       }),
       new webpack.DefinePlugin(this.env())
     )
@@ -70,11 +72,12 @@ export default class WebpackServerConfig extends WebpackBaseConfig {
         app: [path.resolve(this.options.buildDir, 'server.js')]
       },
       output: Object.assign({}, config.output, {
-        filename: 'server-bundle.js',
+        filename: 'server.js',
         libraryTarget: 'commonjs2'
       }),
       performance: {
         hints: false,
+        maxEntrypointSize: Infinity,
         maxAssetSize: Infinity
       },
       externals: []
@@ -83,16 +86,18 @@ export default class WebpackServerConfig extends WebpackBaseConfig {
     // https://webpack.js.org/configuration/externals/#externals
     // https://github.com/liady/webpack-node-externals
     // https://vue-loader.vuejs.org/migrating.html#ssr-externals
-    this.options.modulesDir.forEach((dir) => {
-      if (fs.existsSync(dir)) {
-        config.externals.push(
-          nodeExternals({
-            whitelist: this.whitelist,
-            modulesDir: dir
-          })
-        )
-      }
-    })
+    if (!this.options.build.standalone) {
+      this.options.modulesDir.forEach((dir) => {
+        if (fs.existsSync(dir)) {
+          config.externals.push(
+            nodeExternals({
+              whitelist: this.whitelist,
+              modulesDir: dir
+            })
+          )
+        }
+      })
+    }
 
     return config
   }
diff --git a/packages/webpack/src/config/plugins/vue/client.js b/packages/webpack/src/plugins/vue/client.js
similarity index 80%
rename from packages/webpack/src/config/plugins/vue/client.js
rename to packages/webpack/src/plugins/vue/client.js
index 52ad2576b3..cd33e7a010 100644
--- a/packages/webpack/src/config/plugins/vue/client.js
+++ b/packages/webpack/src/plugins/vue/client.js
@@ -1,3 +1,8 @@
+/**
+ * This file is based on Vue.js (MIT) webpack plugins
+ * https://github.com/vuejs/vue/blob/dev/src/server/webpack-plugin/client.js
+ */
+
 import hash from 'hash-sum'
 import uniq from 'lodash/uniq'
 
@@ -6,7 +11,7 @@ import { isJS, isCSS, onEmit } from './util'
 export default class VueSSRClientPlugin {
   constructor(options = {}) {
     this.options = Object.assign({
-      filename: 'vue-ssr-client-manifest.json'
+      filename: null
     }, options)
   }
 
@@ -45,7 +50,7 @@ export default class VueSSRClientPlugin {
       const assetModules = stats.modules.filter(m => m.assets.length)
       const fileToIndex = file => manifest.all.indexOf(file)
       stats.modules.forEach((m) => {
-        // ignore modules duplicated in multiple chunks
+        // Ignore modules duplicated in multiple chunks
         if (m.chunks.length === 1) {
           const cid = m.chunks[0]
           const chunk = stats.chunks.find(c => c.id === cid)
@@ -54,7 +59,8 @@ export default class VueSSRClientPlugin {
           }
           const id = m.identifier.replace(/\s\w+$/, '') // remove appended hash
           const files = manifest.modules[hash(id)] = chunk.files.map(fileToIndex)
-          // find all asset modules associated with the same chunk
+
+          // Find all asset modules associated with the same chunk
           assetModules.forEach((m) => {
             if (m.chunks.some(id => id === cid)) {
               files.push.apply(files, m.assets.map(fileToIndex))
@@ -63,16 +69,11 @@ export default class VueSSRClientPlugin {
         }
       })
 
-      // const debug = (file, obj) => {
-      //   require('fs').writeFileSync(__dirname + '/' + file, JSON.stringify(obj, null, 2))
-      // }
-      // debug('stats.json', stats)
-      // debug('client-manifest.json', manifest)
+      const src = JSON.stringify(manifest, null, 2)
 
-      const json = JSON.stringify(manifest, null, 2)
       compilation.assets[this.options.filename] = {
-        source: () => json,
-        size: () => json.length
+        source: () => src,
+        size: () => src.length
       }
       cb()
     })
diff --git a/packages/webpack/src/plugins/vue/cors.js b/packages/webpack/src/plugins/vue/cors.js
new file mode 100644
index 0000000000..d1b7138ddf
--- /dev/null
+++ b/packages/webpack/src/plugins/vue/cors.js
@@ -0,0 +1,23 @@
+export default class CorsPlugin {
+  constructor({ crossorigin }) {
+    this.crossorigin = crossorigin
+  }
+
+  apply(compiler) {
+    const ID = `vue-cors-plugin`
+    compiler.hooks.compilation.tap(ID, (compilation) => {
+      compilation.hooks.htmlWebpackPluginAlterAssetTags.tap(ID, (data) => {
+        if (!this.crossorigin) {
+          return
+        }
+        [...data.head, ...data.body].forEach((tag) => {
+          if (['script', 'link'].includes(tag.tagName)) {
+            if (tag.attributes) {
+              tag.attributes.crossorigin = this.crossorigin
+            }
+          }
+        })
+      })
+    })
+  }
+}
diff --git a/packages/webpack/src/config/plugins/vue/modern.js b/packages/webpack/src/plugins/vue/modern.js
similarity index 79%
rename from packages/webpack/src/config/plugins/vue/modern.js
rename to packages/webpack/src/plugins/vue/modern.js
index f6b05f5e4f..0593429dc1 100644
--- a/packages/webpack/src/config/plugins/vue/modern.js
+++ b/packages/webpack/src/plugins/vue/modern.js
@@ -1,16 +1,14 @@
 /*
-** This plugin is inspired by @vue/cli-service ModernModePlugin
-** https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/webpack/ModernModePlugin.js
+* This file is based on @vue/cli-service (MIT) ModernModePlugin
+* https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/webpack/ModernModePlugin.js
 */
-import EventEmitter from 'events'
 
-// https://gist.github.com/samthor/64b114e4a4f539915a95b91ffd340acc
-const safariFix = `!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();`
+import EventEmitter from 'events'
 
 const assetsMap = {}
 const watcher = new EventEmitter()
 
-class ModernModePlugin {
+export default class ModernModePlugin {
   constructor({ targetDir, isModernBuild }) {
     this.targetDir = targetDir
     this.isModernBuild = isModernBuild
@@ -79,13 +77,6 @@ class ModernModePlugin {
           }
         })
 
-        // inject Safari 10 nomodule fix
-        data.body.push({
-          tagName: 'script',
-          closeTag: true,
-          innerHTML: safariFix
-        })
-
         // inject links for legacy assets as <script nomodule>
         const fileName = data.plugin.options.filename
         const legacyAssets = (await this.getAssets(fileName))
@@ -102,11 +93,16 @@ class ModernModePlugin {
 
       compilation.hooks.htmlWebpackPluginAfterHtmlProcessing.tap(ID, (data) => {
         data.html = data.html.replace(/\snomodule="">/g, ' nomodule>')
+
+        // inject Safari 10 nomodule fix
+        data.html = data.html.replace(
+          /(<\/body\s*>)/i,
+          match => `<script>${ModernModePlugin.safariFix}</script>${match}`
+        )
       })
     })
   }
 }
 
-ModernModePlugin.safariFix = safariFix
-
-export default ModernModePlugin
+// https://gist.github.com/samthor/64b114e4a4f539915a95b91ffd340acc
+ModernModePlugin.safariFix = `!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();`
diff --git a/packages/webpack/src/config/plugins/vue/server.js b/packages/webpack/src/plugins/vue/server.js
similarity index 65%
rename from packages/webpack/src/config/plugins/vue/server.js
rename to packages/webpack/src/plugins/vue/server.js
index 2f71ff3e06..422df372bd 100644
--- a/packages/webpack/src/config/plugins/vue/server.js
+++ b/packages/webpack/src/plugins/vue/server.js
@@ -3,7 +3,7 @@ import { validate, isJS, onEmit } from './util'
 export default class VueSSRServerPlugin {
   constructor(options = {}) {
     this.options = Object.assign({
-      filename: 'vue-ssr-server-bundle.json'
+      filename: null
     }, options)
   }
 
@@ -12,7 +12,7 @@ export default class VueSSRServerPlugin {
 
     onEmit(compiler, 'vue-server-plugin', (compilation, cb) => {
       const stats = compilation.getStats().toJson()
-      const entryName = Object.keys(stats.entrypoints)[0]
+      const [entryName] = Object.keys(stats.entrypoints)
       const entryInfo = stats.entrypoints[entryName]
 
       if (!entryInfo) {
@@ -29,7 +29,7 @@ export default class VueSSRServerPlugin {
         )
       }
 
-      const entry = entryAssets[0]
+      const [entry] = entryAssets
       if (!entry || typeof entry !== 'string') {
         throw new Error(
           `Entry "${entryName}" not found. Did you specify the correct entry option?`
@@ -44,20 +44,20 @@ export default class VueSSRServerPlugin {
 
       stats.assets.forEach((asset) => {
         if (isJS(asset.name)) {
-          bundle.files[asset.name] = compilation.assets[asset.name].source()
+          bundle.files[asset.name] = asset.name
         } else if (asset.name.match(/\.js\.map$/)) {
-          bundle.maps[asset.name.replace(/\.map$/, '')] = JSON.parse(compilation.assets[asset.name].source())
+          bundle.maps[asset.name.replace(/\.map$/, '')] = asset.name
+        } else {
+          // Do not emit non-js assets for server
+          delete compilation.assets[asset.name]
         }
-        // do not emit anything else for server
-        delete compilation.assets[asset.name]
       })
 
-      const json = JSON.stringify(bundle, null, 2)
-      const filename = this.options.filename
+      const src = JSON.stringify(bundle, null, 2)
 
-      compilation.assets[filename] = {
-        source: () => json,
-        size: () => json.length
+      compilation.assets[this.options.filename] = {
+        source: () => src,
+        size: () => src.length
       }
 
       cb()
diff --git a/packages/webpack/src/config/plugins/vue/util.js b/packages/webpack/src/plugins/vue/util.js
similarity index 61%
rename from packages/webpack/src/config/plugins/vue/util.js
rename to packages/webpack/src/plugins/vue/util.js
index 1adafad9ab..18b62b645d 100644
--- a/packages/webpack/src/config/plugins/vue/util.js
+++ b/packages/webpack/src/plugins/vue/util.js
@@ -1,20 +1,21 @@
-import chalk from 'chalk'
+/**
+ * This file is based on Vue.js (MIT) webpack plugins
+ * https://github.com/vuejs/vue/blob/dev/src/server/webpack-plugin/util.js
+ */
 
-const prefix = `[vue-server-renderer-webpack-plugin]`
-export const warn = msg => console.error(chalk.red(`${prefix} ${msg}\n`)) // eslint-disable-line no-console
-export const tip = msg => console.log(chalk.yellow(`${prefix} ${msg}\n`)) // eslint-disable-line no-console
+import consola from 'consola'
 
 export const validate = (compiler) => {
   if (compiler.options.target !== 'node') {
-    warn('webpack config `target` should be "node".')
+    consola.warn('webpack config `target` should be "node".')
   }
 
   if (compiler.options.output && compiler.options.output.libraryTarget !== 'commonjs2') {
-    warn('webpack config `output.libraryTarget` should be "commonjs2".')
+    consola.warn('webpack config `output.libraryTarget` should be "commonjs2".')
   }
 
   if (!compiler.options.externals) {
-    tip(
+    consola.info(
       'It is recommended to externalize dependencies in the server build for ' +
       'better build performance.'
     )
diff --git a/packages/webpack/src/config/plugins/warnfix.js b/packages/webpack/src/plugins/warnfix.js
similarity index 57%
rename from packages/webpack/src/config/plugins/warnfix.js
rename to packages/webpack/src/plugins/warnfix.js
index ae2802a498..582fc422be 100644
--- a/packages/webpack/src/config/plugins/warnfix.js
+++ b/packages/webpack/src/plugins/warnfix.js
@@ -1,16 +1,10 @@
 export default class WarnFixPlugin {
   apply(compiler) /* istanbul ignore next */ {
     compiler.hooks.done.tap('warnfix-plugin', (stats) => {
-      stats.compilation.warnings = stats.compilation.warnings.filter((warn) => {
-        if (
-          warn.name === 'ModuleDependencyWarning' &&
+      stats.compilation.warnings = stats.compilation.warnings.filter(warn =>
+        !(warn.name === 'ModuleDependencyWarning' &&
           warn.message.includes(`export 'default'`) &&
-          warn.message.includes('nuxt_plugin_')
-        ) {
-          return false
-        }
-        return true
-      })
+          warn.message.includes('nuxt_plugin_')))
     })
   }
 }
diff --git a/packages/webpack/src/utils/index.js b/packages/webpack/src/utils/index.js
new file mode 100644
index 0000000000..1a98c709f2
--- /dev/null
+++ b/packages/webpack/src/utils/index.js
@@ -0,0 +1,3 @@
+export { default as PerfLoader } from './perf-loader'
+export { default as StyleLoader } from './style-loader'
+export { reservedVueTags } from './reserved-tags'
diff --git a/packages/webpack/src/config/utils/perf-loader.js b/packages/webpack/src/utils/perf-loader.js
similarity index 100%
rename from packages/webpack/src/config/utils/perf-loader.js
rename to packages/webpack/src/utils/perf-loader.js
diff --git a/packages/webpack/src/config/utils/postcss.js b/packages/webpack/src/utils/postcss.js
similarity index 94%
rename from packages/webpack/src/config/utils/postcss.js
rename to packages/webpack/src/utils/postcss.js
index a96caedee6..4c1c9299fc 100644
--- a/packages/webpack/src/config/utils/postcss.js
+++ b/packages/webpack/src/utils/postcss.js
@@ -5,7 +5,7 @@ import merge from 'lodash/merge'
 import cloneDeep from 'lodash/cloneDeep'
 import createResolver from 'postcss-import-resolver'
 
-import { isPureObject } from '@nuxt/common'
+import { isPureObject } from '@nuxt/utils'
 
 export const orderPresets = {
   cssnanoLast: (names) => {
@@ -108,16 +108,17 @@ export default class PostcssConfig {
   }
 
   loadPlugins(config) {
-    const plugins = config.plugins
+    const { plugins } = config
     if (isPureObject(plugins)) {
       // Map postcss plugins into instances on object mode once
       config.plugins = this.sortPlugins(config)
         .map((p) => {
-          const plugin = require(p)
+          const plugin = this.nuxt.resolver.requireModule(p)
           const opts = plugins[p]
-          if (opts === false) return // Disabled
-          const instance = plugin(opts)
-          return instance
+          if (opts === false) {
+            return // Disabled
+          }
+          return plugin(opts)
         })
         .filter(Boolean)
     }
diff --git a/packages/webpack/src/utils/reserved-tags.js b/packages/webpack/src/utils/reserved-tags.js
new file mode 100644
index 0000000000..a29d1b9795
--- /dev/null
+++ b/packages/webpack/src/utils/reserved-tags.js
@@ -0,0 +1,23 @@
+export const reservedVueTags = [
+  // HTML tags
+  'html', 'body', 'base', 'head', 'link', 'meta', 'style', 'title', 'address',
+  'article', 'aside', 'footer', 'header', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+  'hgroup', 'nav', 'section', 'div', 'dd', 'dl', 'dt', 'figcaption', 'figure',
+  'picture', 'hr', 'img', 'li', 'main', 'ol', 'p', 'pre', 'ul', 'a', 'b', 'abbr',
+  'bdi', 'bdo', 'br', 'cite', 'code', 'data', 'dfn', 'em', 'i', 'kbd', 'mark',
+  'q', 'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'small', 'span', 'strong', 'sub',
+  'sup', 'time', 'u', 'var', 'wbr', 'area', 'audio', 'map', 'track', 'video',
+  'embed', 'object', 'param', 'source', 'canvas', 'script', 'noscript', 'del',
+  'ins', 'caption', 'col', 'colgroup', 'table', 'thead', 'tbody', 'td', 'th', 'tr',
+  'button', 'datalist', 'fieldset', 'form', 'input', 'label', 'legend', 'meter',
+  'optgroup', 'option', 'output', 'progress', 'select', 'textarea', 'details',
+  'dialog', 'menu', 'menuitem', 'summary', 'content', 'element', 'shadow', 'template',
+  'blockquote', 'iframe', 'tfoot',
+  // SVG tags
+  'svg', 'animate', 'circle', 'clippath', 'cursor', 'defs', 'desc', 'ellipse', 'filter',
+  'font-face', 'foreignObject', 'g', 'glyph', 'image', 'line', 'marker', 'mask',
+  'missing-glyph', 'path', 'pattern', 'polygon', 'polyline', 'rect', 'switch', 'symbol',
+  'text', 'textpath', 'tspan', 'use', 'view',
+  // Vue built-in tags
+  'slot', 'component'
+]
diff --git a/packages/webpack/src/config/utils/style-loader.js b/packages/webpack/src/utils/style-loader.js
similarity index 77%
rename from packages/webpack/src/config/utils/style-loader.js
rename to packages/webpack/src/utils/style-loader.js
index 3877be4c76..843c4e897f 100644
--- a/packages/webpack/src/config/utils/style-loader.js
+++ b/packages/webpack/src/utils/style-loader.js
@@ -1,7 +1,7 @@
 import path from 'path'
-import MiniCssExtractPlugin from 'mini-css-extract-plugin'
+import ExtractCssChunksPlugin from 'extract-css-chunks-webpack-plugin'
 
-import { wrapArray } from '@nuxt/common'
+import { wrapArray } from '@nuxt/utils'
 
 import PostcssConfig from './postcss'
 
@@ -9,12 +9,9 @@ export default class StyleLoader {
   constructor(options, nuxt, { isServer, perfLoader }) {
     this.isServer = isServer
     this.perfLoader = perfLoader
-    this.dev = options.dev
-    this.srcDir = options.srcDir
-    this.assetsDir = options.dir.assets
-    this.staticDir = options.dir.static
     this.rootDir = options.rootDir
     this.loaders = {
+      vueStyle: options.build.loaders.vueStyle,
       css: options.build.loaders.css,
       cssModules: options.build.loaders.cssModules
     }
@@ -27,6 +24,10 @@ export default class StyleLoader {
     }
   }
 
+  get exportOnlyLocals() {
+    return Boolean(this.isServer && this.extractCSS)
+  }
+
   normalize(loaders) {
     loaders = wrapArray(loaders)
     return loaders.map(loader => (typeof loader === 'string' ? { loader } : loader))
@@ -64,29 +65,25 @@ export default class StyleLoader {
   }
 
   css(options) {
-    return {
-      loader: (this.isServer && this.extractCSS) ? 'css-loader/locals' : 'css-loader',
-      options
-    }
+    options.exportOnlyLocals = this.exportOnlyLocals
+    return [
+      ...options.exportOnlyLocals ? [] : [this.styleLoader()],
+      { loader: 'css-loader', options }
+    ]
   }
 
   cssModules(options) {
-    options.modules = true
-    return {
-      loader: 'css-loader',
-      options
-    }
+    return this.css(Object.assign(options, { modules: true }))
   }
 
   extract() {
-    if (this.extractCSS && !this.isServer) {
-      return MiniCssExtractPlugin.loader
+    if (this.extractCSS) {
+      return ExtractCssChunksPlugin.loader
     }
   }
 
-  vueStyle() {
-    // https://github.com/vuejs/vue-style-loader
-    return {
+  styleLoader() {
+    return this.extract() || {
       loader: 'vue-style-loader',
       options: this.loaders.vueStyle
     }
@@ -101,14 +98,11 @@ export default class StyleLoader {
 
     this.loaders.css.importLoaders = this.loaders.cssModules.importLoaders = customLoaders.length
 
-    const styleLoader = this.extract() || this.vueStyle()
-
     return [
       // This matches <style module>
       {
         resourceQuery: /module/,
         use: this.perfLoader.css().concat(
-          styleLoader,
           this.cssModules(this.loaders.cssModules),
           customLoaders
         )
@@ -116,7 +110,6 @@ export default class StyleLoader {
       // This matches plain <style> or <style scoped>
       {
         use: this.perfLoader.css().concat(
-          styleLoader,
           this.css(this.loaders.css),
           customLoaders
         )
diff --git a/renovate.json b/renovate.json
index 6606a80649..90df38a90a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,5 +4,8 @@
   ],
   "baseBranches": [
     "dev"
+  ],
+  "ignoreDeps": [
+    "thread-loader"
   ]
 }
diff --git a/scripts/commits b/scripts/commits
index ab84c79f05..f161b0268a 100755
--- a/scripts/commits
+++ b/scripts/commits
@@ -4,6 +4,8 @@
 
 latestTag=`git describe | grep -oE "^[^-]+"`
 
+echo "Comaparing $latestTag...dev"
+
 diff=`git --no-pager log $latestTag...dev --pretty="%s (%an) (%h)"`
 
 echo
@@ -15,3 +17,10 @@ echo
 echo "# Fixes"
 echo "$diff" | awk '!/feat/'
 echo "$diff" | awk '!/feat/' | grep -oE "[0-9a-f]{8}" > .git/fix.txt
+
+echo
+echo "To apply diff into target banch:"
+echo "$ git cherry-pick \`tac .git/fix.txt\`"
+echo "In case of conflicts:"
+echo "$ yarn"
+echo "$ git cherry-pick --continue"
diff --git a/scripts/dev b/scripts/dev
index 23a7898816..2e70b3c6ab 100755
--- a/scripts/dev
+++ b/scripts/dev
@@ -5,9 +5,9 @@ import consola from 'consola'
 
 import Package from './package.js'
 
-const useCjs = new Set([
+const useCjs = [
   '@nuxt/cli'
-])
+]
 
 const stub = {
   es: `export * from '../src/index'`,
@@ -22,13 +22,44 @@ const _require = esm(module, {
   }
 })
 
+const execa = require('execa')
+
+global.__NUXT = new Proxy({}, {
+  get(target, propertyKey, receiver) {
+    if (propertyKey === 'version') {
+      try {
+        const { stdout } = execa.sync('git', ['status', '-s', '-b', '--porcelain=2'])
+
+        const status = { dirty: false }
+        for (const line of stdout.split('\\n')) {
+          if (line[0] === '#') {
+            const match = line.match(/branch\.([^\\s]+) (.*)\$/)
+            if (match && match.length) {
+              status[match[1]] = match[2]
+            }
+          } else {
+            status.dirty = true
+            break
+          }
+        }
+
+        return \`git<\${status.head}\${status.dirty ? '~' : '-'}\${(status.oid && status.oid.substr(0, 7)) || ''}> (\${status.ab})\`
+      } catch (err) {
+        return 'source'
+      }
+    }
+
+    return target[propertyKey]
+  }
+})
+
 module.exports = _require('../src/index')
-`}
+` }
 
 async function main() {
   // Read package at current directory
   const rootPackage = new Package()
-  const workspacePackages = rootPackage.getWorkspacePackages()
+  const workspacePackages = await rootPackage.getWorkspacePackages()
 
   // Create a dev-only entrypoint to the src
   for (const pkg of workspacePackages) {
@@ -38,7 +69,7 @@ async function main() {
     consola.info(pkg.pkg.main)
     const distMain = pkg.resolvePath(pkg.pkg.main)
     await fs.mkdirp(path.dirname(distMain))
-    await fs.writeFile(distMain, useCjs.has(pkg.pkg.name) ? stub.cjs : stub.es)
+    await fs.writeFile(distMain, useCjs.includes(pkg.pkg.name) ? stub.cjs : stub.es)
   }
 }
 
diff --git a/scripts/package b/scripts/package
index 40ef6bac3a..52bfdaaf1c 100755
--- a/scripts/package
+++ b/scripts/package
@@ -7,7 +7,7 @@ import Package from './package.js'
 async function main() {
   // Read package at current directory
   const rootPackage = new Package()
-  const workspacePackages = rootPackage.getWorkspacePackages()
+  const workspacePackages = await rootPackage.getWorkspacePackages()
 
   const watch = process.argv.includes('--watch')
 
@@ -27,8 +27,8 @@ async function main() {
   // Step 1: Apply suffixes
   for (const pkg of workspacePackages) {
     if (pkg.options.suffix && pkg.options.suffix.length) {
-      pkg.suffixAndVersion()
-      pkg.writePackage()
+      await pkg.suffixAndVersion()
+      await pkg.writePackage()
     }
   }
 
diff --git a/scripts/package.js b/scripts/package.js
index 70c2b81184..7af28fb14c 100644
--- a/scripts/package.js
+++ b/scripts/package.js
@@ -1,11 +1,11 @@
 import { resolve } from 'path'
-import EventEmitter from 'events'
 import consola from 'consola'
-import { sync as spawnSync } from 'cross-spawn'
-import { existsSync, readJSONSync, writeFileSync, copySync, removeSync } from 'fs-extra'
+import spawn from 'cross-spawn'
+import { existsSync, readJSONSync, writeFile, copy, remove } from 'fs-extra'
 import _ from 'lodash'
 import { rollup, watch } from 'rollup'
-import glob from 'glob'
+import { glob as _glob } from 'glob'
+import pify from 'pify'
 import sortPackageJson from 'sort-package-json'
 
 import rollupConfig from './rollup.config'
@@ -16,27 +16,31 @@ const DEFAULTS = {
   configPath: 'package.js',
   distDir: 'dist',
   build: false,
-  suffix: process.env.PACKAGE_SUFFIX ? `-${process.env.PACKAGE_SUFFIX}` : ''
+  suffix: process.env.PACKAGE_SUFFIX ? `-${process.env.PACKAGE_SUFFIX}` : '',
+  hooks: {}
 }
 
+const glob = pify(_glob)
+
 const sortObjectKeys = obj => _(obj).toPairs().sortBy(0).fromPairs().value()
 
-export default class Package extends EventEmitter {
+export default class Package {
   constructor(options) {
-    super()
-
     // Assign options
     this.options = Object.assign({}, DEFAULTS, options)
 
-    // Initialize
-    this.init()
+    // Basic logger
+    this.logger = consola
+
+    // Init (sync)
+    this._init()
   }
 
-  init() {
+  _init() {
     // Try to read package.json
     this.readPkg()
 
-    // Init logger
+    // Use tagged logger
     this.logger = consola.withTag(this.pkg.name)
 
     // Try to load config
@@ -59,24 +63,38 @@ export default class Package extends EventEmitter {
       config = config.default || config
 
       Object.assign(this.options, config)
-
-      if (typeof config.extend === 'function') {
-        config.extend(this, {
-          load: (relativePath, opts) => new Package(Object.assign({
-            rootDir: this.resolvePath(relativePath)
-          }, opts))
-        })
-      }
     }
   }
 
-  writePackage() {
+  async callHook(name, ...args) {
+    let fns = this.options.hooks[name]
+
+    if (!fns) {
+      return
+    }
+
+    if (!Array.isArray(fns)) {
+      fns = [fns]
+    }
+
+    for (const fn of fns) {
+      await fn(this, ...args)
+    }
+  }
+
+  load(relativePath, opts) {
+    return new Package(Object.assign({
+      rootDir: this.resolvePath(relativePath)
+    }, opts))
+  }
+
+  async writePackage() {
     if (this.options.sortDependencies) {
       this.sortDependencies()
     }
     const pkgPath = this.resolvePath(this.options.pkgPath)
     this.logger.debug('Writing', pkgPath)
-    writeFileSync(pkgPath, JSON.stringify(this.pkg, null, 2) + '\n')
+    await writeFile(pkgPath, JSON.stringify(this.pkg, null, 2) + '\n')
   }
 
   generateVersion() {
@@ -89,7 +107,8 @@ export default class Package extends EventEmitter {
   tryRequire(id) {
     try {
       return require(id)
-    } catch (e) {}
+    } catch (e) {
+    }
   }
 
   suffixAndVersion() {
@@ -114,7 +133,7 @@ export default class Package extends EventEmitter {
     }
 
     if (typeof this.pkg.bin === 'string') {
-      const bin = this.pkg.bin
+      const { bin } = this.pkg
       this.pkg.bin = {
         [oldPkgName]: bin,
         [this.pkg.name]: bin
@@ -147,62 +166,68 @@ export default class Package extends EventEmitter {
     }
   }
 
-  getWorkspacePackages() {
+  async getWorkspacePackages() {
     const packages = []
 
     for (const workspace of this.pkg.workspaces || []) {
-      const dirs = glob.sync(workspace)
+      const dirs = await glob(workspace)
       for (const dir of dirs) {
-        const pkg = new Package({
-          rootDir: this.resolvePath(dir)
-        })
-        packages.push(pkg)
+        if (existsSync(this.resolvePath(dir, 'package.json'))) {
+          const pkg = new Package({ rootDir: this.resolvePath(dir) })
+          packages.push(pkg)
+        } else {
+          consola.warn('Invalid workspace package:', dir)
+        }
       }
     }
 
     return packages
   }
 
-  async build(options = {}, _watch = false) {
-    this.emit('build:before')
-
-    // Extend options
-    const replace = Object.assign({}, options.replace)
-    const alias = Object.assign({}, options.alias)
+  async build(_watch = false) {
+    // Prepare rollup config
+    const config = {
+      rootDir: this.options.rootDir,
+      alias: {},
+      replace: {}
+    }
 
     // Replace linkedDependencies with their suffixed version
     if (this.options.suffix && this.options.suffix.length) {
       for (const _name of (this.options.linkedDependencies || [])) {
         const name = _name + this.options.suffix
-        if (replace[`'${_name}'`] === undefined) {
-          replace[`'${_name}'`] = `'${name}'`
-        }
-        if (alias[_name] === undefined) {
-          alias[_name] = name
-        }
+        config.replace[`'${_name}'`] = `'${name}'`
+        config.alias[_name] = name
       }
     }
 
-    const config = rollupConfig({
-      rootDir: this.options.rootDir,
-      ...options,
-      replace,
-      alias
-    }, this.pkg)
+    // Allow extending config
+    await this.callHook('build:extend', { config })
+
+    // Create rollup config
+    const _rollupConfig = rollupConfig(config, this.pkg)
+
+    // Allow extending rollup config
+    await this.callHook('build:extendRollup', {
+      rollupConfig: _rollupConfig
+    })
 
     if (_watch) {
       // Watch
-      const watcher = watch(config)
+      const watcher = watch(_rollupConfig)
       watcher.on('event', (event) => {
         switch (event.code) {
           // The watcher is (re)starting
-          case 'START': return this.logger.debug('Watching for changes')
+          case 'START':
+            return this.logger.debug('Watching for changes')
 
           // Building an individual bundle
-          case 'BUNDLE_START': return this.logger.debug('Building bundle')
+          case 'BUNDLE_START':
+            return this.logger.debug('Building bundle')
 
           // Finished building a bundle
-          case 'BUNDLE_END': return
+          case 'BUNDLE_END':
+            return
 
           // Finished building all bundles
           case 'END':
@@ -210,24 +235,28 @@ export default class Package extends EventEmitter {
             return this.logger.success('Bundle built')
 
           // Encountered an error while bundling
-          case 'ERROR': return this.logger.error(event.error)
+          case 'ERROR':
+            return this.logger.error(event.error)
 
           // Eencountered an unrecoverable error
-          case 'FATAL': return this.logger.fatal(event.error)
+          case 'FATAL':
+            return this.logger.fatal(event.error)
 
           // Unknown event
-          default: return this.logger.info(JSON.stringify(event))
+          default:
+            return this.logger.info(JSON.stringify(event))
         }
       })
     } else {
       // Build
       this.logger.info('Building bundle')
       try {
-        const bundle = await rollup(config)
-        removeSync(config.output.dir)
-        await bundle.write(config.output)
+        const bundle = await rollup(_rollupConfig)
+        await remove(_rollupConfig.output.dir)
+        await bundle.write(_rollupConfig.output)
+
         this.logger.success('Bundle built')
-        this.emit('build:done')
+        await this.callHook('build:done', { bundle })
 
         // Analyze bundle imports against pkg
         // if (this.pkg.dependencies) {
@@ -249,13 +278,13 @@ export default class Package extends EventEmitter {
     }
   }
 
-  watch(options) {
-    return this.build(options, true)
+  watch() {
+    return this.build(true)
   }
 
-  publish(tag = 'latest') {
+  async publish(tag = 'latest') {
     this.logger.info(`publishing ${this.pkg.name}@${this.pkg.version} with tag ${tag}`)
-    this.exec('npm', `publish --tag ${tag}`)
+    await this.exec('npm', `publish --tag ${tag}`)
   }
 
   copyFieldsFrom(source, fields = []) {
@@ -264,11 +293,11 @@ export default class Package extends EventEmitter {
     }
   }
 
-  copyFilesFrom(source, files) {
+  async copyFilesFrom(source, files) {
     for (const file of files || source.pkg.files || []) {
       const src = resolve(source.options.rootDir, file)
       const dst = resolve(this.options.rootDir, file)
-      copySync(src, dst)
+      await copy(src, dst)
     }
   }
 
@@ -288,7 +317,7 @@ export default class Package extends EventEmitter {
   }
 
   exec(command, args, silent = false) {
-    const r = spawnSync(command, args.split(' '), { cwd: this.options.rootDir }, { env: process.env })
+    const r = spawn.sync(command, args.split(' '), { cwd: this.options.rootDir }, { env: process.env })
 
     if (!silent) {
       const fullCommand = command + ' ' + args
@@ -314,10 +343,12 @@ export default class Package extends EventEmitter {
   }
 
   gitShortCommit() {
-    return this.exec('git', 'rev-parse --short HEAD', true).stdout
+    const { stdout } = this.exec('git', 'rev-parse --short HEAD', true)
+    return stdout
   }
 
   gitBranch() {
-    return this.exec('git', 'rev-parse --abbrev-ref HEAD', true).stdout
+    const { stdout } = this.exec('git', 'rev-parse --abbrev-ref HEAD', true)
+    return stdout
   }
 }
diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js
index fbd31474c2..b7a689810a 100644
--- a/scripts/rollup.config.js
+++ b/scripts/rollup.config.js
@@ -7,6 +7,7 @@ import replacePlugin from 'rollup-plugin-replace'
 import aliasPlugin from 'rollup-plugin-alias'
 import nodeResolvePlugin from 'rollup-plugin-node-resolve'
 import defaultsDeep from 'lodash/defaultsDeep'
+import consola from 'consola'
 
 import { builtins } from './builtins'
 
@@ -16,20 +17,28 @@ export default function rollupConfig({
   input = 'src/index.js',
   replace = {},
   alias = {},
+  resolve = {
+    only: [
+      /lodash/
+    ]
+  },
   ...options
 }, pkg) {
   if (!pkg) {
     pkg = readJSONSync(path.resolve(rootDir, 'package.json'))
   }
 
+  const name = path.basename(pkg.name.replace('-edge', ''))
+
   return defaultsDeep({}, options, {
     input: path.resolve(rootDir, input),
     output: {
-      file: `${pkg.name.replace('-edge', '')}.js`,
       dir: path.resolve(rootDir, 'dist'),
-      format: 'cjs'
+      entryFileNames: `${name}.js`,
+      chunkFileNames: `${name}-[name].js`,
+      format: 'cjs',
+      preferConst: true
     },
-    preferConst: true,
     external: [
       // Dependencies that will be installed alongise with the nuxt package
       ...Object.keys(pkg.dependencies || {}),
@@ -46,11 +55,7 @@ export default function rollupConfig({
           ...replace
         }
       }),
-      nodeResolvePlugin({
-        only: [
-          /lodash/
-        ]
-      }),
+      nodeResolvePlugin(resolve),
       commonjsPlugin(),
       jsonPlugin(),
       licensePlugin({
@@ -64,6 +69,12 @@ export default function rollupConfig({
           `*/`
         ].join('\n')
       })
-    ].concat(plugins)
+    ].concat(plugins),
+    onwarn(warning, warn) {
+      if (warning.plugin === 'rollup-plugin-license') {
+        return
+      }
+      consola.warn(warning)
+    }
   })
 }
diff --git a/test/e2e/basic.browser.test.js b/test/e2e/basic.browser.test.js
index a62f553b28..0b7a402ea5 100644
--- a/test/e2e/basic.browser.test.js
+++ b/test/e2e/basic.browser.test.js
@@ -58,7 +58,7 @@ describe('basic browser', () => {
   test('/css', async () => {
     await page.nuxt.navigate('/css')
 
-    expect(await page.$text('.red')).toBe('This is red')
+    expect(await page.$text('.red', true)).toEqual('This is red')
     expect(await page.$eval('.red', (red) => {
       const { color, backgroundColor } = window.getComputedStyle(red)
       return { color, backgroundColor }
@@ -78,8 +78,10 @@ describe('basic browser', () => {
   test('/store', async () => {
     await page.nuxt.navigate('/store')
 
-    expect(await page.$text('h1')).toBe('Vuex Nested Modules')
-    expect(await page.$text('p')).toBe('1')
+    expect(await page.$text('h1')).toBe('foo/bar/baz: Vuex Nested Modules')
+    expect(await page.$text('h2')).toBe('index/counter: 1')
+    expect(await page.$text('h3')).toBe('foo/blarg/getVal: 4')
+    expect(await page.$text('h4')).toBe('foo/bab/getBabVal: 10')
   })
 
   test('/head', async () => {
@@ -119,6 +121,15 @@ describe('basic browser', () => {
     expect(await page.$text('h1')).toBe('User: 1')
   })
 
+  test('/scroll-to-top', async () => {
+    const page = await browser.page(url('/scroll-to-top'))
+    await page.evaluate(() => window.scrollBy(0, window.innerHeight))
+    await page.nuxt.navigate('/scroll-to-top/other')
+    const pageYOffset = await page.evaluate(() => window.pageYOffset)
+    expect(pageYOffset).toBeGreaterThan(0)
+    page.close()
+  })
+
   test('/validate should display a 404', async () => {
     await page.nuxt.navigate('/validate')
 
@@ -166,7 +177,7 @@ describe('basic browser', () => {
     await page.nuxt.navigate('/error2')
 
     expect(await page.$text('.title')).toBe('Custom error')
-    expect(await page.nuxt.errorData()).toEqual({ message: 'Custom error', statusCode: 500 })
+    expect(await page.nuxt.errorData()).toEqual({ message: 'Custom error', statusCode: 500, customProp: 'ezpz' })
   })
 
   test('/redirect-middleware', async () => {
diff --git a/test/e2e/basic.vue-config.test.js b/test/e2e/basic.vue-config.test.js
index 61386f1e0e..bb0a008558 100644
--- a/test/e2e/basic.vue-config.test.js
+++ b/test/e2e/basic.vue-config.test.js
@@ -30,8 +30,8 @@ describe('basic vue-config', () => {
     expect(nuxt.options.vue.config).toEqual({ silent: true, performance: false })
     page = await browser.page(url('/config'))
 
-    expect(await page.$text('#silent')).toBe('true')
-    expect(await page.$text('#performance')).toBe('false')
+    expect(await page.$text('#silent', true)).toBe('true')
+    expect(await page.$text('#performance', true)).toBe('false')
   })
 
   test('explicit', async () => {
@@ -40,9 +40,9 @@ describe('basic vue-config', () => {
 
     expect(nuxt.options.vue.config).toEqual({ silent: false, performance: true, devtools: true })
 
-    expect(await page.$text('#silent')).toBe('false')
-    expect(await page.$text('#performance')).toBe('true')
-    expect(await page.$text('#devtools')).toBe('true')
+    expect(await page.$text('#silent', true)).toBe('false')
+    expect(await page.$text('#performance', true)).toBe('true')
+    expect(await page.$text('#devtools', true)).toBe('true')
   })
 
   afterEach(async () => {
diff --git a/test/e2e/children.patch.browser.test.js b/test/e2e/children.patch.browser.test.js
index 02ad78da15..e2fef3a1bd 100644
--- a/test/e2e/children.patch.browser.test.js
+++ b/test/e2e/children.patch.browser.test.js
@@ -106,7 +106,7 @@ describe('children patch (browser)', () => {
     await page.type('[data-test-search-input]', 'gu')
 
     await waitFor(250)
-    const newCountries = await page.$$text('[data-test-search-result]')
+    const newCountries = await page.$$text('[data-test-search-result]', true)
     expect(newCountries.length).toBe(1)
     expect(newCountries).toEqual(['Guinea'])
     expect(await page.nuxt.routeData()).toEqual({
diff --git a/test/fixtures/basic/layouts/custom.js b/test/fixtures/basic/layouts/custom.js
new file mode 100644
index 0000000000..b0bcd797b8
--- /dev/null
+++ b/test/fixtures/basic/layouts/custom.js
@@ -0,0 +1,10 @@
+export default {
+  render(h) {
+    return h('div',
+      [
+        h('h1', 'JS Layout'),
+        h('nuxt')
+      ]
+    )
+  }
+}
diff --git a/test/fixtures/basic/layouts/default.vue b/test/fixtures/basic/layouts/default.vue
new file mode 100644
index 0000000000..0acb4c7997
--- /dev/null
+++ b/test/fixtures/basic/layouts/default.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <Nuxt />
+  </div>
+</template>
diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js
index 0e6f38f8a7..f17e9c587b 100644
--- a/test/fixtures/basic/nuxt.config.js
+++ b/test/fixtures/basic/nuxt.config.js
@@ -39,7 +39,7 @@ export default {
   },
   head() {
     return {
-      titleTemplate: (titleChunk) => {
+      titleTemplate(titleChunk) {
         return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
       }
     }
diff --git a/test/fixtures/basic/pages/config.vue b/test/fixtures/basic/pages/config.vue
index 2534c69d0b..83fb353e07 100644
--- a/test/fixtures/basic/pages/config.vue
+++ b/test/fixtures/basic/pages/config.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <span v-for="(key,i) in configKeys" :id="key" :key="i">{{ vueConfig[key] | toStr }}</span>
+    <span v-for="(key,i) in configKeys" :id="key" :key="i">
+      {{ vueConfig[key] | toStr }}
+    </span>
   </div>
 </template>
 
diff --git a/test/fixtures/basic/pages/css.vue b/test/fixtures/basic/pages/css.vue
index 08eca4556c..8bf4d9da7d 100644
--- a/test/fixtures/basic/pages/css.vue
+++ b/test/fixtures/basic/pages/css.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="red">This is red</div>
+  <div class="red">
+    This is red
+  </div>
 </template>
 
 <style>
diff --git a/test/fixtures/basic/pages/custom.js b/test/fixtures/basic/pages/custom.js
new file mode 100644
index 0000000000..98982336b2
--- /dev/null
+++ b/test/fixtures/basic/pages/custom.js
@@ -0,0 +1,6 @@
+export default {
+  layout: 'custom',
+  render(h) {
+    return h('h2', 'custom page')
+  }
+}
diff --git a/test/fixtures/basic/pages/error2.vue b/test/fixtures/basic/pages/error2.vue
index 252ad842a4..8c97235635 100644
--- a/test/fixtures/basic/pages/error2.vue
+++ b/test/fixtures/basic/pages/error2.vue
@@ -5,7 +5,7 @@
 <script>
 export default {
   asyncData({ error }) {
-    error({ message: 'Custom error' })
+    error({ message: 'Custom error', customProp: 'ezpz' })
   }
 }
 </script>
diff --git a/test/fixtures/basic/pages/no-ssr.vue b/test/fixtures/basic/pages/no-ssr.vue
index 5073989d45..16f7827aad 100644
--- a/test/fixtures/basic/pages/no-ssr.vue
+++ b/test/fixtures/basic/pages/no-ssr.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <no-ssr placeholder="Loading..." placeholder-tag="p">
+    <NoSsr placeholder="Loading..." placeholder-tag="p">
       <h1>Displayed only on client-side</h1>
-    </no-ssr>
+    </NoSsr>
   </div>
 </template>
diff --git a/test/fixtures/basic/pages/postcss.vue b/test/fixtures/basic/pages/postcss.vue
new file mode 100644
index 0000000000..976a4f653b
--- /dev/null
+++ b/test/fixtures/basic/pages/postcss.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="red">
+    This is red
+  </div>
+</template>
+
+<style lang="postcss">
+@custom-selector :--red div.red;
+:--red {
+  background-color: blue;
+}
+.red {
+  color: red;
+}
+</style>
diff --git a/test/fixtures/basic/pages/scroll-to-top/index.vue b/test/fixtures/basic/pages/scroll-to-top/index.vue
new file mode 100644
index 0000000000..a22be0381c
--- /dev/null
+++ b/test/fixtures/basic/pages/scroll-to-top/index.vue
@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <NuxtLink to="/scroll-to-top/other">
+      go to other
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+}
+</script>
+
+<style>
+div {
+  margin-top: 1500px;
+}
+</style>
diff --git a/test/fixtures/basic/pages/scroll-to-top/other.vue b/test/fixtures/basic/pages/scroll-to-top/other.vue
new file mode 100644
index 0000000000..f185b84991
--- /dev/null
+++ b/test/fixtures/basic/pages/scroll-to-top/other.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <NuxtLink to="/scroll-to-top">
+      go to index
+    </NuxtLink>
+  </div>
+</template>
+
+<script>
+export default {
+  scrollToTop: false
+}
+</script>
diff --git a/test/fixtures/basic/pages/store.vue b/test/fixtures/basic/pages/store.vue
index d9d834cd51..9cb29c2bd2 100644
--- a/test/fixtures/basic/pages/store.vue
+++ b/test/fixtures/basic/pages/store.vue
@@ -1,12 +1,16 @@
 <template>
   <div>
-    <h1>{{ baz }}</h1>
+    <h1>foo/bar/baz: {{ baz }}</h1>
     <br>
-    <p>{{ $store.state.counter }}</p>
+    <h2>index/counter: {{ $store.state.counter }}</h2>
     <br>
-    <h2>{{ getVal }}</h2>
+    <h3>foo/blarg/getVal: {{ getVal }}</h3>
     <br>
-    <h3>{{ getBabVal }}</h3>
+    <h4>foo/bab/getBabVal: {{ getBabVal }}</h4>
+    <br>
+    <button @click="$store.commit('increment')">
+      +1
+    </button>
   </div>
 </template>
 
diff --git a/test/fixtures/children/layouts/patch.vue b/test/fixtures/children/layouts/patch.vue
index bb3501ee6c..1b5cdc7520 100644
--- a/test/fixtures/children/layouts/patch.vue
+++ b/test/fixtures/children/layouts/patch.vue
@@ -1,15 +1,47 @@
 <template>
   <div>
-    <nuxt />
+    <Nuxt />
     <ul>
-      <li><nuxt-link data-test-id="patch" to="/patch">/patch</nuxt-link></li>
-      <li><nuxt-link data-test-id="patch-id-1" to="/patch/1">/patch/1</nuxt-link></li>
-      <li><nuxt-link data-test-id="patch-id-2" to="/patch/2">/patch/2</nuxt-link></li>
-      <li><nuxt-link data-test-id="patch-id-2" to="/patch/2#test">/patch/2#test</nuxt-link></li>
-      <li><nuxt-link data-test-id="patch-id-child" to="/patch/2/child">/patch/2/child</nuxt-link></li>
-      <li><nuxt-link data-test-id="patch-id-2-child-1" to="/patch/2/child/1">/patch/2/child/1</nuxt-link></li>
-      <li><nuxt-link data-test-id="patch-id-2-child-1" to="/patch/2/child/1?query=true">/patch/2/child/1?query=true</nuxt-link></li>
-      <li><nuxt-link data-test-id="patch-id-2-child-1" to="/patch/2/child/1?query=true#test">/patch/2/child/1?query=true#test</nuxt-link></li>
+      <li>
+        <NuxtLink data-test-id="patch" to="/patch">
+          /patch
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink data-test-id="patch-id-1" to="/patch/1">
+          /patch/1
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink data-test-id="patch-id-2" to="/patch/2">
+          /patch/2
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink data-test-id="patch-id-2" to="/patch/2#test">
+          /patch/2#test
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink data-test-id="patch-id-child" to="/patch/2/child">
+          /patch/2/child
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink data-test-id="patch-id-2-child-1" to="/patch/2/child/1">
+          /patch/2/child/1
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink data-test-id="patch-id-2-child-1" to="/patch/2/child/1?query=true">
+          /patch/2/child/1?query=true
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink data-test-id="patch-id-2-child-1" to="/patch/2/child/1?query=true#test">
+          /patch/2/child/1?query=true#test
+        </NuxtLink>
+      </li>
     </ul>
   </div>
 </template>
diff --git a/test/fixtures/children/pages/parent.vue b/test/fixtures/children/pages/parent.vue
index 906b5a0fe2..5202e28a66 100644
--- a/test/fixtures/children/pages/parent.vue
+++ b/test/fixtures/children/pages/parent.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <h1>I am the {{ name }}</h1>
-    <nuxt-child />
+    <NuxtChild />
   </div>
 </template>
 
diff --git a/test/fixtures/children/pages/patch.vue b/test/fixtures/children/pages/patch.vue
index 657ee0516b..db87d4964b 100644
--- a/test/fixtures/children/pages/patch.vue
+++ b/test/fixtures/children/pages/patch.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
-    <h1>patch: <i data-date-patch>{{ date }}</i></h1>
-    <nuxt-child />
+    <h1>
+      patch: <i data-date-patch>
+        {{ date }}
+      </i>
+    </h1>
+    <NuxtChild />
   </div>
 </template>
 
diff --git a/test/fixtures/children/pages/patch/_id.vue b/test/fixtures/children/pages/patch/_id.vue
index ca34852d4b..69cfbc50eb 100644
--- a/test/fixtures/children/pages/patch/_id.vue
+++ b/test/fixtures/children/pages/patch/_id.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
-    <h2>_id: <i data-date-id>{{ date }}</i></h2>
-    <nuxt-child />
+    <h2>
+      _id: <i data-date-id>
+        {{ date }}
+      </i>
+    </h2>
+    <NuxtChild />
   </div>
 </template>
 
diff --git a/test/fixtures/children/pages/patch/_id/child.vue b/test/fixtures/children/pages/patch/_id/child.vue
index 70969b99d9..1d06dce172 100644
--- a/test/fixtures/children/pages/patch/_id/child.vue
+++ b/test/fixtures/children/pages/patch/_id/child.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
-    <h3>child: <i data-date-child>{{ date }}</i></h3>
-    <nuxt-child />
+    <h3>
+      child: <i data-date-child>
+        {{ date }}
+      </i>
+    </h3>
+    <NuxtChild />
   </div>
 </template>
 
diff --git a/test/fixtures/children/pages/patch/_id/child/_slug.vue b/test/fixtures/children/pages/patch/_id/child/_slug.vue
index 8ae0e8bd1a..beb74d88de 100644
--- a/test/fixtures/children/pages/patch/_id/child/_slug.vue
+++ b/test/fixtures/children/pages/patch/_id/child/_slug.vue
@@ -1,8 +1,16 @@
 <template>
   <div>
-    <h4>_slug: <i data-date-child-slug>{{ date }}</i></h4>
+    <h4>
+      _slug: <i data-date-child-slug>
+        {{ date }}
+      </i>
+    </h4>
     <input ref="search" v-model="q" data-test-search-input type="text" @input="update">
-    <ul><li v-for="s in searchResults" :key="s" data-test-search-result>{{ s }}</li></ul>
+    <ul>
+      <li v-for="s in searchResults" :key="s" data-test-search-result>
+        {{ s }}
+      </li>
+    </ul>
   </div>
 </template>
 
diff --git a/test/fixtures/config-explicit/pages/config.vue b/test/fixtures/config-explicit/pages/config.vue
index 63b3a9e9c1..d72fa77456 100644
--- a/test/fixtures/config-explicit/pages/config.vue
+++ b/test/fixtures/config-explicit/pages/config.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <span v-for="(key, i) in configKeys" :id="key" :key="i">{{ vueConfig[key] | toStr }}</span>
+    <span v-for="(key, i) in configKeys" :id="key" :key="i">
+      {{ vueConfig[key] | toStr }}
+    </span>
   </div>
 </template>
 
diff --git a/test/fixtures/custom-dirs/custom-layouts/layouts/default.vue b/test/fixtures/custom-dirs/custom-layouts/layouts/default.vue
index 91a1548acc..50c73c93c2 100644
--- a/test/fixtures/custom-dirs/custom-layouts/layouts/default.vue
+++ b/test/fixtures/custom-dirs/custom-layouts/layouts/default.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <nuxt />
+    <Nuxt />
     <p>I have custom layouts directory</p>
   </div>
 </template>
diff --git a/test/fixtures/extract-css/layouts/default.vue b/test/fixtures/extract-css/layouts/default.vue
index 5f0b21261b..b483de85b5 100644
--- a/test/fixtures/extract-css/layouts/default.vue
+++ b/test/fixtures/extract-css/layouts/default.vue
@@ -1,6 +1,6 @@
 <template>
   <main>
-    <nuxt />
+    <Nuxt />
   </main>
 </template>
 
diff --git a/test/fixtures/extract-css/pages/about.vue b/test/fixtures/extract-css/pages/about.vue
index 41d5edb585..b25e343579 100644
--- a/test/fixtures/extract-css/pages/about.vue
+++ b/test/fixtures/extract-css/pages/about.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <h1 :class="$style.test">I'm BLUE</h1>
+    <h1 :class="$style.test">
+      I'm BLUE
+    </h1>
   </div>
 </template>
 
diff --git a/test/fixtures/extract-css/pages/index.vue b/test/fixtures/extract-css/pages/index.vue
index 614cf27723..cce78256b2 100644
--- a/test/fixtures/extract-css/pages/index.vue
+++ b/test/fixtures/extract-css/pages/index.vue
@@ -2,11 +2,21 @@
   <div>
     <h1>I'm RED</h1>
     <section class="container">
-      <div class="item-a">item-a</div>
-      <div class="item-b">item-b</div>
-      <div class="item-c">item-c</div>
-      <div class="item-d">item-d</div>
-      <div class="item-e">item-e</div>
+      <div class="item-a">
+        item-a
+      </div>
+      <div class="item-b">
+        item-b
+      </div>
+      <div class="item-c">
+        item-c
+      </div>
+      <div class="item-d">
+        item-d
+      </div>
+      <div class="item-e">
+        item-e
+      </div>
     </section>
   </div>
 </template>
diff --git a/test/fixtures/meta-attrs/meta-attrs.test.js b/test/fixtures/meta-attrs/meta-attrs.test.js
new file mode 100644
index 0000000000..8f43c520c8
--- /dev/null
+++ b/test/fixtures/meta-attrs/meta-attrs.test.js
@@ -0,0 +1,3 @@
+import { buildFixture } from '../../utils/build'
+
+buildFixture('meta-attrs')
diff --git a/test/fixtures/meta-attrs/nuxt.config.js b/test/fixtures/meta-attrs/nuxt.config.js
new file mode 100644
index 0000000000..8acbef9f8d
--- /dev/null
+++ b/test/fixtures/meta-attrs/nuxt.config.js
@@ -0,0 +1,15 @@
+export default {
+  head: {
+    htmlAttrs: {
+      foo: 'baz'
+    },
+
+    headAttrs: {
+      bar: 'foo'
+    },
+
+    bodyAttrs: {
+      baz: 'bar'
+    }
+  }
+}
diff --git a/test/fixtures/missing-pages-dir/missing-pages-dir.test.js b/test/fixtures/missing-pages-dir/missing-pages-dir.test.js
index fa3cb36125..4c98210c8b 100644
--- a/test/fixtures/missing-pages-dir/missing-pages-dir.test.js
+++ b/test/fixtures/missing-pages-dir/missing-pages-dir.test.js
@@ -3,7 +3,7 @@ import { buildFixture } from '../../utils/build'
 
 describe('missing-pages-dir', () => {
   buildFixture('missing-pages-dir', (builder) => {
-    const options = builder.nuxt.options
+    const { options } = builder.nuxt
     expect(consola.warn).toHaveBeenCalledTimes(1)
     expect(consola.warn).toHaveBeenCalledWith(`No \`${options.dir.pages}\` directory found in ${options.srcDir}. Using the default built-in page.`)
   })
diff --git a/test/fixtures/missing-style-resource/nuxt.config.js b/test/fixtures/missing-style-resource/nuxt.config.js
index 44d2cebae8..1ff1df20ed 100644
--- a/test/fixtures/missing-style-resource/nuxt.config.js
+++ b/test/fixtures/missing-style-resource/nuxt.config.js
@@ -1,5 +1,7 @@
 export default {
-  styleResources: {
-    'stylus': './nothinghere'
+  build: {
+    styleResources: {
+      'stylus': './nothinghere'
+    }
   }
 }
diff --git a/test/fixtures/modern/nuxt.config.js b/test/fixtures/modern/nuxt.config.js
index 246d8495ef..5cb35a8467 100644
--- a/test/fixtures/modern/nuxt.config.js
+++ b/test/fixtures/modern/nuxt.config.js
@@ -1,6 +1,7 @@
 export default {
   modern: true,
   build: {
+    crossorigin: 'use-credentials',
     filenames: {
       app: ({ isModern }) => {
         return `${isModern ? 'modern-' : ''}[name].js`
@@ -9,5 +10,10 @@ export default {
         return `${isModern ? 'modern-' : ''}[name].js`
       }
     }
+  },
+  render: {
+    http2: {
+      push: true
+    }
   }
 }
diff --git a/test/fixtures/module/layouts/layout.vue b/test/fixtures/module/layouts/layout.vue
new file mode 100644
index 0000000000..85562e97e6
--- /dev/null
+++ b/test/fixtures/module/layouts/layout.vue
@@ -0,0 +1,6 @@
+<template>
+  <div>
+    <h1>Layouts</h1>
+    <Nuxt />
+  </div>
+</template>
diff --git a/test/fixtures/module/modules/basic/layout.vue b/test/fixtures/module/modules/basic/layout.vue
index cb532fbf0c..f0d5263c49 100644
--- a/test/fixtures/module/modules/basic/layout.vue
+++ b/test/fixtures/module/modules/basic/layout.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <h1>Module Layouts</h1>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/module/modules/middleware/midd3.js b/test/fixtures/module/modules/middleware/midd3.js
new file mode 100644
index 0000000000..9841db4b91
--- /dev/null
+++ b/test/fixtures/module/modules/middleware/midd3.js
@@ -0,0 +1,7 @@
+export default {
+  path: '/midd3',
+  handler(req, res) {
+    res.write('Be creative when writing test strings! Hey Mama :wave:')
+    res.end()
+  }
+}
diff --git a/test/fixtures/module/nuxt.config.js b/test/fixtures/module/nuxt.config.js
index cf3ef40c88..09540fb8ed 100644
--- a/test/fixtures/module/nuxt.config.js
+++ b/test/fixtures/module/nuxt.config.js
@@ -12,7 +12,10 @@ export default {
     },
     ['./modules/template', { baz: 'ping' }]
   ],
-  serverMiddleware: ['./modules/middleware/midd2'],
+  serverMiddleware: [
+    './modules/middleware/midd2',
+    '~/modules/middleware/midd3'
+  ],
   hooks(hook) {
     hook('ready', (nuxt) => {
       nuxt.__ready_called__ = true
diff --git a/test/fixtures/module/views/about.vue b/test/fixtures/module/views/about.vue
index 93009e1b3e..9dc2dfcf62 100644
--- a/test/fixtures/module/views/about.vue
+++ b/test/fixtures/module/views/about.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
     <h1>About page</h1>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
diff --git a/test/fixtures/module/views/index.vue b/test/fixtures/module/views/index.vue
index a3da52e442..441b548c4c 100644
--- a/test/fixtures/module/views/index.vue
+++ b/test/fixtures/module/views/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
     <h1>{{ $reverseStr('NUXT') }}</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
diff --git a/test/fixtures/named-views/components/childLeft.vue b/test/fixtures/named-views/components/childLeft.vue
new file mode 100644
index 0000000000..14f275498d
--- /dev/null
+++ b/test/fixtures/named-views/components/childLeft.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>Child Left content!</div>
+</template>
+
+<script>
+export default {
+  name: 'ChildLeft'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/test/fixtures/named-views/components/mainTop.vue b/test/fixtures/named-views/components/mainTop.vue
new file mode 100644
index 0000000000..bb8a21ef07
--- /dev/null
+++ b/test/fixtures/named-views/components/mainTop.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>Main Top content!</div>
+</template>
+
+<script>
+export default {
+  name: 'MainTop'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/test/fixtures/named-views/layouts/default.vue b/test/fixtures/named-views/layouts/default.vue
new file mode 100644
index 0000000000..9c37997d66
--- /dev/null
+++ b/test/fixtures/named-views/layouts/default.vue
@@ -0,0 +1,6 @@
+<template>
+  <div>
+    TOP:<Nuxt name="top" />:TOP
+    PAGE:<Nuxt />:PAGE
+  </div>
+</template>
diff --git a/test/fixtures/named-views/named-views.test.js b/test/fixtures/named-views/named-views.test.js
new file mode 100644
index 0000000000..a6f63f1ba0
--- /dev/null
+++ b/test/fixtures/named-views/named-views.test.js
@@ -0,0 +1,3 @@
+import { buildFixture } from '../../utils/build'
+
+buildFixture('named-views')
diff --git a/test/fixtures/named-views/nuxt.config.js b/test/fixtures/named-views/nuxt.config.js
new file mode 100644
index 0000000000..a23f24aae9
--- /dev/null
+++ b/test/fixtures/named-views/nuxt.config.js
@@ -0,0 +1,30 @@
+export default {
+  router: {
+    extendRoutes(routes, resolve) {
+      const indexIndex = routes.findIndex(route => route.name === 'index')
+      let index = routes[indexIndex].children.findIndex(route => route.name === 'index-child-id')
+      routes[indexIndex].children[index] = {
+        ...routes[indexIndex].children[index],
+        components: {
+          default: routes[indexIndex].children[index].component,
+          left: resolve(__dirname, 'components/childLeft.vue')
+        },
+        chunkNames: {
+          left: 'components/childLeft'
+        }
+      }
+
+      index = routes.findIndex(route => route.name === 'main')
+      routes[index] = {
+        ...routes[index],
+        components: {
+          default: routes[index].component,
+          top: resolve(__dirname, 'components/mainTop.vue')
+        },
+        chunkNames: {
+          top: 'components/mainTop'
+        }
+      }
+    }
+  }
+}
diff --git a/test/fixtures/named-views/pages/index.vue b/test/fixtures/named-views/pages/index.vue
new file mode 100755
index 0000000000..f6884f1314
--- /dev/null
+++ b/test/fixtures/named-views/pages/index.vue
@@ -0,0 +1,16 @@
+<template lang="html">
+  <div class="main">
+    LEFT:<NuxtChild name="left" />:LEFT
+    CHILD:<NuxtChild />:CHILD
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Stage'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/test/fixtures/named-views/pages/index/child/_id/index.vue b/test/fixtures/named-views/pages/index/child/_id/index.vue
new file mode 100644
index 0000000000..cc8ea37ad3
--- /dev/null
+++ b/test/fixtures/named-views/pages/index/child/_id/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>Child content ID:{{ id }}!</div>
+</template>
+
+<script>
+export default {
+  name: 'Child',
+  validate({ params }) {
+    return !isNaN(+params.id)
+  },
+  computed: {
+    id() {
+      return this.$route.params.id
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/test/fixtures/named-views/pages/index/section.vue b/test/fixtures/named-views/pages/index/section.vue
new file mode 100644
index 0000000000..ae9b046728
--- /dev/null
+++ b/test/fixtures/named-views/pages/index/section.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>This page does not have left panel.</div>
+</template>
+
+<script>
+export default {
+  name: 'Section'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/test/fixtures/named-views/pages/main.vue b/test/fixtures/named-views/pages/main.vue
new file mode 100755
index 0000000000..1c9634da85
--- /dev/null
+++ b/test/fixtures/named-views/pages/main.vue
@@ -0,0 +1,16 @@
+<template lang="html">
+  <div class="main">
+    LEFT:<NuxtChild name="left" />:LEFT
+    CHILD:<NuxtChild />:CHILD
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Main'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/test/fixtures/route-name-splitter/nuxt.config.js b/test/fixtures/route-name-splitter/nuxt.config.js
new file mode 100644
index 0000000000..8f72308a6d
--- /dev/null
+++ b/test/fixtures/route-name-splitter/nuxt.config.js
@@ -0,0 +1,5 @@
+export default {
+  router: {
+    routeNameSplitter: '/'
+  }
+}
diff --git a/test/fixtures/route-name-splitter/pages/_/_.vue b/test/fixtures/route-name-splitter/pages/_/_.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/pages/_/index.vue b/test/fixtures/route-name-splitter/pages/_/index.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/pages/_/p/_.vue b/test/fixtures/route-name-splitter/pages/_/p/_.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/pages/index.vue b/test/fixtures/route-name-splitter/pages/index.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/pages/parent/child.vue b/test/fixtures/route-name-splitter/pages/parent/child.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/pages/parent/index.vue b/test/fixtures/route-name-splitter/pages/parent/index.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/pages/posts.vue b/test/fixtures/route-name-splitter/pages/posts.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/pages/posts/_id.vue b/test/fixtures/route-name-splitter/pages/posts/_id.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/route-name-splitter/route-name-splitter.test.js b/test/fixtures/route-name-splitter/route-name-splitter.test.js
new file mode 100644
index 0000000000..61147da103
--- /dev/null
+++ b/test/fixtures/route-name-splitter/route-name-splitter.test.js
@@ -0,0 +1,3 @@
+import { buildFixture } from '../../utils/build'
+
+buildFixture('route-name-splitter')
diff --git a/test/fixtures/spa/layouts/custom.vue b/test/fixtures/spa/layouts/custom.vue
index 616dba23c7..da28a42595 100644
--- a/test/fixtures/spa/layouts/custom.vue
+++ b/test/fixtures/spa/layouts/custom.vue
@@ -2,6 +2,6 @@
   <div>
     Custom layout
     <br>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/spa/layouts/default.vue b/test/fixtures/spa/layouts/default.vue
index 972cb9eb0b..0ac566cd1c 100644
--- a/test/fixtures/spa/layouts/default.vue
+++ b/test/fixtures/spa/layouts/default.vue
@@ -2,6 +2,6 @@
   <div>
     Default layout
     <br>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/spa/nuxt.config.js b/test/fixtures/spa/nuxt.config.js
index d8337c48e8..e3f902b0f4 100644
--- a/test/fixtures/spa/nuxt.config.js
+++ b/test/fixtures/spa/nuxt.config.js
@@ -4,6 +4,15 @@ export default {
   render: {
     http2: {
       push: true
+    },
+    bundleRenderer: {
+      shouldPrefetch: () => true
+    }
+  },
+  build: {
+    filenames: {
+      app: '[name].js',
+      chunk: '[name].js'
     }
   },
   plugins: [
diff --git a/test/fixtures/ssr/components/test.vue b/test/fixtures/ssr/components/test.vue
index d7cbad1722..4120ae1a4b 100644
--- a/test/fixtures/ssr/components/test.vue
+++ b/test/fixtures/ssr/components/test.vue
@@ -1,7 +1,5 @@
 <template>
-  <foobar>
-    {{ id }}
-  </foobar>
+  <Foobar>{{ id }}</Foobar>
 </template>
 
 <script>
diff --git a/test/fixtures/ssr/pages/asyncComponent.vue b/test/fixtures/ssr/pages/asyncComponent.vue
index 97bb189a97..7b54395055 100644
--- a/test/fixtures/ssr/pages/asyncComponent.vue
+++ b/test/fixtures/ssr/pages/asyncComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <async-test />
+    <AsyncTest />
   </div>
 </template>
 
diff --git a/test/fixtures/ssr/pages/asyncData.vue b/test/fixtures/ssr/pages/asyncData.vue
index 7c166fda89..ff3bffac85 100644
--- a/test/fixtures/ssr/pages/asyncData.vue
+++ b/test/fixtures/ssr/pages/asyncData.vue
@@ -1,5 +1,5 @@
 <template>
-  <foobar>{{ id }}</foobar>
+  <Foobar>{{ id }}</Foobar>
 </template>
 
 <script>
diff --git a/test/fixtures/ssr/pages/component.vue b/test/fixtures/ssr/pages/component.vue
index 186718ea0b..ce74b9c01a 100644
--- a/test/fixtures/ssr/pages/component.vue
+++ b/test/fixtures/ssr/pages/component.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
-    <test />
+    <Test />
   </div>
 </template>
 
 <script>
-import test from '@/components/test'
+import Test from '@/components/test'
 
 export default {
   components: {
-    test
+    Test
   }
 }
 </script>
diff --git a/test/fixtures/ssr/pages/data.vue b/test/fixtures/ssr/pages/data.vue
index 0c7c69bd2b..4120ae1a4b 100644
--- a/test/fixtures/ssr/pages/data.vue
+++ b/test/fixtures/ssr/pages/data.vue
@@ -1,5 +1,5 @@
 <template>
-  <foobar>{{ id }}</foobar>
+  <Foobar>{{ id }}</Foobar>
 </template>
 
 <script>
diff --git a/test/fixtures/ssr/pages/fetch.vue b/test/fixtures/ssr/pages/fetch.vue
index 15294e19be..984ad7a3eb 100644
--- a/test/fixtures/ssr/pages/fetch.vue
+++ b/test/fixtures/ssr/pages/fetch.vue
@@ -1,5 +1,5 @@
 <template>
-  <foobar>{{ $store.__id }}</foobar>
+  <Foobar>{{ $store.__id }}</Foobar>
 </template>
 
 <script>
diff --git a/test/fixtures/ssr/pages/store.vue b/test/fixtures/ssr/pages/store.vue
index 3560c07023..55949dce1d 100644
--- a/test/fixtures/ssr/pages/store.vue
+++ b/test/fixtures/ssr/pages/store.vue
@@ -1,5 +1,3 @@
 <template>
-  <foobar>
-    {{ $store.state[$route.query.onServerInit === '1' ? 'id2': 'id'] }}
-  </foobar>
+  <Foobar>{{ $store.state[$route.query.onServerInit === '1' ? 'id2': 'id'] }}</Foobar>
 </template>
diff --git a/test/fixtures/typescript/layouts/default.vue b/test/fixtures/typescript/layouts/default.vue
new file mode 100644
index 0000000000..c0e0ef391d
--- /dev/null
+++ b/test/fixtures/typescript/layouts/default.vue
@@ -0,0 +1,12 @@
+<template>
+  <Nuxt />
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component({
+  middleware: 'test'
+})
+export default class DefaultLayout extends Vue {}
+</script>
diff --git a/test/fixtures/typescript/middleware/test.ts b/test/fixtures/typescript/middleware/test.ts
new file mode 100644
index 0000000000..ead516c976
--- /dev/null
+++ b/test/fixtures/typescript/middleware/test.ts
@@ -0,0 +1 @@
+export default () => {}
diff --git a/test/fixtures/typescript/modules/module.ts b/test/fixtures/typescript/modules/module.ts
new file mode 100644
index 0000000000..ead516c976
--- /dev/null
+++ b/test/fixtures/typescript/modules/module.ts
@@ -0,0 +1 @@
+export default () => {}
diff --git a/test/fixtures/typescript/nuxt.config.ts b/test/fixtures/typescript/nuxt.config.ts
new file mode 100644
index 0000000000..ab6b0bc663
--- /dev/null
+++ b/test/fixtures/typescript/nuxt.config.ts
@@ -0,0 +1,13 @@
+const config: any = {
+  modules: [
+    '~/modules/module'
+  ],
+  plugins: [
+    '~/plugins/plugin'
+  ],
+  serverMiddleware: [
+    '~/server-middleware/test.ts'
+  ]
+}
+
+export default config
diff --git a/test/fixtures/typescript/pages/about.ts b/test/fixtures/typescript/pages/about.ts
new file mode 100644
index 0000000000..1218ba9b58
--- /dev/null
+++ b/test/fixtures/typescript/pages/about.ts
@@ -0,0 +1,8 @@
+import Vue from 'vue'
+
+export default Vue.extend({
+  name: 'About',
+  render (h) {
+    return h('div', 'About Page')
+  }
+})
diff --git a/test/fixtures/typescript/pages/contact.tsx b/test/fixtures/typescript/pages/contact.tsx
new file mode 100644
index 0000000000..21879491a8
--- /dev/null
+++ b/test/fixtures/typescript/pages/contact.tsx
@@ -0,0 +1,9 @@
+import Vue from 'vue'
+
+export default Vue.extend({
+  name: 'Contact',
+  // @ts-ignore: h not used but needed to compile
+  render (h) {
+    return <div>Contact Page</div>
+  }
+})
diff --git a/test/fixtures/typescript/pages/index.vue b/test/fixtures/typescript/pages/index.vue
new file mode 100644
index 0000000000..d29cf5e56e
--- /dev/null
+++ b/test/fixtures/typescript/pages/index.vue
@@ -0,0 +1,12 @@
+<template>
+  <div>{{ message }}</div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component
+export default class Index extends Vue {
+  message: string = 'Index Page'
+}
+</script>
diff --git a/test/fixtures/typescript/pages/interface.vue b/test/fixtures/typescript/pages/interface.vue
new file mode 100644
index 0000000000..6e21446eda
--- /dev/null
+++ b/test/fixtures/typescript/pages/interface.vue
@@ -0,0 +1,22 @@
+<template>
+  <div>{{ test.attributes.message }}</div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+interface Test {
+  attributes: {
+    message: string
+  }
+}
+
+@Component
+export default class Interface extends Vue {
+  test: Test = {
+    attributes: {
+      message: 'Interface Page'
+    }
+  }
+}
+</script>
diff --git a/test/fixtures/typescript/plugins/plugin.ts b/test/fixtures/typescript/plugins/plugin.ts
new file mode 100644
index 0000000000..ead516c976
--- /dev/null
+++ b/test/fixtures/typescript/plugins/plugin.ts
@@ -0,0 +1 @@
+export default () => {}
diff --git a/test/fixtures/typescript/server-middleware/test.ts b/test/fixtures/typescript/server-middleware/test.ts
new file mode 100644
index 0000000000..cdb0ac4668
--- /dev/null
+++ b/test/fixtures/typescript/server-middleware/test.ts
@@ -0,0 +1,7 @@
+export default {
+  path: '/api/test',
+  handler(_, res) {
+    const message: String = 'Works!'
+    res.end(message)
+  }
+}
diff --git a/test/fixtures/typescript/tsconfig.json b/test/fixtures/typescript/tsconfig.json
new file mode 100644
index 0000000000..6b563db445
--- /dev/null
+++ b/test/fixtures/typescript/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "@nuxt/typescript",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "noImplicitAny": false,
+    "types": [
+      "@types/node",
+      "@nuxt/vue-app"
+    ]
+  }
+}
diff --git a/test/fixtures/typescript/typescript.test.js b/test/fixtures/typescript/typescript.test.js
new file mode 100644
index 0000000000..0d352b49dd
--- /dev/null
+++ b/test/fixtures/typescript/typescript.test.js
@@ -0,0 +1,3 @@
+import { buildFixture } from '../../utils/build'
+
+buildFixture('typescript')
diff --git a/test/fixtures/with-config/assets/app.css b/test/fixtures/with-config/assets/app.pcss
similarity index 100%
rename from test/fixtures/with-config/assets/app.css
rename to test/fixtures/with-config/assets/app.pcss
diff --git a/test/fixtures/with-config/layouts/custom-env.vue b/test/fixtures/with-config/layouts/custom-env.vue
index 7067d93782..655c9a3c8d 100644
--- a/test/fixtures/with-config/layouts/custom-env.vue
+++ b/test/fixtures/with-config/layouts/custom-env.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <h1>Custom env layout</h1>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/with-config/layouts/custom.vue b/test/fixtures/with-config/layouts/custom.vue
index 5e254dab79..962b80da74 100644
--- a/test/fixtures/with-config/layouts/custom.vue
+++ b/test/fixtures/with-config/layouts/custom.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <h1>Custom layout</h1>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/with-config/layouts/default.vue b/test/fixtures/with-config/layouts/default.vue
index f1670a7a2d..25cba134cf 100644
--- a/test/fixtures/with-config/layouts/default.vue
+++ b/test/fixtures/with-config/layouts/default.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <h1>Default layout</h1>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/with-config/layouts/desktop/default.vue b/test/fixtures/with-config/layouts/desktop/default.vue
index 649ec36e41..886f28fa54 100644
--- a/test/fixtures/with-config/layouts/desktop/default.vue
+++ b/test/fixtures/with-config/layouts/desktop/default.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <h1>Default desktop layout</h1>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/with-config/layouts/mobile/default.vue b/test/fixtures/with-config/layouts/mobile/default.vue
index 7219975d14..0426ae49b3 100644
--- a/test/fixtures/with-config/layouts/mobile/default.vue
+++ b/test/fixtures/with-config/layouts/mobile/default.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <h1>Default mobile layout</h1>
-    <nuxt />
+    <Nuxt />
   </div>
 </template>
diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js
index 48ccb1e152..404ddee974 100644
--- a/test/fixtures/with-config/nuxt.config.js
+++ b/test/fixtures/with-config/nuxt.config.js
@@ -6,7 +6,10 @@ export default {
   srcDir: __dirname,
   server: {
     port: 8000,
-    host: '0.0.0.0'
+    host: '0.0.0.0',
+    timing: {
+      total: true
+    }
   },
   router: {
     base: '/test/',
@@ -17,7 +20,8 @@ export default {
         {
           name: 'about-bis',
           path: '/about-bis',
-          component: '~/pages/about.vue'
+          component: '~/pages/about.vue',
+          meta: { text: 'test-meta' }
         },
         {
           path: '/redirect/about-bis',
@@ -36,6 +40,10 @@ export default {
   extensions: 'ts',
   plugins: [
     '~/plugins/test',
+    '~/plugins/doubled',
+    { src: '~/plugins/test.plugin', mode: 'abc' },
+    '~/plugins/test.client',
+    '~/plugins/test.server',
     { src: '~/plugins/only-client.js', ssr: false }
   ],
   loading: '~/components/loading',
@@ -72,11 +80,11 @@ export default {
     transpile: 'vue-test',
     extend(config, options) {
       return Object.assign({}, config, {
-        devtool: 'nosources-source-map'
+        devtool: '#source-map'
       })
     }
   },
-  css: [{ src: '~/assets/app.css' }],
+  css: [{ src: '~/assets/app' }],
   render: {
     csp: true,
     http2: {
diff --git a/test/fixtures/with-config/pages/about.vue b/test/fixtures/with-config/pages/about.vue
index 39572c46f1..974128a9c7 100644
--- a/test/fixtures/with-config/pages/about.vue
+++ b/test/fixtures/with-config/pages/about.vue
@@ -1,12 +1,18 @@
 <template>
   <div>
     <h1>About page</h1>
-    <nuxt-link to="/">Home page</nuxt-link>
+    <h2>{{ meta[0].text }}</h2>
+    <NuxtLink to="/">
+      Home page
+    </NuxtLink>
   </div>
 </template>
 
 <script>
 export default {
-  layout: 'custom'
+  layout: 'custom',
+  asyncData({ route }) {
+    return { meta: route.meta || 'empty-meta' }
+  }
 }
 </script>
diff --git a/test/fixtures/with-config/pages/env.vue b/test/fixtures/with-config/pages/env.vue
index 1c2dd3419e..132b08b263 100644
--- a/test/fixtures/with-config/pages/env.vue
+++ b/test/fixtures/with-config/pages/env.vue
@@ -3,7 +3,9 @@
     <pre>{{ env }}</pre>
     <p>object:</p>
     <pre>{{ processEnv }}</pre>
-    <nuxt-link to="/">Home</nuxt-link>
+    <NuxtLink to="/">
+      Home
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/test/fixtures/with-config/pages/index.vue b/test/fixtures/with-config/pages/index.vue
index 202ed3e9f6..ab862c7d75 100644
--- a/test/fixtures/with-config/pages/index.vue
+++ b/test/fixtures/with-config/pages/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <h1>I have custom configurations</h1>
-    <nuxt-link to="/about">About page</nuxt-link>
+    <NuxtLink to="/about">
+      About page
+    </NuxtLink>
   </div>
 </template>
 
diff --git a/test/fixtures/with-config/plugins/doubled/index.js b/test/fixtures/with-config/plugins/doubled/index.js
new file mode 100644
index 0000000000..ead516c976
--- /dev/null
+++ b/test/fixtures/with-config/plugins/doubled/index.js
@@ -0,0 +1 @@
+export default () => {}
diff --git a/test/fixtures/with-config/plugins/test.client.js b/test/fixtures/with-config/plugins/test.client.js
new file mode 100644
index 0000000000..387e7fc54a
--- /dev/null
+++ b/test/fixtures/with-config/plugins/test.client.js
@@ -0,0 +1 @@
+window.__test_plugin_client = 'test_plugin_client'
diff --git a/test/fixtures/with-config/plugins/test.plugin.js b/test/fixtures/with-config/plugins/test.plugin.js
new file mode 100644
index 0000000000..9d36fa2f97
--- /dev/null
+++ b/test/fixtures/with-config/plugins/test.plugin.js
@@ -0,0 +1,5 @@
+if (process.client) {
+  window.__test_plugin_ext = true
+} else {
+  global.__test_plugin_ext = true
+}
diff --git a/test/fixtures/with-config/plugins/test.server.js b/test/fixtures/with-config/plugins/test.server.js
new file mode 100644
index 0000000000..94df4661fa
--- /dev/null
+++ b/test/fixtures/with-config/plugins/test.server.js
@@ -0,0 +1 @@
+global.__test_plugin_server = 'test_plugin_server'
diff --git a/test/fixtures/with-config/with-config.test.js b/test/fixtures/with-config/with-config.test.js
index 6d1b6da61c..a0ab037806 100644
--- a/test/fixtures/with-config/with-config.test.js
+++ b/test/fixtures/with-config/with-config.test.js
@@ -14,12 +14,15 @@ const hooks = [
 
 describe('with-config', () => {
   buildFixture('with-config', () => {
-    expect(consola.warn).toHaveBeenCalledTimes(4)
+    expect(consola.warn).toHaveBeenCalledTimes(5)
     expect(consola.fatal).toHaveBeenCalledTimes(0)
     expect(consola.warn.mock.calls).toMatchObject([
       [
         'Unknown mode: unknown. Falling back to universal'
       ],
+      [
+        `Invalid plugin mode (server/client/all): 'abc'. Falling back to 'all'`
+      ],
       [{
         message: 'Found 2 plugins that match the configuration, suggest to specify extension:',
         additional: expect.stringContaining('plugins/test.json')
diff --git a/test/types/index.ts b/test/types/index.ts
new file mode 100644
index 0000000000..0375e1c1b9
--- /dev/null
+++ b/test/types/index.ts
@@ -0,0 +1,2 @@
+import './vue'
+import './process'
diff --git a/test/types/process.ts b/test/types/process.ts
new file mode 100644
index 0000000000..47f2279ce9
--- /dev/null
+++ b/test/types/process.ts
@@ -0,0 +1,17 @@
+/**
+ * Test extended type definitions of NodeJS Process interface
+ * @nuxt/vue-app/types/process.d.ts
+ */
+
+process.browser = true
+
+process.client = true
+
+process.mode = 'universal'
+process.mode = 'spa'
+
+process.modern = true
+
+process.server = true
+
+process.static = true
diff --git a/test/types/tsconfig.json b/test/types/tsconfig.json
new file mode 100644
index 0000000000..f842055462
--- /dev/null
+++ b/test/types/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "strict": true,
+    "noEmit": true,
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.promise",
+      "es2015.core"
+    ]
+  }
+}
diff --git a/test/types/vue.ts b/test/types/vue.ts
new file mode 100644
index 0000000000..c3be7c69dc
--- /dev/null
+++ b/test/types/vue.ts
@@ -0,0 +1,106 @@
+/**
+ * Test extended type definitions of Vue interfaces
+ * @nuxt/vue-app/types/vue.d.ts
+ */
+
+import Vue, { ComponentOptions } from 'vue'
+import { Middleware } from '@nuxt/vue-app'
+
+const options: ComponentOptions<Vue> = {}
+
+// asyncData
+
+options.asyncData = (context) => {
+  return {
+    foo: 'bar'
+  }
+}
+
+options.asyncData = () => undefined
+
+// fetch
+
+options.fetch = ({ store }) => {
+  return Promise.resolve('bar').then(res => {
+    store.commit('setFoo', res)
+  })
+}
+
+options.fetch = async ({ store }) => {
+  let res = await Promise.resolve('bar')
+  store.commit('setFoo', res)
+}
+
+// key
+
+options.key = 'foo'
+options.key = (to) => to.fullPath
+
+// head
+
+const metaInfo = {
+  title: 'Home',
+  meta: [
+    { hid: 'description', name: 'description', content: 'My custom description' }
+  ]
+}
+
+options.head = metaInfo
+options.head = () => metaInfo
+
+// layout
+
+options.layout = 'foo'
+options.layout = (context) => 'foo'
+
+// loading
+
+options.loading = true
+
+// middleware
+
+const middlewares: Middleware[] = [
+  'foo',
+  (ctx) => {},
+  (ctx, cb) => {},
+  async (ctx) => {},
+  async (ctx, cb) => {} // unlikely
+]
+
+options.middleware = middlewares
+options.middleware = middlewares[0]
+options.middleware = middlewares[1]
+options.middleware = middlewares[2]
+
+// scrollToTop
+
+options.scrollToTop = true
+
+// transition
+
+options.transition = 'foo'
+options.transition = { name: 'foo' }
+options.transition = (to, from) => 'foo'
+
+// validate
+
+options.validate = (context) => true
+options.validate = async (context) => true
+
+// watchQuery
+
+options.watchQuery = true
+options.watchQuery = ['foo', 'bar']
+
+// $nuxt
+
+const vm = new Vue(options)
+
+if (vm.$nuxt.$loading.fail) vm.$nuxt.$loading.fail()
+vm.$nuxt.$loading.finish()
+if (vm.$nuxt.$loading.increase) vm.$nuxt.$loading.increase(1)
+if (vm.$nuxt.$loading.pause) vm.$nuxt.$loading.pause()
+vm.$nuxt.$loading.start()
+
+vm.$nuxt.isOffline = true
+vm.$nuxt.isOnline = true
diff --git a/test/unit/async-config.size-limit.test.js b/test/unit/async-config.size-limit.test.js
index b3ab624447..2ff88a739c 100644
--- a/test/unit/async-config.size-limit.test.js
+++ b/test/unit/async-config.size-limit.test.js
@@ -34,6 +34,6 @@ describe('size-limit test', () => {
     const responseSizeBytes = responseSizes.reduce((bytes, responseLength) => bytes + responseLength, 0)
     const responseSizeKilobytes = Math.ceil(responseSizeBytes / 1024)
     // Without gzip!
-    expect(responseSizeKilobytes).toBeLessThanOrEqual(170)
+    expect(responseSizeKilobytes).toBeLessThanOrEqual(180)
   })
 })
diff --git a/test/unit/basic.config.defaults.test.js b/test/unit/basic.config.defaults.test.js
index 857060e71e..fb71787c2a 100644
--- a/test/unit/basic.config.defaults.test.js
+++ b/test/unit/basic.config.defaults.test.js
@@ -1,8 +1,12 @@
 import { resolve } from 'path'
 import consola from 'consola'
+import Glob from 'glob'
+import pify from 'pify'
 
 import { Nuxt, getNuxtConfig, version } from '../utils'
 
+const glob = pify(Glob)
+
 describe('basic config defaults', () => {
   test('Nuxt.version is same as package', () => {
     expect(Nuxt.version).toBe(version)
@@ -14,6 +18,11 @@ describe('basic config defaults', () => {
     expect(options.modulesDir).toContain(currentNodeModulesDir)
   })
 
+  test('client source map not generated', async () => {
+    const mapFiles = await glob(resolve(__dirname, '..', 'fixtures/basic/.nuxt/dist/client/*.js.map'))
+    expect(mapFiles.length).toEqual(0)
+  })
+
   test('vendor has been deprecated', () => {
     const options = getNuxtConfig({
       build: { vendor: 'vue' }
diff --git a/test/unit/basic.dev.test.js b/test/unit/basic.dev.test.js
index 9c977154d9..e3f48dd8b2 100644
--- a/test/unit/basic.dev.test.js
+++ b/test/unit/basic.dev.test.js
@@ -80,14 +80,14 @@ describe('basic dev', () => {
   })
 
   test('Config: build.loaders', () => {
-    expect(Object.keys(loadersOptions)).toHaveLength(12)
+    expect(Object.keys(loadersOptions)).toHaveLength(14)
     expect(loadersOptions).toHaveProperty(
       'file', 'fontUrl', 'imgUrl', 'pugPlain', 'vue',
-      'css', 'cssModules', 'less', 'sass', 'scss', 'stylus', 'vueStyle'
+      'css', 'cssModules', 'less', 'sass', 'scss', 'stylus', 'ts', 'tsx', 'vueStyle'
     )
     const { cssModules, vue } = loadersOptions
     expect(cssModules.localIdentName).toBe('[hash:base64:6]')
-    expect(vueLoader.options).toBe(vue)
+    expect(vueLoader.options).toEqual(vue)
   })
 
   test('Config: cssnano is at then end of postcss plugins', () => {
@@ -143,17 +143,6 @@ describe('basic dev', () => {
     })
   })
 
-  test('/error no source-map (Youch)', async () => {
-    const sourceMaps = nuxt.renderer.resources.serverBundle.maps
-    nuxt.renderer.resources.serverBundle.maps = {}
-
-    await expect(nuxt.server.renderAndGetWindow(url('/error'))).rejects.toMatchObject({
-      statusCode: 500
-    })
-
-    nuxt.renderer.resources.serverBundle.maps = sourceMaps
-  })
-
   test('/error should return json format error (Youch)', async () => {
     const opts = {
       headers: {
diff --git a/test/unit/basic.generate.test.js b/test/unit/basic.generate.test.js
index 89ed0ec7f6..371165dd1b 100644
--- a/test/unit/basic.generate.test.js
+++ b/test/unit/basic.generate.test.js
@@ -103,7 +103,7 @@ describe('basic generate', () => {
 
     const element = window.document.querySelector('.red')
     expect(element).not.toBe(null)
-    expect(element.textContent).toBe('This is red')
+    expect(element.textContent).toContain('This is red')
     expect(element.className).toBe('red')
     // t.is(window.getComputedStyle(element), 'red')
   })
diff --git a/test/unit/basic.ssr.csp.test.js b/test/unit/basic.ssr.csp.test.js
index f9cee79346..eaedce24b2 100644
--- a/test/unit/basic.ssr.csp.test.js
+++ b/test/unit/basic.ssr.csp.test.js
@@ -312,5 +312,30 @@ describe('basic ssr csp', () => {
         expect(uniqueHashes.length).toBe(hashes.length)
       }
     )
+    test(
+      'Not contain old hashes when loading new page',
+      async () => {
+        const cspOption = {
+          enabled: true,
+          policies: {
+            'default-src': [`'self'`],
+            'script-src': ['https://example.com', 'https://example.io']
+          }
+        }
+        nuxt = await startCspDevServer(cspOption)
+        const { headers: user1Header } = await rp(url('/users/1'), {
+          resolveWithFullResponse: true
+        })
+        const user1Hashes = user1Header[reportOnlyHeader].split(' ').filter(s => s.startsWith('\'sha256-'))
+
+        const { headers: user2Header } = await rp(url('/users/2'), {
+          resolveWithFullResponse: true
+        })
+        const user2Hashes = new Set(user2Header[reportOnlyHeader].split(' ').filter(s => s.startsWith('\'sha256-')))
+
+        const intersection = new Set(user1Hashes.filter(x => user2Hashes.has(x)))
+        expect(intersection.size).toBe(0)
+      }
+    )
   })
 })
diff --git a/test/unit/basic.ssr.test.js b/test/unit/basic.ssr.test.js
index 3e21a1fa2f..9ca12be26c 100644
--- a/test/unit/basic.ssr.test.js
+++ b/test/unit/basic.ssr.test.js
@@ -35,7 +35,20 @@ describe('basic ssr', () => {
 
     const element = window.document.querySelector('.red')
     expect(element).not.toBe(null)
-    expect(element.textContent).toBe('This is red')
+    expect(element.textContent).toContain('This is red')
+    expect(element.className).toBe('red')
+    // t.is(window.getComputedStyle(element).color, 'red')
+  })
+
+  test('/postcss', async () => {
+    const window = await nuxt.server.renderAndGetWindow(url('/css'))
+
+    const headHtml = window.document.head.innerHTML
+    expect(headHtml).toContain('color:red')
+
+    const element = window.document.querySelector('.red')
+    expect(element).not.toBe(null)
+    expect(element.textContent).toContain('This is red')
     expect(element.className).toBe('red')
     // t.is(window.getComputedStyle(element).color, 'red')
   })
@@ -57,8 +70,10 @@ describe('basic ssr', () => {
 
   test('/store', async () => {
     const { html } = await nuxt.server.renderRoute('/store')
-    expect(html).toContain('<h1>Vuex Nested Modules</h1>')
-    expect(html).toContain('<p>1</p>')
+    expect(html).toContain('<h1>foo/bar/baz: Vuex Nested Modules</h1>')
+    expect(html).toContain('<h2>index/counter: 1</h2>')
+    expect(html).toContain('<h3>foo/blarg/getVal: 4</h3>')
+    expect(html).toContain('<h4>foo/bab/getBabVal: 10</h4>')
   })
 
   test('/head', async () => {
@@ -222,6 +237,7 @@ describe('basic ssr', () => {
     expect(html).toContain('Custom error')
     expect(error.message).toContain('Custom error')
     expect(error.statusCode).toBe(500)
+    expect(error.customProp).toBe('ezpz')
   })
 
   test('/error2 status code', async () => {
@@ -268,11 +284,6 @@ describe('basic ssr', () => {
       .rejects.toMatchObject({ statusCode: 304 })
   })
 
-  test('/_nuxt/server-bundle.json should return 404', async () => {
-    await expect(rp(url('/_nuxt/server-bundle.json')))
-      .rejects.toMatchObject({ statusCode: 404 })
-  })
-
   test('/_nuxt/ should return 404', async () => {
     await expect(rp(url('/_nuxt/')))
       .rejects.toMatchObject({ statusCode: 404 })
@@ -315,10 +326,18 @@ describe('basic ssr', () => {
   })
 
   test('/тест雨 (test non ascii route)', async () => {
-    const { html } = await nuxt.server.renderRoute('/тест雨')
+    const window = await nuxt.server.renderAndGetWindow(url('/тест雨'))
+    const html = window.document.body.innerHTML
     expect(html).toMatch('Hello unicode')
   })
 
+  test('/custom (js layout)', async () => {
+    const window = await nuxt.server.renderAndGetWindow(url('/custom'))
+    const html = window.document.body.innerHTML
+    expect(html).toMatch('<h1>JS Layout</h1>')
+    expect(html).toMatch('<h2>custom page</h2>')
+  })
+
   // Close server and ask nuxt to stop listening to file changes
   afterAll(async () => {
     await nuxt.close()
diff --git a/test/unit/cli.test.js b/test/unit/cli.test.js
index 3db88d7511..0e40959420 100644
--- a/test/unit/cli.test.js
+++ b/test/unit/cli.test.js
@@ -20,10 +20,10 @@ const close = async (nuxtInt) => {
   }
 }
 
-describe('cli', () => {
+describe.skip.win('cli', () => {
   test('nuxt dev', async () => {
     let stdout = ''
-    const env = process.env
+    const { env } = process
     env.PORT = port = await getPort()
 
     const nuxtDev = spawnNuxt('dev', { env })
@@ -52,7 +52,7 @@ describe('cli', () => {
     let stdout = ''
     let error
 
-    const env = process.env
+    const { env } = process
     env.PORT = port = await getPort()
 
     await new Promise((resolve) => {
diff --git a/test/unit/extract-css.test.js b/test/unit/extract-css.test.js
index 86bbd95ce2..62222be8f2 100644
--- a/test/unit/extract-css.test.js
+++ b/test/unit/extract-css.test.js
@@ -14,7 +14,7 @@ describe('extract css', () => {
     await nuxt.server.listen(await getPort(), '0.0.0.0')
   })
 
-  test.skip('Verify global.css has been extracted and minified', async () => {
+  test('Verify global.css has been extracted and minified', async () => {
     const fileName = isWindows ? 'pages_index.css' : 'pages/index.css'
     const extractedIndexCss = resolve(__dirname, '..', 'fixtures/extract-css/.nuxt/dist/client', fileName)
     const content = await readFile(extractedIndexCss, 'utf-8')
@@ -28,6 +28,8 @@ describe('extract css', () => {
 
   test('/about should contain module style', async () => {
     const { html } = await nuxt.server.renderRoute('/about')
-    expect(html).toMatch(/<h1 class="test_[a-zA-Z0-9]{5}">I'm BLUE<\/h1>/)
+    expect(html).toMatch(/<h1 class="test_[a-zA-Z0-9]{5}">\s*I'm BLUE\s*<\/h1>/)
+    // no duplicate inlined style
+    expect(html).not.toContain('{color:#00f}')
   })
 })
diff --git a/test/unit/fallback.generate.test.js b/test/unit/fallback.generate.test.js
index 2afec697e6..0dc16dc501 100644
--- a/test/unit/fallback.generate.test.js
+++ b/test/unit/fallback.generate.test.js
@@ -75,8 +75,11 @@ describe('fallback generate', () => {
   })
 
   test('generate.fallback = true is transformed to /404.html', () => {
-    nuxt.options.generate.fallback = true
-    const options = getNuxtConfig(nuxt.options)
+    const options = getNuxtConfig({
+      generate: {
+        fallback: true
+      }
+    })
     expect(options.generate.fallback).toBe('404.html')
   })
 
diff --git a/test/unit/meta-attrs.test.js b/test/unit/meta-attrs.test.js
new file mode 100644
index 0000000000..da98008411
--- /dev/null
+++ b/test/unit/meta-attrs.test.js
@@ -0,0 +1,23 @@
+import { loadFixture, getPort, Nuxt } from '../utils'
+
+let nuxt = null
+
+describe('meta-attrs', () => {
+  beforeAll(async () => {
+    const options = await loadFixture('meta-attrs')
+    nuxt = new Nuxt(options)
+    await nuxt.server.listen(await getPort(), '0.0.0.0')
+  })
+
+  test('/', async () => {
+    const { html } = await nuxt.server.renderRoute('/')
+    expect(html).toContain('<html data-n-head-ssr foo="baz" data-n-head="foo">')
+    expect(html).toContain('<head bar="foo" data-n-head="bar">')
+    expect(html).toContain('<body baz="bar" data-n-head="baz">')
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  afterAll(async () => {
+    await nuxt.close()
+  })
+})
diff --git a/test/unit/modern.client.test.js b/test/unit/modern.client.test.js
index 1918534389..4f2ca88264 100644
--- a/test/unit/modern.client.test.js
+++ b/test/unit/modern.client.test.js
@@ -1,9 +1,9 @@
-import { loadFixture, getPort, Nuxt, rp } from '../utils'
+import { loadFixture, getPort, Nuxt, rp, wChunk } from '../utils'
 
 let nuxt, port
 const url = route => 'http://localhost:' + port + route
 
-describe('modern client mode', () => {
+describe('modern client mode (SSR)', () => {
   beforeAll(async () => {
     const options = await loadFixture('modern', { modern: 'client' })
     nuxt = new Nuxt(options)
@@ -13,20 +13,35 @@ describe('modern client mode', () => {
 
   test('should contain nomodule legacy resources', async () => {
     const response = await rp(url('/'))
-    expect(response).toContain('script nomodule src="/_nuxt/app.js')
-    expect(response).toContain('script nomodule src="/_nuxt/commons.app.js')
+    expect(response).toContain('script nomodule crossorigin="use-credentials" src="/_nuxt/app.js')
+    expect(response).toContain('script nomodule crossorigin="use-credentials" src="/_nuxt/commons.app.js')
   })
 
   test('should contain module modern resources', async () => {
     const response = await rp(url('/'))
-    expect(response).toContain('<script type="module" src="/_nuxt/modern-app.js"')
-    expect(response).toContain('<script type="module" src="/_nuxt/modern-commons.app.js"')
+    expect(response).toContain('<script type="module" crossorigin="use-credentials" src="/_nuxt/modern-app.js"')
+    expect(response).toContain('<script type="module" crossorigin="use-credentials" src="/_nuxt/modern-commons.app.js"')
   })
 
   test('should contain module preload resources', async () => {
     const response = await rp(url('/'))
-    expect(response).toContain('<link rel="modulepreload" href="/_nuxt/modern-app.js" as="script">')
-    expect(response).toContain('<link rel="modulepreload" href="/_nuxt/modern-commons.app.js" as="script">')
+    expect(response).toContain('<link rel="modulepreload" crossorigin="use-credentials" href="/_nuxt/modern-app.js" as="script">')
+    expect(response).toContain('<link rel="modulepreload" crossorigin="use-credentials" href="/_nuxt/modern-commons.app.js" as="script">')
+  })
+
+  test('should contain module http2 pushed resources', async () => {
+    const { headers: { link } } = await rp(url('/'), { resolveWithFullResponse: true })
+    expect(link).toEqual([
+      '</_nuxt/modern-runtime.js>; rel=modulepreload; crossorigin=use-credentials; as=script',
+      '</_nuxt/modern-commons.app.js>; rel=modulepreload; crossorigin=use-credentials; as=script',
+      '</_nuxt/modern-app.js>; rel=modulepreload; crossorigin=use-credentials; as=script',
+      `</_nuxt/modern-${wChunk('pages/index.js')}>; rel=modulepreload; crossorigin=use-credentials; as=script`
+    ].join(', '))
+  })
+
+  test('should contain safari fix script', async () => {
+    const response = await rp(url('/'))
+    expect(response).toContain('"noModule"')
   })
 
   // Close server and ask nuxt to stop listening to file changes
diff --git a/test/unit/modern.server.test.js b/test/unit/modern.server.test.js
index d43bc99ff5..24b00068d8 100644
--- a/test/unit/modern.server.test.js
+++ b/test/unit/modern.server.test.js
@@ -1,16 +1,25 @@
+import chalk from 'chalk'
+import consola from 'consola'
 import { loadFixture, getPort, Nuxt, rp, wChunk } from '../utils'
 
 let nuxt, port
 const url = route => 'http://localhost:' + port + route
+const modernUA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36'
+const modernInfo = mode => `Modern bundles are detected. Modern mode (${chalk.green.bold(mode)}) is enabled now.`
 
 describe('modern server mode', () => {
   beforeAll(async () => {
-    const options = await loadFixture('modern', { modern: 'server' })
+    const options = await loadFixture('modern')
     nuxt = new Nuxt(options)
     port = await getPort()
     await nuxt.server.listen(port, 'localhost')
   })
 
+  test('should detect server modern mode', async () => {
+    await nuxt.server.renderAndGetWindow(url('/'))
+    expect(consola.info).toHaveBeenCalledWith(modernInfo('server'))
+  })
+
   test('should use legacy resources by default', async () => {
     const response = await rp(url('/'))
     expect(response).toContain('/_nuxt/app.js')
@@ -18,11 +27,7 @@ describe('modern server mode', () => {
   })
 
   test('should use modern resources for modern resources', async () => {
-    const response = await rp(url('/'), {
-      headers: {
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36'
-      }
-    })
+    const response = await rp(url('/'), { headers: { 'user-agent': modernUA } })
     expect(response).toContain('/_nuxt/modern-app.js')
     expect(response).toContain('/_nuxt/modern-commons.app.js')
   })
@@ -37,6 +42,31 @@ describe('modern server mode', () => {
     expect(response).toContain('arrow:function(){return"build test"}')
   })
 
+  test('should contain legacy http2 pushed resources', async () => {
+    const { headers: { link } } = await rp(url('/'), {
+      resolveWithFullResponse: true
+    })
+    expect(link).toEqual([
+      '</_nuxt/runtime.js>; rel=preload; crossorigin=use-credentials; as=script',
+      '</_nuxt/commons.app.js>; rel=preload; crossorigin=use-credentials; as=script',
+      '</_nuxt/app.js>; rel=preload; crossorigin=use-credentials; as=script',
+      `</_nuxt/${wChunk('pages/index.js')}>; rel=preload; crossorigin=use-credentials; as=script`
+    ].join(', '))
+  })
+
+  test('should contain module http2 pushed resources', async () => {
+    const { headers: { link } } = await rp(url('/'), {
+      headers: { 'user-agent': modernUA },
+      resolveWithFullResponse: true
+    })
+    expect(link).toEqual([
+      '</_nuxt/modern-runtime.js>; rel=preload; crossorigin=use-credentials; as=script',
+      '</_nuxt/modern-commons.app.js>; rel=preload; crossorigin=use-credentials; as=script',
+      '</_nuxt/modern-app.js>; rel=preload; crossorigin=use-credentials; as=script',
+      `</_nuxt/modern-${wChunk('pages/index.js')}>; rel=preload; crossorigin=use-credentials; as=script`
+    ].join(', '))
+  })
+
   // Close server and ask nuxt to stop listening to file changes
   afterAll(async () => {
     await nuxt.close()
diff --git a/test/unit/modern.spa.test.js b/test/unit/modern.spa.test.js
new file mode 100644
index 0000000000..15a06fa9e4
--- /dev/null
+++ b/test/unit/modern.spa.test.js
@@ -0,0 +1,53 @@
+import chalk from 'chalk'
+import consola from 'consola'
+import { loadFixture, getPort, Nuxt, rp } from '../utils'
+
+let nuxt, port, options
+const url = route => 'http://localhost:' + port + route
+const modernInfo = mode => `Modern bundles are detected. Modern mode (${chalk.green.bold(mode)}) is enabled now.`
+
+describe('modern client mode (SPA)', () => {
+  beforeAll(async () => {
+    options = await loadFixture('modern', { render: { ssr: false } })
+    nuxt = new Nuxt(options)
+    port = await getPort()
+    await nuxt.server.listen(port, 'localhost')
+  })
+
+  test('should detect client modern mode', async () => {
+    await nuxt.server.renderAndGetWindow(url('/'))
+    expect(consola.info).toHaveBeenCalledWith(modernInfo('client'))
+  })
+
+  test('should contain nomodule legacy resources', async () => {
+    const response = await rp(url('/'))
+    expect(response).toContain('src="/_nuxt/app.js" crossorigin="use-credentials" nomodule')
+    expect(response).toContain('src="/_nuxt/commons.app.js" crossorigin="use-credentials" nomodule')
+  })
+
+  test('should contain module modern resources', async () => {
+    const response = await rp(url('/'))
+    expect(response).toContain('<script type="module" src="/_nuxt/modern-app.js" crossorigin="use-credentials"')
+    expect(response).toContain('<script type="module" src="/_nuxt/modern-commons.app.js" crossorigin="use-credentials"')
+  })
+
+  test.skip('should contain module preload resources', async () => {
+    const response = await rp(url('/'))
+    expect(response).toContain('<link rel="modulepreload" crossorigin="use-credentials" href="/_nuxt/modern-app.js" as="script">')
+    expect(response).toContain('<link rel="modulepreload" crossorigin="use-credentials" href="/_nuxt/modern-commons.app.js" as="script">')
+  })
+
+  test('should contain module http2 pushed resources', async () => {
+    const { headers: { link } } = await rp(url('/'), { resolveWithFullResponse: true })
+    expect(link).toEqual([
+      '</_nuxt/modern-runtime.js>; rel=modulepreload; crossorigin=use-credentials; as=script',
+      '</_nuxt/modern-commons.app.js>; rel=modulepreload; crossorigin=use-credentials; as=script',
+      '</_nuxt/modern-app.js>; rel=modulepreload; crossorigin=use-credentials; as=script'
+    ].join(', '))
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  afterAll(async () => {
+    await nuxt.close()
+  })
+})
diff --git a/test/unit/module.test.js b/test/unit/module.test.js
index 69b69da146..013a6f70ce 100644
--- a/test/unit/module.test.js
+++ b/test/unit/module.test.js
@@ -1,9 +1,10 @@
-import { normalize } from 'path'
+import { normalize, resolve } from 'path'
 import consola from 'consola'
 import { loadFixture, getPort, Nuxt, Builder, rp } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
+const rootDir = resolve(__dirname, '..', 'fixtures/module')
 
 let nuxt = null
 // let buildSpies = null
@@ -24,7 +25,7 @@ describe('module', () => {
     expect(html).toContain('<h1>TXUN</h1>')
   })
 
-  test('Layout', async () => {
+  test('Layout - layouts from Module.addLayout take precedence', async () => {
     expect(nuxt.options.layouts.layout).toContain('layout')
 
     const { html } = await nuxt.server.renderRoute('/layout')
@@ -54,6 +55,11 @@ describe('module', () => {
     expect(response).toBe('It works!')
   })
 
+  test('serverMiddleware with path', async () => {
+    const response = await rp(url('/midd3'))
+    expect(response).toBe('Be creative when writing test strings! Hey Mama :wave:')
+  })
+
   test('Hooks - Use external middleware before render', async () => {
     const response = await rp(url('/use-middleware'))
     expect(response).toBe('Use external middleware')
@@ -69,6 +75,13 @@ describe('module', () => {
     expect(consola.warn).toHaveBeenCalledWith('addVendor has been deprecated due to webpack4 optimization')
   })
 
+  test('AddLayout - duplicate layout', () => {
+    nuxt.moduleContainer.addLayout(resolve(rootDir, 'modules', 'basic', 'layout.vue'))
+    expect(consola.warn).toHaveBeenCalledWith(
+      expect.stringContaining('Duplicate layout registration, "layout" has been registered as "./basic.layout.')
+    )
+  })
+
   test('Lodash - deprecated', async () => {
     const builder = new Builder(nuxt)
     await builder.generateRoutesAndFiles()
diff --git a/test/unit/named-views.test.js b/test/unit/named-views.test.js
new file mode 100644
index 0000000000..ca47db8c59
--- /dev/null
+++ b/test/unit/named-views.test.js
@@ -0,0 +1,41 @@
+import { getPort, loadFixture, Nuxt } from '../utils'
+
+let port
+let nuxt = null
+
+describe('named views', () => {
+  beforeAll(async () => {
+    const options = await loadFixture('named-views')
+    nuxt = new Nuxt(options)
+    port = await getPort()
+    await nuxt.server.listen(port, '0.0.0.0')
+  })
+
+  test('/ - no child, no named', async () => {
+    const { html } = await nuxt.server.renderRoute('/')
+    expect(html).toContain('LEFT:<!---->:LEFT')
+    expect(html).toContain('CHILD:<!---->:CHILD')
+    expect(html).toContain('TOP:<!---->:TOP')
+  })
+
+  test('/section - have child, no named', async () => {
+    const { html } = await nuxt.server.renderRoute('/section')
+    expect(html).toContain('LEFT:<!---->:LEFT')
+    expect(html).toMatch(new RegExp('CHILD:<div( data-v-.+)*>This page does not have left panel.</div>:CHILD'))
+    expect(html).toContain('TOP:<!---->:TOP')
+  })
+
+  test('/child/123 - have child, have named', async () => {
+    const { html } = await nuxt.server.renderRoute('/child/123')
+    expect(html).toMatch(new RegExp('LEFT:<div( data-v-.+)*>Child Left content!</div>:LEFT'))
+    expect(html).toMatch(new RegExp('CHILD:<div( data-v-.+)*>Child content ID:123!</div>:CHILD'))
+    expect(html).toContain('TOP:<!---->:TOP')
+  })
+
+  test('/main - no child, no named left, have named top', async () => {
+    const { html } = await nuxt.server.renderRoute('/main')
+    expect(html).toMatch(new RegExp('TOP:<div( data-v-.+)*>Main Top content!</div>:TOP'))
+    expect(html).toContain('LEFT:<!---->:LEFT')
+    expect(html).toContain('CHILD:<!---->:CHILD')
+  })
+})
diff --git a/test/unit/nuxt.test.js b/test/unit/nuxt.test.js
index fa174249d3..c084dc8346 100644
--- a/test/unit/nuxt.test.js
+++ b/test/unit/nuxt.test.js
@@ -19,22 +19,25 @@ describe('nuxt', () => {
     expect(nuxt.initialized).toBe(true)
   })
 
-  test('Fail to build when no pages/ directory but is in the parent', () => {
+  test('Fail to build when no pages/ directory but is in the parent', async () => {
+    const config = await loadFixture('empty')
     const nuxt = new Nuxt({
-      dev: false,
+      ...config,
       rootDir: resolve(__dirname, '..', 'fixtures', 'empty', 'pages')
     })
 
-    return new Builder(nuxt).build().catch((err) => {
-      const s = String(err)
-      expect(s).toContain('No `pages` directory found')
-      expect(s).toContain('Did you mean to run `nuxt` in the parent (`../`) directory?')
-    })
+    try {
+      await new Builder(nuxt).build()
+    } catch (err) {
+      expect(err.message).toContain('No `pages` directory found')
+      expect(err.message).toContain('Did you mean to run `nuxt` in the parent (`../`) directory?')
+    }
+    expect.hasAssertions()
   })
 
   test('Build with default page when no pages/ directory', async () => {
-    const nuxt = new Nuxt()
-    new Builder(nuxt).build()
+    const config = await loadFixture('missing-pages-dir')
+    const nuxt = new Nuxt(config)
     const port = await getPort()
     await nuxt.server.listen(port, 'localhost')
 
@@ -45,27 +48,17 @@ describe('nuxt', () => {
     await nuxt.close()
   })
 
-  test('Fail to build when specified plugin isn\'t found', () => {
-    const nuxt = new Nuxt({
-      dev: false,
-      rootDir: resolve(__dirname, '..', 'fixtures', 'missing-plugin')
-    })
+  test('Fail to build when specified plugin isn\'t found', async () => {
+    const config = await loadFixture('missing-plugin')
+    const nuxt = new Nuxt(config)
 
-    return new Builder(nuxt).build().catch((err) => {
-      const s = String(err)
-      expect(s).toContain('Plugin not found')
-    })
+    await expect(new Builder(nuxt).build()).rejects.toThrow('Plugin not found')
   })
 
-  test('Warn when styleResource isn\'t found', () => {
-    const nuxt = new Nuxt({
-      dev: false,
-      rootDir: resolve(__dirname, '..', 'fixtures', 'missing-style-resource')
-    })
+  test('Warn when styleResource isn\'t found', async () => {
+    const config = await loadFixture('missing-style-resource')
+    const nuxt = new Nuxt(config)
 
-    return new Builder(nuxt).build().catch((err) => {
-      const s = String(err)
-      expect(s).toContain('Style Resource not found')
-    })
+    await expect(new Builder(nuxt).build()).rejects.toThrow('Style Resource not found')
   })
 })
diff --git a/test/unit/renderer.test.js b/test/unit/renderer.test.js
new file mode 100644
index 0000000000..2495fa7269
--- /dev/null
+++ b/test/unit/renderer.test.js
@@ -0,0 +1,48 @@
+import path from 'path'
+import consola from 'consola'
+import { Nuxt } from '../utils'
+
+const NO_BUILD_MSG = 'No build files found. Use either `nuxt build` or `builder.build()` or start nuxt in development mode.'
+const NO_MODERN_BUILD_MSG = 'No modern build files found. Use either `nuxt build --modern` or `modern` option to build modern files.'
+
+describe('renderer', () => {
+  afterEach(() => {
+    consola.fatal.mockClear()
+  })
+
+  test('detect no-build (Universal)', async () => {
+    const nuxt = new Nuxt({
+      _start: true,
+      mode: 'universal',
+      dev: false,
+      buildDir: '/path/to/404'
+    })
+    await nuxt.ready()
+    await expect(nuxt.renderer.renderer.isReady).toBe(false)
+    expect(consola.fatal).toHaveBeenCalledWith(new Error(NO_BUILD_MSG))
+  })
+
+  test('detect no-build (SPA)', async () => {
+    const nuxt = new Nuxt({
+      _start: true,
+      mode: 'spa',
+      dev: false,
+      buildDir: '/path/to/404'
+    })
+    await nuxt.ready()
+    await expect(nuxt.renderer.renderer.isReady).toBe(false)
+    expect(consola.fatal).toHaveBeenCalledWith(new Error(NO_BUILD_MSG))
+  })
+  test('detect no-modern-build', async () => {
+    const nuxt = new Nuxt({
+      _start: true,
+      mode: 'universal',
+      modern: 'client',
+      dev: false,
+      buildDir: path.resolve(__dirname, '..', 'fixtures', 'empty', '.nuxt')
+    })
+    await nuxt.ready()
+    await expect(nuxt.renderer.renderer.isReady).toBe(true)
+    expect(consola.fatal).toHaveBeenCalledWith(new Error(NO_MODERN_BUILD_MSG))
+  })
+})
diff --git a/test/unit/route-name-splitter.test.js b/test/unit/route-name-splitter.test.js
new file mode 100644
index 0000000000..9595788d4d
--- /dev/null
+++ b/test/unit/route-name-splitter.test.js
@@ -0,0 +1,33 @@
+import { resolve } from 'path'
+import fs from 'fs'
+import { promisify } from 'util'
+
+const readFile = promisify(fs.readFile)
+
+describe('route-name-splitter', () => {
+  test('Check routes names', () => {
+    return readFile(
+      resolve(__dirname, '..', 'fixtures/route-name-splitter/.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
+      )
+      const routes = eval('( ' + routerFile + ')') // eslint-disable-line no-eval
+
+      expect(routes[0].name).toBe('parent')
+      expect(routes[1].name).toBe('posts')
+      expect(routes[1].children[0].name).toBe('posts/id')
+      expect(routes[2].name).toBe('parent/child')
+      expect(routes[3].name).toBe('index')
+      expect(routes[4].name).toBe('all/p/all')
+      expect(routes[5].name).toBe('all/all')
+      expect(routes[6].name).toBe('all')
+    })
+  })
+})
diff --git a/test/unit/server.listen.test.js b/test/unit/server.listen.test.js
new file mode 100644
index 0000000000..2b25b08b34
--- /dev/null
+++ b/test/unit/server.listen.test.js
@@ -0,0 +1,73 @@
+import consola from 'consola'
+
+import { loadFixture, getPort, Nuxt } from '../utils'
+
+let config
+
+describe('server listen', () => {
+  beforeAll(async () => {
+    config = await loadFixture('empty')
+  })
+
+  test('should throw error when listening on same port (prod)', async () => {
+    const nuxt = new Nuxt(config)
+    const port = await getPort()
+    const listen = () => nuxt.server.listen(port, 'localhost')
+
+    // Listen for first time
+    await listen()
+    expect(nuxt.server.listeners[0].port).toBe(port)
+
+    // Listen for second time
+    await expect(listen()).rejects.toThrow(`Address \`localhost:${port}\` is already in use.`)
+
+    await nuxt.close()
+  })
+
+  test('should assign a random port when listening on same port (dev)', async () => {
+    const nuxt = new Nuxt({ ...config, dev: true })
+    const port = await getPort()
+    const listen = () => nuxt.server.listen(port, 'localhost')
+
+    // Listen for first time
+    await listen()
+    expect(nuxt.server.listeners[0].port).toBe(port)
+
+    // Listen for second time
+    await listen()
+    expect(nuxt.server.listeners[1].port).not.toBe(nuxt.server.listeners[0].port)
+    expect(consola.warn).toHaveBeenCalledTimes(1)
+    expect(consola.warn).toHaveBeenCalledWith(`Address \`localhost:${port}\` is already in use.`)
+
+    await nuxt.close()
+  })
+
+  test('should skip the use of default port when listening on port 0', async () => {
+    // Stub process.env.PORT
+    const stubDetails = {
+      originalValue: process.env.PORT,
+      hasProperty: 'PORT' in process.env
+    }
+    const DEFAULT_PORT = '2999'
+    process.env.PORT = DEFAULT_PORT
+
+    // Setup test
+    const nuxt = new Nuxt({ ...config, dev: true })
+    const listen = () => nuxt.server.listen(0, 'localhost') // Use port 0 to let allow host to randomly assign a free PORT
+    const toString = (x = '') => `${x}`
+
+    // Nuxt server should not be listening on the DEFAULT_PORT
+    await listen()
+    expect(toString(nuxt.server.listeners[0].port)).not.toBe(DEFAULT_PORT)
+
+    // Reset stub for process.env.PORT
+    if (stubDetails.hasProperty) {
+      process.env.PORT = stubDetails.originalValue
+    } else {
+      delete process.env.PORT
+    }
+
+    // Finalize test
+    await nuxt.close()
+  })
+})
diff --git a/test/unit/sockets.test.js b/test/unit/sockets.test.js
index 0cc0cbdcf0..92e1c7907a 100644
--- a/test/unit/sockets.test.js
+++ b/test/unit/sockets.test.js
@@ -3,19 +3,14 @@ import { loadFixture, Nuxt } from '../utils'
 let nuxt = null
 
 describe.skip.win('basic sockets', () => {
-  beforeAll(async () => {
+  test('/', async () => {
     const options = await loadFixture('sockets')
     nuxt = new Nuxt(options)
     await nuxt.server.listen()
-  })
 
-  test('/', async () => {
     const { html } = await nuxt.server.renderRoute('/')
     expect(html).toContain('<h1>Served over sockets!</h1>')
-  })
 
-  // Close server and ask nuxt to stop listening to file changes
-  afterAll(async () => {
     await nuxt.close()
   })
 })
diff --git a/test/unit/spa.test.js b/test/unit/spa.test.js
index e021f61986..9a51f6fbed 100644
--- a/test/unit/spa.test.js
+++ b/test/unit/spa.test.js
@@ -1,5 +1,5 @@
 import consola from 'consola'
-import { loadFixture, getPort, Nuxt } from '../utils'
+import { loadFixture, getPort, Nuxt, wChunk } from '../utils'
 
 let nuxt, port
 const url = route => 'http://localhost:' + port + route
@@ -27,6 +27,21 @@ describe('spa', () => {
     consola.log.mockClear()
   })
 
+  test('/ (include preload and prefetch resources)', async () => {
+    const { head } = await renderRoute('/')
+    expect(head).toMatch(`<link rel="preload" href="/_nuxt/runtime.js" as="script">`)
+    expect(head).toMatch(`<link rel="preload" href="/_nuxt/commons.app.js" as="script">`)
+    expect(head).toMatch(`<link rel="preload" href="/_nuxt/app.js" as="script">`)
+    expect(head).toMatch(`<link rel="prefetch" href="/_nuxt/${wChunk('pages/custom.js')}">`)
+    expect(head).toMatch(`<link rel="prefetch" href="/_nuxt/${wChunk('pages/error-handler-async.js')}">`)
+    expect(head).toMatch(`<link rel="prefetch" href="/_nuxt/${wChunk('pages/error-handler-object.js')}">`)
+    expect(head).toMatch(`<link rel="prefetch" href="/_nuxt/${wChunk('pages/error-handler-string.js')}">`)
+    expect(head).toMatch(`<link rel="prefetch" href="/_nuxt/${wChunk('pages/error-handler.js')}">`)
+    expect(head).toMatch(`<link rel="prefetch" href="/_nuxt/${wChunk('pages/index.js')}">`)
+    expect(head).toMatch(`<link rel="prefetch" href="/_nuxt/${wChunk('pages/mounted.js')}">`)
+    consola.log.mockClear()
+  })
+
   test('/custom (custom layout)', async () => {
     const { html } = await renderRoute('/custom')
     expect(html).toMatch('Custom layout')
diff --git a/test/unit/ssr.test.js b/test/unit/ssr.test.js
index 5e09eb6a8e..b328a22e46 100644
--- a/test/unit/ssr.test.js
+++ b/test/unit/ssr.test.js
@@ -7,7 +7,7 @@ let nuxt = null
 
 // Utils
 const range = n => [...Array(n).keys()]
-const FOOBAR_REGEX = /<foobar>([\s\S]*)<\/foobar>/
+const FOOBAR_REGEX = /<Foobar>([\s\S]*)<\/Foobar>/
 const match = (regex, text) => (regex.exec(text) || [])[1]
 
 const url = route => 'http://localhost:' + port + route
diff --git a/test/unit/typescript.modern.test.js b/test/unit/typescript.modern.test.js
new file mode 100644
index 0000000000..f6105747be
--- /dev/null
+++ b/test/unit/typescript.modern.test.js
@@ -0,0 +1,23 @@
+import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'
+import { loadFixture, Nuxt, Builder, BundleBuilder } from '../utils'
+
+jest.mock('fork-ts-checker-webpack-plugin')
+
+describe('typescript modern', () => {
+  let nuxt
+
+  beforeAll(async () => {
+    const options = await loadFixture('typescript')
+    nuxt = new Nuxt(Object.assign(options, { modern: true, build: { useForkTsChecker: true } }))
+    await new Builder(nuxt, BundleBuilder).build()
+  })
+
+  test('check types only once', () => {
+    expect(ForkTsCheckerWebpackPlugin).toHaveBeenCalledTimes(1)
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  afterAll(async () => {
+    await nuxt.close()
+  })
+})
diff --git a/test/unit/typescript.setup.test.js b/test/unit/typescript.setup.test.js
new file mode 100644
index 0000000000..f111a33fd8
--- /dev/null
+++ b/test/unit/typescript.setup.test.js
@@ -0,0 +1,46 @@
+import { resolve } from 'path'
+import { exists, mkdirp, readJSON, remove } from 'fs-extra'
+import { register } from 'ts-node'
+import { setup as setupTypeScript } from '@nuxt/typescript'
+
+jest.mock('ts-node')
+
+describe('typescript setup', () => {
+  const rootDir = 'tmp'
+  const tsConfigPath = resolve(rootDir, 'tsconfig.json')
+
+  beforeAll(async () => {
+    // We're assuming that rootDir provided to setupTypeScript is existing so we create the tested one
+    await mkdirp(rootDir)
+    await setupTypeScript(tsConfigPath)
+  })
+
+  test('tsconfig.json has been generated if missing', async () => {
+    expect(await exists(tsConfigPath)).toBe(true)
+    expect(await readJSON(tsConfigPath)).toEqual({
+      extends: '@nuxt/typescript',
+      compilerOptions: {
+        baseUrl: '.',
+        types: [
+          '@types/node',
+          '@nuxt/vue-app'
+        ]
+      }
+    })
+  })
+
+  test('ts-node has been registered once', async () => {
+    // Call setupTypeScript a second time to test guard
+    await setupTypeScript(tsConfigPath)
+
+    expect(register).toHaveBeenCalledTimes(1)
+    expect(register).toHaveBeenCalledWith({
+      project: tsConfigPath
+    })
+  })
+
+  afterAll(async () => {
+    // Clean workspace by removing the temporary folder (and the generated tsconfig.json at the same time)
+    await remove(tsConfigPath)
+  })
+})
diff --git a/test/unit/typescript.test.js b/test/unit/typescript.test.js
new file mode 100644
index 0000000000..7d015f55ee
--- /dev/null
+++ b/test/unit/typescript.test.js
@@ -0,0 +1,49 @@
+import { loadFixture, getPort, Nuxt, rp } from '../utils'
+
+describe('typescript', () => {
+  let nuxt
+  let port
+  const url = route => 'http://localhost:' + port + route
+
+  beforeAll(async () => {
+    const options = await loadFixture('typescript')
+    nuxt = new Nuxt(options)
+    await nuxt.ready()
+    port = await getPort()
+    await nuxt.server.listen(port, '0.0.0.0')
+  })
+
+  test('/', async () => {
+    const { html } = await nuxt.server.renderRoute('/')
+    expect(html).toContain('<div>Index Page</div>')
+  })
+
+  test('/about', async () => {
+    const { html } = await nuxt.server.renderRoute('/about')
+    expect(html).toContain('<div>About Page</div>')
+  })
+
+  test('/interface', async () => {
+    const { html } = await nuxt.server.renderRoute('/interface')
+    expect(html).toContain('<div>Interface Page</div>')
+  })
+
+  test('/contact', async () => {
+    const { html } = await nuxt.server.renderRoute('/contact')
+    expect(html).toContain('<div>Contact Page</div>')
+  })
+
+  test('/api/test', async () => {
+    const html = await rp(url('/api/test'))
+    expect(html).toContain('Works!')
+  })
+
+  test('TS module successfully required', () => {
+    expect(nuxt.moduleContainer.requiredModules).toHaveProperty('~/modules/module')
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  afterAll(async () => {
+    await nuxt.close()
+  })
+})
diff --git a/test/unit/utils.test.js b/test/unit/utils.test.js
index add1baa0e0..84515e4712 100644
--- a/test/unit/utils.test.js
+++ b/test/unit/utils.test.js
@@ -1,6 +1,6 @@
 import path from 'path'
 import { waitUntil } from '../utils'
-import * as Utils from '../../packages/common/src/index'
+import * as Utils from '../../packages/utils/src/index'
 
 describe('utils', () => {
   test('encodeHtml', () => {
diff --git a/test/unit/with-config.test.js b/test/unit/with-config.test.js
index b967b1a0c2..374f44b791 100644
--- a/test/unit/with-config.test.js
+++ b/test/unit/with-config.test.js
@@ -1,6 +1,12 @@
+import { resolve } from 'path'
+import { existsSync } from 'fs'
 import jsdom from 'jsdom'
+import Glob from 'glob'
+import pify from 'pify'
 import { getPort, loadFixture, Nuxt, rp } from '../utils'
 
+const glob = pify(Glob)
+
 let port
 const url = route => 'http://localhost:' + port + route
 
@@ -14,6 +20,13 @@ describe('with-config', () => {
     await nuxt.server.listen(port, 'localhost')
   })
 
+  test('client source map generated', async () => {
+    const jsFiles = await glob(resolve(__dirname, '..', 'fixtures/with-config/.nuxt/dist/client/*.js'))
+    for (const file of jsFiles) {
+      expect(existsSync(`${file}.map`)).toBe(true)
+    }
+  })
+
   test('/', async () => {
     const { html } = await nuxt.server.renderRoute('/')
     expect(html).toContain('<h1>I have custom configurations</h1>')
@@ -77,6 +90,9 @@ describe('with-config', () => {
     expect(html).toContain('<h1>I have custom configurations</h1>')
 
     expect(window.__test_plugin).toBe(true)
+    expect(window.__test_plugin_ext).toBe(true)
+    expect(window.__test_plugin_client).toBe('test_plugin_client')
+    expect(window.__test_plugin_server).toBeUndefined()
   })
 
   test('/test/about (custom layout)', async () => {
@@ -134,6 +150,7 @@ describe('with-config', () => {
     const html = window.document.body.innerHTML
     expect(html).toContain('<h1>Custom layout</h1>')
     expect(html).toContain('<h1>About page</h1>')
+    expect(html).toContain('<h2>test-meta</h2>')
   })
 
   test('/test/not-existed should return 404', async () => {
@@ -180,6 +197,13 @@ describe('with-config', () => {
     expect(fakeErrorLog).toHaveBeenCalled()
   })
 
+  test('/ with Server-Timing header', async () => {
+    const { headers } = await rp(url('/test'), {
+      resolveWithFullResponse: true
+    })
+    expect(headers['server-timing']).toMatch(/total;dur=\d+;desc="Nuxt Server Time"/)
+  })
+
   // Close server and ask nuxt to stop listening to file changes
   afterAll(async () => {
     await nuxt.close()
diff --git a/test/unit/wp.config.test.js b/test/unit/wp.config.test.js
index 1641c03362..500ec8528f 100644
--- a/test/unit/wp.config.test.js
+++ b/test/unit/wp.config.test.js
@@ -1,6 +1,6 @@
 
 import path from 'path'
-import PerfLoader from '../../packages/webpack/src/config/utils/perf-loader'
+import PerfLoader from '../../packages/webpack/src/utils/perf-loader'
 
 describe('webpack configuration', () => {
   test('performance loader', () => {
diff --git a/test/utils/browser.js b/test/utils/browser.js
index c2ba5a104e..9cfedec129 100644
--- a/test/utils/browser.js
+++ b/test/utils/browser.js
@@ -27,9 +27,13 @@ export default class Browser {
     await page.waitForFunction(`!!${page.$nuxtGlobalHandle}`)
     page.html = () =>
       page.evaluate(() => window.document.documentElement.outerHTML)
-    page.$text = selector => page.$eval(selector, el => el.textContent)
-    page.$$text = selector =>
-      page.$$eval(selector, els => els.map(el => el.textContent))
+    page.$text = (selector, trim) => page.$eval(selector, (el, trim) => {
+      return trim ? el.textContent.replace(/^\s+|\s+$/g, '') : el.textContent
+    }, trim)
+    page.$$text = (selector, trim) =>
+      page.$$eval(selector, (els, trim) => els.map((el) => {
+        return trim ? el.textContent.replace(/^\s+|\s+$/g, '') : el.textContent
+      }), trim)
     page.$attr = (selector, attr) =>
       page.$eval(selector, (el, attr) => el.getAttribute(attr), attr)
     page.$$attr = (selector, attr) =>
diff --git a/test/utils/index.js b/test/utils/index.js
index 77601e7237..afa91cd8bc 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -1,5 +1,5 @@
 import klawSync from 'klaw-sync'
-import { waitFor } from '../../packages/common'
+import { waitFor } from '../../packages/utils'
 
 export { getNuxtConfig } from '../../packages/config'
 export { default as getPort } from 'get-port'
diff --git a/test/utils/nuxt.js b/test/utils/nuxt.js
index 47d954a484..05a7c11f98 100644
--- a/test/utils/nuxt.js
+++ b/test/utils/nuxt.js
@@ -1,20 +1,30 @@
 
 import path from 'path'
-import fs from 'fs'
 import { defaultsDeep } from 'lodash'
+import { version as coreVersion } from '../../packages/core/package.json'
 
-export { version } from '../../packages/core/package.json'
 export { Nuxt } from '../../packages/core/src/index'
 export { Builder } from '../../packages/builder/src/index'
 export { Generator } from '../../packages/generator/src/index'
 export { BundleBuilder } from '../../packages/webpack/src/index'
-export * from '../../packages/common/src/index'
+export * from '../../packages/utils/src/index'
+
+export const version = `v${coreVersion}`
 
 export const loadFixture = async function (fixture, overrides) {
   const rootDir = path.resolve(__dirname, '..', 'fixtures', fixture)
-  const configFile = path.resolve(rootDir, 'nuxt.config.js')
+  let config = {}
+
+  try {
+    config = await import(`../fixtures/${fixture}/nuxt.config`)
+    config = config.default || config
+  } catch (e) {
+    // Ignore MODULE_NOT_FOUND
+    if (e.code !== 'MODULE_NOT_FOUND') {
+      throw e
+    }
+  }
 
-  let config = fs.existsSync(configFile) ? (await import(`../fixtures/${fixture}/nuxt.config`)).default : {}
   if (typeof config === 'function') {
     config = await config()
   }
diff --git a/test/utils/setup.js b/test/utils/setup.js
index 7426140d91..a20c15f164 100644
--- a/test/utils/setup.js
+++ b/test/utils/setup.js
@@ -1,9 +1,9 @@
 import consola from 'consola'
 import chalk from 'chalk'
+import env from 'std-env'
 
-const isWin = process.platform === 'win32'
-describe.skip.win = isWin ? describe.skip : describe
-test.skip.win = isWin ? test.skip : test
+describe.skip.win = env.windows ? describe.skip : describe
+test.skip.win = env.windows ? test.skip : test
 
 chalk.enabled = false
 
diff --git a/yarn.lock b/yarn.lock
index 6b13372666..92ecb43a43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,18 +9,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.6":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.1.6.tgz#3733cbee4317429bc87c62b29cf8587dba7baeb3"
-  integrity sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==
+"@babel/core@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
+  integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.1.6"
-    "@babel/helpers" "^7.1.5"
-    "@babel/parser" "^7.1.6"
-    "@babel/template" "^7.1.2"
-    "@babel/traverse" "^7.1.6"
-    "@babel/types" "^7.1.6"
+    "@babel/generator" "^7.2.2"
+    "@babel/helpers" "^7.2.0"
+    "@babel/parser" "^7.2.2"
+    "@babel/template" "^7.2.2"
+    "@babel/traverse" "^7.2.2"
+    "@babel/types" "^7.2.2"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -29,12 +29,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.1.6":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz#001303cf87a5b9d093494a4bf251d7b5d03d3999"
-  integrity sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==
+"@babel/generator@^7.2.2":
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.3.0.tgz#f663838cd7b542366de3aa608a657b8ccb2a99eb"
+  integrity sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg==
   dependencies:
-    "@babel/types" "^7.1.6"
+    "@babel/types" "^7.3.0"
     jsesc "^2.5.1"
     lodash "^4.17.10"
     source-map "^0.5.0"
@@ -64,6 +64,17 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-create-class-features-plugin@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.0.tgz#2b01a81b3adc2b1287f9ee193688ef8dc71e718f"
+  integrity sha512-DUsQNS2CGLZZ7I3W3fvh0YpPDd6BuWJlDl+qmZZpABZHza2ErE3LxtEzLJFHFC1ZwtlAXvHhbFYbtM5o5B0WBw==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.2.3"
+
 "@babel/helper-define-map@^7.1.0":
   version "7.1.0"
   resolved "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
@@ -119,15 +130,15 @@
     "@babel/types" "^7.0.0"
 
 "@babel/helper-module-transforms@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
-  integrity sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
+  integrity sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/template" "^7.2.2"
+    "@babel/types" "^7.2.2"
     lodash "^4.17.10"
 
 "@babel/helper-optimise-call-expression@^7.0.0":
@@ -160,14 +171,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
-  integrity sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz#19970020cf22677d62b3a689561dbd9644d8c5e5"
+  integrity sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
+    "@babel/traverse" "^7.2.3"
     "@babel/types" "^7.0.0"
 
 "@babel/helper-simple-access@^7.1.0":
@@ -186,23 +197,23 @@
     "@babel/types" "^7.0.0"
 
 "@babel/helper-wrap-function@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
-  integrity sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
+  integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/template" "^7.1.0"
     "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.1.5":
-  version "7.1.5"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.5.tgz#68bfc1895d685f2b8f1995e788dbfe1f6ccb1996"
-  integrity sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==
+"@babel/helpers@^7.2.0":
+  version "7.3.1"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
+  integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==
   dependencies:
     "@babel/template" "^7.1.2"
     "@babel/traverse" "^7.1.5"
-    "@babel/types" "^7.1.5"
+    "@babel/types" "^7.3.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -213,166 +224,154 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.6":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz#16e97aca1ec1062324a01c5a6a7d0df8dd189854"
-  integrity sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==
+"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
+  version "7.3.1"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181"
+  integrity sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==
 
-"@babel/plugin-proposal-async-generator-functions@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
-  integrity sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==
+"@babel/plugin-proposal-async-generator-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
+  integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-remap-async-to-generator" "^7.1.0"
-    "@babel/plugin-syntax-async-generators" "^7.0.0"
+    "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz#9af01856b1241db60ec8838d84691aa0bd1e8df4"
-  integrity sha512-/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw==
+"@babel/plugin-proposal-class-properties@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd"
+  integrity sha512-wNHxLkEKTQ2ay0tnsam2z7fGZUi+05ziDJflEt3AZTP3oXLKHJp9HqhfroB/vdMvt3sda9fAbq7FsG8QPDrZBg==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-create-class-features-plugin" "^7.3.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
-    "@babel/plugin-syntax-class-properties" "^7.0.0"
 
-"@babel/plugin-proposal-decorators@^7.1.6":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.1.6.tgz#460c31edbd01953efe45d491583b3ec31661d689"
-  integrity sha512-U42f8KhUbtlhUDyV/wK4Rq/wWh8vWyttYABckG/v0vVnMPvayOewZC/83CbVdmyP+UhEqI368FEQ7hHMfhBpQA==
+"@babel/plugin-proposal-decorators@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.3.0.tgz#637ba075fa780b1f75d08186e8fb4357d03a72a7"
+  integrity sha512-3W/oCUmsO43FmZIqermmq6TKaRSYhmh/vybPfVFwQWdSb8xwki38uAIvknCRzuyHRuYfCYmJzL9or1v0AffPjg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.3.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-decorators" "^7.2.0"
+
+"@babel/plugin-proposal-json-strings@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
+  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/plugin-syntax-decorators" "^7.1.0"
+    "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
-  integrity sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==
+"@babel/plugin-proposal-object-rest-spread@^7.3.1":
+  version "7.3.1"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.1.tgz#f69fb6a1ea6a4e1c503994a91d9cf76f3c4b36e8"
+  integrity sha512-Nmmv1+3LqxJu/V5jU9vJmxR/KIRWFk2qLHmbB56yRRRFhlaSuOVXscX3gUmhaKgUhzA3otOHVubbIEVYsZ0eZg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
-  integrity sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==
+"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
+  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
-  integrity sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
-  integrity sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==
+"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
+  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
     regexpu-core "^4.2.0"
 
-"@babel/plugin-syntax-async-generators@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
-  integrity sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==
+"@babel/plugin-syntax-async-generators@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
+  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-class-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz#e051af5d300cbfbcec4a7476e37a803489881634"
-  integrity sha512-cR12g0Qzn4sgkjrbrzWy2GE7m9vMl/sFkqZ3gIpAQdrvPDnLM8180i+ANDFIXfjHo9aqp0ccJlQ0QNZcFUbf9w==
+"@babel/plugin-syntax-decorators@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b"
+  integrity sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-decorators@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.1.0.tgz#2fa7c1a7905a299c9853ebcef340306675f9cbdc"
-  integrity sha512-uQvRSbgQ0nQg3jsmIixXXDCgSpkBolJ9X7NYThMKCcjvE8dN2uWJUzTUNNAeuKOjARTd+wUQV0ztXpgunZYKzQ==
+"@babel/plugin-syntax-dynamic-import@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
+  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-dynamic-import@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0.tgz#6dfb7d8b6c3be14ce952962f658f3b7eb54c33ee"
-  integrity sha512-Gt9xNyRrCHCiyX/ZxDGOcBnlJl0I3IWicpZRC4CdC0P5a/I07Ya2OAMEBU+J7GmRFVmIetqEYRko6QYRuKOESw==
+"@babel/plugin-syntax-json-strings@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
+  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
-  integrity sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==
+"@babel/plugin-syntax-jsx@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
+  integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz#034d5e2b4e14ccaea2e4c137af7e4afb39375ffd"
-  integrity sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==
+"@babel/plugin-syntax-object-rest-spread@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
-  integrity sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==
+"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
+  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
-  integrity sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==
+"@babel/plugin-transform-arrow-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
+  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-arrow-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
-  integrity sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
-  integrity sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==
+"@babel/plugin-transform-async-to-generator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz#68b8a438663e88519e65b776f8938f3445b1a2ff"
+  integrity sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-remap-async-to-generator" "^7.1.0"
 
-"@babel/plugin-transform-block-scoped-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
-  integrity sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==
+"@babel/plugin-transform-block-scoped-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
+  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.1.5":
-  version "7.1.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz#3e8e0bc9a5104519923302a24f748f72f2f61f37"
-  integrity sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ==
+"@babel/plugin-transform-block-scoping@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4"
+  integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.10"
 
-"@babel/plugin-transform-classes@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
-  integrity sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==
+"@babel/plugin-transform-classes@^7.2.0":
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz#6c90542f210ee975aa2aa8c8b5af7fa73a126953"
+  integrity sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-define-map" "^7.1.0"
@@ -383,99 +382,106 @@
     "@babel/helper-split-export-declaration" "^7.0.0"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
-  integrity sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==
+"@babel/plugin-transform-computed-properties@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
+  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.0.0":
-  version "7.1.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.3.tgz#e69ff50ca01fac6cb72863c544e516c2b193012f"
-  integrity sha512-Mb9M4DGIOspH1ExHOUnn2UUXFOyVTiX84fXCd+6B5iWrQg/QMeeRmSwpZ9lnjYLSXtZwiw80ytVMr3zue0ucYw==
+"@babel/plugin-transform-destructuring@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz#e75269b4b7889ec3a332cd0d0c8cff8fed0dc6f3"
+  integrity sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
-  integrity sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==
+"@babel/plugin-transform-dotall-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
+  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
     regexpu-core "^4.1.3"
 
-"@babel/plugin-transform-duplicate-keys@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
-  integrity sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==
+"@babel/plugin-transform-duplicate-keys@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz#d952c4930f312a4dbfff18f0b2914e60c35530b3"
+  integrity sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-exponentiation-operator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
-  integrity sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==
+"@babel/plugin-transform-exponentiation-operator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
+  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-for-of@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
-  integrity sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==
+"@babel/plugin-transform-for-of@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
+  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
-  integrity sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==
+"@babel/plugin-transform-function-name@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
+  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
-  integrity sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==
+"@babel/plugin-transform-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
+  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-amd@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8"
-  integrity sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==
+"@babel/plugin-transform-modules-amd@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
+  integrity sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
-  integrity sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==
+"@babel/plugin-transform-modules-commonjs@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
+  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.0.0":
-  version "7.1.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.1.3.tgz#2119a3e3db612fd74a19d88652efbfe9613a5db0"
-  integrity sha512-PvTxgjxQAq4pvVUZF3mD5gEtVDuId8NtWkJsZLEJZMZAW3TvgQl1pmydLLN1bM8huHFVVU43lf0uvjQj9FRkKw==
+"@babel/plugin-transform-modules-systemjs@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz#912bfe9e5ff982924c81d0937c92d24994bb9068"
+  integrity sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-umd@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8"
-  integrity sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==
+"@babel/plugin-transform-modules-umd@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
+  integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
+  integrity sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==
+  dependencies:
+    regexp-tree "^0.1.0"
+
 "@babel/plugin-transform-new-target@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
@@ -483,18 +489,18 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-object-super@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
-  integrity sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==
+"@babel/plugin-transform-object-super@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz#b35d4c10f56bab5d650047dad0f1d8e8814b6598"
+  integrity sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
 
-"@babel/plugin-transform-parameters@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
-  integrity sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==
+"@babel/plugin-transform-parameters@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz#0d5ad15dc805e2ea866df4dd6682bfe76d1408c2"
+  integrity sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==
   dependencies:
     "@babel/helper-call-delegate" "^7.1.0"
     "@babel/helper-get-function-arity" "^7.0.0"
@@ -507,113 +513,115 @@
   dependencies:
     regenerator-transform "^0.13.3"
 
-"@babel/plugin-transform-runtime@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.1.0.tgz#9f76920d42551bb577e2dc594df229b5f7624b63"
-  integrity sha512-WFLMgzu5DLQEah0lKTJzYb14vd6UiES7PTnXcvrPZ1VrwFeJ+mTbvr65fFAsXYMt2bIoOoC0jk76zY1S7HZjUg==
+"@babel/plugin-transform-runtime@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea"
+  integrity sha512-jIgkljDdq4RYDnJyQsiWbdvGeei/0MOTtSHKO/rfbd/mXBxNpdlulMx49L0HQ4pug1fXannxoqCI+fYSle9eSw==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
-  integrity sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==
+"@babel/plugin-transform-shorthand-properties@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
+  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
-  integrity sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==
+"@babel/plugin-transform-spread@^7.2.0":
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
+  integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-sticky-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
-  integrity sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==
+"@babel/plugin-transform-sticky-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
+  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
-  integrity sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==
+"@babel/plugin-transform-template-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
+  integrity sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
-  integrity sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==
+"@babel/plugin-transform-typeof-symbol@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
+  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
-  integrity sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==
+"@babel/plugin-transform-unicode-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
+  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
     regexpu-core "^4.1.3"
 
-"@babel/polyfill@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz#c8ff65c9ec3be6a1ba10113ebd40e8750fb90bff"
-  integrity sha512-dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q==
+"@babel/polyfill@^7.2.5":
+  version "7.2.5"
+  resolved "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz#6c54b964f71ad27edddc567d065e57e87ed7fa7d"
+  integrity sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==
   dependencies:
     core-js "^2.5.7"
-    regenerator-runtime "^0.11.1"
+    regenerator-runtime "^0.12.0"
 
-"@babel/preset-env@^7.1.6":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.6.tgz#a0bf4b96b6bfcf6e000afc5b72b4abe7cc13ae97"
-  integrity sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw==
+"@babel/preset-env@^7.3.1":
+  version "7.3.1"
+  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.1.tgz#389e8ca6b17ae67aaf9a2111665030be923515db"
+  integrity sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.1.0"
-    "@babel/plugin-proposal-json-strings" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.0.0"
-    "@babel/plugin-syntax-async-generators" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.1.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.1.5"
-    "@babel/plugin-transform-classes" "^7.1.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-dotall-regex" "^7.0.0"
-    "@babel/plugin-transform-duplicate-keys" "^7.0.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.1.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.1.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-amd" "^7.1.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.1.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.0.0"
-    "@babel/plugin-transform-modules-umd" "^7.1.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+    "@babel/plugin-proposal-json-strings" "^7.2.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.3.1"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
+    "@babel/plugin-syntax-async-generators" "^7.2.0"
+    "@babel/plugin-syntax-json-strings" "^7.2.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-transform-arrow-functions" "^7.2.0"
+    "@babel/plugin-transform-async-to-generator" "^7.2.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
+    "@babel/plugin-transform-block-scoping" "^7.2.0"
+    "@babel/plugin-transform-classes" "^7.2.0"
+    "@babel/plugin-transform-computed-properties" "^7.2.0"
+    "@babel/plugin-transform-destructuring" "^7.2.0"
+    "@babel/plugin-transform-dotall-regex" "^7.2.0"
+    "@babel/plugin-transform-duplicate-keys" "^7.2.0"
+    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
+    "@babel/plugin-transform-for-of" "^7.2.0"
+    "@babel/plugin-transform-function-name" "^7.2.0"
+    "@babel/plugin-transform-literals" "^7.2.0"
+    "@babel/plugin-transform-modules-amd" "^7.2.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.2.0"
+    "@babel/plugin-transform-modules-umd" "^7.2.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
     "@babel/plugin-transform-new-target" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.1.0"
-    "@babel/plugin-transform-parameters" "^7.1.0"
+    "@babel/plugin-transform-object-super" "^7.2.0"
+    "@babel/plugin-transform-parameters" "^7.2.0"
     "@babel/plugin-transform-regenerator" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    "@babel/plugin-transform-typeof-symbol" "^7.0.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    browserslist "^4.1.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
+    "@babel/plugin-transform-spread" "^7.2.0"
+    "@babel/plugin-transform-sticky-regex" "^7.2.0"
+    "@babel/plugin-transform-template-literals" "^7.2.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
+    "@babel/plugin-transform-unicode-regex" "^7.2.0"
+    browserslist "^4.3.4"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
     semver "^5.3.0"
@@ -631,41 +639,41 @@
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.1.5":
-  version "7.1.5"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39"
-  integrity sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA==
+"@babel/runtime@^7.3.1":
+  version "7.3.1"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
+  integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/template@^7.1.0", "@babel/template@^7.1.2":
-  version "7.1.2"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
-  integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
+"@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
+  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.1.2"
-    "@babel/types" "^7.1.2"
+    "@babel/parser" "^7.2.2"
+    "@babel/types" "^7.2.2"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.1.6":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz#c8db9963ab4ce5b894222435482bd8ea854b7b5c"
-  integrity sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2", "@babel/traverse@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
+  integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.1.6"
+    "@babel/generator" "^7.2.2"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.6"
-    "@babel/types" "^7.1.6"
+    "@babel/parser" "^7.2.3"
+    "@babel/types" "^7.2.2"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.10"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.5", "@babel/types@^7.1.6":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz#0adb330c3a281348a190263aceb540e10f04bcce"
-  integrity sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0"
+  integrity sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
@@ -676,53 +684,52 @@
   resolved "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@lerna/add@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/add/-/add-3.4.1.tgz#d41068317e30f530df48220d256b5e79690b1877"
-  integrity sha512-Vf54B42jlD6G52qnv/cAGH70cVQIa+LX//lfsbkxHvzkhIqBl5J4KsnTOPkA9uq3R+zP58ayicCHB9ReiEWGJg==
+"@lerna/add@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/add/-/add-3.10.6.tgz#6f2c6b26eb905c40fef4180f3ffa34ad9dbb860b"
+  integrity sha512-FxQ5Bmyb5fF+3BQiNffM6cTeGCrl4uaAuGvxFIWF6Pgz6U14tUc1e16xgKDvVb1CurzJgIV5sLOT5xmCOqv1kA==
   dependencies:
-    "@lerna/bootstrap" "^3.4.1"
-    "@lerna/command" "^3.3.0"
-    "@lerna/filter-options" "^3.3.2"
-    "@lerna/npm-conf" "^3.4.1"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/bootstrap" "3.10.6"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/npm-conf" "3.7.0"
+    "@lerna/validation-error" "3.6.0"
     dedent "^0.7.0"
-    npm-package-arg "^6.0.0"
+    libnpm "^2.0.1"
     p-map "^1.2.0"
-    pacote "^9.1.0"
     semver "^5.5.0"
 
-"@lerna/batch-packages@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.1.2.tgz#74b5312a01a8916204cbc71237ffbe93144b99df"
-  integrity sha512-HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==
+"@lerna/batch-packages@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.10.6.tgz#2d6dfc9be13ea4da49244dd84bfcd46c3d62f4d0"
+  integrity sha512-sInr3ZQJFMh9Zq+ZUoVjX8R67j9ViRkVy0uEMsOfG+jZlXj1lRPRMPRiRgU0jXSYEwCdwuAB5pTd9tTx0VCJUw==
   dependencies:
-    "@lerna/package-graph" "^3.1.2"
-    "@lerna/validation-error" "^3.0.0"
-    npmlog "^4.1.2"
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
 
-"@lerna/bootstrap@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.4.1.tgz#10635e9b547fb7d685949ac78e0923f73da2f52a"
-  integrity sha512-yZDJgNm/KDoRH2klzmQGmpWMg/XMzWgeWvauXkrfW/mj1wwmufOuh5pN4fBFxVmUUa/RFZdfMeaaJt3+W3PPBw==
+"@lerna/bootstrap@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.10.6.tgz#d250baa9cfe9026c4f78e6cf7c9761a90b24e363"
+  integrity sha512-qbGjAxRpV/eiI9CboUIpsPPGpSogs8mN2/iDaAUBTaWVFVz/YyU64nui84Gll0kbdaHOyPput+kk2S8NCSCCdg==
   dependencies:
-    "@lerna/batch-packages" "^3.1.2"
-    "@lerna/command" "^3.3.0"
-    "@lerna/filter-options" "^3.3.2"
-    "@lerna/has-npm-version" "^3.3.0"
-    "@lerna/npm-conf" "^3.4.1"
-    "@lerna/npm-install" "^3.3.0"
-    "@lerna/rimraf-dir" "^3.3.0"
-    "@lerna/run-lifecycle" "^3.4.1"
-    "@lerna/run-parallel-batches" "^3.0.0"
-    "@lerna/symlink-binary" "^3.3.0"
-    "@lerna/symlink-dependencies" "^3.3.0"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/has-npm-version" "3.10.0"
+    "@lerna/npm-install" "3.10.0"
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/rimraf-dir" "3.10.0"
+    "@lerna/run-lifecycle" "3.10.5"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/symlink-binary" "3.10.0"
+    "@lerna/symlink-dependencies" "3.10.0"
+    "@lerna/validation-error" "3.6.0"
     dedent "^0.7.0"
     get-port "^3.2.0"
+    libnpm "^2.0.1"
     multimatch "^2.1.0"
-    npm-package-arg "^6.0.0"
-    npmlog "^4.1.2"
     p-finally "^1.0.0"
     p-map "^1.2.0"
     p-map-series "^1.0.0"
@@ -730,26 +737,26 @@
     read-package-tree "^5.1.6"
     semver "^5.5.0"
 
-"@lerna/changed@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/changed/-/changed-3.4.1.tgz#84a049359a53b8812c3a07a664bd41b1768f5938"
-  integrity sha512-gT7fhl4zQWyGETDO4Yy5wsFnqNlBSsezncS1nkMW1uO6jwnolwYqcr1KbrMR8HdmsZBn/00Y0mRnbtbpPPey8w==
+"@lerna/changed@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/changed/-/changed-3.10.6.tgz#48fed2e6c890b39a71f1dac29e42a6f853956d71"
+  integrity sha512-nZDVq/sKdhgoAg1BVnpqjqUUz5+zedG+AnU+6mjEN2f23YVtRCsW55N4I9eEdW2pxXUaCY85Hj/HPSA74BYaFg==
   dependencies:
-    "@lerna/collect-updates" "^3.3.2"
-    "@lerna/command" "^3.3.0"
-    "@lerna/listable" "^3.0.0"
-    "@lerna/output" "^3.0.0"
-    "@lerna/version" "^3.4.1"
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/command" "3.10.6"
+    "@lerna/listable" "3.10.6"
+    "@lerna/output" "3.6.0"
+    "@lerna/version" "3.10.6"
 
-"@lerna/check-working-tree@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.3.0.tgz#2118f301f28ccb530812e5b27a341b1e6b3c84e2"
-  integrity sha512-oeEP1dNhiiKUaO0pmcIi73YXJpaD0n5JczNctvVNZ8fGZmrALZtEnmC28o6Z7JgQaqq5nd2kO7xbnjoitrC51g==
+"@lerna/check-working-tree@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.10.0.tgz#5ed9f2c5c942bee92afcd8cb5361be44ed0251e3"
+  integrity sha512-NdIPhDgEtGHfeGjB9F0oAoPLywgMpjnJhLLwTNQkelDHo2xNAVpG8kV+A2UJ+cU5UXCZA4RZFxKNmw86rO+Drw==
   dependencies:
-    "@lerna/describe-ref" "^3.3.0"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/describe-ref" "3.10.0"
+    "@lerna/validation-error" "3.6.0"
 
-"@lerna/child-process@^3.3.0":
+"@lerna/child-process@3.3.0":
   version "3.3.0"
   resolved "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f"
   integrity sha512-q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g==
@@ -758,95 +765,96 @@
     execa "^1.0.0"
     strong-log-transformer "^2.0.0"
 
-"@lerna/clean@^3.3.2":
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/@lerna/clean/-/clean-3.3.2.tgz#9a7e8a1e400e580de260fa124945b2939a025069"
-  integrity sha512-mvqusgSp2ou5SGqQgTEoTvGJpGfH4+L6XSeN+Ims+eNFGXuMazmKCf+rz2PZBMFufaHJ/Os+JF0vPCcWI1Fzqg==
+"@lerna/clean@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/clean/-/clean-3.10.6.tgz#31e4a12a722e57ca7adc0c9bc30ba70d55572bb8"
+  integrity sha512-MuL8HOwnyvVtr6GOiAN/Ofjbx+BJdCrtjrM1Uuh8FFnbnZTPVf+0MPxL2jVzPMo0PmoIrX3fvlwvzKNk/lH0Ug==
   dependencies:
-    "@lerna/command" "^3.3.0"
-    "@lerna/filter-options" "^3.3.2"
-    "@lerna/prompt" "^3.3.1"
-    "@lerna/rimraf-dir" "^3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/rimraf-dir" "3.10.0"
     p-map "^1.2.0"
     p-map-series "^1.0.0"
     p-waterfall "^1.0.0"
 
-"@lerna/cli@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/@lerna/cli/-/cli-3.2.0.tgz#3ed25bcbc0b8f0878bc6a102ee0296f01476cfdf"
-  integrity sha512-JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q==
+"@lerna/cli@3.10.7":
+  version "3.10.7"
+  resolved "https://registry.npmjs.org/@lerna/cli/-/cli-3.10.7.tgz#2f88ae4a3c53fa4d3a4f61b5f447bbbcc69546e2"
+  integrity sha512-yuoz/24mIfYit3neKqoE5NVs42Rj9A6A6SlkNPDfsy3v/Vh7SgYkU3cwiGyvwBGzIdhqL4/SWYo8H7YJLs0C+g==
   dependencies:
-    "@lerna/global-options" "^3.1.3"
+    "@lerna/global-options" "3.10.6"
     dedent "^0.7.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
     yargs "^12.0.1"
 
-"@lerna/collect-updates@^3.3.2":
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.3.2.tgz#54df5ce59ca05e8aa04ff8a9299f89cc253a9304"
-  integrity sha512-9WyBJI2S5sYgEZEScu525Lbi6nknNrdBKop35sCDIC9y6AIGvH6Dr5tkTd+Kg3n1dE+kHwW/xjERkx3+h7th3w==
+"@lerna/collect-updates@3.10.1":
+  version "3.10.1"
+  resolved "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.10.1.tgz#3ad60aa31826c0c0cfdf8bf41e58e6c5c86aeb3a"
+  integrity sha512-vb0wEJ8k63G+2CR/ud1WeVHNJ21Fs6Ew6lbdGZXnF4ZvaFWxWJZpoHeWwzjhMdJ75QdTzUaIhTG1hnH9faQNMw==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/describe-ref" "^3.3.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/describe-ref" "3.10.0"
+    libnpm "^2.0.1"
     minimatch "^3.0.4"
-    npmlog "^4.1.2"
     slash "^1.0.0"
 
-"@lerna/command@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/command/-/command-3.3.0.tgz#e81c4716a676b02dbe9d3f548d5f45b4ba32c25a"
-  integrity sha512-NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg==
+"@lerna/command@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/command/-/command-3.10.6.tgz#709bd1c66220da67f65dbe1fc88bb7ba5bb85446"
+  integrity sha512-jPZswMZXOpAaIuSF5hrz+eaWQzbDrvwbrkCoRJKfiAHx7URAkE6MQe9DeAnqrTKMqwfg0RciSrZLc8kWYfrzCQ==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/package-graph" "^3.1.2"
-    "@lerna/project" "^3.0.0"
-    "@lerna/validation-error" "^3.0.0"
-    "@lerna/write-log-file" "^3.0.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/project" "3.10.0"
+    "@lerna/validation-error" "3.6.0"
+    "@lerna/write-log-file" "3.6.0"
     dedent "^0.7.0"
     execa "^1.0.0"
     is-ci "^1.0.10"
+    libnpm "^2.0.1"
     lodash "^4.17.5"
-    npmlog "^4.1.2"
 
-"@lerna/conventional-commits@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz#0b47f9fc0c4a10951883e949d939188da1b527bc"
-  integrity sha512-3NETrA58aUkaEW3RdwdJ766Bg9NVpLzb26mtdlsJQcvB5sQBWH5dJSHIVQH1QsGloBeH2pE/mDUEVY8ZJXuR4w==
+"@lerna/conventional-commits@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.10.0.tgz#284cc16bd3c387f841ff6bec42bcadaa2d13d8e4"
+  integrity sha512-8FvO0eR8g/tEgkb6eRVYaD39TsqMKsOXp17EV48jciciEqcrF/d1Ypu6ilK1GDp6R/1m2mbjt/b52a/qrO+xaw==
   dependencies:
-    "@lerna/validation-error" "^3.0.0"
-    conventional-changelog-angular "^5.0.1"
-    conventional-changelog-core "^3.1.0"
-    conventional-recommended-bump "^4.0.1"
+    "@lerna/validation-error" "3.6.0"
+    conventional-changelog-angular "^5.0.2"
+    conventional-changelog-core "^3.1.5"
+    conventional-recommended-bump "^4.0.4"
     fs-extra "^7.0.0"
     get-stream "^4.0.0"
-    npm-package-arg "^6.0.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
     semver "^5.5.0"
 
-"@lerna/create-symlink@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.3.0.tgz#91de00fd576018ba4251f0c6a5b4b7f768f22a82"
-  integrity sha512-0lb88Nnq1c/GG+fwybuReOnw3+ah4dB81PuWwWwuqUNPE0n50qUf/M/7FfSb5JEh/93fcdbZI0La8t3iysNW1w==
+"@lerna/create-symlink@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.6.0.tgz#f1815cde2fc9d8d2315dfea44ee880f2f1bc65f1"
+  integrity sha512-YG3lTb6zylvmGqKU+QYA3ylSnoLn+FyLH5XZmUsD0i85R884+EyJJeHx/zUk+yrL2ZwHS4RBUgJfC24fqzgPoA==
   dependencies:
     cmd-shim "^2.0.2"
     fs-extra "^7.0.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
 
-"@lerna/create@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/create/-/create-3.4.1.tgz#7cad78a5701d7666a0f5d0fe0e325acd8d8f5b63"
-  integrity sha512-l+4t2SRO5nvW0MNYY+EWxbaMHsAN8bkWH3nyt7EzhBjs4+TlRAJRIEqd8o9NWznheE3pzwczFz1Qfl3BWbyM5A==
+"@lerna/create@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/create/-/create-3.10.6.tgz#85c7398cad912516c0ac6054a5c0c4145ab6cadb"
+  integrity sha512-OddQtGBHM2/eJONggLWoTE6275XGbnJ6dIVF+fLsKS93o4GC6g+qcc6Y7lUWHm5bfpeOwNOVKwj0tvqBZ6MgoA==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/command" "^3.3.0"
-    "@lerna/npm-conf" "^3.4.1"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/npm-conf" "3.7.0"
+    "@lerna/validation-error" "3.6.0"
     camelcase "^4.1.0"
     dedent "^0.7.0"
     fs-extra "^7.0.0"
     globby "^8.0.1"
     init-package-json "^1.10.3"
-    npm-package-arg "^6.0.0"
+    libnpm "^2.0.1"
+    p-reduce "^1.0.0"
     pify "^3.0.0"
     semver "^5.5.0"
     slash "^1.0.0"
@@ -854,300 +862,328 @@
     validate-npm-package-name "^3.0.0"
     whatwg-url "^7.0.0"
 
-"@lerna/describe-ref@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.3.0.tgz#d373adb530d5428ab91e303ccbfcf51a98374a3a"
-  integrity sha512-4t7M4OupnYMSPNLrLUau8qkS+dgLEi4w+DkRkV0+A+KNYga1W0jVgNLPIIsxta7OHfodPkCNAqZCzNCw/dmAwA==
+"@lerna/describe-ref@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.10.0.tgz#266380feece6013ab9674f52bd35bf0be5b0460d"
+  integrity sha512-fouh3FQS07QxJJp/mW8LkGnH0xMRAzpBlejtZaiRwfDkW2kd6EuHaj8I/2/p21Wsprcvuu4dqmyia2YS1xFb/w==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    npmlog "^4.1.2"
+    "@lerna/child-process" "3.3.0"
+    libnpm "^2.0.1"
 
-"@lerna/diff@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/diff/-/diff-3.3.0.tgz#c8130a5f508b47fad5fec81404498bc3acdf9cb5"
-  integrity sha512-sIoMjsm3NVxvmt6ofx8Uu/2fxgldQqLl0zmC9X1xW00j831o5hBffx1EoKj9CnmaEvoSP6j/KFjxy2RWjebCIg==
+"@lerna/diff@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/diff/-/diff-3.10.6.tgz#b4c5a50d8c7e79619376e2c913ec1c627dfd0cdf"
+  integrity sha512-0MqFhosjrqsIdXiKIu7t3CiJELqiU9mkjFBhYPB7JruAzpPwjMXJnC6/Ur5/7LXJYYVpqGQwZI9ZaZlOYJhhrw==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/command" "^3.3.0"
-    "@lerna/validation-error" "^3.0.0"
-    npmlog "^4.1.2"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
 
-"@lerna/exec@^3.3.2":
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/@lerna/exec/-/exec-3.3.2.tgz#95ecaca617fd85abdb91e9a378ed06ec1763d665"
-  integrity sha512-mN6vGxNir7JOGvWLwKr3DW3LNy1ecCo2ziZj5rO9Mw5Rew3carUu1XLmhF/4judtsvXViUY+rvGIcqHe0vvb+w==
+"@lerna/exec@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/exec/-/exec-3.10.6.tgz#5564b614b7e39c1f034f5e0736c9e020945f2f12"
+  integrity sha512-cdHqaRBMYceJu8rZLO8b4ZeR27O+xKPHgzi13OOOfBJQjrTuacjMWyHgmpy8jWc/0f7QnTl4VsHks7VJ3UK+vw==
   dependencies:
-    "@lerna/batch-packages" "^3.1.2"
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/command" "^3.3.0"
-    "@lerna/filter-options" "^3.3.2"
-    "@lerna/run-parallel-batches" "^3.0.0"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/validation-error" "3.6.0"
 
-"@lerna/filter-options@^3.3.2":
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.3.2.tgz#ac90702b7876ff4980dcdeaeac049c433dd01773"
-  integrity sha512-0WHqdDgAnt5WKoByi1q+lFw8HWt5tEKP2DnLlGqWv3YFwVF5DsPRlO7xbzjY9sJgvyJtZcnkMtccdBPFhGGyIQ==
+"@lerna/filter-options@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.10.6.tgz#e05a8b8de6efc16c47c83f0ac58291008efba4b8"
+  integrity sha512-r/dQbqN+RGFKZNn+DyWehswFmAkny/fkdMB2sRM2YVe7zRTtSl95YxD9DtdYnpJTG/jbOVICS/L5QJakrI6SSw==
   dependencies:
-    "@lerna/collect-updates" "^3.3.2"
-    "@lerna/filter-packages" "^3.0.0"
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/filter-packages" "3.10.0"
     dedent "^0.7.0"
 
-"@lerna/filter-packages@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.0.0.tgz#5eb25ad1610f3e2ab845133d1f8d7d40314e838f"
-  integrity sha512-zwbY1J4uRjWRZ/FgYbtVkq7I3Nduwsg2V2HwLKSzwV2vPglfGqgovYOVkND6/xqe2BHwDX4IyA2+e7OJmLaLSA==
+"@lerna/filter-packages@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.10.0.tgz#75f9a08184fc4046da2057e0218253cd6f493f05"
+  integrity sha512-3Acdj+jbany6LnQSuImU4ttcK5ULHSVug8Gh/EvwTewKCDpHAuoI3eyuzZOnSBdMvDOjE03uIESQK0dNNsn6Ow==
   dependencies:
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
     multimatch "^2.1.0"
-    npmlog "^4.1.2"
 
-"@lerna/get-npm-exec-opts@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0.tgz#8fc7866e8d8e9a2f2dc385287ba32eb44de8bdeb"
-  integrity sha512-arcYUm+4xS8J3Palhl+5rRJXnZnFHsLFKHBxznkPIxjwGQeAEw7df38uHdVjEQ+HNeFmHnBgSqfbxl1VIw5DHg==
+"@lerna/get-npm-exec-opts@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.6.0.tgz#ea595eb28d1f34ba61a92ee8391f374282b4b76e"
+  integrity sha512-ruH6KuLlt75aCObXfUIdVJqmfVq7sgWGq5mXa05vc1MEqxTIiU23YiJdWzofQOOUOACaZkzZ4K4Nu7wXEg4Xgg==
   dependencies:
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
 
-"@lerna/global-options@^3.1.3":
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.1.3.tgz#cf85e24655a91d04d4efc9a80c1f83fc768d08ae"
-  integrity sha512-LVeZU/Zgc0XkHdGMRYn+EmHfDmmYNwYRv3ta59iCVFXLVp7FRFWF7oB1ss/WRa9x/pYU0o6L8as/5DomLUGASA==
-
-"@lerna/has-npm-version@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.3.0.tgz#8a73c2c437a0e1e68a19ccbd0dd3c014d4d39135"
-  integrity sha512-GX7omRep1eBRZHgjZLRw3MpBJSdA5gPZFz95P7rxhpvsiG384Tdrr/cKFMhm0A09yq27Tk/nuYTaZIj7HsVE6g==
+"@lerna/get-packed@3.7.0":
+  version "3.7.0"
+  resolved "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.7.0.tgz#549c7738f7be5e3b1433e82ed9cda9123bcd1ed5"
+  integrity sha512-yuFtjsUZIHjeIvIYQ/QuytC+FQcHwo3peB+yGBST2uWCLUCR5rx6knoQcPzbxdFDCuUb5IFccFGd3B1fHFg3RQ==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
+    fs-extra "^7.0.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+
+"@lerna/global-options@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.10.6.tgz#c491a64b0be47eca4ffc875011958a5ee70a9a3e"
+  integrity sha512-k5Xkq1M/uREFC2R9uwN5gcvIgjj4iOXo0YyeEXCMWBiW3j2GL9xN4d1MmAIcrYlAzVYh6kLlWaFWl/rNIneHIw==
+
+"@lerna/has-npm-version@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.10.0.tgz#d3a73c0fedd2f2e9c6fbe166c41809131dc939d2"
+  integrity sha512-N4RRYxGeivuaKgPDzrhkQOQs1Sg4tOnxnEe3akfqu1wDA4Ng5V6Y2uW3DbkAjFL3aNJhWF5Vbf7sBsGtfgDQ8w==
+  dependencies:
+    "@lerna/child-process" "3.3.0"
     semver "^5.5.0"
 
-"@lerna/import@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/@lerna/import/-/import-3.3.1.tgz#deca8c93c9cc03c5844b975c6da9937dd7530440"
-  integrity sha512-2OzTQDkYKbBPpyP2iOI1sWfcvMjNLjjHjmREq/uOWJaSIk5J3Ukt71OPpcOHh4V2CBOlXidCcO+Hyb4FVIy8fw==
+"@lerna/import@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/import/-/import-3.10.6.tgz#36b65854857e8ab5dfd98a1caea4d365ecc06578"
+  integrity sha512-LlGxhfDhovoNoBJLF3PYd3j/G2GFTnfLh0V38+hBQ6lomMNJbjkACfiLVomQxPWWpYLk0GTlpWYR8YGv6L7Ifw==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/command" "^3.3.0"
-    "@lerna/prompt" "^3.3.1"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/validation-error" "3.6.0"
     dedent "^0.7.0"
     fs-extra "^7.0.0"
     p-map-series "^1.0.0"
 
-"@lerna/init@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/init/-/init-3.3.0.tgz#998f3497da3d891867c593b808b6db4b8fc4ccb9"
-  integrity sha512-HvgRLkIG6nDIeAO6ix5sUVIVV+W9UMk2rSSmFT66CDOefRi7S028amiyYnFUK1QkIAaUbVUyOnYaErtbJwICuw==
+"@lerna/init@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/init/-/init-3.10.6.tgz#b5c5166b2ddf00ea0f2742a1f53f59221478cf9a"
+  integrity sha512-RIlEx+ofWLYRNjxCkkV3G0XQPM+/KA5RXRDb5wKQLYO1f+tZAaHoUh8fHDIvxGf/ohY/OIjYYGSsU+ysimfwiQ==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/command" "^3.3.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
     write-json-file "^2.3.0"
 
-"@lerna/link@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/link/-/link-3.3.0.tgz#c0c05ff52d0f0c659fcf221627edfcd58e477a5c"
-  integrity sha512-8CeXzGL7okrsVXsy2sHXI2KuBaczw3cblAnA2+FJPUqSKMPNbUTRzeU3bOlCjYtK0LbxC4ngENJTL3jJ8RaYQQ==
+"@lerna/link@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/link/-/link-3.10.6.tgz#4201cabbfc27bebaf1a400f8cfbd238f285dd3c7"
+  integrity sha512-dwD6qftRWitgLDYbqtDrgO7c8uF5C0fHVew5M6gU5m9tBJidqd7cDwHv/bXboLEI63U7tt5y6LY+wEpYUFsBRw==
   dependencies:
-    "@lerna/command" "^3.3.0"
-    "@lerna/package-graph" "^3.1.2"
-    "@lerna/symlink-dependencies" "^3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/symlink-dependencies" "3.10.0"
     p-map "^1.2.0"
     slash "^1.0.0"
 
-"@lerna/list@^3.3.2":
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/@lerna/list/-/list-3.3.2.tgz#1412b3cce2a83b1baa4ff6fb962d50b46c28ec98"
-  integrity sha512-XXEVy7w+i/xx8NeJmGirw4upEoEF9OfD6XPLjISNQc24VgQV+frXdVJ02QcP7Y/PkY1rdIVrOjvo3ipKVLUxaQ==
+"@lerna/list@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/list/-/list-3.10.6.tgz#7c43c09301ea01528f4dab3b22666f021e8ba9a5"
+  integrity sha512-3ElQBj2dOB4uUkpsjC1bxdeZwEzRBuV1pBBs5E1LncwsZf7D9D99Z32fuZsDaCHpEMgHAD4/j8juI3/7m5dkaQ==
   dependencies:
-    "@lerna/command" "^3.3.0"
-    "@lerna/filter-options" "^3.3.2"
-    "@lerna/listable" "^3.0.0"
-    "@lerna/output" "^3.0.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/listable" "3.10.6"
+    "@lerna/output" "3.6.0"
 
-"@lerna/listable@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/listable/-/listable-3.0.0.tgz#27209b1382c87abdbc964220e75c247d803d4199"
-  integrity sha512-HX/9hyx1HLg2kpiKXIUc1EimlkK1T58aKQ7ovO7rQdTx9ForpefoMzyLnHE1n4XrUtEszcSWJIICJ/F898M6Ag==
+"@lerna/listable@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/listable/-/listable-3.10.6.tgz#cea92de89d9f293c6d63e00be662bed03f85c496"
+  integrity sha512-F7ZuvesSgeuMiJf99eOum5p1MQGQStykcmHH1ek+LQRMiGGF1o3PkBxPvHTZBADGOFarek8bFA5TVmRAMX7NIw==
   dependencies:
+    "@lerna/batch-packages" "3.10.6"
     chalk "^2.3.1"
     columnify "^1.5.4"
 
-"@lerna/log-packed@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.0.4.tgz#6d1f6ce5ca68b9971f2a27f0ecf3c50684be174a"
-  integrity sha512-vVQHgMagE2wnbxhNY9nFkdu+Cx2TsyWalkJfkxbNzmo6gOCrDsxCBDj9vTEV8Q+4aWx0C0Bsc0sB2Eb8y/+ofA==
+"@lerna/log-packed@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.6.0.tgz#bed96c2bdd47f076d9957d0c6069b2edc1518145"
+  integrity sha512-T/J41zMkzpWB5nbiTRS5PmYTFn74mJXe6RQA2qhkdLi0UqnTp97Pux1loz3jsJf2yJtiQUnyMM7KuKIAge0Vlw==
   dependencies:
     byte-size "^4.0.3"
     columnify "^1.5.4"
     has-unicode "^2.0.1"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
 
-"@lerna/npm-conf@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.4.1.tgz#859e931b0bc9a5eed86309cc09508810c1e7d121"
-  integrity sha512-i9G6DnbCqiAqxKx2rSXej/n14qxlV/XOebL6QZonxJKzNTB+Q2wglnhTXmfZXTPJfoqimLaY4NfAEtbOXRWOXQ==
+"@lerna/npm-conf@3.7.0":
+  version "3.7.0"
+  resolved "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.7.0.tgz#f101d4fdf07cefcf1161bcfaf3c0f105b420a450"
+  integrity sha512-+WSMDfPKcKzMfqq283ydz9RRpOU6p9wfx0wy4hVSUY/6YUpsyuk8SShjcRtY8zTM5AOrxvFBuuV90H4YpZ5+Ng==
   dependencies:
     config-chain "^1.1.11"
     pify "^3.0.0"
 
-"@lerna/npm-dist-tag@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.3.0.tgz#e1c5ab67674216d901266a16846b21cc81ff6afd"
-  integrity sha512-EtZJXzh3w5tqXEev+EBBPrWKWWn0WgJfxm4FihfS9VgyaAW8udIVZHGkIQ3f+tBtupcAzA9Q8cQNUkGF2efwmA==
+"@lerna/npm-dist-tag@3.8.5":
+  version "3.8.5"
+  resolved "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.8.5.tgz#5ce22a72576badc8cb6baf85550043d63e66ea44"
+  integrity sha512-VO57yKTB4NC2LZuTd4w0LmlRpoFm/gejQ1gqqLGzSJuSZaBXmieElFovzl21S07cqiy7FNVdz75x7/a6WCZ6XA==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/get-npm-exec-opts" "^3.0.0"
-    npmlog "^4.1.2"
+    figgy-pudding "^3.5.1"
+    libnpm "^2.0.1"
 
-"@lerna/npm-install@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.3.0.tgz#16d00ffd668d11b2386b3ac68bdac2cf8320e533"
-  integrity sha512-WoVvKdS8ltROTGSNQwo6NDq0YKnjwhvTG4li1okcN/eHKOS3tL9bxbgPx7No0wOq5DKBpdeS9KhAfee6LFAZ5g==
+"@lerna/npm-install@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.10.0.tgz#fcd6688a3a2cd0e702a03c54c22eb7ae8b3dacb0"
+  integrity sha512-/6/XyLY9/4jaMPBOVYUr4wZxQURIfwoELY0qCQ8gZ5zv4cOiFiiCUxZ0i4fxqFtD7nJ084zq1DsZW0aH0CIWYw==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/get-npm-exec-opts" "^3.0.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/get-npm-exec-opts" "3.6.0"
     fs-extra "^7.0.0"
-    npm-package-arg "^6.0.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
     signal-exit "^3.0.2"
     write-pkg "^3.1.0"
 
-"@lerna/npm-publish@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.3.1.tgz#30384665d7ee387343332ece62ca231207bbabea"
-  integrity sha512-bVTlWIcBL6Zpyzqvr9C7rxXYcoPw+l7IPz5eqQDNREj1R39Wj18OWB2KTJq8l7LIX7Wf4C2A1uT5hJaEf9BuvA==
+"@lerna/npm-publish@3.10.7":
+  version "3.10.7"
+  resolved "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.10.7.tgz#9326b747b905a7f0e69d4be3f557859c3e359649"
+  integrity sha512-oU3/Q+eHC1fRjh7bk6Nn4tRD1OLR6XZVs3v+UWMWMrF4hVSV61pxcP5tpeI1n4gDQjSgh7seI4EzKVJe/WfraA==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/get-npm-exec-opts" "^3.0.0"
-    "@lerna/has-npm-version" "^3.3.0"
-    "@lerna/log-packed" "^3.0.4"
+    "@lerna/run-lifecycle" "3.10.5"
+    figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
-    npmlog "^4.1.2"
-    p-map "^1.2.0"
+    libnpm "^2.0.1"
 
-"@lerna/npm-run-script@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.3.0.tgz#3c79601c27c67121155b20e039be53130217db72"
-  integrity sha512-YqDguWZzp4jIomaE4aWMUP7MIAJAFvRAf6ziQLpqwoQskfWLqK5mW0CcszT1oLjhfb3cY3MMfSTFaqwbdKmICg==
+"@lerna/npm-run-script@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.10.0.tgz#49a9204eddea136da15a8d8d9eba2c3175b77ddd"
+  integrity sha512-c21tBXLF1Wje4tx/Td9jKIMrlZo/8QQiyyadjdKpwyyo7orSMsVNXGyJwvZ4JVVDcwC3GPU6HQvkt63v7rcyaw==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/get-npm-exec-opts" "^3.0.0"
-    npmlog "^4.1.2"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/get-npm-exec-opts" "3.6.0"
+    libnpm "^2.0.1"
 
-"@lerna/output@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/output/-/output-3.0.0.tgz#4ed4a30ed2f311046b714b3840a090990ba3ce35"
-  integrity sha512-EFxnSbO0zDEVKkTKpoCUAFcZjc3gn3DwPlyTDxbeqPU7neCfxP4rA4+0a6pcOfTlRS5kLBRMx79F2TRCaMM3DA==
+"@lerna/output@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/output/-/output-3.6.0.tgz#a69384bc685cf3b21aa1bfc697eb2b9db3333d0b"
+  integrity sha512-9sjQouf6p7VQtVCRnzoTGlZyURd48i3ha3WBHC/UBJnHZFuXMqWVPKNuvnMf2kRXDyoQD+2mNywpmEJg5jOnRg==
   dependencies:
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
 
-"@lerna/package-graph@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.1.2.tgz#b70298a3a8c82e12090da33233bf242223a38f20"
-  integrity sha512-9wIWb49I1IJmyjPdEVZQ13IAi9biGfH/OZHOC04U2zXGA0GLiY+B3CAx6FQvqkZ8xEGfqzmXnv3LvZ0bQfc1aQ==
+"@lerna/pack-directory@3.10.5":
+  version "3.10.5"
+  resolved "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.10.5.tgz#9bdabceacb74e1f54e47bae925e193978f2aae51"
+  integrity sha512-Ulj24L9XdgjJIxBr6ZjRJEoBULVH3c10lqunUdW41bswXhzhirRtQIxv0+5shngNjDwgMmJfOBcuCVKPSez4tg==
   dependencies:
-    "@lerna/validation-error" "^3.0.0"
-    npm-package-arg "^6.0.0"
+    "@lerna/get-packed" "3.7.0"
+    "@lerna/package" "3.7.2"
+    "@lerna/run-lifecycle" "3.10.5"
+    figgy-pudding "^3.5.1"
+    libnpm "^2.0.1"
+    npm-packlist "^1.1.12"
+    tar "^4.4.8"
+    temp-write "^3.4.0"
+
+"@lerna/package-graph@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.10.6.tgz#8940d1ed7003100117cb1b618f7690585c00db81"
+  integrity sha512-mpIOJbhi+xLqT9BcUrLVD4We8WUdousQf/QndbEWl8DWAW1ethtRHVsCm9ufdBB3F9nj4PH/hqnDWWwqE+rS4w==
+  dependencies:
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
     semver "^5.5.0"
 
-"@lerna/package@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/package/-/package-3.0.0.tgz#14afc9a6cb1f7f7b23c1d7c7aa81bdac7d44c0e5"
-  integrity sha512-djzEJxzn212wS8d9znBnlXkeRlPL7GqeAYBykAmsuq51YGvaQK67Umh5ejdO0uxexF/4r7yRwgrlRHpQs8Rfqg==
+"@lerna/package@3.7.2":
+  version "3.7.2"
+  resolved "https://registry.npmjs.org/@lerna/package/-/package-3.7.2.tgz#03c69fd7fb965c372c8c969165a2f7d6dfe2dfcb"
+  integrity sha512-8A5hN2CekM1a0Ix4VUO/g+REo+MsnXb8lnQ0bGjr1YGWzSL5NxYJ0Z9+0pwTfDpvRDYlFYO0rMVwBUW44b4dUw==
   dependencies:
-    npm-package-arg "^6.0.0"
+    libnpm "^2.0.1"
+    load-json-file "^4.0.0"
     write-pkg "^3.1.0"
 
-"@lerna/project@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/project/-/project-3.0.0.tgz#4320d2a2b4080cabcf95161d9c48475217d8a545"
-  integrity sha512-XhDFVfqj79jG2Speggd15RpYaE8uiR25UKcQBDmumbmqvTS7xf2cvl2pq2UTvDafaJ0YwFF3xkxQZeZnFMwdkw==
+"@lerna/project@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/project/-/project-3.10.0.tgz#98272bf2eb93e9b21850edae568d696bf7fdebda"
+  integrity sha512-9QRl8aGHuyU4zVEELQmNPnJTlS7XHqX7w9I9isCXdnilKc2R0MyvUs21lj6Yyt6xTuQnqD158TR9tbS4QufYQQ==
   dependencies:
-    "@lerna/package" "^3.0.0"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/package" "3.7.2"
+    "@lerna/validation-error" "3.6.0"
     cosmiconfig "^5.0.2"
     dedent "^0.7.0"
     dot-prop "^4.2.0"
     glob-parent "^3.1.0"
     globby "^8.0.1"
+    libnpm "^2.0.1"
     load-json-file "^4.0.0"
-    npmlog "^4.1.2"
     p-map "^1.2.0"
     resolve-from "^4.0.0"
     write-json-file "^2.3.0"
 
-"@lerna/prompt@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.3.1.tgz#ec53f9034a7a02a671627241682947f65078ab88"
-  integrity sha512-eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ==
+"@lerna/prompt@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.6.0.tgz#b17cc464dec9d830619723e879dc747367378217"
+  integrity sha512-nyAjPMolJ/ZRAAVcXrUH89C4n1SiWvLh4xWNvWYKLcf3PI5yges35sDFP/HYrM4+cEbkNFuJCRq6CxaET4PRsg==
   dependencies:
     inquirer "^6.2.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
 
-"@lerna/publish@^3.4.3":
-  version "3.4.3"
-  resolved "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.3.tgz#fb956ca2a871729982022889f90d0e8eb8528340"
-  integrity sha512-baeRL8xmOR25p86cAaS9mL0jdRzdv4dUo04PlK2Wes+YlL705F55cSXeC9npNie+9rGwFyLzCTQe18WdbZyLuw==
+"@lerna/publish@3.10.7":
+  version "3.10.7"
+  resolved "https://registry.npmjs.org/@lerna/publish/-/publish-3.10.7.tgz#8c5a3268398152e1f7993ff7bb6722a0363797af"
+  integrity sha512-Qd8pml2l9s6GIvNX1pTnia+Ddjsm9LF3pRRoOQeugAdv2IJNf45c/83AAEyE9M2ShG5VjgxEITNW4Lg49zipjQ==
   dependencies:
-    "@lerna/batch-packages" "^3.1.2"
-    "@lerna/check-working-tree" "^3.3.0"
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/collect-updates" "^3.3.2"
-    "@lerna/command" "^3.3.0"
-    "@lerna/describe-ref" "^3.3.0"
-    "@lerna/get-npm-exec-opts" "^3.0.0"
-    "@lerna/npm-conf" "^3.4.1"
-    "@lerna/npm-dist-tag" "^3.3.0"
-    "@lerna/npm-publish" "^3.3.1"
-    "@lerna/output" "^3.0.0"
-    "@lerna/prompt" "^3.3.1"
-    "@lerna/run-lifecycle" "^3.4.1"
-    "@lerna/run-parallel-batches" "^3.0.0"
-    "@lerna/validation-error" "^3.0.0"
-    "@lerna/version" "^3.4.1"
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/check-working-tree" "3.10.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/command" "3.10.6"
+    "@lerna/describe-ref" "3.10.0"
+    "@lerna/log-packed" "3.6.0"
+    "@lerna/npm-conf" "3.7.0"
+    "@lerna/npm-dist-tag" "3.8.5"
+    "@lerna/npm-publish" "3.10.7"
+    "@lerna/output" "3.6.0"
+    "@lerna/pack-directory" "3.10.5"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/run-lifecycle" "3.10.5"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/validation-error" "3.6.0"
+    "@lerna/version" "3.10.6"
+    figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
-    libnpmaccess "^3.0.0"
-    npm-package-arg "^6.0.0"
-    npm-registry-fetch "^3.8.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
     p-finally "^1.0.0"
     p-map "^1.2.0"
     p-pipe "^1.2.0"
     p-reduce "^1.0.0"
     semver "^5.5.0"
 
-"@lerna/resolve-symlink@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.3.0.tgz#c5d99a60cb17e2ea90b3521a0ba445478d194a44"
-  integrity sha512-KmoPDcFJ2aOK2inYHbrsiO9SodedUj0L1JDvDgirVNIjMUaQe2Q6Vi4Gh+VCJcyB27JtfHioV9R2NxU72Pk2hg==
+"@lerna/pulse-till-done@3.7.1":
+  version "3.7.1"
+  resolved "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.7.1.tgz#a9e55380fa18f6896a3e5b23621a4227adfb8f85"
+  integrity sha512-MzpesZeW3Mc+CiAq4zUt9qTXI9uEBBKrubYHE36voQTSkHvu/Rox6YOvfUr+U7P6k8frFPeCgGpfMDTLhiqe6w==
+  dependencies:
+    libnpm "^2.0.1"
+
+"@lerna/resolve-symlink@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.6.0.tgz#985344796b704ff32afa923901e795e80741b86e"
+  integrity sha512-TVOAEqHJSQVhNDMFCwEUZPaOETqHDQV1TQWQfC8ZlOqyaUQ7veZUbg0yfG7RPNzlSpvF0ZaGFeR0YhYDAW03GA==
   dependencies:
     fs-extra "^7.0.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
     read-cmd-shim "^1.0.1"
 
-"@lerna/rimraf-dir@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.3.0.tgz#687e9bb3668a9e540e281302a52d9a573860f5db"
-  integrity sha512-vSqOcZ4kZduiSprbt+y40qziyN3VKYh+ygiCdnbBbsaxpdKB6CfrSMUtrLhVFrqUfBHIZRzHIzgjTdtQex1KLw==
+"@lerna/rimraf-dir@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.10.0.tgz#2d9435054ab7bbc5519db0a2654c5d8cacd27f98"
+  integrity sha512-RSKSfxPURc58ERCD/PuzorR86lWEvIWNclXYGvIYM76yNGrWiDF44pGHQvB4J+Lxa5M+52ZtZC/eOC7A7YCH4g==
   dependencies:
-    "@lerna/child-process" "^3.3.0"
-    npmlog "^4.1.2"
+    "@lerna/child-process" "3.3.0"
+    libnpm "^2.0.1"
     path-exists "^3.0.0"
     rimraf "^2.6.2"
 
-"@lerna/run-lifecycle@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz#6d7e44eada31cb4ec78b18ef050da0d86f6c892b"
-  integrity sha512-N/hi2srM9A4BWEkXccP7vCEbf4MmIuALF00DTBMvc0A/ccItwUpl3XNuM7+ADDRK0mkwE3hDw89lJ3A7f8oUQw==
+"@lerna/run-lifecycle@3.10.5":
+  version "3.10.5"
+  resolved "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.10.5.tgz#ea4422bb70c0f8d4382ecb2a626c8ba0ca88550b"
+  integrity sha512-YPmXviaxVlhcKM6IkDTIpTq24mxOuMCilo+MTr1RLoafgB9ZTmP2AHRiFt/sy14wOsq2Zqr0wJyj8KFlDYLTkA==
   dependencies:
-    "@lerna/npm-conf" "^3.4.1"
-    npm-lifecycle "^2.0.0"
-    npmlog "^4.1.2"
+    "@lerna/npm-conf" "3.7.0"
+    figgy-pudding "^3.5.1"
+    libnpm "^2.0.1"
 
-"@lerna/run-parallel-batches@^3.0.0":
+"@lerna/run-parallel-batches@3.0.0":
   version "3.0.0"
   resolved "https://registry.npmjs.org/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840"
   integrity sha512-Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw==
@@ -1155,70 +1191,75 @@
     p-map "^1.2.0"
     p-map-series "^1.0.0"
 
-"@lerna/run@^3.3.2":
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/@lerna/run/-/run-3.3.2.tgz#f521f4a22585c90758f34a584cb1871f8bb2a83e"
-  integrity sha512-cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A==
+"@lerna/run@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/run/-/run-3.10.6.tgz#4c159a719b0ec010409dfe8f9535c9a3c3f3e06a"
+  integrity sha512-KS2lWbu/8WUUscQPi9U8sPO6yYpzf/0GmODjpruR1nRi1u/tuncdjTiG+hjGAeFC1BD7YktT9Za6imIpE8RXmA==
   dependencies:
-    "@lerna/batch-packages" "^3.1.2"
-    "@lerna/command" "^3.3.0"
-    "@lerna/filter-options" "^3.3.2"
-    "@lerna/npm-run-script" "^3.3.0"
-    "@lerna/output" "^3.0.0"
-    "@lerna/run-parallel-batches" "^3.0.0"
-    "@lerna/validation-error" "^3.0.0"
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/npm-run-script" "3.10.0"
+    "@lerna/output" "3.6.0"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/timer" "3.5.0"
+    "@lerna/validation-error" "3.6.0"
     p-map "^1.2.0"
 
-"@lerna/symlink-binary@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.3.0.tgz#99ea570b21baabd61ecab27582eeb1d7b2c5f9cf"
-  integrity sha512-zRo6CimhvH/VJqCFl9T4IC6syjpWyQIxEfO2sBhrapEcfwjtwbhoGgKwucsvt4rIpFazCw63jQ/AXMT27KUIHg==
+"@lerna/symlink-binary@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.10.0.tgz#5acdde86dfd50c9270d7d2a93bade203cff41b3d"
+  integrity sha512-6mQsG+iVjBo8cD8s24O+YgFrwDyUGfUQbK4ryalAXFHI817Zd4xlI3tjg3W99whCt6rt6D0s1fpf8eslMN6dSw==
   dependencies:
-    "@lerna/create-symlink" "^3.3.0"
-    "@lerna/package" "^3.0.0"
+    "@lerna/create-symlink" "3.6.0"
+    "@lerna/package" "3.7.2"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
-    read-pkg "^3.0.0"
 
-"@lerna/symlink-dependencies@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.3.0.tgz#13bcaed3e37986ab01b13498a459c7f609397dc3"
-  integrity sha512-IRngSNCmuD5uBKVv23tHMvr7Mplti0lKHilFKcvhbvhAfu6m/Vclxhkfs/uLyHzG+DeRpl/9o86SQET3h4XDhg==
+"@lerna/symlink-dependencies@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.10.0.tgz#a20226e8e97af6a6bc4b416bfc28c0c5e3ba9ddd"
+  integrity sha512-vGpg5ydwGgQCuWNX5y7CRL38mGpuLhf1GRq9wMm7IGwnctEsdSNqvvE+LDgqtwEZASu5+vffYUkL0VlFXl8uWA==
   dependencies:
-    "@lerna/create-symlink" "^3.3.0"
-    "@lerna/resolve-symlink" "^3.3.0"
-    "@lerna/symlink-binary" "^3.3.0"
+    "@lerna/create-symlink" "3.6.0"
+    "@lerna/resolve-symlink" "3.6.0"
+    "@lerna/symlink-binary" "3.10.0"
     fs-extra "^7.0.0"
     p-finally "^1.0.0"
     p-map "^1.2.0"
     p-map-series "^1.0.0"
 
-"@lerna/validation-error@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.0.0.tgz#a27e90051c3ba71995e2a800a43d94ad04b3e3f4"
-  integrity sha512-5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==
-  dependencies:
-    npmlog "^4.1.2"
+"@lerna/timer@3.5.0":
+  version "3.5.0"
+  resolved "https://registry.npmjs.org/@lerna/timer/-/timer-3.5.0.tgz#8dee6acf002c55de64678c66ef37ca52143f1b9b"
+  integrity sha512-TAb99hqQN6E3JBGtG9iyZNPq1/DbmqgBOeNrKtdJsGvIeX/NGLgUDWMrj2h04V4O+jpBFmSf6HIld6triKmxCA==
 
-"@lerna/version@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.npmjs.org/@lerna/version/-/version-3.4.1.tgz#029448cccd3ccefb4d5f666933bd13cfb37edab0"
-  integrity sha512-oefNaQLBJSI2WLZXw5XxDXk4NyF5/ct0V9ys/J308NpgZthPgwRPjk9ZR0o1IOxW1ABi6z3E317W/dxHDjvAkg==
+"@lerna/validation-error@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.6.0.tgz#550cf66bb2ef88edc02e36017b575a7a9100d5d8"
+  integrity sha512-MWltncGO5VgMS0QedTlZCjFUMF/evRjDMMHrtVorkIB2Cp5xy0rkKa8iDBG43qpUWeG1giwi58yUlETBcWfILw==
   dependencies:
-    "@lerna/batch-packages" "^3.1.2"
-    "@lerna/check-working-tree" "^3.3.0"
-    "@lerna/child-process" "^3.3.0"
-    "@lerna/collect-updates" "^3.3.2"
-    "@lerna/command" "^3.3.0"
-    "@lerna/conventional-commits" "^3.4.1"
-    "@lerna/output" "^3.0.0"
-    "@lerna/prompt" "^3.3.1"
-    "@lerna/run-lifecycle" "^3.4.1"
-    "@lerna/validation-error" "^3.0.0"
+    libnpm "^2.0.1"
+
+"@lerna/version@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.npmjs.org/@lerna/version/-/version-3.10.6.tgz#c31c2bb1aabbdc851407534155567b5cdf48e0fb"
+  integrity sha512-77peW2ROlHHl1e/tHBUmhpb8tsO6CIdlx34XapZhUuIVykrkOuqVFFxqMecrGG8SJe0e3l1G+Fah7bJTQcG0kw==
+  dependencies:
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/check-working-tree" "3.10.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/command" "3.10.6"
+    "@lerna/conventional-commits" "3.10.0"
+    "@lerna/output" "3.6.0"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/run-lifecycle" "3.10.5"
+    "@lerna/validation-error" "3.6.0"
     chalk "^2.3.1"
     dedent "^0.7.0"
+    libnpm "^2.0.1"
     minimatch "^3.0.4"
-    npmlog "^4.1.2"
     p-map "^1.2.0"
     p-pipe "^1.2.0"
     p-reduce "^1.0.0"
@@ -1227,12 +1268,12 @@
     slash "^1.0.0"
     temp-write "^3.4.0"
 
-"@lerna/write-log-file@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.0.0.tgz#2f95fee80c6821fe1ee6ccf8173d2b4079debbd2"
-  integrity sha512-SfbPp29lMeEVOb/M16lJwn4nnx5y+TwCdd7Uom9umd7KcZP0NOvpnX0PHehdonl7TyHZ1Xx2maklYuCLbQrd/A==
+"@lerna/write-log-file@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.6.0.tgz#b8d5a7efc84fa93cbd67d724d11120343b2a849a"
+  integrity sha512-OkLK99V6sYXsJsYg+O9wtiFS3z6eUPaiz2e6cXJt80mfIIdI1t2dnmyua0Ib5cZWExQvx2z6Y32Wlf0MnsoNsA==
   dependencies:
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
     write-file-atomic "^2.3.0"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
@@ -1248,37 +1289,37 @@
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@nuxt/friendly-errors-webpack-plugin@^2.3.2":
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.3.2.tgz#eb2c49b99d4f09ebdd635410b669b0700c2746f3"
-  integrity sha512-88sAXalIhbnUkeKekA9pebrvk37/daN2qFMmv/234yHa1f033mSb/D2gDfOFzJFZokNRY8CG/yS9KHqAjj2IfA==
+"@nuxt/devalue@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@nuxt/devalue/-/devalue-1.2.0.tgz#a76f12fbabf43fbfde6823942338674ba7ae3265"
+  integrity sha512-t4HOJiCc4uqjgDIFjLpVBom/071SroKiJW6fXMg1Tga1ahnSPHBvo7YIPjPzpVSzDJhwKHaio7t0J/trH4+43g==
+  dependencies:
+    consola "^2.3.0"
+
+"@nuxt/friendly-errors-webpack-plugin@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.4.0.tgz#525ad27dca736f5b0554b4d3675c586e8f6d3959"
+  integrity sha512-WF2Gx0A20toPFBxU4zBNOs2mEvxtD1Mr0t8UbsWr6J/8Es35iSzWw9h9V6R/mhtj/r4nnt56EwLgsByiqCvZKA==
   dependencies:
     chalk "^2.3.2"
     consola "^2.0.0-1"
     error-stack-parser "^2.0.0"
     string-width "^2.0.0"
 
-"@nuxtjs/devalue@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@nuxtjs/devalue/-/devalue-1.1.0.tgz#4dcdf33d914f6ea71b09da365452dd1016390d64"
-  integrity sha512-q0c6OY+NgIs0whENpQtGOdnxy95e357aBtX8ix4koMtqijjUuWO+SjFE/s3Apg7F+YfBWMuDJ0wj9ZWktzDnhg==
+"@nuxt/opencollective@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.npmjs.org/@nuxt/opencollective/-/opencollective-0.2.1.tgz#8290f1220072637e575c3935733719a78ad2d056"
+  integrity sha512-NP2VSUKRFGutbhWeKgIU0MnY4fmpH8UWxxwTJNPurCQ5BeWhOxp+Gp5ltO39P/Et/J2GYGb3+ALNqZJ+5cGBBw==
   dependencies:
-    consola "^2.0.7"
+    chalk "^2.4.1"
+    consola "^2.3.0"
+    node-fetch "^2.3.0"
 
 "@nuxtjs/eslint-config@^0.0.1":
   version "0.0.1"
   resolved "https://registry.npmjs.org/@nuxtjs/eslint-config/-/eslint-config-0.0.1.tgz#3aeed1cc6a2e01331c7e6b56bfa7152ce8bb2d90"
   integrity sha512-Scz5oYNtVwePF1ebXcWPrFxBpNF5wAkYh8L++6f2ZdLyUb1mCOwzE2+oVZxS25hGCYUyecFEshbqeSwkC+ktqA==
 
-"@nuxtjs/opencollective@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.2.0.tgz#2badff33d6fd2dcd5dc5ce95e2171c8095f12d25"
-  integrity sha512-A6htoJrs0ZJCmy+PI/ihQFzgkh1rXcMI2p8kt2x7W4Qjv+BjRygiZ/BQMgrZmIKktBzbQgqLFX1CMBh0HvLGvQ==
-  dependencies:
-    chalk "^2.4.1"
-    consola "^2.3.0"
-    node-fetch "^2.3.0"
-
 "@nuxtjs/youch@^4.2.3":
   version "4.2.3"
   resolved "https://registry.npmjs.org/@nuxtjs/youch/-/youch-4.2.3.tgz#36f8b22df5a0efaa81373109851e1d857aca6bed"
@@ -1305,10 +1346,15 @@
   resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
-"@types/node@*", "@types/node@^10.11.7":
-  version "10.12.8"
-  resolved "https://registry.npmjs.org/@types/node/-/node-10.12.8.tgz#d0a3ab5a6e61458c492304e2776ac136b81db927"
-  integrity sha512-INamyRZG4rW3lDCUmwVd5Xho/bXvQm/v1yP8V0UN1RuInU7RoWoaO570b+yLX4Ia/0szsx1wa8VzcsVlsvbWLA==
+"@types/node@*", "@types/node@^10.11.7", "@types/node@^10.12.18":
+  version "10.12.18"
+  resolved "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
+  integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
+
+"@types/q@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
+  integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==
 
 "@types/semver@^5.5.0":
   version "5.5.0"
@@ -1317,7 +1363,7 @@
 
 "@types/strip-bom@^3.0.0":
   version "3.0.0"
-  resolved "http://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
+  resolved "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
   integrity sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=
 
 "@types/strip-json-comments@0.0.30":
@@ -1325,19 +1371,83 @@
   resolved "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
   integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
 
-"@vue/component-compiler-utils@^2.0.0":
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.3.0.tgz#4f580f1b28fc7685859d87ea0e92a1c0271c93da"
-  integrity sha512-4RB1mow8IO2X0/86plKhflMJYSiSn3sWHiqVob8s/LCADFMHSaFRTQp5GdqvjvlGmwjhdn2dzDQik+RLjTx/5g==
+"@vue/babel-helper-vue-jsx-merge-props@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0-beta.2.tgz#f3e20d77b89ddb7a4b9b7a75372f05cd3ac22d92"
+  integrity sha512-Yj92Q1GcGjjctecBfnBmVqKSlMdyZaVq10hlZB4HSd1DJgu4cWgpEImJSzcJRUCZmas6UigwE7f4IjJuQs+JvQ==
+
+"@vue/babel-plugin-transform-vue-jsx@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.0.0-beta.2.tgz#6f7903fe66a34a02163f418c426cf419e862d97e"
+  integrity sha512-fvAymRZAPHitomRE+jIipWRj0STXNSMqeOSdOFu9Ffjqg9WGOxSdCjORxexManfZ2y5QDv7gzI1xfgprsK3nlw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2"
+    html-tags "^2.0.0"
+    lodash.kebabcase "^4.1.1"
+    svg-tags "^1.0.0"
+
+"@vue/babel-preset-jsx@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.0.0-beta.2.tgz#3e5dc2b73da58391c1c7327c2bd2ef154fe4e46e"
+  integrity sha512-nZoAKBR/h6iPMQ66ieQcIdlpPBmqhtUUcgjBS541jIVxSog1rwzrc00jlsuecLonzUMWPU0PabyitsG74vhN1w==
+  dependencies:
+    "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2"
+    "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
+    "@vue/babel-sugar-functional-vue" "^1.0.0-beta.2"
+    "@vue/babel-sugar-inject-h" "^1.0.0-beta.2"
+    "@vue/babel-sugar-v-model" "^1.0.0-beta.2"
+    "@vue/babel-sugar-v-on" "^1.0.0-beta.2"
+
+"@vue/babel-sugar-functional-vue@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.0.0-beta.2.tgz#8831f686e7614f282d5170b902483ef538deef38"
+  integrity sha512-5qvi4hmExgjtrESDk0vflL69dIxkDAukJcYH9o4663E8Nh12Jpbmr+Ja8WmgkAPtTVhk90UVcVUFCCZLHBmhkQ==
+  dependencies:
+    "@babel/plugin-syntax-jsx" "^7.2.0"
+
+"@vue/babel-sugar-inject-h@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.0.0-beta.2.tgz#5f92f994bf4b4126fad8633f554e8a426b51b413"
+  integrity sha512-qGXZ6yE+1trk82xCVJ9j3shsgI+R2ePj3+o8b2Ee7JNaRqQvMfTwpgx5BRlk4q1+CTjvYexdqBS+q4Kg7sSxcg==
+  dependencies:
+    "@babel/plugin-syntax-jsx" "^7.2.0"
+
+"@vue/babel-sugar-v-model@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.0.0-beta.2.tgz#051d3ae3ef5e70d514e09058ec5790f6a42e8c28"
+  integrity sha512-63US3IMEtATJzzK2le/Na53Sk2bp3LHfwZ8eMFwbTaz6e2qeV9frBl3ZYaha64ghT4IDSbrDXUmm0J09EAzFfA==
+  dependencies:
+    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2"
+    "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
+    camelcase "^5.0.0"
+    html-tags "^2.0.0"
+    svg-tags "^1.0.0"
+
+"@vue/babel-sugar-v-on@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.0.0-beta.2.tgz#3e2d122e229b10017f091d178346b601d9245260"
+  integrity sha512-XH/m3k11EKdMY0MrTg4+hQv8BFM8juzHT95chYkgxDmvDdVJnSCuf9+mcysEJttWD4PVuUGN7EHoIWsIhC0dRw==
+  dependencies:
+    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2"
+    camelcase "^5.0.0"
+
+"@vue/component-compiler-utils@^2.5.1":
+  version "2.5.1"
+  resolved "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.5.1.tgz#bd9cf68d728324d7dcede80462c2c0e8fe090acb"
+  integrity sha512-4mLLh8LYDciX4BO6FVfPbuG3QNYOI70dfsNcdCzHDnN/QYiJ9KWWrf9crSDa9D/aon+QME39Lj+XDHiy9t3sRQ==
   dependencies:
     consolidate "^0.15.1"
     hash-sum "^1.0.2"
     lru-cache "^4.1.2"
     merge-source-map "^1.1.0"
-    postcss "^6.0.20"
-    postcss-selector-parser "^3.1.1"
-    prettier "1.13.7"
-    source-map "^0.5.6"
+    postcss "^7.0.7"
+    postcss-selector-parser "^5.0.0"
+    prettier "1.16.0"
+    source-map "^0.7.3"
     vue-template-es2015-compiler "^1.6.0"
 
 "@webassemblyjs/ast@1.7.11":
@@ -1519,12 +1629,10 @@ accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
-  dependencies:
-    acorn "^5.0.0"
+acorn-dynamic-import@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
 acorn-globals@^3.0.0:
   version "3.1.0"
@@ -1542,9 +1650,9 @@ acorn-globals@^4.1.0, acorn-globals@^4.3.0:
     acorn-walk "^6.0.1"
 
 acorn-jsx@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.0.tgz#958584ddb60990c02c97c1bd9d521fce433bb101"
-  integrity sha512-XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg==
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
+  integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
 
 acorn-walk@^6.0.1:
   version "6.1.1"
@@ -1553,7 +1661,7 @@ acorn-walk@^6.0.1:
 
 acorn@^3.1.0:
   version "3.3.0"
-  resolved "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
   integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
 acorn@^4.0.4, acorn@~4.0.2:
@@ -1561,15 +1669,15 @@ acorn@^4.0.4, acorn@~4.0.2:
   resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
   integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
 
-acorn@^5.0.0, acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3:
+acorn@^5.5.3, acorn@^5.7.3:
   version "5.7.3"
   resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.1, acorn@^6.0.2:
-  version "6.0.4"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
-  integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
+acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.4, acorn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
+  integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
 
 agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
   version "4.2.1"
@@ -1586,19 +1694,19 @@ agentkeepalive@^3.4.1:
     humanize-ms "^1.2.1"
 
 ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@^6.1.0, ajv@^6.5.3, ajv@^6.5.5:
-  version "6.5.5"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1"
-  integrity sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==
+ajv@^6.1.0, ajv@^6.5.3, ajv@^6.5.5, ajv@^6.6.1:
+  version "6.7.0"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
+  integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1619,21 +1727,21 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
+ansi-align@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
   dependencies:
-    string-width "^2.0.0"
+    string-width "^3.0.0"
 
-ansi-colors@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
-  integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
+ansi-colors@^3.0.0, ansi-colors@^3.2.1:
+  version "3.2.3"
+  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
 
 ansi-escapes@^3.0.0, ansi-escapes@^3.1.0:
   version "3.1.0"
-  resolved "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
   integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
 ansi-html@0.0.7:
@@ -1651,6 +1759,11 @@ ansi-regex@^3.0.0:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
+ansi-regex@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
+  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -1678,12 +1791,12 @@ append-transform@^0.4.0:
   dependencies:
     default-require-extensions "^1.0.0"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2:
   version "1.2.0"
   resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-aproba@^2.0.0:
+"aproba@^1.1.2 || 2", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
@@ -1696,6 +1809,11 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
+arg@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0"
+  integrity sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1737,7 +1855,7 @@ array-differ@^1.0.0:
 
 array-equal@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  resolved "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
 array-filter@~0.0.0:
@@ -1867,16 +1985,16 @@ atob@^2.1.1:
   resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.3.1:
-  version "9.3.1"
-  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
-  integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
+autoprefixer@^9.4.2:
+  version "9.4.6"
+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
+  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
   dependencies:
-    browserslist "^4.3.3"
-    caniuse-lite "^1.0.30000898"
+    browserslist "^4.4.1"
+    caniuse-lite "^1.0.30000929"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.5"
+    postcss "^7.0.13"
     postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.7.0:
@@ -1889,7 +2007,7 @@ aws4@^1.8.0:
   resolved "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
@@ -1954,11 +2072,6 @@ babel-generator@^6.18.0, babel-generator@^6.26.0:
     source-map "^0.5.7"
     trim-right "^1.0.1"
 
-babel-helper-vue-jsx-merge-props@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
-  integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
-
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
@@ -1975,12 +2088,12 @@ babel-jest@^23.6.0:
     babel-plugin-istanbul "^4.1.6"
     babel-preset-jest "^23.2.0"
 
-babel-loader@^8.0.4:
-  version "8.0.4"
-  resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.4.tgz#7bbf20cbe4560629e2e41534147692d3fecbdce6"
-  integrity sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw==
+babel-loader@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz#225322d7509c2157655840bba52e46b6c2f2fe33"
+  integrity sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==
   dependencies:
-    find-cache-dir "^1.0.0"
+    find-cache-dir "^2.0.0"
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
     util.promisify "^1.0.0"
@@ -2001,7 +2114,7 @@ babel-plugin-dynamic-import-node@^2.2.0:
 
 babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
-  resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
   integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.13.0"
@@ -2016,7 +2129,7 @@ babel-plugin-jest-hoist@^23.2.0:
 
 babel-plugin-syntax-object-rest-spread@^6.13.0:
   version "6.13.0"
-  resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  resolved "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
   integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
 babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
@@ -2037,13 +2150,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-vue-jsx@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-4.0.1.tgz#2c8bddce87a6ef09eaa59869ff1bfbeeafc5f88d"
-  integrity sha512-wbOz7ITB5cloLSjKUU1hWn8zhR+Dwah/RZiTiJY/CQliCwhowmzu6m7NEF+y5EJX/blDzGjRtZvC10Vdb3Q7vw==
-  dependencies:
-    esutils "^2.0.2"
-
 babel-preset-jest@^23.2.0:
   version "23.2.0"
   resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
@@ -2159,6 +2265,22 @@ big.js@^3.1.3:
   resolved "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
   integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+bin-links@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757"
+  integrity sha512-8eEHVgYP03nILphilltWjeIjMbKyJo3wvp9K816pHbhP301ismzw15mxAAEVQ/USUwcP++1uNrbERbp8lOA6Fg==
+  dependencies:
+    bluebird "^3.5.0"
+    cmd-shim "^2.0.2"
+    gentle-fs "^2.0.0"
+    graceful-fs "^4.1.11"
+    write-file-atomic "^2.3.0"
+
 binary-extensions@^1.0.0:
   version "1.12.0"
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
@@ -2171,7 +2293,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.2:
+bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
   version "3.5.3"
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
   integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
@@ -2202,16 +2324,16 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-boxen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/boxen/-/boxen-2.0.0.tgz#46ba3953b1a3d99aaf89ad8c7104a32874934a58"
-  integrity sha512-9DK9PQqcOpsvlKOK3f3lVK+vQsqH4JDGMX73FCWcHRxQQtop1U8urn4owrt5rnc2NgZAJ6wWjTDBc7Fhv+vz/w==
+boxen@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/boxen/-/boxen-2.1.0.tgz#8d576156e33fc26a34d6be8635fd16b1d745f0b2"
+  integrity sha512-luq3RQOt2U5sUX+fiu+qnT+wWnHDcATLpEe63jvge6GUZO99AKbVRfp97d2jgLvq1iQa0ORzaAm4lGVG52ZSlw==
   dependencies:
-    ansi-align "^2.0.0"
+    ansi-align "^3.0.0"
     camelcase "^5.0.0"
     chalk "^2.4.1"
     cli-boxes "^1.0.0"
-    string-width "^2.1.1"
+    string-width "^3.0.0"
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
@@ -2267,7 +2389,7 @@ browser-resolve@^1.11.3:
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
   integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
@@ -2298,7 +2420,7 @@ browserify-des@^1.0.0:
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
-  resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
@@ -2324,23 +2446,21 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist-useragent@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/browserslist-useragent/-/browserslist-useragent-2.0.1.tgz#ea5f706bc426c5fb2b5adf97cde7c1aed0864d0f"
-  integrity sha1-6l9wa8QmxfsrWt+XzefBrtCGTQ8=
+browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.3.5, browserslist@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
+  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
   dependencies:
-    browserslist "^4.0.1"
-    semver "^5.4.1"
-    useragent "^2.2.1"
+    caniuse-lite "^1.0.30000929"
+    electron-to-chromium "^1.3.103"
+    node-releases "^1.1.3"
 
-browserslist@^4.0.0, browserslist@^4.0.1, browserslist@^4.1.0, browserslist@^4.3.3, browserslist@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
-  integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==
+bs-logger@0.x:
+  version "0.2.6"
+  resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
   dependencies:
-    caniuse-lite "^1.0.30000899"
-    electron-to-chromium "^1.3.82"
-    node-releases "^1.0.1"
+    fast-json-stable-stringify "2.x"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -2349,7 +2469,7 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-from@^1.0.0:
+buffer-from@1.x, buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
@@ -2361,22 +2481,22 @@ buffer-xor@^1.0.3:
 
 buffer@^4.3.0:
   version "4.9.1"
-  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
-builtin-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
-  integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
+builtin-modules@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1"
+  integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
@@ -2403,24 +2523,24 @@ bytes@3.0.0:
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
-  version "11.3.1"
-  resolved "https://registry.npmjs.org/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
-  integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
+  version "11.3.2"
+  resolved "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
   dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    figgy-pudding "^3.1.0"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.3"
+    bluebird "^3.5.3"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
     move-concurrently "^1.0.1"
     promise-inflight "^1.0.1"
     rimraf "^2.6.2"
-    ssri "^6.0.0"
-    unique-filename "^1.1.0"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
     y18n "^4.0.0"
 
 cache-base@^1.0.1:
@@ -2438,15 +2558,16 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cache-loader@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.5.tgz#9ab15b0ae5f546f376083a695fc1a75f546cb266"
-  integrity sha512-enWKEQ4kO3YreDFd7AtVRjtJBmNiqh/X9hVDReu0C4qm8gsGmySkwuWtdc+N5O+vq5FzxL1mIZc30NyXCB7o/Q==
+cache-loader@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/cache-loader/-/cache-loader-2.0.1.tgz#5758f41a62d7c23941e3c3c7016e6faeb03acb07"
+  integrity sha512-V99T3FOynmGx26Zom+JrVBytLBsmUCzVG2/4NnUKgvXN4bEV42R1ERl1IyiH/cvFIDA1Ytq2lPZ9tXDSahcQpQ==
   dependencies:
     loader-utils "^1.1.0"
     mkdirp "^0.5.1"
-    neo-async "^2.5.0"
-    schema-utils "^0.4.2"
+    neo-async "^2.6.0"
+    normalize-path "^3.0.0"
+    schema-utils "^1.0.0"
 
 call-me-maybe@^1.0.1:
   version "1.0.1"
@@ -2460,13 +2581,6 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -2474,16 +2588,16 @@ caller-path@^2.0.0:
   dependencies:
     caller-callsite "^2.0.0"
 
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
   integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
+callsites@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
+  integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
+
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -2494,7 +2608,7 @@ camel-case@3.0.x:
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
   integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
@@ -2539,15 +2653,15 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899, caniuse-lite@^1.0.30000905:
-  version "1.0.30000907"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz#0b9899bde53fb1c30e214fb12402361e02ff5c42"
-  integrity sha512-No5sQ/OB2Nmka8MNOOM6nJx+Hxt6MQ6h7t7kgJFu9oTuwjykyKRSBP/+i/QAyFHxeHB+ddE0Da1CG5ihx9oehQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000918, caniuse-lite@^1.0.30000929:
+  version "1.0.30000930"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000930.tgz#c238bab82bedb462bcbdc61d0334932dcc084d8a"
+  integrity sha512-KD+pw9DderBLB8CGqBzYyFWpnrPVOEjsjargU/CvkNyg60od3cxSPTcTeMPhxJhDbkQPWvOz5BAyBzNl/St9vg==
 
-caniuse-lite@^1.0.30000910:
-  version "1.0.30000910"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000910.tgz#755d5181d4b006e5a2b59b1ffa05d0a0470039f5"
-  integrity sha512-u/nxtHGAzCGZzIxt3dA/tpSPOcirBZFWKwz1EPz4aaupnBI2XR0Rbr74g0zc6Hzy41OEM4uMoZ38k56TpYAWjQ==
+caniuse-lite@^1.0.30000932:
+  version "1.0.30000932"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000932.tgz#d01763e9ce77810962ca7391ff827b5949ce4272"
+  integrity sha512-4bghJFItvzz8m0T3lLZbacmEY9X1Z2AtIzTr7s7byqZIOumASfr4ynDx7rtm0J85nDmx8vsgR6vnaSoeU8Oh0A==
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -2571,7 +2685,7 @@ center-align@^0.1.1:
 
 chalk@^1.1.3:
   version "1.1.3"
-  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
@@ -2580,10 +2694,10 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -2638,7 +2752,7 @@ chokidar@^2.0.2, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chownr@^1.0.1, chownr@^1.1.1:
+chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2697,6 +2811,16 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-table3@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+  dependencies:
+    object-assign "^4.1.0"
+    string-width "^2.1.1"
+  optionalDependencies:
+    colors "^1.1.2"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -2744,10 +2868,12 @@ co@^4.6.0:
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 coa@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz#f3f8b0b15073e35d70263fb1042cb2c023db38af"
-  integrity sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
+  integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
   dependencies:
+    "@types/q" "^1.5.1"
+    chalk "^2.4.1"
     q "^1.1.2"
 
 code-point-at@^1.0.0:
@@ -2807,9 +2933,14 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+colors@^1.1.2:
+  version "1.3.3"
+  resolved "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
+  integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
+
 colors@~1.1.2:
   version "1.1.2"
-  resolved "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
   integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 columnify@^1.5.4:
@@ -2832,7 +2963,7 @@ commander@2.17.x, commander@~2.17.1:
   resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@^2.18.0, commander@^2.19.0:
+commander@^2.12.1, commander@^2.18.0, commander@^2.19.0:
   version "2.19.0"
   resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2895,7 +3026,7 @@ concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-config-chain@^1.1.11, config-chain@~1.1.5:
+config-chain@^1.1.11, config-chain@^1.1.12:
   version "1.1.12"
   resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
   integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
@@ -2913,21 +3044,10 @@ connect@^3.6.6:
     parseurl "~1.3.2"
     utils-merge "1.0.1"
 
-consola@^2.0.0-1, consola@^2.0.7, consola@^2.2.4:
-  version "2.2.6"
-  resolved "https://registry.npmjs.org/consola/-/consola-2.2.6.tgz#01360c5b3a3a9e49bbd497ad4e04037c05e772fd"
-  integrity sha512-3ixQ51Pj8GN3p/BQs3d5a5hXdQVfCwr0tyAT9pkUAvR/22wdq1T1QSBLCLL9mpBdybc7WC/5bnNvIb0zuHRJOQ==
-  dependencies:
-    chalk "^2.4.1"
-    dayjs "^1.7.7"
-    figures "^2.0.0"
-    std-env "^2.1.1"
-    string-width "^2.1.1"
-
-consola@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/consola/-/consola-2.3.0.tgz#256b80a927234351d512a4e5693eac9cf8a572b9"
-  integrity sha512-gsawoQfj4DtnwsaPrabFpFOZBxWpzpT+E9fu6YAdFKO3NvBOOsFcQl/cskDOoIDDLMkLZvm4jjMWvSEelIumIw==
+consola@^2.0.0-1, consola@^2.3.0, consola@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.npmjs.org/consola/-/consola-2.3.2.tgz#ec75dd9847fa963dc41e21bc2737ac8c962677bb"
+  integrity sha512-7SAo6nBdWJw7XQFu0ZRnXbGBu+RhEp0/fEpm7lTnqRT6bHM0MwEkW0Yxv8phCP9s18qyMqBmVU/pJ2bri/TZIg==
   dependencies:
     chalk "^2.4.1"
     dayjs "^1.7.7"
@@ -2984,7 +3104,7 @@ content-type@~1.0.4:
   resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-conventional-changelog-angular@^5.0.1:
+conventional-changelog-angular@^5.0.2:
   version "5.0.2"
   resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a"
   integrity sha512-yx7m7lVrXmt4nKWQgWZqxSALEiAKZhOAcbxdUaU9575mB0CzXVbgrgpfSnSP7OqWDUTYGD0YVJ0MSRdyOPgAwA==
@@ -2992,7 +3112,7 @@ conventional-changelog-angular@^5.0.1:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.0:
+conventional-changelog-core@^3.1.5:
   version "3.1.5"
   resolved "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c"
   integrity sha512-iwqAotS4zk0wA4S84YY1JCUG7X3LxaRjJxuUo6GI4dZuIy243j5nOg/Ora35ExT4DOiw5dQbMMQvw2SUjh6moQ==
@@ -3053,7 +3173,7 @@ conventional-commits-parser@^3.0.1:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-recommended-bump@^4.0.1:
+conventional-recommended-bump@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
   integrity sha512-9mY5Yoblq+ZMqJpBzgS+RpSq+SUfP2miOR3H/NR9drGf08WCrY9B6HAGJZEm6+ThsVP917VHAahSOjM6k1vhPg==
@@ -3102,9 +3222,9 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7:
-  version "2.5.7"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
+  version "2.6.3"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz#4b70938bdffdaf64931e66e2db158f0892289c49"
+  integrity sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3141,7 +3261,7 @@ create-ecdh@^4.0.0:
 
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  resolved "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
@@ -3152,7 +3272,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
-  resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  resolved "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
@@ -3207,9 +3327,16 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+css-blank-pseudo@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
+  integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==
+  dependencies:
+    postcss "^7.0.5"
+
 css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
-  resolved "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+  resolved "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
   integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
 
 css-declaration-sorter@^4.0.1:
@@ -3220,25 +3347,31 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
-  integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==
+css-has-pseudo@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee"
+  integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==
   dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash "^4.17.11"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
-    postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
+    postcss "^7.0.6"
+    postcss-selector-parser "^5.0.0-rc.4"
 
-css-prefers-color-scheme@^3.0.0:
+css-loader@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/css-loader/-/css-loader-2.1.0.tgz#42952ac22bca5d076978638e9813abce49b8f0cc"
+  integrity sha512-MoOu+CStsGrSt5K2OeZ89q3Snf+IkxRfAIt9aAKg4piioTrhtP1iEFPu+OVn3Ohz24FO6L+rw9UJxBILiSBw5Q==
+  dependencies:
+    icss-utils "^4.0.0"
+    loader-utils "^1.2.1"
+    lodash "^4.17.11"
+    postcss "^7.0.6"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^2.0.3"
+    postcss-modules-scope "^2.0.0"
+    postcss-modules-values "^2.0.0"
+    postcss-value-parser "^3.3.0"
+    schema-utils "^1.0.0"
+
+css-prefers-color-scheme@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
   integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==
@@ -3252,7 +3385,7 @@ css-select-base-adapter@~0.1.0:
 
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  resolved "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
   integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
@@ -3320,10 +3453,10 @@ css@^2.1.0:
     source-map-resolve "^0.5.2"
     urix "^0.1.0"
 
-cssdb@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/cssdb/-/cssdb-4.2.0.tgz#89623ec696121d0688080ccdcd4627c7e6c6ee0d"
-  integrity sha512-27CuM+rp1/HIH4hkiOvrRUjgv31WamWk7+XSGz7OP/uWR8EOMeXOh4Ncpa/Eq1eO/1eRhQx7HWj8KEbt4nKQBA==
+cssdb@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/cssdb/-/cssdb-4.3.0.tgz#2e1229900616f80c66ff2d568ea2b4f92db1c78c"
+  integrity sha512-VHPES/+c9s+I0ryNj+PXvp84nz+ms843z/efpaEINwP/QfGsINL3gpLp5qjapzDNzNzbXxur8uxKxSXImrg4ag==
 
 cssesc@^0.1.0:
   version "0.1.0"
@@ -3335,10 +3468,10 @@ cssesc@^2.0.0:
   resolved "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
   integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
 
-cssnano-preset-default@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.5.tgz#d1756c0259d98ad311e601ba76e95c60f6771ac1"
-  integrity sha512-f1uhya0ZAjPYtDD58QkBB0R+uYdzHPei7cDxJyQQIHt5acdhyGXaSXl2nDLzWHLwGFbZcHxQtkJS8mmNwnxTvw==
+cssnano-preset-default@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.6.tgz#92379e2a6db4a91c0ea727f5f556eeac693eab6a"
+  integrity sha512-UPboYbFaJFtDUhJ4fqctThWbbyF4q01/7UhsZbLzp35l+nUxtzh1SifoVlEfyLM3n3Z0htd8B1YlCxy9i+bQvg==
   dependencies:
     css-declaration-sorter "^4.0.1"
     cssnano-util-raw-cache "^4.0.1"
@@ -3350,7 +3483,7 @@ cssnano-preset-default@^4.0.5:
     postcss-discard-duplicates "^4.0.2"
     postcss-discard-empty "^4.0.1"
     postcss-discard-overridden "^4.0.1"
-    postcss-merge-longhand "^4.0.9"
+    postcss-merge-longhand "^4.0.10"
     postcss-merge-rules "^4.0.2"
     postcss-minify-font-values "^4.0.2"
     postcss-minify-gradients "^4.0.1"
@@ -3393,13 +3526,13 @@ cssnano-util-same-parent@^4.0.0:
   resolved "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
   integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
 
-cssnano@^4.1.0, cssnano@^4.1.7:
-  version "4.1.7"
-  resolved "https://registry.npmjs.org/cssnano/-/cssnano-4.1.7.tgz#0bf112294bec103ab5f68d3f805732c8325a0b1b"
-  integrity sha512-AiXL90l+MDuQmRNyypG2P7ux7K4XklxYzNNUd5HXZCNcH8/N9bHPcpN97v8tXgRVeFL/Ed8iP8mVmAAu0ZpT7A==
+cssnano@^4.1.0, cssnano@^4.1.8:
+  version "4.1.8"
+  resolved "https://registry.npmjs.org/cssnano/-/cssnano-4.1.8.tgz#8014989679d5fd42491e4499a521dbfb85c95fd1"
+  integrity sha512-5GIY0VzAHORpbKiL3rMXp4w4M1Ki+XlXgEXyuWXVd3h6hlASb+9Vo76dNP56/elLMVBBsUfusCo1q56uW0UWig==
   dependencies:
     cosmiconfig "^5.0.0"
-    cssnano-preset-default "^4.0.5"
+    cssnano-preset-default "^4.0.6"
     is-resolvable "^1.0.0"
     postcss "^7.0.0"
 
@@ -3453,7 +3586,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-urls@^1.0.0, data-urls@^1.0.1:
+data-urls@^1.0.0, data-urls@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
   integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
@@ -3473,9 +3606,9 @@ dateformat@^3.0.0:
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
 dayjs@^1.7.7:
-  version "1.7.7"
-  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.7.7.tgz#8df20f78ac2476e3f5348ef49f8f22ebc3016370"
-  integrity sha512-Qlkiu0NNDpYwhk0syK4ImvAl/5YnsEMkvC2O123INviGeOA3Q8s5VyVkZzmN5SC7Wv9bb1+rfwO+uSqtHB4UWw==
+  version "1.8.0"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.8.0.tgz#507963ac3023f4b1f9f399a278356946fc4c9ae9"
+  integrity sha512-2ofInmfMKLLR5R02q3WEUuDt86UK33VQQTaEeJudF+C04ZUaekCP3VpB0NJPiyPDCGJWq9XYhHX2AemdxA8+dg==
 
 de-indent@^1.0.2:
   version "1.0.2"
@@ -3503,10 +3636,10 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
-  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
@@ -3523,18 +3656,11 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -3555,10 +3681,10 @@ deep-is@~0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-deepmerge@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
-  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
+deepmerge@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-3.1.0.tgz#a612626ce4803da410d77554bfd80361599c034d"
+  integrity sha512-/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg==
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
@@ -3583,7 +3709,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2:
+define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -3670,21 +3796,21 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
-diff@^3.2.0:
+diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
-  resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
   integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.0.0:
+dir-glob@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
   integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
@@ -3694,7 +3820,7 @@ dir-glob@^2.0.0:
 
 doctrine@1.5.0:
   version "1.5.0"
-  resolved "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
   dependencies:
     esutils "^2.0.2"
@@ -3732,19 +3858,14 @@ domain-browser@^1.1.1:
   resolved "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.2.1.tgz#578558ef23befac043a1abb0db07635509393479"
-  integrity sha512-SQVCLFS2E7G5CRCMdn6K9bIhRj1bS6QBWZfF0TUPh4V/BbqrQ619IdSS3/izn0FZ+9l+uODzaZjb08fjOfablA==
-
-domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-  integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=
+domelementtype@1, domelementtype@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@~1.1.1:
   version "1.1.3"
-  resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
   integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
 
 domexception@^1.0.1:
@@ -3807,7 +3928,7 @@ dot-prop@^4.1.1, dot-prop@^4.2.0:
 
 duplexer@^0.1.1:
   version "0.1.1"
-  resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
@@ -3828,7 +3949,7 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-editorconfig@^0.15.0:
+editorconfig@^0.15.2:
   version "0.15.2"
   resolved "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz#047be983abb9ab3c2eefe5199cb2b7c5689f0702"
   integrity sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==
@@ -3850,10 +3971,10 @@ ejs@^2.6.1:
   resolved "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.82:
-  version "1.3.84"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz#2e55df59e818f150a9f61b53471ebf4f0feecc65"
-  integrity sha512-IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw==
+electron-to-chromium@^1.3.103:
+  version "1.3.106"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.106.tgz#672183160e783cb546cff83d9a98d5f69cd91874"
+  integrity sha512-eXX45p4q9CRxG0G8D3ZBZYSdN3DnrcZfrFvt6VUr1u7aKITEtRY/xwWzJ/UZcWXa7DMqPu/pYwuZ6Nm+bl0GmA==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -3868,6 +3989,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -3902,7 +4028,7 @@ enhanced-resolve@^3.4.1:
     object-assign "^4.0.1"
     tapable "^0.2.7"
 
-enhanced-resolve@^4.1.0:
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
@@ -3911,6 +4037,13 @@ enhanced-resolve@^4.1.0:
     memory-fs "^0.4.0"
     tapable "^1.0.0"
 
+enquirer@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.0.tgz#c362c9d84984ebe854def63caaf12983a16af552"
+  integrity sha512-RNGUbRVlfnjmpxV+Ed+7CGu0rg3MK7MmlW+DW0v7V2zdAUBC1s4BxCRiIAozbYB2UJ+q4D+8tW9UFb11kF72/g==
+  dependencies:
+    ansi-colors "^3.2.1"
+
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -3942,18 +4075,19 @@ error-stack-parser@^2.0.0:
   dependencies:
     stackframe "^1.0.4"
 
-es-abstract@^1.5.1, es-abstract@^1.6.1:
-  version "1.12.0"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
+es-abstract@^1.12.0, es-abstract@^1.5.1:
+  version "1.13.0"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
   dependencies:
-    es-to-primitive "^1.1.1"
+    es-to-primitive "^1.2.0"
     function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
+    has "^1.0.3"
+    is-callable "^1.1.4"
     is-regex "^1.0.4"
+    object-keys "^1.0.12"
 
-es-to-primitive@^1.1.1:
+es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
   integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
@@ -3969,7 +4103,7 @@ es6-promise@^4.0.3:
 
 es6-promisify@^5.0.0:
   version "5.0.0"
-  resolved "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  resolved "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
   integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
@@ -4001,7 +4135,7 @@ eslint-config-standard@^12.0.0:
   resolved "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9"
   integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==
 
-eslint-import-resolver-node@^0.3.1:
+eslint-import-resolver-node@^0.3.2:
   version "0.3.2"
   resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
   integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
@@ -4009,56 +4143,56 @@ eslint-import-resolver-node@^0.3.1:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-module-utils@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
-  integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=
+eslint-module-utils@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
+  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
   dependencies:
     debug "^2.6.8"
-    pkg-dir "^1.0.0"
+    pkg-dir "^2.0.0"
 
-eslint-multiplexer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/eslint-multiplexer/-/eslint-multiplexer-1.0.2.tgz#8cce47bbeac7f448617b714245860aa6e5c38941"
-  integrity sha512-H8fIwGwrydqyGs9n10VPr5zt2PPYsAiRrDKcWtE4aw1w+JGzj+DBYc4wvp+ptGwGi/4YCkjsmIkDZQrGgv5axg==
+eslint-multiplexer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/eslint-multiplexer/-/eslint-multiplexer-1.0.3.tgz#8bba4c28ee81e5267a6a28004af63b50c1ad8c94"
+  integrity sha512-wvJqYkLnJAOE480S3/0FKdjiY7oFIV+lsU0DWxUINQbTTxT0dN1XSkT06QQeu74wjpwsWdb1UNWPSWo6T0QyGQ==
   dependencies:
     cross-spawn "^6.0.5"
     minimist "^1.2.0"
     minimist-options "^3.0.2"
 
 eslint-plugin-es@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.3.2.tgz#6d2e94ed40db3b3d92a0eb55c7c06e3a7adbb3db"
-  integrity sha512-xrdbConViY20DhGrt9FwjhDo4fr/9Yus2pYf0xJsdJaCcUzMq7+pAoNH7kSXF6V08bRHMpgDWclYbcr/Sn3hNg==
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6"
+  integrity sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw==
   dependencies:
     eslint-utils "^1.3.0"
     regexpp "^2.0.1"
 
-eslint-plugin-import@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
-  integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==
+eslint-plugin-import@^2.15.0:
+  version "2.15.0"
+  resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.15.0.tgz#d8f3c28b8988ccde5df964706faa7c1e52f0602a"
+  integrity sha512-LEHqgR+RcnpGqYW7h9WMkPb/tP+ekKxWdQDztfTtZeV43IHF+X8lXU+1HOCcR4oXD24qRgEwNSxIweD5uNKGVg==
   dependencies:
     contains-path "^0.1.0"
-    debug "^2.6.8"
+    debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.1"
-    eslint-module-utils "^2.2.0"
-    has "^1.0.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.3"
+    eslint-import-resolver-node "^0.3.2"
+    eslint-module-utils "^2.3.0"
+    has "^1.0.3"
+    lodash "^4.17.11"
+    minimatch "^3.0.4"
     read-pkg-up "^2.0.0"
-    resolve "^1.6.0"
+    resolve "^1.9.0"
 
-eslint-plugin-jest@^22.0.0:
-  version "22.0.0"
-  resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.0.0.tgz#87dc52bbdd47f37f23bf2b10bb8469458bb3ed68"
-  integrity sha512-YOj8cYI5ZXEZUrX2kUBLachR1ffjQiicIMBoivN7bXXHnxi8RcwNvmVzwlu3nTmjlvk5AP3kIpC5i8HcinmhPA==
+eslint-plugin-jest@^22.1.3:
+  version "22.1.3"
+  resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.1.3.tgz#4444108dfcddc5d2117ed6dc551f529d7e73a99e"
+  integrity sha512-JTZTI6WQoNruAugNyCO8fXfTONVcDd5i6dMRFA5g3rUFn1UDDLILY1bTL6alvNXbW2U7Sc2OSpi8m08pInnq0A==
 
-eslint-plugin-node@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-8.0.0.tgz#fb9e8911f4543514f154bb6a5924b599aa645568"
-  integrity sha512-Y+ln8iQ52scz9+rSPnSWRaAxeWaoJZ4wIveDR0vLHkuSZGe44Vk1J4HX7WvEP5Cm+iXPE8ixo7OM7gAO3/OKpQ==
+eslint-plugin-node@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz#55ae3560022863d141fa7a11799532340a685964"
+  integrity sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w==
   dependencies:
     eslint-plugin-es "^1.3.1"
     eslint-utils "^1.3.1"
@@ -4077,12 +4211,12 @@ eslint-plugin-standard@^4.0.0:
   resolved "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c"
   integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA==
 
-eslint-plugin-vue@^5.0.0-beta.4:
-  version "5.0.0-beta.4"
-  resolved "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0-beta.4.tgz#fdb576b9e723e27140646adab218001dd16a829f"
-  integrity sha512-roXXroqY2AcgF4dk0SG1reeeQz2X3Ef7q9B0GD0+vdc58vApig1hpTReT4Mf0YqTEI80/ldXD1ibV6n4vVUZrw==
+eslint-plugin-vue@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.1.0.tgz#d0d373334be8140d698ec4e1fb83f09faa48081b"
+  integrity sha512-C7avvbGLb9J1PyGiFolPcGR4ljUc+dKm5ZJdrUKXwXFxHHx4SqOmRI29AsFyW7PbCGcnOvIlaq7NJS6HDIak+g==
   dependencies:
-    vue-eslint-parser "^3.2.1"
+    vue-eslint-parser "^4.0.2"
 
 eslint-scope@3.7.1:
   version "3.7.1"
@@ -4110,10 +4244,10 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
   integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
-eslint@^5.9.0:
-  version "5.9.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz#b234b6d15ef84b5849c6de2af43195a2d59d408e"
-  integrity sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==
+eslint@^5.12.1:
+  version "5.12.1"
+  resolved "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz#5ca9931fb9029d04e7be92b03ce3b58edfac7e3b"
+  integrity sha512-54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.5.3"
@@ -4124,7 +4258,7 @@ eslint@^5.9.0:
     eslint-scope "^4.0.0"
     eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^4.0.0"
+    espree "^5.0.0"
     esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
@@ -4132,9 +4266,9 @@ eslint@^5.9.0:
     glob "^7.1.2"
     globals "^11.7.0"
     ignore "^4.0.6"
+    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     inquirer "^6.1.0"
-    is-resolvable "^1.1.0"
     js-yaml "^3.12.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
@@ -4147,19 +4281,18 @@ eslint@^5.9.0:
     pluralize "^7.0.0"
     progress "^2.0.0"
     regexpp "^2.0.1"
-    require-uncached "^1.0.3"
     semver "^5.5.1"
     strip-ansi "^4.0.0"
     strip-json-comments "^2.0.1"
     table "^5.0.2"
     text-table "^0.2.0"
 
-esm@^3.0.84:
-  version "3.0.84"
-  resolved "https://registry.npmjs.org/esm/-/esm-3.0.84.tgz#bb108989f4673b32d4f62406869c28eed3815a63"
-  integrity sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==
+esm@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.npmjs.org/esm/-/esm-3.1.4.tgz#d75f7c1b16e5be57e0446c267d8c0fda9566983d"
+  integrity sha512-GScwIz0110RTNzBmAQEdqaAYkD9zVhj2Jo+jeizjIcdyTw+C6S0Zv/dlPYgfF41hRTu2f1vQYliubzIkusx2gA==
 
-espree@^4.0.0:
+espree@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"
   integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==
@@ -4168,6 +4301,15 @@ espree@^4.0.0:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
+espree@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz#fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c"
+  integrity sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==
+  dependencies:
+    acorn "^6.0.2"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
+
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -4212,10 +4354,15 @@ etag@^1.8.1, etag@~1.8.1:
   resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-events@^1.0.0:
-  version "1.1.1"
-  resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
+
+eventsource-polyfill@^0.9.6:
+  version "0.9.6"
+  resolved "https://registry.npmjs.org/eventsource-polyfill/-/eventsource-polyfill-0.9.6.tgz#10e0d187f111b167f28fdab918843ce7d818f13c"
+  integrity sha1-EODRh/ERsWfyj9q5GIQ859gY8Tw=
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
@@ -4232,19 +4379,6 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.2.0"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    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"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -4401,6 +4535,17 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-css-chunks-webpack-plugin@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.npmjs.org/extract-css-chunks-webpack-plugin/-/extract-css-chunks-webpack-plugin-3.3.2.tgz#c99ba78be7c670e1bbd1dcffe3e272ab5e88026d"
+  integrity sha512-7XNEW3AiFiWqOCxJyjNDMqk+PMwqSQhrAr/NobhlI1fxb0a4AqlgCn3+dxlcqTlD+MhRz0jI4u3bXmw3jyoBVQ==
+  dependencies:
+    loader-utils "^1.1.0"
+    lodash "^4.17.11"
+    normalize-url "^4.1.0"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
+
 extract-from-css@^0.4.4:
   version "0.4.4"
   resolved "https://registry.npmjs.org/extract-from-css/-/extract-from-css-0.4.4.tgz#1ea7df2e7c7c6eb9922fa08e8adaea486f6f8f92"
@@ -4434,9 +4579,9 @@ fast-deep-equal@^2.0.1:
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-glob@^2.0.2:
-  version "2.2.4"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.4.tgz#e54f4b66d378040e0e4d6a68ec36bbc5b04363c0"
-  integrity sha512-FjK2nCGI/McyzgNtTESqaWP3trPvHyRyoyY70hxjc3oKPNmDe8taohLZpoVKoUjW85tbU5txaYUZCNtVzygl1g==
+  version "2.2.6"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
+  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.1.2"
@@ -4445,7 +4590,7 @@ fast-glob@^2.0.2:
     merge2 "^1.2.3"
     micromatch "^3.1.10"
 
-fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
@@ -4474,7 +4619,7 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
-figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
@@ -4494,10 +4639,10 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
+file-loader@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
+  integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
@@ -4556,7 +4701,7 @@ finalhandler@1.1.0:
 
 finalhandler@1.1.1, finalhandler@^1.1.1:
   version "1.1.1"
-  resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
   integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
@@ -4593,6 +4738,11 @@ find-cache-dir@^2.0.0:
     make-dir "^1.0.0"
     pkg-dir "^3.0.0"
 
+find-npm-prefix@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
+  integrity sha512-KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA==
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4655,6 +4805,18 @@ forever-agent@~0.6.1:
   resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+fork-ts-checker-webpack-plugin@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.5.2.tgz#a73b3630bd0a69409a6e4824e54c03a62fe82d8f"
+  integrity sha512-a5IG+xXyKnpruI0CP/anyRLAoxWtp3lzdG6flxicANnoSzz64b12dJ7ASAVRrI2OaWwZR2JyBaMHFQqInhWhIw==
+  dependencies:
+    babel-code-frame "^6.22.0"
+    chalk "^2.4.1"
+    chokidar "^2.0.4"
+    micromatch "^3.1.10"
+    minimatch "^3.0.4"
+    tapable "^1.0.0"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -4705,6 +4867,15 @@ fs-minipass@^1.2.5:
   dependencies:
     minipass "^2.2.1"
 
+fs-vacuum@^1.2.10:
+  version "1.2.10"
+  resolved "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"
+  integrity sha1-t2Kb7AekAxolSP35n17PHMizHjY=
+  dependencies:
+    graceful-fs "^4.1.2"
+    path-is-inside "^1.0.1"
+    rimraf "^2.5.2"
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -4721,9 +4892,9 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.2, fsevents@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
@@ -4738,7 +4909,7 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.1.0, function-bind@^1.1.1:
+function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
@@ -4767,6 +4938,20 @@ genfun@^5.0.0:
   resolved "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
   integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
+gentle-fs@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/gentle-fs/-/gentle-fs-2.0.1.tgz#585cfd612bfc5cd52471fdb42537f016a5ce3687"
+  integrity sha512-cEng5+3fuARewXktTEGbwsktcldA+YsnUEaXZwcK/3pjSE1X9ObnTs+/8rYf8s+RnIcQm2D5x3rwpN7Zom8Bew==
+  dependencies:
+    aproba "^1.1.2"
+    fs-vacuum "^1.2.10"
+    graceful-fs "^4.1.11"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    path-is-inside "^1.0.2"
+    read-cmd-shim "^1.0.1"
+    slide "^1.1.6"
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -4788,10 +4973,10 @@ get-port@^3.2.0:
   resolved "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
   integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=
 
-get-port@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/get-port/-/get-port-4.0.0.tgz#373c85960138ee20027c070e3cb08019fea29816"
-  integrity sha512-Yy3yNI2oShgbaWg4cmPhWjkZfktEvpKI09aDX4PZzNtlU9obuYrX7x2mumQsrNxlF+Ls7OtMQW/u+X4s896bOQ==
+get-port@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/get-port/-/get-port-4.1.0.tgz#93eb3d5552c197497d76e9c389a6ac9920e20192"
+  integrity sha512-4/fqAYrzrzOiqDrdeZRKXGdTGgbkfTEumGlNQPeP6Jy8w0PzN9mzeNQ3XgHaTNie8pQ3hOUkrwlZt2Fzk5H9mA==
 
 get-stdin@^4.0.1:
   version "4.0.1"
@@ -4800,7 +4985,7 @@ get-stdin@^4.0.1:
 
 get-stream@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-stream@^4.0.0, get-stream@^4.1.0:
@@ -4884,7 +5069,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -4897,9 +5082,9 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
     path-is-absolute "^1.0.0"
 
 globals@^11.1.0, globals@^11.7.0:
-  version "11.9.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
-  integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==
+  version "11.10.0"
+  resolved "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50"
+  integrity sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==
 
 globals@^9.18.0:
   version "9.18.0"
@@ -4907,19 +5092,19 @@ globals@^9.18.0:
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^8.0.1:
-  version "8.0.1"
-  resolved "http://registry.npmjs.org/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
-  integrity sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==
+  version "8.0.2"
+  resolved "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
   dependencies:
     array-union "^1.0.1"
-    dir-glob "^2.0.0"
+    dir-glob "2.0.0"
     fast-glob "^2.0.2"
     glob "^7.1.2"
     ignore "^3.3.5"
     pify "^3.0.0"
     slash "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -4961,6 +5146,25 @@ har-validator@~5.1.0:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
+hard-source-webpack-plugin@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.npmjs.org/hard-source-webpack-plugin/-/hard-source-webpack-plugin-0.13.1.tgz#a99071e25b232f1438a5bc3c99f10a3869e4428e"
+  integrity sha512-r9zf5Wq7IqJHdVAQsZ4OP+dcUSvoHqDMxJlIzaE2J0TZWn3UjMMrHqwDHR8Jr/pzPfG7XxSe36E7Y8QGNdtuAw==
+  dependencies:
+    chalk "^2.4.1"
+    find-cache-dir "^2.0.0"
+    graceful-fs "^4.1.11"
+    lodash "^4.15.0"
+    mkdirp "^0.5.1"
+    node-object-hash "^1.2.0"
+    parse-json "^4.0.0"
+    pkg-dir "^3.0.0"
+    rimraf "^2.6.2"
+    semver "^5.6.0"
+    tapable "^1.0.0-beta.5"
+    webpack-sources "^1.0.1"
+    write-json-file "^2.3.0"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -5019,7 +5223,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.0, has@^1.0.1:
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -5040,9 +5244,9 @@ hash-sum@^1.0.2:
   integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
-  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
+  version "1.1.7"
+  resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
@@ -5129,9 +5333,14 @@ html-minifier@^3.2.3, html-minifier@^3.5.21:
     relateurl "0.2.x"
     uglify-js "3.4.x"
 
+html-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
+  integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=
+
 html-webpack-plugin@^3.2.0:
   version "3.2.0"
-  resolved "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
+  resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
   integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
   dependencies:
     html-minifier "^3.2.3"
@@ -5156,7 +5365,7 @@ htmlparser2@^3.9.1:
 
 htmlparser2@~3.3.0:
   version "3.3.0"
-  resolved "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
   integrity sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=
   dependencies:
     domelementtype "1"
@@ -5171,7 +5380,7 @@ http-cache-semantics@^3.8.1:
 
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
-  resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
   integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
@@ -5235,12 +5444,12 @@ icss-replace-symbols@^1.1.0:
   resolved "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
   integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+icss-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-4.0.0.tgz#d52cf4bcdcfa1c45c2dbefb4ffdf6b00ef608098"
+  integrity sha512-bA/xGiwWM17qjllIs9X/y0EjsB7e0AV08F3OL8UPsoNkNRibIuu8f1eKTnQ8QO1DteKKTxTUAn+IEWUToIwGOA==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
 ieee754@^1.1.4:
   version "1.1.12"
@@ -5289,6 +5498,14 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
+import-fresh@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
+  integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -5349,7 +5566,7 @@ inherits@2.0.1:
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -5369,9 +5586,9 @@ init-package-json@^1.10.3:
     validate-npm-package-name "^3.0.0"
 
 inquirer@^6.1.0, inquirer@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
+  version "6.2.1"
+  resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
+  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -5384,7 +5601,7 @@ inquirer@^6.1.0, inquirer@^6.2.0:
     run-async "^2.2.0"
     rxjs "^6.1.0"
     string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    strip-ansi "^5.0.0"
     through "^2.3.6"
 
 invariant@^2.2.2, invariant@^2.2.4:
@@ -5404,6 +5621,11 @@ invert-kv@^2.0.0:
   resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
+ip-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-3.0.0.tgz#0a934694b4066558c46294244a23cc33116bf732"
+  integrity sha512-T8wDtjy+Qf2TAPDQmBp0eGKJ8GavlWlUnamr3wRn6vvdZlKVuJXXMlSncYFRYgVHOM3If5NR1H4+OvVQU9Idvg==
+
 ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -5457,12 +5679,12 @@ is-buffer@^1.1.5:
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.3, is-callable@^1.1.4:
+is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
@@ -5641,7 +5863,7 @@ is-number@^4.0.0:
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
@@ -5678,7 +5900,7 @@ is-regex@^1.0.3, is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-resolvable@^1.0.0, is-resolvable@^1.1.0:
+is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
@@ -5944,7 +6166,7 @@ jest-environment-node@^23.4.0:
 
 jest-get-type@^22.1.0:
   version "22.4.3"
-  resolved "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
   integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
 jest-haste-map@^23.6.0:
@@ -5979,10 +6201,10 @@ jest-jasmine2@^23.6.0:
     jest-util "^23.4.0"
     pretty-format "^23.6.0"
 
-jest-junit@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/jest-junit/-/jest-junit-5.2.0.tgz#980401db7aa69999cf117c6d740a8135c22ae379"
-  integrity sha512-Mdg0Qpdh1Xm/FA1B/mcLlmEmlr3XzH5pZg7MvcAwZhjHijPRd1z/UwYwkwNHmCV7o4ZOWCf77nLu7ZkhHHrtJg==
+jest-junit@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npmjs.org/jest-junit/-/jest-junit-6.1.0.tgz#7c9ee19de705fb212bf4bfa5ab08334452cb597d"
+  integrity sha512-o/FKO45Ayomv2dMgXrmCfPi6eaHxVYnUEqWtJUWP4PFkjKOtKs2iLgwY5nz1tN49UpCDHNQBiGRSWPdr/qTcwg==
   dependencies:
     jest-config "^23.6.0"
     jest-validate "^23.0.1"
@@ -6160,19 +6382,20 @@ jest@^23.6.0:
     jest-cli "^23.6.0"
 
 js-beautify@^1.6.14:
-  version "1.8.8"
-  resolved "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.8.tgz#1eb175b73a3571a5f1ed8d98e7cf2b05bfa98471"
-  integrity sha512-qVNq7ZZ7ZbLdzorvSlRDadS0Rh5oyItaE95v6I4wbbuSiijxn7SnnsV6dvKlcXuO2jX7lK8tn9fBulx34K/Ejg==
+  version "1.8.9"
+  resolved "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz#08e3c05ead3ecfbd4f512c3895b1cda76c87d523"
+  integrity sha512-MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA==
   dependencies:
-    config-chain "~1.1.5"
-    editorconfig "^0.15.0"
+    config-chain "^1.1.12"
+    editorconfig "^0.15.2"
+    glob "^7.1.3"
     mkdirp "~0.5.0"
     nopt "~4.0.1"
 
 js-levenshtein@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
-  integrity sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==
+  version "1.1.6"
+  resolved "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
+  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
 
 js-stringify@^1.0.1:
   version "1.0.2"
@@ -6190,9 +6413,9 @@ js-tokens@^3.0.2:
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
+  version "3.12.1"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
+  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -6234,18 +6457,18 @@ jsdom@^11.5.1:
     ws "^5.2.0"
     xml-name-validator "^3.0.0"
 
-jsdom@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.npmjs.org/jsdom/-/jsdom-13.0.0.tgz#f1df2411b714a4e08d1bdc343c0a0889c688210f"
-  integrity sha512-Kmq4ASMNkgpY+YufE322EnIKoiz0UWY2DRkKlU7d5YrIW4xiVRhWFrZV1fr6w/ZNxQ50wGAH5gGRzydgnmkkvw==
+jsdom@^13.2.0:
+  version "13.2.0"
+  resolved "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz#b1a0dbdadc255435262be8ea3723d2dba0d7eb3a"
+  integrity sha512-cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw==
   dependencies:
     abab "^2.0.0"
-    acorn "^6.0.2"
+    acorn "^6.0.4"
     acorn-globals "^4.3.0"
     array-equal "^1.0.0"
     cssom "^0.3.4"
     cssstyle "^1.1.1"
-    data-urls "^1.0.1"
+    data-urls "^1.1.0"
     domexception "^1.0.1"
     escodegen "^1.11.0"
     html-encoding-sniffer "^1.0.2"
@@ -6254,21 +6477,21 @@ jsdom@^13.0.0:
     pn "^1.1.0"
     request "^2.88.0"
     request-promise-native "^1.0.5"
-    saxes "^3.1.3"
+    saxes "^3.1.5"
     symbol-tree "^3.2.2"
-    tough-cookie "^2.4.3"
+    tough-cookie "^2.5.0"
     w3c-hr-time "^1.0.1"
-    w3c-xmlserializer "^1.0.0"
+    w3c-xmlserializer "^1.0.1"
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.2.0"
+    whatwg-mimetype "^2.3.0"
     whatwg-url "^7.0.0"
-    ws "^6.1.0"
+    ws "^6.1.2"
     xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
   version "1.3.0"
-  resolved "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
   integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
@@ -6278,7 +6501,7 @@ jsesc@^2.5.1:
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
@@ -6306,18 +6529,25 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^0.5.0, json5@^0.5.1:
-  version "0.5.1"
-  resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-json5@^2.1.0:
+json5@2.x, json5@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
   integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
   dependencies:
     minimist "^1.2.0"
 
+json5@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -6441,28 +6671,28 @@ left-pad@^1.3.0:
   resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
   integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
 
-lerna@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.npmjs.org/lerna/-/lerna-3.4.3.tgz#501454efb453c65c305802d370ee337f7298787e"
-  integrity sha512-tWq1LvpHqkyB+FaJCmkEweivr88yShDMmauofPVdh0M5gU1cVucszYnIgWafulKYu2LMQ3IfUMUU5Pp3+MvADQ==
+lerna@3.10.7:
+  version "3.10.7"
+  resolved "https://registry.npmjs.org/lerna/-/lerna-3.10.7.tgz#9d308b1fee1697f89fe90e6bc37e51c03b531557"
+  integrity sha512-ha/dehl/L3Nw0pbdir5z6Hrv2oYBg5ym2fTcuk8HCLe7Zdb/ylIHdrgW8CU9eTVZkwr4et8RdVtxFA/+xa65/Q==
   dependencies:
-    "@lerna/add" "^3.4.1"
-    "@lerna/bootstrap" "^3.4.1"
-    "@lerna/changed" "^3.4.1"
-    "@lerna/clean" "^3.3.2"
-    "@lerna/cli" "^3.2.0"
-    "@lerna/create" "^3.4.1"
-    "@lerna/diff" "^3.3.0"
-    "@lerna/exec" "^3.3.2"
-    "@lerna/import" "^3.3.1"
-    "@lerna/init" "^3.3.0"
-    "@lerna/link" "^3.3.0"
-    "@lerna/list" "^3.3.2"
-    "@lerna/publish" "^3.4.3"
-    "@lerna/run" "^3.3.2"
-    "@lerna/version" "^3.4.1"
+    "@lerna/add" "3.10.6"
+    "@lerna/bootstrap" "3.10.6"
+    "@lerna/changed" "3.10.6"
+    "@lerna/clean" "3.10.6"
+    "@lerna/cli" "3.10.7"
+    "@lerna/create" "3.10.6"
+    "@lerna/diff" "3.10.6"
+    "@lerna/exec" "3.10.6"
+    "@lerna/import" "3.10.6"
+    "@lerna/init" "3.10.6"
+    "@lerna/link" "3.10.6"
+    "@lerna/list" "3.10.6"
+    "@lerna/publish" "3.10.7"
+    "@lerna/run" "3.10.6"
+    "@lerna/version" "3.10.6"
     import-local "^1.0.0"
-    npmlog "^4.1.2"
+    libnpm "^2.0.1"
 
 leven@^2.1.0:
   version "2.1.0"
@@ -6477,7 +6707,33 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@^3.0.0:
+libnpm@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/libnpm/-/libnpm-2.0.1.tgz#a48fcdee3c25e13c77eb7c60a0efe561d7fb0d8f"
+  integrity sha512-qTKoxyJvpBxHZQB6k0AhSLajyXq9ZE/lUsZzuHAplr2Bpv9G+k4YuYlExYdUCeVRRGqcJt8hvkPh4tBwKoV98w==
+  dependencies:
+    bin-links "^1.1.2"
+    bluebird "^3.5.3"
+    find-npm-prefix "^1.0.2"
+    libnpmaccess "^3.0.1"
+    libnpmconfig "^1.2.1"
+    libnpmhook "^5.0.2"
+    libnpmorg "^1.0.0"
+    libnpmpublish "^1.1.0"
+    libnpmsearch "^2.0.0"
+    libnpmteam "^1.0.1"
+    lock-verify "^2.0.2"
+    npm-lifecycle "^2.1.0"
+    npm-logical-tree "^1.2.1"
+    npm-package-arg "^6.1.0"
+    npm-profile "^4.0.1"
+    npm-registry-fetch "^3.8.0"
+    npmlog "^4.1.2"
+    pacote "^9.2.3"
+    read-package-json "^2.0.13"
+    stringify-package "^1.0.0"
+
+libnpmaccess@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8"
   integrity sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA==
@@ -6487,9 +6743,72 @@ libnpmaccess@^3.0.0:
     npm-package-arg "^6.1.0"
     npm-registry-fetch "^3.8.0"
 
+libnpmconfig@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"
+  integrity sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    find-up "^3.0.0"
+    ini "^1.3.5"
+
+libnpmhook@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.npmjs.org/libnpmhook/-/libnpmhook-5.0.2.tgz#d12817b0fb893f36f1d5be20017f2aea25825d94"
+  integrity sha512-vLenmdFWhRfnnZiNFPNMog6CK7Ujofy2TWiM2CrpZUjBRIhHkJeDaAbJdYCT6W4lcHtyrJR8yXW8KFyq6UAp1g==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
+libnpmorg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232"
+  integrity sha512-o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
+libnpmpublish@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-1.1.1.tgz#ff0c6bb0b4ad2bda2ad1f5fba6760a4af37125f0"
+  integrity sha512-nefbvJd/wY38zdt+b9SHL6171vqBrMtZ56Gsgfd0duEKb/pB8rDT4/ObUQLrHz1tOfht1flt2zM+UGaemzAG5g==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    lodash.clonedeep "^4.5.0"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-registry-fetch "^3.8.0"
+    semver "^5.5.1"
+    ssri "^6.0.1"
+
+libnpmsearch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/libnpmsearch/-/libnpmsearch-2.0.0.tgz#de05af47ada81554a5f64276a69599070d4a5685"
+  integrity sha512-vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
+libnpmteam@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213"
+  integrity sha512-gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
   integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
@@ -6500,7 +6819,7 @@ load-json-file@^1.0.0:
 
 load-json-file@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
   integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
@@ -6519,9 +6838,9 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-runner@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
-  integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
 loader-utils@^0.2.16:
   version "0.2.17"
@@ -6533,14 +6852,14 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.1:
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
   dependencies:
-    big.js "^3.1.3"
+    big.js "^5.2.2"
     emojis-list "^2.0.0"
-    json5 "^0.5.0"
+    json5 "^1.0.1"
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -6558,11 +6877,24 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lock-verify@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/lock-verify/-/lock-verify-2.0.2.tgz#148e4f85974915c9e3c34d694b7de9ecb18ee7a8"
+  integrity sha512-QNVwK0EGZBS4R3YQ7F1Ox8p41Po9VGl2QG/2GsuvTbkJZYSsPeWHKMbbH6iZMCHWSMww5nrJroZYnGzI4cePuw==
+  dependencies:
+    npm-package-arg "^5.1.2 || 6"
+    semver "^5.4.1"
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -6573,6 +6905,11 @@ lodash.isplainobject@^4.0.6:
   resolved "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
   integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
+lodash.kebabcase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+  integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -6603,12 +6940,12 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.9:
-  version "4.17.9"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.9.tgz#9c056579af0bdbb4322e23c836df13ef2b271cb7"
-  integrity sha512-vuRLquvot5sKUldMBumG0YqLvX6m/RGBBOmqb3CWR/MC/QvvD1cTH1fOqxz2FJAQeoExeUdX5Gu9vP2EP6ik+Q==
+lodash.uniqueid@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26"
+  integrity sha1-MmjyanyI5PSxdY1nknGBTjH6WyY=
 
-lodash@4.x, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1:
+lodash@4.17.11, lodash@4.x, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1:
   version "4.17.11"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -6638,22 +6975,22 @@ lower-case@^1.1.1:
   resolved "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
+lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+  version "4.1.5"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-magic-string@0.25.0:
-  version "0.25.0"
-  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
-  integrity sha512-Msbwa9oNYNPjwVh9ury5X2BHbTFWoirTlzuf4X+pIoSOQVKNRJHXTx1WmKYuXzRM4QZFv8dGXyZvhDMmWhGLPw==
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
-    sourcemap-codec "^1.4.1"
+    yallist "^3.0.2"
 
-magic-string@^0.25.1:
+magic-string@0.25.1, magic-string@^0.25.1:
   version "0.25.1"
   resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
   integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
@@ -6667,6 +7004,11 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+make-error@1.x, make-error@^1.1.1:
+  version "1.3.5"
+  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
+
 make-fetch-happen@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
@@ -6721,9 +7063,9 @@ map-visit@^1.0.0:
     object-visit "^1.0.0"
 
 math-random@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
+  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
 md5.js@^1.3.4:
   version "1.3.5"
@@ -6741,7 +7083,7 @@ mdn-data@~1.1.0:
 
 media-typer@0.3.0:
   version "0.3.0"
-  resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
@@ -6770,7 +7112,7 @@ memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
 
 meow@^3.3.0:
   version "3.7.0"
-  resolved "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
@@ -6897,24 +7239,15 @@ mime@1.4.1:
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^2.0.3, mime@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
-  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
+  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mini-css-extract-plugin@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz#c99e9e78d54f3fa775633aee5933aeaa4e80719a"
-  integrity sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w==
-  dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^1.0.0"
-    webpack-sources "^1.1.0"
-
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -6942,17 +7275,17 @@ minimist-options@^3.0.1, minimist-options@^3.0.2:
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
@@ -6964,9 +7297,9 @@ minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
     yallist "^3.0.0"
 
 minizlib@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
-  integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
   dependencies:
     minipass "^2.2.1"
 
@@ -6994,9 +7327,9 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@0.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 "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
@@ -7006,10 +7339,10 @@ modify-values@^1.0.0:
   resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@2.22.2:
-  version "2.22.2"
-  resolved "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
+moment@2.23.0:
+  version "2.23.0"
+  resolved "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225"
+  integrity sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -7048,15 +7381,20 @@ mustache@^2.3.0:
   resolved "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5"
   integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==
 
-mute-stream@0.0.7, mute-stream@~0.0.4:
+mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@~0.0.4:
+  version "0.0.8"
+  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nan@^2.9.2:
-  version "2.11.1"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
+  version "2.12.1"
+  resolved "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
+  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7094,7 +7432,7 @@ negotiator@0.6.1:
   resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0:
+neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
@@ -7157,9 +7495,9 @@ node-int64@^0.4.0:
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
-  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
+  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -7168,7 +7506,7 @@ node-libs-browser@^2.0.0:
     constants-browserify "^1.0.0"
     crypto-browserify "^3.11.0"
     domain-browser "^1.1.1"
-    events "^1.0.0"
+    events "^3.0.0"
     https-browserify "^1.0.0"
     os-browserify "^0.3.0"
     path-browserify "0.0.0"
@@ -7182,7 +7520,7 @@ node-libs-browser@^2.0.0:
     timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
-    util "^0.10.3"
+    util "^0.11.0"
     vm-browserify "0.0.4"
 
 node-modules-regexp@^1.0.0:
@@ -7200,6 +7538,11 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
+node-object-hash@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/node-object-hash/-/node-object-hash-1.4.1.tgz#de968492e20c493b8bbc25ad2ee828265fd60934"
+  integrity sha512-JQVqSM5/mOaUoUhCYR0t1vgm8RFo7qpJtPvnoFCLeqQh1xrfmr3BCD3nGBnACzpIEF7F7EVgqGD3O4lao/BY/A==
+
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
@@ -7216,10 +7559,10 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.0.3.tgz#3414ed84595096459c251699bfcb47d88324a9e4"
-  integrity sha512-ZaZWMsbuDcetpHmYeKWPO6e63pSXLb50M7lJgCbcM2nC/nQC3daNifmtp5a2kp7EWwYfhuvH6zLPWkrF8IiDdw==
+node-releases@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2"
+  integrity sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==
   dependencies:
     semver "^5.3.0"
 
@@ -7255,6 +7598,11 @@ normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
@@ -7265,12 +7613,17 @@ normalize-url@^3.0.0:
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
+normalize-url@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-4.1.0.tgz#307e74c87473efa81969ad1b4bb91f1990178904"
+  integrity sha512-X781mkWeK6PDMAZJfGn/wnwil4dV6pIdF9euiNqtA89uJvZuNDJO2YyJxiwpPhTQcF5pYUU1v+kcOxzYV6rZlA==
+
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
   integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
-npm-lifecycle@^2.0.0:
+npm-lifecycle@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
   integrity sha512-QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g==
@@ -7284,7 +7637,12 @@ npm-lifecycle@^2.0.0:
     umask "^1.1.0"
     which "^1.3.1"
 
-"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+npm-logical-tree@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88"
+  integrity sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg==
+
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^5.1.2 || 6", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
   integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
@@ -7295,9 +7653,9 @@ npm-lifecycle@^2.0.0:
     validate-npm-package-name "^3.0.0"
 
 npm-packlist@^1.1.12, npm-packlist@^1.1.6:
-  version "1.1.12"
-  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
-  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f"
+  integrity sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -7311,6 +7669,15 @@ npm-pick-manifest@^2.2.3:
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
+npm-profile@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa"
+  integrity sha512-NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA==
+  dependencies:
+    aproba "^1.1.2 || 2"
+    figgy-pudding "^3.4.1"
+    npm-registry-fetch "^3.8.0"
+
 npm-registry-fetch@^3.8.0:
   version "3.8.0"
   resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
@@ -7427,14 +7794,14 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 object.values@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
-  integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
+  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.6.1"
-    function-bind "^1.1.0"
-    has "^1.0.1"
+    define-properties "^1.1.3"
+    es-abstract "^1.12.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -7443,7 +7810,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
+on-headers@^1.0.1, on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
   integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
@@ -7502,7 +7869,7 @@ os-browserify@^0.3.0:
 
 os-homedir@^1.0.0:
   version "1.0.2"
-  resolved "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^2.0.0:
@@ -7515,17 +7882,17 @@ os-locale@^2.0.0:
     mem "^1.1.0"
 
 os-locale@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
-  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     lcid "^2.0.0"
     mem "^4.0.0"
 
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
-  resolved "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
@@ -7548,7 +7915,7 @@ p-finally@^1.0.0:
 
 p-is-promise@^1.1.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  resolved "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
   integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
 p-limit@^1.1.0:
@@ -7559,9 +7926,9 @@ p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
+  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
   dependencies:
     p-try "^2.0.0"
 
@@ -7618,17 +7985,17 @@ p-waterfall@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
-pacote@^9.1.0:
-  version "9.2.3"
-  resolved "https://registry.npmjs.org/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
-  integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==
+pacote@^9.2.3:
+  version "9.4.0"
+  resolved "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
+  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
   dependencies:
-    bluebird "^3.5.2"
-    cacache "^11.2.0"
+    bluebird "^3.5.3"
+    cacache "^11.3.2"
     figgy-pudding "^3.5.1"
     get-stream "^4.1.0"
     glob "^7.1.3"
-    lru-cache "^4.1.3"
+    lru-cache "^5.1.1"
     make-fetch-happen "^4.0.1"
     minimatch "^3.0.4"
     minipass "^2.3.5"
@@ -7647,14 +8014,14 @@ pacote@^9.1.0:
     safe-buffer "^5.1.2"
     semver "^5.6.0"
     ssri "^6.0.1"
-    tar "^4.4.6"
+    tar "^4.4.8"
     unique-filename "^1.1.1"
     which "^1.3.1"
 
 pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
+  version "1.0.8"
+  resolved "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
+  integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
@@ -7672,16 +8039,24 @@ param-case@2.1.x:
   dependencies:
     no-case "^2.2.0"
 
+parent-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5"
+  integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==
+  dependencies:
+    callsites "^3.0.0"
+
 parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
-  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
+  version "5.1.3"
+  resolved "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz#1600c6cc0727365d68b97f3aa78939e735a75204"
+  integrity sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
     create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
 
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
@@ -7764,10 +8139,10 @@ path-exists@^3.0.0:
 
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
-  resolved "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -7777,7 +8152,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -7833,7 +8208,7 @@ performance-now@^2.1.0:
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
-  resolved "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
@@ -7865,13 +8240,6 @@ pirates@^4.0.0:
   dependencies:
     node-modules-regexp "^1.0.0"
 
-pkg-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
-  integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q=
-  dependencies:
-    find-up "^1.0.0"
-
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -7902,12 +8270,12 @@ posix-character-classes@^0.1.0:
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-attribute-case-insensitive@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.0.tgz#807b6a797ad8bf1c821b2d51cf641e9dd3837624"
-  integrity sha512-K/zqdg0/UgUgC8qR0lDuxYzmowPpnvrrNC5YuoqzhHMubR9AuhsPlpVu3jjkLHgDAzR+ohD/m7//iGnN9WxbzQ==
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz#b2a721a0d279c2f9103a36331c88981526428cc7"
+  integrity sha512-L2YKB3vF4PetdTIthQVeT+7YiSzMoNMLLYxPXXppOOP7NoazEAy45sh2LvJ8leCQjfBcfkYQs8TtCcQjeZTp8A==
   dependencies:
     postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    postcss-selector-parser "^5.0.0"
 
 postcss-calc@^7.0.0:
   version "7.0.1"
@@ -8157,10 +8525,10 @@ postcss-media-minmax@^4.0.0:
   dependencies:
     postcss "^7.0.2"
 
-postcss-merge-longhand@^4.0.9:
-  version "4.0.9"
-  resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.9.tgz#c2428b994833ffb2a072f290ca642e75ceabcd6f"
-  integrity sha512-UVMXrXF5K/kIwUbK/crPFCytpWbNX2Q3dZSc8+nQUgfOHrCT4+MHncpdxVphUlQeZxlLXUJbDyXc5NBhTnS2tA==
+postcss-merge-longhand@^4.0.10:
+  version "4.0.10"
+  resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.10.tgz#c4d63ab57bdc054ab4067ab075d488c8c2978380"
+  integrity sha512-hME10s6CSjm9nlVIcO1ukR7Jr5RisTaaC1y83jWCivpuBtPohA3pZE7cGTIVSYjXvLnXozHTiVOkG4dnnl756g==
   dependencies:
     css-color-names "0.0.4"
     postcss "^7.0.0"
@@ -8219,36 +8587,37 @@ postcss-minify-selectors@^4.0.1:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
-  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+postcss-modules-local-by-default@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.4.tgz#a000bb07e4f57f412ba35c904d035cfd4a7b9446"
+  integrity sha512-WvuSaTKXUqYJbnT7R3YrsNrHv/C5vRfr5VglS4bFOk0MYT4CLBfc/xgExA+x2RftlYgiBDvWmVs191Xv8S8gZQ==
   dependencies:
     css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-value-parser "^3.3.1"
 
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+postcss-modules-scope@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.0.1.tgz#2c0f2394cde4cd09147db054c68917e38f6d43a4"
+  integrity sha512-7+6k9c3/AuZ5c596LJx9n923A/j3nF3ormewYBF1RrIQvjvjXe1xE8V8A1KFyFwXbvnshT6FBZFX0k/F1igneg==
   dependencies:
     css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
 
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+postcss-modules-values@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
+  integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
   dependencies:
     icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
 
 postcss-nesting@^7.0.0:
   version "7.0.0"
@@ -8369,17 +8738,19 @@ postcss-place@^4.0.1:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-preset-env@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.4.0.tgz#f5466550b177454fc98ca5054b4478e8e5caa714"
-  integrity sha512-0jCyY/T9kWv1i2abt5DOOoh0uHJia0HUTWMV72Tw75tGx3pH628oSS8WBMCE5L1Ou3LvoAl9pe07u8g/afvc3A==
+postcss-preset-env@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.5.0.tgz#a14b8f6e748b2a3a4a02a56f36c390f30073b9e1"
+  integrity sha512-RdsIrYJd9p9AouQoJ8dFP5ksBJEIegA4q4WzJDih8nevz3cZyIP/q1Eaw3pTVpUAu3n7Y32YmvAW3X07mSRGkw==
   dependencies:
-    autoprefixer "^9.3.1"
-    browserslist "^4.3.4"
-    caniuse-lite "^1.0.30000905"
-    css-prefers-color-scheme "^3.0.0"
-    cssdb "^4.2.0"
-    postcss "^7.0.5"
+    autoprefixer "^9.4.2"
+    browserslist "^4.3.5"
+    caniuse-lite "^1.0.30000918"
+    css-blank-pseudo "^0.1.4"
+    css-has-pseudo "^0.10.0"
+    css-prefers-color-scheme "^3.1.1"
+    cssdb "^4.3.0"
+    postcss "^7.0.6"
     postcss-attribute-case-insensitive "^4.0.0"
     postcss-color-functional-notation "^2.0.1"
     postcss-color-gray "^5.0.0"
@@ -8461,7 +8832,7 @@ postcss-selector-not@^4.0.0:
     balanced-match "^1.0.0"
     postcss "^7.0.2"
 
-postcss-selector-parser@^3.0.0, postcss-selector-parser@^3.1.1:
+postcss-selector-parser@^3.0.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
   integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
@@ -8470,10 +8841,10 @@ postcss-selector-parser@^3.0.0, postcss-selector-parser@^3.1.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
-  version "5.0.0-rc.4"
-  resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0-rc.4.tgz#ca5e77238bf152966378c13e91ad6d611568ea87"
-  integrity sha512-0XvfYuShrKlTk1ooUrVzMCFQRcypsdEIsGqh5IxC5rdtBi4/M/tDAJeSONwC2MTqEFsmPZYAV7Dd4X8rgAfV0A==
+postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
+  integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
   dependencies:
     cssesc "^2.0.0"
     indexes-of "^1.0.1"
@@ -8515,40 +8886,22 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss-values-parser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.0.tgz#1ba42cae31367c44f96721cb5eb99462bfb39705"
-  integrity sha512-cyRdkgbRRefu91ByAlJow4y9w/hnBmmWgLpWmlFQ2bpIy2eKrqowt3VeYcaHQ08otVXmC9V2JtYW1Z/RpvYR8A==
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
+  integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
   dependencies:
     flatten "^1.0.2"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.23:
-  version "6.0.23"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+  version "7.0.14"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
+  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
   dependencies:
-    chalk "^2.4.1"
+    chalk "^2.4.2"
     source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
-  version "7.0.5"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
-  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.5.0"
-
-postcss@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz#6dcaa1e999cdd4a255dcd7d4d9547f4ca010cdc2"
-  integrity sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.5.0"
+    supports-color "^6.1.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
@@ -8560,10 +8913,10 @@ preserve@^0.2.0:
   resolved "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-prettier@1.13.7:
-  version "1.13.7"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
-  integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==
+prettier@1.16.0:
+  version "1.16.0"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-1.16.0.tgz#104dd25f5ee3d0c9d0a6ce4bb40ced8481d51219"
+  integrity sha512-MCBCYeAuZfejUPdEpkleLWvpRBwLii/Sp5jQs0eb8Ul/drGIDjkL6tAU24tk6yCGf0KPV5rhPPPlczfBmN2pWQ==
 
 pretty-bytes@^5.1.0:
   version "5.1.0"
@@ -8606,10 +8959,10 @@ process@^0.11.10:
   resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
-  integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
+progress@^2.0.0, progress@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
@@ -8681,10 +9034,10 @@ pseudomap@^1.0.2:
   resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
+psl@^1.1.24, psl@^1.1.28:
+  version "1.1.31"
+  resolved "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -8845,24 +9198,24 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.npmjs.org/puppeteer/-/puppeteer-1.10.0.tgz#e3005f1251c2feae0e10c0f7a35afbcd56589ceb"
-  integrity sha512-3i28X/ucX8t3eL4TZA60FLMOQNKqudFSOGDHr0cT7T4dE027CrcS885aAqjdxNybhMPliM5yImNsKJ6SQrPzhw==
+puppeteer@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.npmjs.org/puppeteer/-/puppeteer-1.11.0.tgz#63cdbe12b07275cd6e0b94bce41f3fcb20305770"
+  integrity sha512-iG4iMOHixc2EpzqRV+pv7o3GgmU2dNYEMkvKwSaQO/vMZURakwSOn/EYJ6OIRFYOque1qorzIBvrytPIQB3YzQ==
   dependencies:
-    debug "^3.1.0"
+    debug "^4.1.0"
     extract-zip "^1.6.6"
     https-proxy-agent "^2.2.1"
     mime "^2.0.3"
-    progress "^2.0.0"
+    progress "^2.0.1"
     proxy-from-env "^1.0.0"
     rimraf "^2.6.1"
-    ws "^5.1.1"
+    ws "^6.1.0"
 
 q@^1.1.2, q@^1.5.1:
   version "1.5.1"
@@ -8952,7 +9305,7 @@ read-cmd-shim@^1.0.1:
   dependencies:
     graceful-fs "^4.1.2"
 
-"read-package-json@1 || 2", read-package-json@^2.0.0:
+"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
   version "2.0.13"
   resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
   integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
@@ -9035,7 +9388,7 @@ read@1, read@~1.0.1:
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
@@ -9048,7 +9401,7 @@ read@1, read@~1.0.1:
 
 readable-stream@1.0:
   version "1.0.34"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
   dependencies:
     core-util-is "~1.0.0"
@@ -9057,9 +9410,9 @@ readable-stream@1.0:
     string_decoder "~0.10.x"
 
 readable-stream@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz#351302e4c68b5abd6a2ed55376a7f9a25be3057a"
-  integrity sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
+  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -9119,7 +9472,7 @@ regenerate@^1.2.1, regenerate@^1.4.0:
   resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
+regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
@@ -9151,6 +9504,15 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp-tree@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.0.tgz#a56ad7746097888ea16457479029ec9345b96ab0"
+  integrity sha512-rHQv+tzu+0l3KS/ERabas1yK49ahNVxuH40WcPg53CzP5p8TgmmyBgHELLyJcvjhTD0e5ahSY6C76LbEVtr7cg==
+  dependencies:
+    cli-table3 "^0.5.0"
+    colors "^1.1.2"
+    yargs "^10.0.3"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -9166,26 +9528,26 @@ regexpu-core@^1.0.0:
     regjsparser "^0.1.4"
 
 regexpu-core@^4.1.3, regexpu-core@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
-  integrity sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32"
+  integrity sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^7.0.0"
-    regjsgen "^0.4.0"
-    regjsparser "^0.3.0"
+    regjsgen "^0.5.0"
+    regjsparser "^0.6.0"
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.0.2"
 
 regjsgen@^0.2.0:
   version "0.2.0"
-  resolved "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
   integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
-regjsgen@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
-  integrity sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==
+regjsgen@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
+  integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
 
 regjsparser@^0.1.4:
   version "0.1.5"
@@ -9194,10 +9556,10 @@ regjsparser@^0.1.4:
   dependencies:
     jsesc "~0.5.0"
 
-regjsparser@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
-  integrity sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==
+regjsparser@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
+  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -9296,14 +9658,6 @@ require-main-filename@^1.0.1:
   resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -9311,11 +9665,6 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -9336,12 +9685,12 @@ resolve@1.1.7:
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
+resolve@1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
+  version "1.10.0"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
   dependencies:
-    path-parse "^1.0.5"
+    path-parse "^1.0.6"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
@@ -9378,12 +9727,12 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
-  version "2.6.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
+rimraf@2, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
-    glob "^7.0.5"
+    glob "^7.1.3"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
@@ -9393,17 +9742,17 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-alias@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-alias/-/rollup-plugin-alias-1.4.0.tgz#120cba7c46621c03138f0ca6fd5dd2ade9872db9"
-  integrity sha512-lB094zdi19FS+1bVarVp9kBN0Zk41PdTGoCk0z8xesKO7RGjOo18cp1hUzEqrOQ4bM9+KLD9nbnu/XUxQm9pbg==
+rollup-plugin-alias@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/rollup-plugin-alias/-/rollup-plugin-alias-1.5.1.tgz#80cce3a967befda5b09c86abc14a043a78035b46"
+  integrity sha512-pQTYBRNfLedoVOO7AYHNegIavEIp4jKTga5jUi1r//KYgHKGWgG4qJXYhbcWKt2k1FwGlR5wCYoY+IFkme0t4A==
   dependencies:
-    slash "^1.0.0"
+    slash "^2.0.0"
 
-rollup-plugin-babel@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz#8282b0e22233160d679e9c7631342e848422fb02"
-  integrity sha512-/PP0MgbPQyRywI4zRIJim6ySjTcOLo4kQbEbROqp9kOR3kHC3FeU++QpBDZhS2BcHtJTVZMVbBV46flbBN5zxQ==
+rollup-plugin-babel@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.2.tgz#8c0e1bd7aa9826e90769cf76895007098ffd1413"
+  integrity sha512-KfnizE258L/4enADKX61ozfwGHoqYauvoofghFJBhFnpH9Sb9dNPpWg8QHOaAfVASUYV8w0mCx430i9z0LJoJg==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     rollup-pluginutils "^2.3.0"
@@ -9425,25 +9774,25 @@ rollup-plugin-json@^3.1.0:
   dependencies:
     rollup-pluginutils "^2.3.1"
 
-rollup-plugin-license@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-0.7.0.tgz#908101f56d2c1e6311aa2d422eb41732063d5389"
-  integrity sha512-KoZxV+UxBUaubo3mu7IHjMFryCuZIU8Q9tm8GLUl/lz6DQCEJUEgcp+urItEuux8xa7M0Qx7Fjoe4g3s9hsUFg==
+rollup-plugin-license@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-0.8.1.tgz#cdcfee2a32f27790e5019a2a7abd9234476ac589"
+  integrity sha512-UeDVawklIv/rb4/M8AqHHtt03L+gDNfCVjQJqgUaQKiNTmUk+peAzkaLYeC6kfQm7i77kGYEzkbPZ0Dd9NEbCQ==
   dependencies:
     commenting "1.0.5"
-    lodash "4.17.9"
-    magic-string "0.25.0"
+    lodash "4.17.11"
+    magic-string "0.25.1"
     mkdirp "0.5.1"
-    moment "2.22.2"
+    moment "2.23.0"
 
-rollup-plugin-node-resolve@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
-  integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
+rollup-plugin-node-resolve@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz#9bc6b8205e9936cc0e26bba2415f1ecf1e64d9b2"
+  integrity sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw==
   dependencies:
-    builtin-modules "^2.0.0"
+    builtin-modules "^3.0.0"
     is-module "^1.0.0"
-    resolve "^1.1.6"
+    resolve "^1.8.1"
 
 rollup-plugin-replace@^2.1.0:
   version "2.1.0"
@@ -9462,13 +9811,14 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.0, rollup-pluginutils@^2.3.1,
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.67.3:
-  version "0.67.3"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-0.67.3.tgz#55475b1b62c43220c3b4bd7edc5846233932f50b"
-  integrity sha512-TyNQCz97rKuVVbsKUTXfwIjV7UljWyTVd7cTMuE+aqlQ7WJslkYF5QaYGjMLR2BlQtUOO5CAxSVnpQ55iYp5jg==
+rollup@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/rollup/-/rollup-1.1.2.tgz#8d094b85683b810d0c05a16bd7618cf70d48eba7"
+  integrity sha512-OkdMxqMl8pWoQc5D8y1cIinYQPPLV8ZkfLgCzL6SytXeNA2P7UHynEQXI9tYxuAjAMsSyvRaWnyJDLHMxq0XAg==
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"
+    acorn "^6.0.5"
 
 rsvp@^3.3.3:
   version "3.6.2"
@@ -9503,7 +9853,7 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
   integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
@@ -9534,14 +9884,14 @@ sax@^1.2.4, sax@~1.2.4:
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/saxes/-/saxes-3.1.3.tgz#334ab3b802a465ccda96fff9bdefbd505546ffa8"
-  integrity sha512-Nc5DXc5A+m3rUDtkS+vHlBWKT7mCKjJPyia7f8YMW773hsXVv2wEHQZGE0zs4+5PLwz9U5Sbl/94Cnd9vHV7Bg==
+saxes@^3.1.5:
+  version "3.1.6"
+  resolved "https://registry.npmjs.org/saxes/-/saxes-3.1.6.tgz#2d948a47b54918516c5a64096f08865deb5bd8cd"
+  integrity sha512-LAYs+lChg1v5uKNzPtsgTxSS5hLo8aIhSMCJt1WMpefAxm3D1RTpMwSpb6ebdL31cubiLTnhokVktBW+cv9Y9w==
   dependencies:
     xmlchars "^1.3.1"
 
-schema-utils@^0.4.2, schema-utils@^0.4.4:
+schema-utils@^0.4.4:
   version "0.4.7"
   resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
   integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
@@ -9558,14 +9908,14 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 semver@~5.3.0:
   version "5.3.0"
-  resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
   integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2:
@@ -9587,10 +9937,10 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-serialize-javascript@^1.3.0, serialize-javascript@^1.4.0, serialize-javascript@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
+serialize-javascript@^1.3.0, serialize-javascript@^1.4.0, serialize-javascript@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
 serve-placeholder@^1.1.0:
   version "1.1.0"
@@ -9651,7 +10001,7 @@ setprototypeof@1.1.0:
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
-  resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
@@ -9711,11 +10061,18 @@ slash@^1.0.0:
   resolved "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slice-ansi@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
+slice-ansi@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz#5373bdb8559b45676e8541c66916cdd6251612e7"
+  integrity sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==
   dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
 slide@^1.1.6:
@@ -9786,10 +10143,10 @@ sort-object-keys@^1.1.2:
   resolved "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.2.tgz#d3a6c48dc2ac97e6bc94367696e03f6d09d37952"
   integrity sha1-06bEjcKsl+a8lDZ2luA/bQnTeVI=
 
-sort-package-json@^1.16.0:
-  version "1.16.0"
-  resolved "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.16.0.tgz#087f5ce05b6faca373312e7124918e0d68492d7b"
-  integrity sha512-QFJNxdpp7zZgSkmAIaMrteqqxGP4TkooKrGtslM2qYiML92PTYDOFOk+lG+TdvJzjheD502UFIys2qSvQljKaw==
+sort-package-json@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.18.0.tgz#d9ece79b1e1818dea67451813f9e504481bebd00"
+  integrity sha512-OkUR/WjlMz4IFOOMhYTpVl9rDaL4XIIOabzTXUBQVck04Dh+DyhjCNnMcndwX2dz+u77Q3MUuj1ncyVjVesB7Q==
   dependencies:
     detect-indent "^5.0.0"
     sort-object-keys "^1.1.2"
@@ -9818,9 +10175,9 @@ source-map-support@^0.4.15:
     source-map "^0.5.6"
 
 source-map-support@^0.5.6, source-map-support@^0.5.9, source-map-support@~0.5.6:
-  version "0.5.9"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
+  version "0.5.10"
+  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
+  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -9845,15 +10202,20 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 sourcemap-codec@^1.4.1:
-  version "1.4.3"
-  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.3.tgz#0ba615b73ec35112f63c2f2d9e7c3f87282b0e33"
-  integrity sha512-vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA==
+  version "1.4.4"
+  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
+  integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
 spdx-correct@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
-  integrity sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -9872,9 +10234,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2"
-  integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
+  integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -9903,9 +10265,9 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.15.2"
-  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"
-  integrity sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==
+  version "1.16.0"
+  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de"
+  integrity sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -9967,7 +10329,7 @@ statuses@~1.4.0:
   resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
   integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
-std-env@^2.1.1, std-env@^2.2.1:
+std-env@^2.2.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/std-env/-/std-env-2.2.1.tgz#2ffa0fdc9e2263e0004c1211966e960948a40f6b"
   integrity sha512-IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ==
@@ -9980,9 +10342,9 @@ stealthy-require@^1.1.0:
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -10036,10 +10398,19 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+string-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
+  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.0.0"
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -10048,9 +10419,21 @@ string_decoder@~0.10.x:
   resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringify-package@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
+  integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
@@ -10062,6 +10445,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+  dependencies:
+    ansi-regex "^4.0.0"
+
 strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -10076,7 +10466,7 @@ strip-bom@^2.0.0:
 
 strip-eof@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
@@ -10097,11 +10487,10 @@ strip-json-comments@^2.0.0, strip-json-comments@^2.0.1, strip-json-comments@~2.0
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 strong-log-transformer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.0.0.tgz#fa6d8e0a9e62b3c168c3cad5ae5d00dc97ba26cc"
-  integrity sha512-FQmNqAXJgOX8ygOcvPLlGWBNT41mvNJ9ALoYf0GTwVt9t30mGTqpmp/oJx5gLcu52DXK10kS7dVWhx8aPXDTlg==
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
+  integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
   dependencies:
-    byline "^5.0.0"
     duplexer "^0.1.1"
     minimist "^1.2.0"
     through "^2.3.4"
@@ -10138,13 +10527,25 @@ supports-color@^3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+  integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
+
 svgo@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985"
@@ -10171,35 +10572,35 @@ symbol-tree@^3.2.2:
   integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
 
 table@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/table/-/table-5.1.0.tgz#69a54644f6f01ad1628f8178715b408dc6bf11f7"
-  integrity sha512-e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/table/-/table-5.2.1.tgz#e78463702b1be9f7131c39860bcfb1b81114c2a1"
+  integrity sha512-qmhNs2GEHNqY5fd2Mo+8N1r2sw/rvTAAvBZTaTx+Y7PHLypqyrxr1MdIu0pLw6Xvl/Gi4ONu/sdceP8vvUjkyA==
   dependencies:
-    ajv "^6.5.3"
-    lodash "^4.17.10"
-    slice-ansi "1.0.0"
+    ajv "^6.6.1"
+    lodash "^4.17.11"
+    slice-ansi "2.0.0"
     string-width "^2.1.1"
 
 tapable@^0.2.7:
-  version "0.2.8"
-  resolved "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
-  integrity sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=
+  version "0.2.9"
+  resolved "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz#af2d8bbc9b04f74ee17af2b4d9048f807acd18a8"
+  integrity sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==
 
-tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
-  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
+tapable@^1.0.0, tapable@^1.0.0-beta.5, tapable@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
+  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
 
 tar@^2.0.0:
   version "2.2.1"
-  resolved "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  resolved "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4, tar@^4.4.6:
+tar@^4, tar@^4.4.8:
   version "4.4.8"
   resolved "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
   integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
@@ -10236,10 +10637,10 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
-  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
+terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz#7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"
+  integrity sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
@@ -10251,9 +10652,9 @@ terser-webpack-plugin@^1.1.0:
     worker-farm "^1.5.2"
 
 terser@^3.8.1:
-  version "3.10.11"
-  resolved "https://registry.npmjs.org/terser/-/terser-3.10.11.tgz#e063da74b194dde9faf0a561f3a438c549d2da3f"
-  integrity sha512-iruZ7j14oBbRYJC5cP0/vTU7YOWjN+J1ZskEGoF78tFzXdkK2hbCL/3TRZN8XB+MuvFhvOHMp7WkOCBO4VEL5g==
+  version "3.14.1"
+  resolved "https://registry.npmjs.org/terser/-/terser-3.14.1.tgz#cc4764014af570bc79c79742358bd46926018a32"
+  integrity sha512-NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -10304,7 +10705,7 @@ through2@^2.0.0, through2@^2.0.2:
 
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
-  resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 time-fix-plugin@^2.0.5:
@@ -10324,7 +10725,7 @@ timsort@^0.3.0:
   resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
-tmp@0.0.x, tmp@^0.0.33:
+tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
@@ -10386,7 +10787,24 @@ toposort@^1.0.0:
   resolved "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
   integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.4.3, tough-cookie@~2.4.3:
+tough-cookie@>=2.3.3:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.0.tgz#d2bceddebde633153ff20a52fa844a0dc71dacef"
+  integrity sha512-LHMvg+RBP/mAVNqVbOX8t+iJ+tqhBA/t49DuI7+IDAWHrASnesqSu1vWbKB7UrE2yk+HMFUBMadRGMkB4VCfog==
+  dependencies:
+    ip-regex "^3.0.0"
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@^2.3.4, tough-cookie@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
   integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
@@ -10426,6 +10844,43 @@ tryer@^1.0.0:
   resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
+ts-jest@^23.10.5:
+  version "23.10.5"
+  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-23.10.5.tgz#cdb550df4466a30489bf70ba867615799f388dd5"
+  integrity sha512-MRCs9qnGoyKgFc8adDEntAOP64fWK1vZKnOYU1o2HxaqjdJvGqmkLCPCnVq1/If4zkUmEjKPnCiUisTrlX2p2A==
+  dependencies:
+    bs-logger "0.x"
+    buffer-from "1.x"
+    fast-json-stable-stringify "2.x"
+    json5 "2.x"
+    make-error "1.x"
+    mkdirp "0.x"
+    resolve "1.x"
+    semver "^5.5"
+    yargs-parser "10.x"
+
+ts-loader@^5.3.3:
+  version "5.3.3"
+  resolved "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473"
+  integrity sha512-KwF1SplmOJepnoZ4eRIloH/zXL195F51skt7reEsS6jvDqzgc/YSbz9b8E07GxIUwLXdcD4ssrJu6v8CwaTafA==
+  dependencies:
+    chalk "^2.3.0"
+    enhanced-resolve "^4.0.0"
+    loader-utils "^1.0.2"
+    micromatch "^3.1.4"
+    semver "^5.0.1"
+
+ts-node@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz#9ecdf8d782a0ca4c80d1d641cbb236af4ac1b756"
+  integrity sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==
+  dependencies:
+    arg "^4.1.0"
+    diff "^3.1.0"
+    make-error "^1.1.1"
+    source-map-support "^0.5.6"
+    yn "^3.0.0"
+
 tsconfig@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
@@ -10436,11 +10891,36 @@ tsconfig@^7.0.0:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
-tslib@^1.9.0:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
+tslint@^5.12.1:
+  version "5.12.1"
+  resolved "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
+  integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
+  dependencies:
+    babel-code-frame "^6.22.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.7.0"
+    minimatch "^3.0.4"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.27.2"
+
+tsutils@^2.27.2:
+  version "2.29.0"
+  resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+  dependencies:
+    tslib "^1.8.1"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -10478,6 +10958,16 @@ typedarray@^0.0.6:
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+
+ua-parser-js@^0.7.19:
+  version "0.7.19"
+  resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
+  integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
+
 uglify-js@3.4.x, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
@@ -10554,7 +11044,7 @@ uniqs@^2.0.0:
   resolved "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
   integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -10640,14 +11130,6 @@ use@^3.1.0:
   resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-useragent@^2.2.1:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -10663,15 +11145,15 @@ util.promisify@1.0.0, util.promisify@^1.0.0, util.promisify@~1.0.0:
 
 util@0.10.3:
   version "0.10.3"
-  resolved "http://registry.npmjs.org/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  resolved "https://registry.npmjs.org/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.npmjs.org/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.npmjs.org/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
   dependencies:
     inherits "2.0.3"
 
@@ -10736,27 +11218,32 @@ void-elements@^2.0.1:
   resolved "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
-vue-eslint-parser@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-3.2.2.tgz#47c971ee4c39b0ee7d7f5e154cb621beb22f7a34"
-  integrity sha512-dprI6ggKCTwV22r+i8dtUGquiOCn063xyDmb7BV/BjG5Oc/m5EoMNrWevpvTcrlGuFZmYVPs5fgsu8UIxmMKzg==
+vue-class-component@^6.2.0:
+  version "6.3.2"
+  resolved "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz#e6037e84d1df2af3bde4f455e50ca1b9eec02be6"
+  integrity sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==
+
+vue-eslint-parser@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz#80cf162e484387b2640371ad21ba1f86e0c10a61"
+  integrity sha512-AUeQsYdO6+7QXCems+WvGlrXd37PHv/zcRQSQdY1xdOMwdFAPEnMBsv7zPvk0TPGulXkK/5p/ITgrjiYB7k3ag==
   dependencies:
-    debug "^3.1.0"
+    debug "^4.1.0"
     eslint-scope "^4.0.0"
     eslint-visitor-keys "^1.0.0"
-    espree "^4.0.0"
+    espree "^4.1.0"
     esquery "^1.0.1"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 vue-hot-reload-api@^2.3.0:
   version "2.3.1"
   resolved "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
   integrity sha512-AA86yKZ5uOKz87/q1UpngEXhbRkaYg1b7HMMVRobNV1IVKqZe8oLIzo6iMocVwZXnYitlGwf2k4ZRLOZlS8oPQ==
 
-vue-jest@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/vue-jest/-/vue-jest-3.0.0.tgz#e5b0ad60c37bbeebe214124420de9eb911596cdc"
-  integrity sha512-naYRHx600YmwfUCoCUsbNlgQ6uk8L0Nn76bVZyMIJYOLlvS+f/1BqOX7ASXlYnNqNobYSC5AtWSlNzRBtYz/mw==
+vue-jest@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/vue-jest/-/vue-jest-3.0.2.tgz#c64bf5da9abd0d3ee16071217037696d14b0689c"
+  integrity sha512-5XIQ1xQFW0ZnWxHWM7adVA2IqbDsdw1vhgZfGFX4oWd75J38KIS3YT41PtiE7lpMLmNM6+VJ0uprT2mhHjUgkA==
   dependencies:
     babel-plugin-transform-es2015-modules-commonjs "^6.26.0"
     chalk "^2.1.0"
@@ -10769,40 +11256,48 @@ vue-jest@^3.0.0:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-loader@^15.4.2:
-  version "15.4.2"
-  resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-15.4.2.tgz#812bb26e447dd3b84c485eb634190d914ce125e2"
-  integrity sha512-nVV27GNIA9MeoD8yQ3dkUzwlAaAsWeYSWZHsu/K04KCD339lW0Jv2sJWsjj3721SP7sl2lYdPmjcHgkWQSp5bg==
+vue-loader@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-15.6.2.tgz#892741d96260936ff69e892f72ec361ba4d100d2"
+  integrity sha512-T6fONodj861M3PqZ1jlbUFjeezbUnPRY2bd+3eZuDvYADgkN3VFU2H5feqySNg9XBt8rcbyBGmFWTZtrOX+v5w==
   dependencies:
-    "@vue/component-compiler-utils" "^2.0.0"
+    "@vue/component-compiler-utils" "^2.5.1"
     hash-sum "^1.0.2"
     loader-utils "^1.1.0"
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
-vue-meta@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.npmjs.org/vue-meta/-/vue-meta-1.5.6.tgz#8c6e56e560217c63637bb9ed66434df15c162057"
-  integrity sha512-0MK3VGtAeZvGBkWmvCIsTE3LzoXvfbbduF1vbNOa491tYw7E1IlLMsmdr0DNypIdrFGS4NmOajVMJcDXCSp2VA==
+vue-meta@^1.5.8:
+  version "1.5.8"
+  resolved "https://registry.npmjs.org/vue-meta/-/vue-meta-1.5.8.tgz#1088d50cdf770525e37430186781bede929370a4"
+  integrity sha512-cF/ADL1kA8Gn6wfSx0+kYIPAmJ49y9R0QlMS9tg5ddDDZWaZMZ0rveFWaTOKr0eabUV/H3D9ip68Xt9f5SFbyA==
   dependencies:
-    deepmerge "^2.2.1"
+    deepmerge "^3.0.0"
     lodash.isplainobject "^4.0.6"
+    lodash.uniqueid "^4.0.1"
     object-assign "^4.1.1"
 
-vue-no-ssr@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/vue-no-ssr/-/vue-no-ssr-1.1.0.tgz#b323807112f676324d9d7cfde85d7831ced11dd9"
-  integrity sha512-prJ9czuPrVu0GhUZKTS/epFfM15QjLuG6wt61g0nyixPXk0g6eY7wNF4RKIqJsxomOiuSYTv3Zo8A43Vi93xfw==
+vue-no-ssr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz#875f3be6fb0ae41568a837f3ac1a80eaa137b998"
+  integrity sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g==
+
+vue-property-decorator@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-7.3.0.tgz#d50d67f0b0f1c814f9f2fba36d6eeccbcc62dbb6"
+  integrity sha512-HarXfTQ/Nxm4s/APpAaGIGHq5ZzslApImQy8ZrtkfGamw8rUFAVgMS5C50/AQ80+wfw3Wpnf4bNzbmj75m/k2Q==
+  dependencies:
+    vue-class-component "^6.2.0"
 
 vue-router@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
   integrity sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg==
 
-vue-server-renderer@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.5.17.tgz#c1f24815a4b12a2797c154549b29b44b6be004b5"
-  integrity sha512-n62Fg4xv9ouxNloW2U3Bru2Jj+DkbnnrlzwuTkaU1o7CIDifG+r0+ILLMW0eVjgCjhKefHTYjwJ49RJ3bCjv1Q==
+vue-server-renderer@^2.5.22:
+  version "2.5.22"
+  resolved "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.5.22.tgz#f119efef289c865adc22fda0ae7595299bedbdcf"
+  integrity sha512-PQ0PubA6b2MyZud/gepWeiUuDFSbRfa6h1qYINcbwXRr4Z3yLTHprEQuFnWikdkTkZpeLFYUqZrDxPbDcJ71mA==
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -10821,28 +11316,28 @@ vue-style-loader@^4.1.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz#52a4a078c327deb937482a509ae85c06f346c3cb"
-  integrity sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==
+vue-template-compiler@^2.5.22:
+  version "2.5.22"
+  resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.22.tgz#c3d3c02c65f1908205c4fbd3b0ef579e51239955"
+  integrity sha512-1VTw/NPTUeHNiwhkq6NkFzO7gYLjFCueBN0FX8NEiQIemd5EUMQ5hxrF7O0zCPo5tae+U9S/scETPea+hIz8Eg==
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
 
 vue-template-es2015-compiler@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
-  integrity sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==
+  version "1.8.2"
+  resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a"
+  integrity sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA==
 
-vue@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada"
-  integrity sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==
+vue@^2.5.22:
+  version "2.5.22"
+  resolved "https://registry.npmjs.org/vue/-/vue-2.5.22.tgz#3bf88041af08b8539c37b268b70ca79245e9cc30"
+  integrity sha512-pxY3ZHlXNJMFQbkjEgGVMaMMkSV1ONpz+4qB55kZuJzyJOhn6MSy/YZdzhdnumegNzVTL/Dn3Pp4UrVBYt1j/g==
 
-vuex@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz#e761352ebe0af537d4bb755a9b9dc4be3df7efd2"
-  integrity sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w==
+vuex@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/vuex/-/vuex-3.1.0.tgz#634b81515cf0cfe976bd1ffe9601755e51f843b9"
+  integrity sha512-mdHeHT/7u4BncpUZMlxNaIdcN/HIt1GsGG5LKByArvYG/v6DvHcOxvDCts+7SRdCoIRGllK8IMZvQtQXLppDYg==
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
@@ -10851,10 +11346,10 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
-w3c-xmlserializer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.0.0.tgz#d23e20de595b892056f20a359fc2622908d48695"
-  integrity sha512-0et1+9uXYiIRAecx1D5Z1nk60+vimniGdIKl4XjeqkWi6acoHNlXMv1VR5jV+jF4ooeO08oWbYxeAJOcon1oMA==
+w3c-xmlserializer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.0.1.tgz#054cdcd359dc5d1f3ec9be4e272c756af4b21d39"
+  integrity sha512-XZGI1OH/OLQr/NaJhhPmzhngwcAnZDLytsvXnRmlYeRkmbb0I7sqFFA22erq4WQR0sUu17ZSQOAV9mFwCqKRNg==
   dependencies:
     domexception "^1.0.1"
     webidl-conversions "^4.0.2"
@@ -10914,10 +11409,10 @@ webpack-bundle-analyzer@^3.0.3:
     opener "^1.5.1"
     ws "^6.0.0"
 
-webpack-dev-middleware@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+webpack-dev-middleware@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
+  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
   dependencies:
     memory-fs "~0.4.1"
     mime "^2.3.1"
@@ -10944,10 +11439,10 @@ webpack-log@^2.0.0:
 
 webpack-node-externals@^1.7.2:
   version "1.7.2"
-  resolved "http://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz#6e1ee79ac67c070402ba700ef033a9b8d52ac4e3"
+  resolved "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz#6e1ee79ac67c070402ba700ef033a9b8d52ac4e3"
   integrity sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg==
 
-webpack-sources@^1.1.0, webpack-sources@^1.3.0:
+webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
   integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
@@ -10955,17 +11450,17 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.26.1:
-  version "4.26.1"
-  resolved "https://registry.npmjs.org/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39"
-  integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug==
+webpack@^4.29.0:
+  version "4.29.0"
+  resolved "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
+  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
   dependencies:
     "@webassemblyjs/ast" "1.7.11"
     "@webassemblyjs/helper-module-context" "1.7.11"
     "@webassemblyjs/wasm-edit" "1.7.11"
     "@webassemblyjs/wasm-parser" "1.7.11"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
+    acorn "^6.0.5"
+    acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
     chrome-trace-event "^1.0.0"
@@ -10985,14 +11480,14 @@ webpack@^4.26.1:
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
-webpackbar@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/webpackbar/-/webpackbar-3.1.3.tgz#3ea7b7e3d09fd3ac62ba476a45a1c0c2830e6dcb"
-  integrity sha512-OvCUjHxd+FRSlocJTqi0wjBZIIetW04WkDiKpkfL7ZvvEeQnTVL+6yBzjJVpdaY7CZ/tfQKM8IBXIcHlPqyX+g==
+webpackbar@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.npmjs.org/webpackbar/-/webpackbar-3.1.5.tgz#71f9de2d8b897785a3b3291cb6c8beecdf06542b"
+  integrity sha512-ayCxwj0m3lw8TMkbBBRl3XNiCIHqXYaQus8sNL+jX0lsp4LrYO9OmijsPeuu91cd/oUgK66c0AKQovPtJ1qDsA==
   dependencies:
     ansi-escapes "^3.1.0"
     chalk "^2.4.1"
-    consola "^2.2.4"
+    consola "^2.3.0"
     figures "^2.0.0"
     pretty-time "^1.1.0"
     std-env "^2.2.1"
@@ -11006,10 +11501,10 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171"
-  integrity sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw==
+whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
 whatwg-url@^6.4.1:
   version "6.5.0"
@@ -11092,7 +11587,7 @@ worker-farm@^1.5.2:
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
   integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
@@ -11113,9 +11608,9 @@ wrappy@1:
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
+  version "2.4.2"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -11148,17 +11643,17 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^5.1.1, ws@^5.2.0:
+ws@^5.2.0:
   version "5.2.2"
   resolved "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
   integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.0.0, ws@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz#119a9dbf92c54e190ec18d10e871d55c95cf9373"
-  integrity sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==
+ws@^6.0.0, ws@^6.1.0, ws@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
+  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -11177,11 +11672,6 @@ xmlchars@^1.3.1:
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-1.3.1.tgz#1dda035f833dbb4f86a0c28eaa6ca769214793cf"
   integrity sha512-tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw==
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -11210,17 +11700,32 @@ yallist@^2.1.2:
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@^10.1.0:
+yargs-parser@10.x:
   version "10.1.0"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
+  integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
@@ -11228,9 +11733,27 @@ yargs-parser@^9.0.2:
   dependencies:
     camelcase "^4.1.0"
 
+yargs@^10.0.3:
+  version "10.1.2"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
+  integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^8.1.0"
+
 yargs@^11.0.0:
   version "11.1.0"
-  resolved "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
   integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
   dependencies:
     cliui "^4.0.0"
@@ -11247,12 +11770,12 @@ yargs@^11.0.0:
     yargs-parser "^9.0.2"
 
 yargs@^12.0.1:
-  version "12.0.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+  version "12.0.5"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^2.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -11262,11 +11785,11 @@ yargs@^12.0.1:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
+    yargs-parser "^11.1.1"
 
 yargs@~3.10.0:
   version "3.10.0"
-  resolved "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
   integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
   dependencies:
     camelcase "^1.0.2"
@@ -11280,3 +11803,8 @@ yauzl@2.4.1:
   integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
   dependencies:
     fd-slicer "~1.0.1"
+
+yn@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/yn/-/yn-3.0.0.tgz#0073c6b56e92aed652fbdfd62431f2d6b9a7a091"
+  integrity sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==