diff --git a/.circleci/config.yml b/.circleci/config.yml
index d62410aa63..82da90d547 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,12 +23,6 @@ jobs:
           paths:
             - "node_modules"
 
-      # Build
-      - run:
-          name: Build
-          command: |
-            yarn build
-
       # Test
       - run:
           name: Tests
@@ -41,5 +35,5 @@ jobs:
             if [ "${CIRCLE_BRANCH}" == "dev" ]; then
               echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
               echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-              npm run release-next
+              ./scripts/release-next && npm publish --tag next
             fi
diff --git a/.eslintrc.js b/.eslintrc.js
index 69b6b59125..451755e074 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,7 +8,7 @@ module.exports = {
     browser: true,
     node: true
   },
-  extends: 'standard',
+  extends: ['standard', 'standard-jsx'],
   // required to lint *.vue files
   plugins: [
     'html'
diff --git a/.gitignore b/.gitignore
index 6b2d6f7e1d..0d87892d25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ package-lock.json
 npm-debug.log*
 
 # Other
-.nuxt
+.nuxt*
 .cache
 
 # Dist folder
@@ -47,4 +47,4 @@ coverage
 .AppleDesktop
 Network Trash Folder
 Temporary Items
-.apdisk
\ No newline at end of file
+.apdisk
diff --git a/.travis.yml b/.travis.yml
index a92abde5dc..3a8d45dd6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,13 @@
 language: node_js
 node_js:
   - "8"
-  - "6"
+  - "9"
 cache:
   yarn: true
   directories:
     - node_modules
 install:
   - yarn install
-  - yarn run build
 script:
   - yarn run test
 after_success:
diff --git a/appveyor.yml b/appveyor.yml
index f001912793..d9a0ff6927 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,8 @@
 # Test against the latest version of this Node.js version
 environment:
   matrix:
-    - nodejs_version: "6"
     - nodejs_version: "8"
+    - nodejs_version: "9"
 
 cache:
   - "%LOCALAPPDATA%\\Yarn"
diff --git a/bin/nuxt-generate b/bin/nuxt-generate
index c9fa725982..44a0b03cf2 100755
--- a/bin/nuxt-generate
+++ b/bin/nuxt-generate
@@ -33,7 +33,6 @@ if (argv.help) {
     Usage
       $ nuxt generate <dir>
     Options
-      --spa              Launch in SPA mode
       --spa              Launch in SPA mode
       --universal        Launch in Universal mode (default)
       --config-file, -c  Path to Nuxt.js config file (default: nuxt.config.js)
diff --git a/build/rollup.config.js b/build/rollup.config.js
deleted file mode 100755
index 3328377d48..0000000000
--- a/build/rollup.config.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Some parts brought from https://github.com/vuejs/vue/blob/dev/build/config.js
-const { resolve } = require('path')
-const rollupBabel = require('rollup-plugin-babel')
-const rollupAlias = require('rollup-plugin-alias')
-const rollupCommonJS = require('rollup-plugin-commonjs')
-const rollupReplace = require('rollup-plugin-replace')
-const rollupNodeResolve = require('rollup-plugin-node-resolve')
-const packageJson = require('../package.json')
-
-const dependencies = Object.keys(packageJson.dependencies)
-const version = packageJson.version || process.env.VERSION
-
-// -----------------------------
-// Banner
-// -----------------------------
-const banner =
-  '/*!\n' +
-  ' * Nuxt.js v' + version + '\n' +
-  ' * Released under the MIT License.\n' +
-  ' */'
-
-// -----------------------------
-// Aliases
-// -----------------------------
-const rootDir = resolve(__dirname, '..')
-const libDir = resolve(rootDir, 'lib')
-const distDir = resolve(rootDir, 'dist')
-
-const aliases = {
-  core: resolve(libDir, 'core/index.js'),
-  builder: resolve(libDir, 'builder/index.js'),
-  common: resolve(libDir, 'common/index.js'),
-  utils: resolve(libDir, 'common/utils.js'),
-  app: resolve(libDir, 'app')
-}
-
-// -----------------------------
-// Builds
-// -----------------------------
-const builds = {
-  nuxt: {
-    entry: resolve(libDir, 'index.js'),
-    file: resolve(distDir, 'nuxt.js')
-  },
-  core: {
-    entry: resolve(libDir, 'core/index.js'),
-    file: resolve(distDir, 'core.js')
-  }
-}
-
-// -----------------------------
-// Default config
-// -----------------------------
-function genConfig(opts) {
-  const config = {
-    input: opts.entry,
-    output: {
-      file: opts.file,
-      format: 'cjs',
-      sourcemap: true
-    },
-    external: ['fs', 'path', 'http', 'module', 'vue-server-renderer/server-plugin', 'vue-server-renderer/client-plugin']
-      .concat(dependencies, opts.external),
-    banner: opts.banner || banner,
-    name: opts.modulename || 'Nuxt',
-    plugins: [
-      rollupAlias(Object.assign({
-        resolve: ['.js', '.json', '.jsx', '.ts']
-      }, aliases, opts.alias)),
-
-      rollupNodeResolve({ preferBuiltins: true }),
-
-      rollupCommonJS(),
-
-      rollupBabel(Object.assign({
-        exclude: 'node_modules/**',
-        plugins: [
-          ['transform-runtime', { 'helpers': false, 'polyfill': false }],
-          'transform-async-to-generator',
-          'array-includes',
-          'external-helpers'
-        ],
-        presets: [
-          ['env', {
-            targets: {
-              node: '6.11.0'
-            },
-            modules: false
-          }]
-        ],
-        'env': {
-          'test': {
-            'plugins': [ 'istanbul' ]
-          }
-        }
-      }, opts.babel)),
-
-      rollupReplace({ __VERSION__: version })
-    ].concat(opts.plugins || [])
-  }
-
-  if (opts.env) {
-    config.plugins.push(rollupReplace({
-      'process.env.NODE_ENV': JSON.stringify(opts.env)
-    }))
-  }
-
-  return config
-}
-
-if (process.env.TARGET) {
-  module.exports = genConfig(builds[process.env.TARGET])
-} else {
-  exports.getBuild = name => genConfig(builds[name])
-  exports.getAllBuilds = () => Object.keys(builds).map(name => genConfig(builds[name]))
-}
diff --git a/examples/hello-world-jsx/pages/about.vue b/examples/hello-world-jsx/pages/about.vue
deleted file mode 100644
index 26ed2649b8..0000000000
--- a/examples/hello-world-jsx/pages/about.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-export default {
-  asyncData({ req }) {
-    return {
-      name: req ? 'server' : 'client'
-    }
-  },
-  render(h) {
-    return <div>
-      <p>Hi from {this.name}</p>
-      <nuxt-link to="/">Home page</nuxt-link>
-    </div>
-  }
-}
-</script>
diff --git a/examples/hello-world-jsx/pages/index.js b/examples/hello-world-jsx/pages/index.js
deleted file mode 100644
index 675e8981f2..0000000000
--- a/examples/hello-world-jsx/pages/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-  render(h) {
-    return <div>
-      <h1>Welcome !</h1>
-      <nuxt-link to="/about">About page</nuxt-link>
-    </div>
-  }
-}
diff --git a/examples/i18n/layouts/default.vue b/examples/i18n/layouts/default.vue
index 8bf6defab9..46cf9e913e 100644
--- a/examples/i18n/layouts/default.vue
+++ b/examples/i18n/layouts/default.vue
@@ -4,10 +4,10 @@
       <div class="container">
         <h1 class="Header__Title">Nuxt i18n</h1>
         <nav class="Header__Menu">
-          <nuxt-link class="Header__Link" :to="path('/')" exact>
+          <nuxt-link class="Header__Link" :to="$i18n.path('')" exact>
             {{ $t('links.home') }}
           </nuxt-link>
-          <nuxt-link class="Header__Link" :to="path('/about')" exact>
+          <nuxt-link class="Header__Link" :to="$i18n.path('about')" exact>
             {{ $t('links.about') }}
           </nuxt-link>
           <nuxt-link class="Header__Link" v-if="$i18n.locale === 'en'" :to="`/fr` + $route.fullPath" active-class="none" exact>
@@ -24,13 +24,7 @@
 </template>
 
 <script>
-export default {
-  methods: {
-    path(url) {
-      return (this.$i18n.locale === 'en' ? url : '/' + this.$i18n.locale + url)
-    }
-  }
-}
+export default {}
 </script>
 
 <style>
diff --git a/examples/i18n/plugins/i18n.js b/examples/i18n/plugins/i18n.js
index e4859aadc9..e4208be5af 100644
--- a/examples/i18n/plugins/i18n.js
+++ b/examples/i18n/plugins/i18n.js
@@ -14,4 +14,12 @@ export default ({ app, store }) => {
       'fr': require('~/locales/fr.json')
     }
   })
+
+  app.i18n.path = (link) => {
+    if (app.i18n.locale === app.i18n.fallbackLocale) {
+      return `/${link}`
+    }
+
+    return `/${app.i18n.locale}/${link}`
+  }
 }
diff --git a/examples/jsx/README.md b/examples/jsx/README.md
new file mode 100644
index 0000000000..068b72b549
--- /dev/null
+++ b/examples/jsx/README.md
@@ -0,0 +1,5 @@
+# Render Functions & JSX Example
+
+## Documentation
+
+Vue: https://vuejs.org/v2/guide/render-function.html
diff --git a/examples/jsx/components/test.vue b/examples/jsx/components/test.vue
new file mode 100644
index 0000000000..f7f9ca0415
--- /dev/null
+++ b/examples/jsx/components/test.vue
@@ -0,0 +1,17 @@
+<template>
+  <p v-html="data"></p>
+</template>
+
+<script>
+export default {
+  props: {
+    data: String
+  }
+}
+</script>
+
+<style scoped>
+p {
+  padding: 5px 20px;
+}
+</style>
diff --git a/examples/hello-world-jsx/package.json b/examples/jsx/package.json
similarity index 83%
rename from examples/hello-world-jsx/package.json
rename to examples/jsx/package.json
index abcca8b416..d6478c6544 100644
--- a/examples/hello-world-jsx/package.json
+++ b/examples/jsx/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hello-nuxt-jsx",
+  "name": "nuxt-jsx",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/jsx/pages/about.js b/examples/jsx/pages/about.js
new file mode 100644
index 0000000000..4bd675870c
--- /dev/null
+++ b/examples/jsx/pages/about.js
@@ -0,0 +1,21 @@
+
+import Test from '~/components/test.vue'
+
+export default {
+  head: {
+    title: 'About Page',
+    meta: [
+      { hid: 'description', name: 'description', content: 'About page description' }
+    ]
+  },
+  components: {
+    Test
+  },
+  render() {
+    return <div class='container'>
+      <h1>About page</h1>
+      <test data='I am test component' />
+      <p><nuxt-link to='/'>Home page</nuxt-link></p>
+    </div>
+  }
+}
diff --git a/examples/jsx/pages/index.js b/examples/jsx/pages/index.js
new file mode 100755
index 0000000000..ab5d1cb93b
--- /dev/null
+++ b/examples/jsx/pages/index.js
@@ -0,0 +1,20 @@
+export default {
+  head: {
+    title: 'Home page 🚀',
+    meta: [
+      { hid: 'description', name: 'description', content: 'Home page description' }
+    ],
+    script: [
+      { src: '/head.js' },
+      // Supported since 1.0
+      { src: '/body.js', body: true },
+      { src: '/defer.js', defer: '' }
+    ]
+  },
+  render() {
+    return <div class='container'>
+      <h1>Home page 🚀</h1>
+      <nuxt-link to='/about'>About page</nuxt-link>
+    </div>
+  }
+}
diff --git a/examples/with-vue-material/README.md b/examples/with-vue-material/README.md
new file mode 100644
index 0000000000..2cd080e524
--- /dev/null
+++ b/examples/with-vue-material/README.md
@@ -0,0 +1,7 @@
+# Nuxt With Vue-Material
+
+## Compatibility
+
+Vue-Material >= 1.0.0beta
+
+[View Demo](https://nuxt-vue-material.now.sh)
diff --git a/examples/with-vue-material/nuxt.config.js b/examples/with-vue-material/nuxt.config.js
new file mode 100644
index 0000000000..38d84fe8c0
--- /dev/null
+++ b/examples/with-vue-material/nuxt.config.js
@@ -0,0 +1,25 @@
+module.exports = {
+  head: {
+    meta: [
+      {
+        name: 'viewport',
+        content: 'width=device-width, initial-scale=1, minimal-ui'
+      }
+    ],
+    link: [
+      {
+        rel: 'stylesheet',
+        href: 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic|Material+Icons'
+      },
+      {
+        rel: 'stylesheet',
+        href: 'https://unpkg.com/vue-material@beta/dist/vue-material.min.css'
+      },
+      {
+        rel: 'stylesheet',
+        href: 'https://unpkg.com/vue-material@beta/dist/theme/default.css'
+      }
+    ]
+  },
+  plugins: ['~/plugins/vue-material']
+}
diff --git a/examples/with-vue-material/package.json b/examples/with-vue-material/package.json
new file mode 100644
index 0000000000..0363fc255b
--- /dev/null
+++ b/examples/with-vue-material/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "with-vue-material",
+  "version": "1.0.0",
+  "dependencies": {
+    "nuxt": "latest",
+    "vue": "~2.4.4",
+    "vue-material": "beta"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start"
+  }
+}
diff --git a/examples/with-vue-material/pages/index.vue b/examples/with-vue-material/pages/index.vue
new file mode 100644
index 0000000000..f24b6c078d
--- /dev/null
+++ b/examples/with-vue-material/pages/index.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="page-container md-layout-column">
+    <md-toolbar class="md-primary">
+      <md-button class="md-icon-button" @click="showNavigation = true">
+        <md-icon>menu</md-icon>
+      </md-button>
+      <span class="md-title">Nuxt + Vue Material</span>
+
+      <div class="md-toolbar-section-end">
+        <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>
+      </md-toolbar>
+
+      <md-list>
+        <md-list-item>
+          <md-icon>move_to_inbox</md-icon>
+          <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>
+        </md-list-item>
+
+        <md-list-item>
+          <md-icon>delete</md-icon>
+          <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>
+        </md-list-item>
+      </md-list>
+    </md-drawer>
+
+    <md-drawer class="md-right" :md-active.sync="showSidepanel">
+      <md-toolbar class="md-transparent" md-elevation="0">
+        <span class="md-title">Favorites</span>
+      </md-toolbar>
+
+      <md-list>
+        <md-list-item>
+          <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-button>
+        </md-list-item>
+
+        <md-list-item>
+          <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-button>
+        </md-list-item>
+
+        <md-list-item>
+          <span class="md-list-item-text">Mary Johnson</span>
+
+          <md-button class="md-icon-button md-list-action">
+            <md-icon>chat_bubble</md-icon>
+          </md-button>
+        </md-list-item>
+      </md-list>
+    </md-drawer>
+
+    <md-content>
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Error quibusdam, non molestias et! Earum magnam, similique, quo recusandae placeat dicta asperiores modi sint ea repudiandae maxime? Quae non explicabo, neque.
+    </md-content>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Sidenav',
+  data: () => ({
+    showNavigation: false,
+    showSidepanel: false
+  })
+}
+</script>
+
+<style scoped>
+  .page-container {
+    min-height: 100vh;
+    overflow: hidden;
+    position: relative;
+    border: 1px solid rgba(#000, 0.12);
+  }
+
+  .md-drawer {
+    width: 230px;
+    max-width: calc(100vw - 125px);
+  }
+
+  .md-content {
+    padding: 16px;
+  }
+</style>
diff --git a/examples/with-vue-material/plugins/vue-material.js b/examples/with-vue-material/plugins/vue-material.js
new file mode 100644
index 0000000000..3f64c62cc1
--- /dev/null
+++ b/examples/with-vue-material/plugins/vue-material.js
@@ -0,0 +1,4 @@
+import Vue from 'vue'
+import VueMaterial from 'vue-material'
+
+Vue.use(VueMaterial)
diff --git a/index.js b/index.js
deleted file mode 100644
index 24e035805e..0000000000
--- a/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Nuxt.js
- * (c) 2016-2017 Chopin Brothers
- * Core maintainer: Pooya (@pi0)
- * Released under the MIT License.
- */
-
-// Node Source Map Support
-// https://github.com/evanw/node-source-map-support
-require('source-map-support').install()
-
-// Fix babel flag
-/* istanbul ignore else */
-process.noDeprecation = true
-
-module.exports = require('./dist/nuxt')
diff --git a/lib/app/components/nuxt.js b/lib/app/components/nuxt.js
index 333762ac4e..380bf5f110 100644
--- a/lib/app/components/nuxt.js
+++ b/lib/app/components/nuxt.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import NuxtChild from './nuxt-child'
-import NuxtError from '<%= components.ErrorPage ? ((components.ErrorPage.includes('~') || components.ErrorPage.includes('@')) ? components.ErrorPage : "../" + components.ErrorPage) : "./nuxt-error.vue" %>'
+import NuxtError from '<%= components.ErrorPage ? ((components.ErrorPage.indexOf('~') === 0 || components.ErrorPage.indexOf('@') === 0) ? components.ErrorPage : "../" + components.ErrorPage) : "./nuxt-error.vue" %>'
 import { compile } from '../utils'
 
 export default {
diff --git a/lib/app/index.js b/lib/app/index.js
index 986ad113ec..bfcecfd48c 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -8,13 +8,12 @@ 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 %>'
-import { setContext, getLocation } from './utils'
+import { setContext, getLocation, getRouteData } from './utils'
 <% if (store) { %>import { createStore } from './store.js'<% } %>
 
 /* Plugins */
-
-<% plugins.forEach(plugin => { %>// <%= plugin.src %><%= (plugin.ssr===false) ? ' (Only included in client bundle)' : '' %>
-import <%= plugin.name %> from '<%= plugin.name %>'<% }) %>
+<% plugins.forEach(plugin => { %>import <%= plugin.name %> from '<%= plugin.name %>' // Source: <%= relativeToBuild(plugin.src) %><%= (plugin.ssr===false) ? ' (ssr: false)' : '' %>
+<% }) %>
 
 // Component: <no-ssr>
 Vue.component(NoSSR.name, NoSSR)
@@ -167,7 +166,17 @@ async function createApp (ssrContext) {
   // If server-side, wait for async component to be resolved first
   if (process.server && ssrContext && ssrContext.url) {
     await new Promise((resolve, reject) => {
-      router.push(ssrContext.url, resolve, reject)
+      router.push(ssrContext.url, resolve, () => {
+        // navigated to a different route in router guard
+        const unregister = router.afterEach(async (to, from, next) => {
+          ssrContext.url = to.fullPath
+          app.context.route = await getRouteData(to)
+          app.context.params = to.params || {}
+          app.context.query = to.query || {}
+          unregister()
+          resolve()
+        })
+      })
     })
   }
 
diff --git a/lib/app/utils.js b/lib/app/utils.js
index f78973d570..7942fbdd21 100644
--- a/lib/app/utils.js
+++ b/lib/app/utils.js
@@ -85,7 +85,7 @@ export function resolveRouteComponents(route) {
   )
 }
 
-async function getRouteData(route) {
+export async function getRouteData(route) {
   // Make sure the components are resolved (code-splitting)
   await resolveRouteComponents(route)
   // Send back a copy of route with meta based on Component definition
@@ -127,11 +127,16 @@ export async function setContext(app, context) {
       if (!status) return
       app.context._redirected = true // Used in middleware
       // if only 1 or 2 arguments: redirect('/') or redirect('/', { foo: 'bar' })
-      if (typeof status === 'string' && (typeof path === 'undefined' || typeof path === 'object')) {
+      let pathType = typeof path
+      if (typeof status !== 'number' && (pathType === 'undefined' || pathType === 'object')) {
         query = path || {}
         path = status
+        pathType = typeof path
         status = 302
       }
+      if (pathType === 'object') {
+        path = app.router.resolve(path).href
+      }
       // "/absolute/route", "./relative/route" or "../relative/route"
       if (/(^[.]{1,2}\/)|(^\/(?!\/))/.test(path)) {
         app.context.next({
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 45c57269c0..832b5fd0a4 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -1,29 +1,30 @@
-import _ from 'lodash'
-import chokidar from 'chokidar'
-import fs, { remove, readFile, writeFile, mkdirp, existsSync } from 'fs-extra'
-import hash from 'hash-sum'
-import pify from 'pify'
-import webpack from 'webpack'
-import serialize from 'serialize-javascript'
-import { join, resolve, basename, extname, dirname } from 'path'
-import MFS from 'memory-fs'
-import webpackDevMiddleware from 'webpack-dev-middleware'
-import webpackHotMiddleware from 'webpack-hot-middleware'
-import { r, wp, wChunk, createRoutes, sequence, relativeTo, isPureObject, waitFor } from 'utils'
-import Debug from 'debug'
-import Glob from 'glob'
-import clientWebpackConfig from './webpack/client.config.js'
-import serverWebpackConfig from './webpack/server.config.js'
-import dllWebpackConfig from './webpack/dll.config.js'
-import vueLoaderConfig from './webpack/vue-loader.config'
-import styleLoader from './webpack/style-loader'
+const { promisify } = require('util')
+const _ = require('lodash')
+const chokidar = require('chokidar')
+const { remove, readFile, writeFile, mkdirp, existsSync } = require('fs-extra')
+const hash = require('hash-sum')
+const webpack = require('webpack')
+const serialize = require('serialize-javascript')
+const { join, resolve, basename, extname, dirname } = require('path')
+const MFS = require('memory-fs')
+const webpackDevMiddleware = require('webpack-dev-middleware')
+const webpackHotMiddleware = require('webpack-hot-middleware')
+const { r, wp, wChunk, createRoutes, sequence, relativeTo, isPureObject, waitFor, rmCache } = require('../common/utils')
+const Debug = require('debug')
+const Glob = require('glob')
+const clientWebpackConfig = require('./webpack/client.config.js')
+const serverWebpackConfig = require('./webpack/server.config.js')
+const dllWebpackConfig = require('./webpack/dll.config.js')
+const vueLoaderConfig = require('./webpack/vue-loader.config')
+const styleLoader = require('./webpack/style-loader')
+const { Options } = require('../common')
 
 const debug = Debug('nuxt:build')
 debug.color = 2 // Force green color
 
-const glob = pify(Glob)
+const glob = promisify(Glob)
 
-export default class Builder {
+module.exports = class Builder {
   constructor(nuxt) {
     this.nuxt = nuxt
     this.isStatic = false // Flag to know if the build is for a generated app
@@ -38,17 +39,7 @@ export default class Builder {
     this.customFilesWatcher = null
 
     // Mute stats on dev
-    this.webpackStats = this.options.dev ? false : {
-      chunks: false,
-      children: false,
-      modules: false,
-      colors: true,
-      excludeAssets: [
-        /.map$/,
-        /index\..+\.html$/,
-        /vue-ssr-client-manifest.json/
-      ]
-    }
+    this.webpackStats = this.options.dev ? false : this.options.build.stats
 
     // Helper to resolve build paths
     this.relativeToBuild = (...args) => relativeTo(this.options.buildDir, ...args)
@@ -62,18 +53,21 @@ export default class Builder {
     // Stop watching on nuxt.close()
     if (this.options.dev) {
       this.nuxt.hook('close', () => this.unwatch())
+    } else {
+      this.nuxt.hook('build:done', () => this.generateConfig())
     }
   }
 
   get plugins() {
-    return this.options.plugins.map((p, i) => {
+    return _.uniqBy(this.options.plugins.map((p, i) => {
       if (typeof p === 'string') p = { src: p }
+      const pluginBaseName = basename(p.src, extname(p.src)).replace(/[^a-zA-Z?\d\s:]/g, '')
       return {
         src: this.nuxt.resolvePath(p.src),
         ssr: (p.ssr !== false),
-        name: basename(p.src, extname(p.src)).replace(/[^a-zA-Z?\d\s:]/g, '') + '_plugin_' + hash(p.src)
+        name: 'nuxt_plugin_' + pluginBaseName + '_' + hash(p.src)
       }
-    })
+    }), p => p.name)
   }
 
   vendor() {
@@ -124,19 +118,6 @@ export default class Builder {
     // Call before hook
     await this.nuxt.callHook('build:before', this, this.options.build)
 
-    // Babel options
-    this.babelOptions = _.defaults(this.options.build.babel, {
-      babelrc: false,
-      cacheDirectory: !!this.options.dev
-    })
-    if (!this.babelOptions.babelrc && !this.babelOptions.presets) {
-      this.babelOptions.presets = [
-        [require.resolve('babel-preset-vue-app'), {
-          targets: { ie: 9, uglify: true }
-        }]
-      ]
-    }
-
     // Map postcss plugins into instances on object mode once
     if (isPureObject(this.options.build.postcss)) {
       if (isPureObject(this.options.build.postcss.plugins)) {
@@ -154,9 +135,9 @@ export default class Builder {
     // Check if pages dir exists and warn if not
     this._nuxtPages = typeof this.options.build.createRoutes !== 'function'
     if (this._nuxtPages) {
-      if (!fs.existsSync(join(this.options.srcDir, 'pages'))) {
+      if (!existsSync(join(this.options.srcDir, 'pages'))) {
         let dir = this.options.srcDir
-        if (fs.existsSync(join(this.options.srcDir, '..', 'pages'))) {
+        if (existsSync(join(this.options.srcDir, '..', 'pages'))) {
           throw new Error(`No \`pages\` directory found in ${dir}. Did you mean to run \`nuxt\` in the parent (\`../\`) directory?`)
         } else {
           throw new Error(`Couldn't find a \`pages\` directory in ${dir}. Please create one under the project root`)
@@ -189,6 +170,42 @@ export default class Builder {
     return this
   }
 
+  getBabelOptions({ isServer }) {
+    const options = _.defaults({}, {
+      babelrc: false,
+      cacheDirectory: !!this.options.dev
+    }, this.options.build.babel)
+
+    if (typeof options.presets === 'function') {
+      options.presets = options.presets({ isServer })
+    }
+
+    if (!options.babelrc && !options.presets) {
+      options.presets = [
+        [
+          require.resolve('babel-preset-vue-app'),
+          {
+            targets: isServer ? { node: '8.0.0' } : { ie: 9, uglify: true }
+          }
+        ]
+      ]
+    }
+
+    return options
+  }
+
+  getFileName(name) {
+    let fileName = this.options.build.filenames[name]
+
+    // Don't use hashes when watching
+    // https://github.com/webpack/webpack/issues/1914#issuecomment-174171709
+    if (this.options.dev) {
+      fileName = fileName.replace(/\[(chunkhash|contenthash|hash)\]\./g, '')
+    }
+
+    return fileName
+  }
+
   async generateRoutesAndFiles() {
     debug('Generating files...')
     // -- Templates --
@@ -220,7 +237,7 @@ export default class Builder {
       router: this.options.router,
       env: this.options.env,
       head: this.options.head,
-      middleware: fs.existsSync(join(this.options.srcDir, 'middleware')),
+      middleware: existsSync(join(this.options.srcDir, 'middleware')),
       store: this.options.store,
       css: this.options.css,
       plugins: this.plugins,
@@ -235,16 +252,18 @@ export default class Builder {
     }
 
     // -- Layouts --
-    if (fs.existsSync(resolve(this.options.srcDir, 'layouts'))) {
-      const layoutsFiles = await glob('layouts/**/*.vue', { cwd: this.options.srcDir })
+    if (existsSync(resolve(this.options.srcDir, 'layouts'))) {
+      const layoutsFiles = await glob('layouts/**/*.{vue,js}', { cwd: this.options.srcDir })
       let hasErrorLayout = false
       layoutsFiles.forEach((file) => {
-        let name = file.split('/').slice(1).join('/').replace(/\.vue$/, '')
+        let name = file.split('/').slice(1).join('/').replace(/\.(vue|js)$/, '')
         if (name === 'error') {
           hasErrorLayout = true
           return
         }
-        templateVars.layouts[name] = this.relativeToBuild(this.options.srcDir, file)
+        if (!templateVars.layouts[name] || /\.vue$/.test(file)) {
+          templateVars.layouts[name] = this.relativeToBuild(this.options.srcDir, file)
+        }
       })
       if (!templateVars.components.ErrorPage && hasErrorLayout) {
         templateVars.components.ErrorPage = this.relativeToBuild(this.options.srcDir, 'layouts/error.vue')
@@ -262,8 +281,14 @@ export default class Builder {
     // If user defined a custom method to create routes
     if (this._nuxtPages) {
       // Use nuxt.js createRoutes bases on pages/
-      const files = await glob('pages/**/*.vue', { cwd: this.options.srcDir })
-      templateVars.router.routes = createRoutes(files, this.options.srcDir)
+      const files = {};
+      (await glob('pages/**/*.{vue,js}', { cwd: this.options.srcDir })).forEach(f => {
+        const key = f.replace(/\.(js|vue)$/, '')
+        if (/\.vue$/.test(f) || !files[key]) {
+          files[key] = f
+        }
+      })
+      templateVars.router.routes = createRoutes(Object.values(files), this.options.srcDir)
     } else {
       templateVars.router.routes = this.options.build.createRoutes(this.options.srcDir)
     }
@@ -299,7 +324,7 @@ export default class Builder {
       }
       // Allow override templates using a file with same name in ${srcDir}/app
       const customPath = r(this.options.srcDir, 'app', file)
-      const customFileExists = fs.existsSync(customPath)
+      const customFileExists = existsSync(customPath)
 
       return {
         src: customFileExists
@@ -436,7 +461,7 @@ export default class Builder {
       compiler.plugin('done', async (stats) => {
         await this.nuxt.callHook('build:compiled', { name, compiler, stats })
         // Reload renderer if available
-        this.nuxt.renderer.loadResources(sharedFS || fs)
+        this.nuxt.renderer.loadResources(sharedFS || require('fs'))
         // Resolve on next tick
         process.nextTick(resolve)
       })
@@ -460,8 +485,11 @@ export default class Builder {
             /* istanbul ignore if */
             if (err) return reject(err)
             // not keep modified or deleted items in Vue.prototype
-            delete require.cache[require.resolve('vue')]
-            delete require.cache[require.resolve('vue-router')]
+            Object.keys(require.cache).forEach(key => {
+              if (!/(node_modules\/postcss)|(\.node$)/.test(key)) {
+                rmCache(key)
+              }
+            })
           })
         )
         return
@@ -489,17 +517,16 @@ export default class Builder {
     debug('Adding webpack middleware...')
 
     // Create webpack dev middleware
-    this.webpackDevMiddleware = pify(webpackDevMiddleware(compiler, Object.assign({
+    this.webpackDevMiddleware = promisify(webpackDevMiddleware(compiler, Object.assign({
       publicPath: this.options.build.publicPath,
       stats: this.webpackStats,
-      noInfo: true,
-      quiet: true,
+      logLevel: 'silent',
       watchOptions: this.options.watchers.webpack
     }, this.options.build.devMiddleware)))
 
-    this.webpackDevMiddleware.close = pify(this.webpackDevMiddleware.close)
+    this.webpackDevMiddleware.close = promisify(this.webpackDevMiddleware.close)
 
-    this.webpackHotMiddleware = pify(webpackHotMiddleware(compiler, Object.assign({
+    this.webpackHotMiddleware = promisify(webpackHotMiddleware(compiler, Object.assign({
       log: false,
       heartbeat: 10000
     }, this.options.build.hotMiddleware)))
@@ -520,14 +547,14 @@ export default class Builder {
       r(src, 'layouts'),
       r(src, 'store'),
       r(src, 'middleware'),
-      r(src, 'layouts/*.vue'),
-      r(src, 'layouts/**/*.vue')
+      r(src, 'layouts/*.{vue,js}'),
+      r(src, 'layouts/**/*.{vue,js}')
     ]
     if (this._nuxtPages) {
       patterns.push(
         r(src, 'pages'),
-        r(src, 'pages/*.vue'),
-        r(src, 'pages/**/*.vue')
+        r(src, 'pages/*.{vue,js}'),
+        r(src, 'pages/**/*.{vue,js}')
       )
     }
     const options = Object.assign({}, this.options.watchers.chokidar, {
@@ -560,6 +587,12 @@ export default class Builder {
     // Stop webpack middleware
     await this.webpackDevMiddleware.close()
   }
+
+  async generateConfig() {
+    const config = resolve(this.options.buildDir, 'build.config.js')
+    const options = _.omit(this.options, Options.unsafeKeys)
+    await writeFile(config, `module.exports = ${JSON.stringify(options, null, '  ')}`, 'utf8')
+  }
 }
 
 const STATUS = {
diff --git a/lib/builder/generator.js b/lib/builder/generator.js
index 5b743ecdf9..63b6268e80 100644
--- a/lib/builder/generator.js
+++ b/lib/builder/generator.js
@@ -1,10 +1,10 @@
-import { copy, remove, writeFile, mkdirp, removeSync, existsSync } from 'fs-extra'
-import _ from 'lodash'
-import { resolve, join, dirname, sep } from 'path'
-import { minify } from 'html-minifier'
-import { isUrl, promisifyRoute, waitFor, flatRoutes } from 'utils'
+const { copy, remove, writeFile, mkdirp, removeSync, existsSync } = require('fs-extra')
+const _ = require('lodash')
+const { resolve, join, dirname, sep } = require('path')
+const { minify } = require('html-minifier')
+const { isUrl, promisifyRoute, waitFor, flatRoutes } = require('../common/utils')
 
-export default class Generator {
+module.exports = class Generator {
   constructor(nuxt, builder) {
     this.nuxt = nuxt
     this.options = nuxt.options
diff --git a/lib/builder/index.js b/lib/builder/index.js
index 7e52dab70a..fc3309238b 100755
--- a/lib/builder/index.js
+++ b/lib/builder/index.js
@@ -1,7 +1,7 @@
-import Builder from './builder'
-import Generator from './generator'
+const Builder = require('./builder')
+const Generator = require('./generator')
 
-export {
+module.exports = {
   Builder,
   Generator
 }
diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index 5188e92063..fcf07fea54 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -1,9 +1,10 @@
-import ExtractTextPlugin from 'extract-text-webpack-plugin'
-import { cloneDeep } from 'lodash'
-import { join, resolve } from 'path'
-import webpack from 'webpack'
-import { isUrl, urlJoin } from 'utils'
-import TimeFixPlugin from './timefix-plugin'
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const { cloneDeep } = require('lodash')
+const { join, resolve } = require('path')
+const webpack = require('webpack')
+const { isUrl, urlJoin } = require('../../common/utils')
+const TimeFixPlugin = require('./plugins/timefix')
+const WarnFixPlugin = require('./plugins/warnfix')
 
 /*
 |--------------------------------------------------------------------------
@@ -13,19 +14,17 @@ import TimeFixPlugin from './timefix-plugin'
 | webpack config files
 |--------------------------------------------------------------------------
 */
-export default function webpackBaseConfig(name) {
-  const nodeModulesDir = join(__dirname, '..', 'node_modules')
-
+module.exports = function webpackBaseConfig({ name, isServer }) {
   const config = {
     name,
-    devtool: this.options.dev ? 'cheap-module-source-map' : 'nosources-source-map',
+    devtool: this.options.dev ? 'cheap-module-eval-source-map' : false,
     entry: {
       app: null
     },
     output: {
       path: resolve(this.options.buildDir, 'dist'),
-      filename: this.options.build.filenames.app,
-      chunkFilename: this.options.build.filenames.chunk,
+      filename: this.getFileName('app'),
+      chunkFilename: this.getFileName('chunk'),
       publicPath: (isUrl(this.options.build.publicPath)
         ? this.options.build.publicPath
         : urlJoin(this.options.router.base, this.options.build.publicPath))
@@ -47,16 +46,10 @@ export default function webpackBaseConfig(name) {
         'assets': join(this.options.srcDir, 'assets'),
         'static': join(this.options.srcDir, 'static')
       },
-      modules: [
-        ...this.options.modulesDir,
-        nodeModulesDir
-      ]
+      modules: this.options.modulesDir
     },
     resolveLoader: {
-      modules: [
-        ...this.options.modulesDir,
-        nodeModulesDir
-      ]
+      modules: this.options.modulesDir
     },
     module: {
       noParse: /es6-promise\.js$/, // Avoid webpack shimming process
@@ -64,13 +57,13 @@ export default function webpackBaseConfig(name) {
         {
           test: /\.vue$/,
           loader: 'vue-loader',
-          options: this.vueLoader()
+          options: this.vueLoader({ isServer })
         },
         {
           test: /\.js$/,
           loader: 'babel-loader',
           exclude: /node_modules/,
-          options: Object.assign({}, this.babelOptions)
+          options: this.getBabelOptions({ isServer })
         },
         { test: /\.css$/, use: this.styleLoader('css') },
         { test: /\.less$/, use: this.styleLoader('less', 'less-loader') },
@@ -106,32 +99,23 @@ export default function webpackBaseConfig(name) {
   }
 
   // Add timefix-plugin before others plugins
-  config.plugins.unshift(new TimeFixPlugin())
+  if (this.options.dev) {
+    config.plugins.unshift(new TimeFixPlugin())
+  }
+
+  // Hide warnings about plugins without a default export (#1179)
+  config.plugins.push(new WarnFixPlugin())
 
   // CSS extraction
   const extractCSS = this.options.build.extractCSS
   if (extractCSS) {
     const extractOptions = Object.assign(
-      { filename: this.options.build.filenames.css },
+      { filename: this.getFileName('css') },
       typeof extractCSS === 'object' ? extractCSS : {}
     )
     config.plugins.push(new ExtractTextPlugin(extractOptions))
   }
 
-  // Workaround for hiding Warnings about plugins without a default export (#1179)
-  config.plugins.push({
-    apply(compiler) {
-      compiler.plugin('done', stats => {
-        stats.compilation.warnings = stats.compilation.warnings.filter(warn => {
-          if (warn.name === 'ModuleDependencyWarning' && warn.message.includes(`export 'default'`) && warn.message.includes('plugin')) {
-            return false
-          }
-          return true
-        })
-      })
-    }
-  })
-
   // --------------------------------------
   // Dev specific config
   // --------------------------------------
diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
index f11c81a9c4..6d975b73c4 100644
--- a/lib/builder/webpack/client.config.js
+++ b/lib/builder/webpack/client.config.js
@@ -1,15 +1,17 @@
-import { each } from 'lodash'
-import webpack from 'webpack'
-import VueSSRClientPlugin from 'vue-server-renderer/client-plugin'
-import HTMLPlugin from 'html-webpack-plugin'
-import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'
-import UglifyJSPlugin from 'uglifyjs-webpack-plugin'
-import ProgressBarPlugin from 'progress-bar-webpack-plugin'
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
-import { resolve } from 'path'
-import { existsSync } from 'fs'
-import Debug from 'debug'
-import base from './base.config.js'
+const { each } = require('lodash')
+const webpack = require('webpack')
+const VueSSRClientPlugin = require('vue-server-renderer/client-plugin')
+const HTMLPlugin = require('html-webpack-plugin')
+const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin')
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
+const ProgressBarPlugin = require('progress-bar-webpack-plugin')
+const ProgressPlugin = require('webpack/lib/ProgressPlugin')
+const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
+const { resolve } = require('path')
+const { existsSync } = require('fs')
+const Debug = require('debug')
+const Chalk = require('chalk')
+const base = require('./base.config.js')
 
 const debug = Debug('nuxt:build')
 debug.color = 2 // Force green color
@@ -24,8 +26,8 @@ debug.color = 2 // Force green color
 | In production, will generate public/dist/style.css
 |--------------------------------------------------------------------------
 */
-export default function webpackClientConfig() {
-  let config = base.call(this, 'client')
+module.exports = function webpackClientConfig() {
+  let config = base.call(this, { name: 'client', isServer: false })
 
   // Entry points
   config.entry.app = resolve(this.options.buildDir, 'client.js')
@@ -73,7 +75,7 @@ export default function webpackClientConfig() {
     new webpack.optimize.CommonsChunkPlugin({
       name: 'manifest',
       minChunks: Infinity,
-      filename: this.options.build.filenames.manifest
+      filename: this.getFileName('manifest')
     })
   )
 
@@ -91,17 +93,29 @@ export default function webpackClientConfig() {
   )
 
   // Build progress bar
-  config.plugins.push(
-    new ProgressBarPlugin()
-  )
+  if (this.options.build.profile) {
+    config.plugins.push(new ProgressPlugin({
+      profile: true
+    }))
+  } else {
+    config.plugins.push(new ProgressBarPlugin({
+      complete: Chalk.green('█'),
+      incomplete: Chalk.white('█'),
+      format: '  :bar ' + Chalk.green.bold(':percent') + ' :msg',
+      clear: false
+    }))
+  }
+
+  const shouldClearConsole = this.options.build.stats !== false &&
+                             this.options.build.stats !== 'errors-only'
+
+  // Add friendly error plugin
+  config.plugins.push(new FriendlyErrorsWebpackPlugin({ clearConsole: shouldClearConsole }))
 
   // --------------------------------------
   // Dev specific config
   // --------------------------------------
   if (this.options.dev) {
-    // Add friendly error plugin
-    config.plugins.push(new FriendlyErrorsWebpackPlugin())
-
     // https://webpack.js.org/plugins/named-modules-plugin
     config.plugins.push(new webpack.NamedModulesPlugin())
 
@@ -139,7 +153,7 @@ export default function webpackClientConfig() {
     if (this.options.build.uglify !== false) {
       config.plugins.push(
         new UglifyJSPlugin(Object.assign({
-          cache: true,
+          // cache: true,
           sourceMap: true,
           parallel: true,
           extractComments: {
@@ -184,36 +198,18 @@ export default function webpackClientConfig() {
 // Adds Common Chunks Plugin
 // --------------------------------------------------------------------------
 function commonChunksPlugin(config) {
-  const _this = this
-  const totalPages = _this.routes ? _this.routes.length : 0
-
-  // This well-known vendor may exist as a dependency of other requests.
-  const maybeVendor = [
-    '/core-js/',
-    '/regenerator-runtime/',
-    '/es6-promise/',
-    '/babel-runtime/',
-    '/lodash/'
-  ]
-
   // Create explicit vendor chunk
   config.plugins.unshift(
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
-      filename: this.options.build.filenames.vendor,
+      filename: this.getFileName('vendor'),
       minChunks(module, count) {
-        // Detect and externalize well-known vendor if detected
-        if (module.context && maybeVendor.some(v => module.context.includes(v))) {
-          return true
-        }
         // A module is extracted into the vendor chunk when...
         return (
           // If it's inside node_modules
           /node_modules/.test(module.context) &&
-          // Do not externalize if the request is a CSS file
-          !/\.(css|less|scss|sass|styl|stylus)$/.test(module.request) &&
-          // Used in at-least 1/2 of the total pages
-          (totalPages <= 2 ? count >= totalPages : count >= totalPages * 0.5)
+          // Do not externalize if the request is a CSS file or a Vue file which can potentially emit CSS assets!
+          !/\.(css|less|scss|sass|styl|stylus|vue)$/.test(module.request)
         )
       }
     })
diff --git a/lib/builder/webpack/dll.config.js b/lib/builder/webpack/dll.config.js
index 725015c7df..5ad19116b3 100644
--- a/lib/builder/webpack/dll.config.js
+++ b/lib/builder/webpack/dll.config.js
@@ -1,6 +1,6 @@
-import webpack from 'webpack'
-import { resolve } from 'path'
-import ClientConfig from './client.config'
+const webpack = require('webpack')
+const { resolve } = require('path')
+const ClientConfig = require('./client.config')
 
 /*
 |--------------------------------------------------------------------------
@@ -8,7 +8,7 @@ import ClientConfig from './client.config'
 | https://github.com/webpack/webpack/tree/master/examples/dll
 |--------------------------------------------------------------------------
 */
-export default function webpackDllConfig(_refConfig) {
+module.exports = function webpackDllConfig(_refConfig) {
   const refConfig = _refConfig || new ClientConfig()
 
   const name = refConfig.name + '-dll'
diff --git a/lib/builder/webpack/timefix-plugin.js b/lib/builder/webpack/plugins/timefix.js
similarity index 92%
rename from lib/builder/webpack/timefix-plugin.js
rename to lib/builder/webpack/plugins/timefix.js
index 9c16918735..ddf6445648 100644
--- a/lib/builder/webpack/timefix-plugin.js
+++ b/lib/builder/webpack/plugins/timefix.js
@@ -1,6 +1,6 @@
 // Taken from https://github.com/egoist/poi/blob/3e93c88c520db2d20c25647415e6ae0d3de61145/packages/poi/lib/webpack/timefix-plugin.js#L1-L16
 // Thanks to @egoist
-export default class TimeFixPlugin {
+module.exports = class TimeFixPlugin {
   constructor(timefix = 11000) {
     this.timefix = timefix
   }
diff --git a/lib/builder/webpack/plugins/warnfix.js b/lib/builder/webpack/plugins/warnfix.js
new file mode 100644
index 0000000000..3f28913af6
--- /dev/null
+++ b/lib/builder/webpack/plugins/warnfix.js
@@ -0,0 +1,14 @@
+module.exports = class WarnFixPlugin {
+  apply(compiler) /* istanbul ignore next */ {
+    compiler.plugin('done', stats => {
+      stats.compilation.warnings = stats.compilation.warnings.filter(warn => {
+        if (warn.name === 'ModuleDependencyWarning' &&
+          warn.message.includes(`export 'default'`) &&
+          warn.message.includes('nuxt_plugin_')) {
+          return false
+        }
+        return true
+      })
+    })
+  }
+}
diff --git a/lib/builder/webpack/server.config.js b/lib/builder/webpack/server.config.js
index 451e70c304..e6a1ecf869 100644
--- a/lib/builder/webpack/server.config.js
+++ b/lib/builder/webpack/server.config.js
@@ -1,18 +1,18 @@
-import webpack from 'webpack'
-import VueSSRServerPlugin from 'vue-server-renderer/server-plugin'
-import nodeExternals from 'webpack-node-externals'
-import { each } from 'lodash'
-import { resolve } from 'path'
-import { existsSync } from 'fs'
-import base from './base.config.js'
+const webpack = require('webpack')
+const VueSSRServerPlugin = require('vue-server-renderer/server-plugin')
+const nodeExternals = require('webpack-node-externals')
+const { each } = require('lodash')
+const { resolve } = require('path')
+const { existsSync } = require('fs')
+const base = require('./base.config.js')
 
 /*
 |--------------------------------------------------------------------------
 | Webpack Server Config
 |--------------------------------------------------------------------------
 */
-export default function webpackServerConfig() {
-  let config = base.call(this, 'server')
+module.exports = function webpackServerConfig() {
+  let config = base.call(this, { name: 'server', isServer: true })
 
   // env object defined in nuxt.config.js
   let env = {}
diff --git a/lib/builder/webpack/style-loader.js b/lib/builder/webpack/style-loader.js
index 90f29d57be..4c3c689373 100755
--- a/lib/builder/webpack/style-loader.js
+++ b/lib/builder/webpack/style-loader.js
@@ -1,7 +1,7 @@
-import ExtractTextPlugin from 'extract-text-webpack-plugin'
-import { join } from 'path'
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const { join } = require('path')
 
-export default function styleLoader(ext, loaders = [], isVueLoader = false) {
+module.exports = function styleLoader(ext, loaders = [], isVueLoader = false) {
   // Normalize loaders
   loaders = (Array.isArray(loaders) ? loaders : [loaders]).map(loader => {
     if (typeof loader === 'string') {
@@ -45,8 +45,8 @@ export default function styleLoader(ext, loaders = [], isVueLoader = false) {
     }
   }
 
-  if (this.options.build.extractCSS && !this.options.dev) {
-    return ExtractTextPlugin.extract({
+  if (this.options.build.extractCSS) {
+    const extraction = ExtractTextPlugin.extract({
       fallback: vueStyleLoader,
       use: [
         cssLoader,
@@ -54,6 +54,7 @@ export default function styleLoader(ext, loaders = [], isVueLoader = false) {
         ...loaders
       ].filter(l => l)
     })
+    return this.options.dev ? ['css-hot-loader'].concat(extraction) : extraction
   }
 
   // https://github.com/yenshih/style-resources-loader
diff --git a/lib/builder/webpack/vue-loader.config.js b/lib/builder/webpack/vue-loader.config.js
index c5b608b6cf..af162b1869 100644
--- a/lib/builder/webpack/vue-loader.config.js
+++ b/lib/builder/webpack/vue-loader.config.js
@@ -1,4 +1,4 @@
-export default function vueLoader() {
+module.exports = function vueLoader({ isServer }) {
   // https://vue-loader.vuejs.org/en
   const config = {
     postcss: this.options.build.postcss,
@@ -8,7 +8,7 @@ export default function vueLoader() {
     loaders: {
       'js': {
         loader: 'babel-loader',
-        options: Object.assign({}, this.babelOptions)
+        options: this.getBabelOptions({ isServer })
       },
       // Note: do not nest the `postcss` option under `loaders`
       'css': this.styleLoader('css', [], true),
diff --git a/lib/common/cli/errors.js b/lib/common/cli/errors.js
index 6a95d886d5..8ec2230db6 100644
--- a/lib/common/cli/errors.js
+++ b/lib/common/cli/errors.js
@@ -8,10 +8,9 @@ pe.skipPackage('regenerator-runtime')
 pe.skipPackage('babel-runtime')
 pe.skipPackage('core-js')
 
-// Skip dist artifacts and Node internals
-const skipFiles = [ 'nuxt.js', 'core.js' ]
+// Skip node internals
 pe.skip((traceLine, lineNumber) => {
-  if (!traceLine.file || skipFiles.indexOf(traceLine.file) !== -1) {
+  if (!traceLine.file) {
     return true
   }
 })
diff --git a/lib/common/index.js b/lib/common/index.js
index 26a5ba474a..3a241c30d1 100755
--- a/lib/common/index.js
+++ b/lib/common/index.js
@@ -1,12 +1,7 @@
-import * as Utils from './utils'
-import Options from './options'
+const Utils = require('./utils')
+const Options = require('./options')
 
-export default {
-  Utils,
-  Options
-}
-
-export {
+module.exports = {
   Utils,
   Options
 }
diff --git a/lib/common/options.js b/lib/common/options.js
index 34e7b3e34a..3194c84b5c 100755
--- a/lib/common/options.js
+++ b/lib/common/options.js
@@ -1,15 +1,15 @@
-import _ from 'lodash'
-import Debug from 'debug'
-import { join, resolve } from 'path'
-import { existsSync } from 'fs'
-import { isUrl, isPureObject } from 'utils'
+const _ = require('lodash')
+const Debug = require('debug')
+const { join, resolve } = require('path')
+const { existsSync } = require('fs')
+const { isUrl, isPureObject } = require('../common/utils')
 
 const debug = Debug('nuxt:build')
 debug.color = 2 // Force green color
 
 const Options = {}
 
-export default Options
+module.exports = Options
 
 Options.from = function (_options) {
   // Clone options to prevent unwanted side-effects
@@ -32,25 +32,30 @@ Options.from = function (_options) {
     options.layoutTransition = { name: options.layoutTransition }
   }
 
+  const hasValue = v => typeof v === 'string' && v
+  options.rootDir = hasValue(options.rootDir) ? options.rootDir : process.cwd()
+
+  // Apply defaults by ${buildDir}/dist/build.config.js
+  // TODO: Unsafe operation.
+  // const buildDir = options.buildDir || Options.defaults.buildDir
+  // const buildConfig = resolve(options.rootDir, buildDir, 'build.config.js')
+  // if (existsSync(buildConfig)) {
+  //   _.defaultsDeep(options, require(buildConfig))
+  // }
+
   // Apply defaults
   _.defaultsDeep(options, Options.defaults)
 
   // Resolve dirs
-  const hasValue = v => typeof v === 'string' && v
-  options.rootDir = hasValue(options.rootDir) ? options.rootDir : process.cwd()
   options.srcDir = hasValue(options.srcDir) ? resolve(options.rootDir, options.srcDir) : options.rootDir
   options.buildDir = resolve(options.rootDir, options.buildDir)
   options.cacheDir = resolve(options.rootDir, options.cacheDir)
 
-  // Normalize modulesDir
-  /* istanbul ignore if */
-  if (!options.modulesDir) {
-    options.modulesDir = ['node_modules']
-  }
-  if (!Array.isArray(options.modulesDir)) {
-    options.modulesDir = [options.modulesDir]
-  }
-  options.modulesDir = options.modulesDir.filter(dir => hasValue(dir)).map(dir => resolve(options.rootDir, dir))
+  // Populate modulesDir
+  options.modulesDir = []
+    .concat(options.modulesDir, join(options.nuxtDir, 'node_modules'))
+    .filter(dir => hasValue(dir))
+    .map(dir => resolve(options.rootDir, dir))
 
   // If app.html is defined, set the template path to the user template
   options.appTemplatePath = resolve(options.buildDir, 'views/app.template.html')
@@ -127,6 +132,7 @@ Options.from = function (_options) {
       }
       if (isPureObject(options.build.postcss)) {
         options.build.postcss = Object.assign({
+          useConfigFile: false,
           sourceMap: options.build.cssSourceMap,
           plugins: {
             // https://github.com/postcss/postcss-import
@@ -185,16 +191,23 @@ Options.modes = {
   }
 }
 
+Options.unsafeKeys = [
+  'rootDir', 'srcDir', 'buildDir', 'modulesDir', 'cacheDir', 'nuxtDir',
+  'nuxtAppDir', 'build', 'generate', 'router.routes', 'appTemplatePath'
+]
+
 Options.defaults = {
   mode: 'universal',
   dev: process.env.NODE_ENV !== 'production',
   debug: undefined, // Will be equal to dev if not provided
   buildDir: '.nuxt',
   cacheDir: '.cache',
-  nuxtDir: resolve(__dirname, '..'), // Relative to dist
-  nuxtAppDir: resolve(__dirname, '../lib/app/'), // Relative to dist
+  nuxtDir: resolve(__dirname, '../..'),
+  nuxtAppDir: resolve(__dirname, '../app'),
+  modulesDir: ['node_modules'], // ~> relative to options.rootDir
   build: {
     analyze: false,
+    profile: process.argv.includes('--profile'),
     dll: false,
     scopeHoisting: false,
     extractCSS: false,
@@ -216,7 +229,18 @@ Options.defaults = {
     templates: [],
     watch: [],
     devMiddleware: {},
-    hotMiddleware: {}
+    hotMiddleware: {},
+    stats: {
+      chunks: false,
+      children: false,
+      modules: false,
+      colors: true,
+      excludeAssets: [
+        /.map$/,
+        /index\..+\.html$/,
+        /vue-ssr-client-manifest.json/
+      ]
+    }
   },
   generate: {
     dir: 'dist',
diff --git a/lib/common/utils.js b/lib/common/utils.js
index 7e534cf62a..11b434b1d0 100644
--- a/lib/common/utils.js
+++ b/lib/common/utils.js
@@ -1,15 +1,15 @@
-import { resolve, relative, sep } from 'path'
-import _ from 'lodash'
+const { resolve, relative, sep } = require('path')
+const _ = require('lodash')
 
-export function encodeHtml(str) {
+exports.encodeHtml = function encodeHtml(str) {
   return str.replace(/</g, '&lt;').replace(/>/g, '&gt;')
 }
 
-export function getContext(req, res) {
+exports.getContext = function getContext(req, res) {
   return { req, res }
 }
 
-export function setAnsiColors(ansiHTML) {
+exports.setAnsiColors = function setAnsiColors(ansiHTML) {
   ansiHTML.setColors({
     reset: ['efefef', 'a6004c'],
     darkgrey: '5a012b',
@@ -22,19 +22,19 @@ export function setAnsiColors(ansiHTML) {
   })
 }
 
-export async function waitFor(ms) {
+exports.waitFor = async function waitFor(ms) {
   return new Promise(resolve => setTimeout(resolve, (ms || 0)))
 }
 
-export function urlJoin() {
+exports.urlJoin = function urlJoin() {
   return [].slice.call(arguments).join('/').replace(/\/+/g, '/').replace(':/', '://')
 }
 
-export function isUrl(url) {
+exports.isUrl = function isUrl(url) {
   return (url.indexOf('http') === 0 || url.indexOf('//') === 0)
 }
 
-export function promisifyRoute(fn, ...args) {
+exports.promisifyRoute = function promisifyRoute(fn, ...args) {
   // If routes is an array
   if (Array.isArray(fn)) {
     return Promise.resolve(fn)
@@ -57,15 +57,15 @@ export function promisifyRoute(fn, ...args) {
   return promise
 }
 
-export function sequence(tasks, fn) {
+exports.sequence = function sequence(tasks, fn) {
   return tasks.reduce((promise, task) => promise.then(() => fn(task)), Promise.resolve())
 }
 
-export function parallel(tasks, fn) {
+exports.parallel = function parallel(tasks, fn) {
   return Promise.all(tasks.map(task => fn(task)))
 }
 
-export function chainFn(base, fn) {
+exports.chainFn = function chainFn(base, fn) {
   /* istanbul ignore if */
   if (!(fn instanceof Function)) {
     return
@@ -88,13 +88,13 @@ export function chainFn(base, fn) {
   }
 }
 
-export function isPureObject(o) {
+exports.isPureObject = function isPureObject(o) {
   return !Array.isArray(o) && typeof o === 'object'
 }
 
-export const isWindows = /^win/.test(process.platform)
+const isWindows = exports.isWindows = /^win/.test(process.platform)
 
-export function wp(p = '') {
+const wp = exports.wp = function wp(p = '') {
   /* istanbul ignore if */
   if (isWindows) {
     return p.replace(/\\/g, '\\\\')
@@ -102,7 +102,7 @@ export function wp(p = '') {
   return p
 }
 
-export function wChunk(p = '') {
+exports.wChunk = function wChunk(p = '') {
   /* istanbul ignore if */
   if (isWindows) {
     return p.replace(/\//g, '_')
@@ -114,18 +114,18 @@ const reqSep = /\//g
 const sysSep = _.escapeRegExp(sep)
 const normalize = string => string.replace(reqSep, sysSep)
 
-export function r() {
+const r = exports.r = function r() {
   let args = Array.prototype.slice.apply(arguments)
   let lastArg = _.last(args)
 
-  if (lastArg.includes('@') || lastArg.includes('~')) {
+  if (lastArg.indexOf('@') === 0 || lastArg.indexOf('~') === 0) {
     return wp(lastArg)
   }
 
   return wp(resolve(...args.map(normalize)))
 }
 
-export function relativeTo() {
+exports.relativeTo = function relativeTo() {
   let args = Array.prototype.slice.apply(arguments)
   let dir = args.shift()
 
@@ -133,7 +133,7 @@ export function relativeTo() {
   let path = r(...args)
 
   // Check if path is an alias
-  if (path.includes('@') || path.includes('~')) {
+  if (path.indexOf('@') === 0 || path.indexOf('~') === 0) {
     return path
   }
 
@@ -145,13 +145,17 @@ export function relativeTo() {
   return wp(rp)
 }
 
-export function flatRoutes(router, path = '', routes = []) {
+exports.flatRoutes = function flatRoutes(router, path = '', routes = []) {
   router.forEach((r) => {
     if (!r.path.includes(':') && !r.path.includes('*')) {
       /* istanbul ignore if */
       if (r.children) {
+        if (path === '' && r.path === '/') {
+          routes.push('/')
+        }
         flatRoutes(r.children, path + r.path + '/', routes)
       } else {
+        path = path.replace(/^\/+$/, '/')
         routes.push((r.path === '' && path[path.length - 1] === '/' ? path.slice(0, -1) : path) + r.path)
       }
     }
@@ -159,7 +163,7 @@ export function flatRoutes(router, path = '', routes = []) {
   return routes
 }
 
-export function cleanChildrenRoutes(routes, isChild = false) {
+function cleanChildrenRoutes(routes, isChild = false) {
   let start = -1
   let routesIndex = []
   routes.forEach((route) => {
@@ -205,16 +209,16 @@ export function cleanChildrenRoutes(routes, isChild = false) {
   return routes
 }
 
-export function createRoutes(files, srcDir) {
+exports.createRoutes = function createRoutes(files, srcDir) {
   let routes = []
   files.forEach((file) => {
-    let keys = file.replace(/^pages/, '').replace(/\.vue$/, '').replace(/\/{2,}/g, '/').split('/').slice(1)
+    let keys = file.replace(/^pages/, '').replace(/\.(vue|js)$/, '').replace(/\/{2,}/g, '/').split('/').slice(1)
     let route = { name: '', path: '', component: r(srcDir, file) }
     let parent = routes
     keys.forEach((key, i) => {
       route.name = route.name ? route.name + '-' + key.replace('_', '') : key.replace('_', '')
       route.name += (key === '_') ? 'all' : ''
-      route.chunkName = file.replace(/\.vue$/, '')
+      route.chunkName = file.replace(/\.(vue|js)$/, '')
       let child = _.find(parent, { name: route.name })
       if (child) {
         child.children = child.children || []
@@ -264,3 +268,16 @@ export function createRoutes(files, srcDir) {
   })
   return cleanChildrenRoutes(routes)
 }
+
+exports.rmCache = function rmCache(path) {
+  const mod = require.cache[path]
+  delete require.cache[path]
+  if (mod.parent && mod.parent.children) {
+    for (let i = 0; i < mod.parent.children.length; i++) {
+      if (mod.parent.children[i] === mod) {
+        mod.parent.children.splice(i, 1)
+        break
+      }
+    }
+  }
+}
diff --git a/lib/core/index.js b/lib/core/index.js
index 3eee8a295c..b4e0d1399a 100755
--- a/lib/core/index.js
+++ b/lib/core/index.js
@@ -1,9 +1,9 @@
-import { Options, Utils } from 'common'
-import Module from './module'
-import Nuxt from './nuxt'
-import Renderer from './renderer'
+const { Options, Utils } = require('../common')
+const Module = require('./module')
+const Nuxt = require('./nuxt')
+const Renderer = require('./renderer')
 
-export {
+module.exports = {
   Nuxt,
   Module,
   Renderer,
diff --git a/lib/core/meta.js b/lib/core/meta.js
index 1edd0c3d7f..0df24a9de4 100644
--- a/lib/core/meta.js
+++ b/lib/core/meta.js
@@ -1,10 +1,10 @@
 
-import Vue from 'vue'
-import VueMeta from 'vue-meta'
-import VueServerRenderer from 'vue-server-renderer'
-import LRU from 'lru-cache'
+const Vue = require('vue')
+const VueMeta = require('vue-meta')
+const VueServerRenderer = require('vue-server-renderer')
+const LRU = require('lru-cache')
 
-export default class MetaRenderer {
+module.exports = class MetaRenderer {
   constructor(nuxt, renderer) {
     this.nuxt = nuxt
     this.renderer = renderer
diff --git a/lib/core/module.js b/lib/core/module.js
index 0ad7182279..2ce68de4e8 100755
--- a/lib/core/module.js
+++ b/lib/core/module.js
@@ -1,13 +1,13 @@
-import path from 'path'
-import fs from 'fs'
-import { uniq } from 'lodash'
-import hash from 'hash-sum'
-import { chainFn, sequence } from 'utils'
-import Debug from 'debug'
+const path = require('path')
+const fs = require('fs')
+const { uniq } = require('lodash')
+const hash = require('hash-sum')
+const { chainFn, sequence } = require('../common/utils')
+const Debug = require('debug')
 
 const debug = Debug('nuxt:module')
 
-export default class ModuleContainer {
+module.exports = class ModuleContainer {
   constructor(nuxt) {
     this.nuxt = nuxt
     this.options = nuxt.options
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index f9a8f00f29..8a4dccc511 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -1,33 +1,25 @@
-import chalk from 'chalk'
-import { Options } from 'common'
-import { sequence } from 'utils'
-import ModuleContainer from './module'
-import Renderer from './renderer'
-import Debug from 'debug'
-import enableDestroy from 'server-destroy'
-import Module from 'module'
-import { isPlainObject } from 'lodash'
-import { join, resolve } from 'path'
+const Debug = require('debug')
+const enableDestroy = require('server-destroy')
+const Module = require('module')
+const { isPlainObject } = require('lodash')
+const chalk = require('chalk')
+const { Options } = require('../common')
+const { sequence } = require('../common/utils')
+const { join, resolve } = require('path')
+const { version } = require('../../package.json')
+const ModuleContainer = require('./module')
+const Renderer = require('./renderer')
 
 const debug = Debug('nuxt:')
 debug.color = 5
 
-export default class Nuxt {
+module.exports = class Nuxt {
   constructor(options = {}) {
     this.options = Options.from(options)
 
-    // Paths for resolving requires from `rootDir`
-    this.nodeModulePaths = Module._nodeModulePaths(this.options.rootDir)
-
-    if (this.options.nuxtDir.indexOf(this.options.rootDir) !== 0) {
-      this.nodeModulePaths = [
-        ...this.nodeModulePaths,
-        ...Module._nodeModulePaths(this.options.nuxtDir)
-      ]
-    }
-
     this.initialized = false
     this.errorHandler = this.errorHandler.bind(this)
+
     // Hooks
     this._hooks = {}
     this.hook = this.hook.bind(this)
@@ -45,7 +37,7 @@ export default class Nuxt {
   }
 
   static get version() {
-    return '__VERSION__'
+    return version
   }
 
   async ready() {
@@ -177,7 +169,7 @@ export default class Nuxt {
   resolvePath(path) {
     // Try to resolve using NPM resolve path first
     try {
-      let resolvedPath = Module._resolveFilename(path, { paths: this.nodeModulePaths })
+      let resolvedPath = Module._resolveFilename(path, { paths: this.options.modulesDir })
       return resolvedPath
     } catch (e) {
       // Just continue
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 4e70a4af5b..16187ff93e 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -1,20 +1,20 @@
-import ansiHTML from 'ansi-html'
-import serialize from 'serialize-javascript'
-import generateETag from 'etag'
-import fresh from 'fresh'
-import serveStatic from 'serve-static'
-import compression from 'compression'
-import _ from 'lodash'
-import { join, resolve } from 'path'
-import fs from 'fs-extra'
-import { createBundleRenderer } from 'vue-server-renderer'
-import { getContext, setAnsiColors, isUrl, waitFor } from 'utils'
-import Debug from 'debug'
-import Youch from '@nuxtjs/youch'
-import { SourceMapConsumer } from 'source-map'
-import connect from 'connect'
-import { Options } from 'common'
-import MetaRenderer from './meta'
+const ansiHTML = require('ansi-html')
+const serialize = require('serialize-javascript')
+const generateETag = require('etag')
+const fresh = require('fresh')
+const serveStatic = require('serve-static')
+const compression = require('compression')
+const _ = require('lodash')
+const { join, resolve } = require('path')
+const fs = require('fs-extra')
+const { createBundleRenderer } = require('vue-server-renderer')
+const { getContext, setAnsiColors, isUrl, waitFor } = require('../common/utils')
+const Debug = require('debug')
+const Youch = require('@nuxtjs/youch')
+const { SourceMapConsumer } = require('source-map')
+const connect = require('connect')
+const { Options } = require('../common')
+const MetaRenderer = require('./meta')
 
 const debug = Debug('nuxt:render')
 debug.color = 4 // Force blue color
@@ -23,7 +23,7 @@ setAnsiColors(ansiHTML)
 
 let jsdom = null
 
-export default class Renderer {
+module.exports = class Renderer {
   constructor(nuxt) {
     this.nuxt = nuxt
     this.options = nuxt.options
@@ -126,6 +126,7 @@ export default class Renderer {
 
   get isResourcesAvailable() {
     // Required for both
+    /* istanbul ignore if */
     if (!this.resources.clientManifest) {
       return false
     }
@@ -223,7 +224,7 @@ export default class Renderer {
 
     // open in editor for debug mode only
     const _this = this
-    if (this.options.debug) {
+    if (this.options.debug && this.options.dev) {
       this.useMiddleware({
         path: '_open',
         handler(req, res) {
@@ -417,9 +418,11 @@ export default class Renderer {
       if (line) {
         frame.lineNumber = line
       }
+      /* istanbul ignore if */
       if (column) {
         frame.columnNumber = column
       }
+      /* istanbul ignore if */
       if (name) {
         frame.functionName = name
       }
diff --git a/lib/index.js b/lib/index.js
index aa7df41b13..f0b416e198 100755
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,11 @@
-import * as core from './core'
-import * as builder from './builder'
+/*!
+ * Nuxt.js
+ * (c) 2016-2017 Chopin Brothers
+ * Core maintainer: Pooya Parsa (@pi0)
+ * Released under the MIT License.
+ */
 
-export default Object.assign({}, core, builder)
+const core = require('./core')
+const builder = require('./builder')
+
+module.exports = Object.assign({}, core, builder)
diff --git a/package.json b/package.json
index ec12ca35b8..5287f30a20 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
       "name": "Pooya Parsa (@pi0)"
     }
   ],
-  "main": "./index.js",
+  "main": "./lib/index.js",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,9 +21,7 @@
   },
   "files": [
     "bin",
-    "dist",
-    "lib",
-    "index.js"
+    "lib"
   ],
   "keywords": [
     "nuxt",
@@ -47,44 +45,39 @@
     ]
   },
   "scripts": {
-    "test": "npm run lint && cross-env NODE_ENV=test npm run build:nuxt && nyc ava --verbose --serial test/ -- && nyc report --reporter=html",
+    "test": "npm run lint && nyc ava --verbose test/ -- && nyc report --reporter=html",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.vue bin/* build/ lib/ test/ examples/",
-    "build": "rimraf dist/ && npm run build:nuxt && npm run build:core",
-    "build:nuxt": "rollup -c build/rollup.config.js --environment TARGET:nuxt",
-    "build:core": "rollup -c build/rollup.config.js --environment TARGET:core",
-    "watch": "npm run build:nuxt -- -w",
-    "make-start": "node ./build/start.js",
     "precommit": "npm run lint",
-    "postinstall": "opencollective postinstall || exit 0",
-    "release-next": "npm run build && node ./build/release-next && npm publish --tag next"
+    "postinstall": "opencollective postinstall || exit 0"
   },
   "engines": {
-    "node": ">=6.11",
-    "npm": ">=3.10.0"
+    "node": ">=8.0.0",
+    "npm": ">=5.0.0"
   },
   "dependencies": {
     "@nuxtjs/youch": "^3.1.0",
     "ansi-html": "^0.0.7",
-    "autoprefixer": "^7.1.6",
+    "autoprefixer": "^7.2.3",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
-    "babel-preset-vue-app": "^1.3.1",
-    "caniuse-lite": "^1.0.30000772",
+    "babel-preset-vue-app": "^2.0.0",
+    "caniuse-lite": "^1.0.30000784",
     "chalk": "^2.3.0",
     "chokidar": "^1.7.0",
     "clone": "^2.1.1",
     "compression": "^1.7.1",
     "connect": "^3.6.5",
+    "css-hot-loader": "^1.3.4",
     "css-loader": "^0.28.7",
     "debug": "^3.1.0",
-    "es6-promise": "^4.1.1",
+    "es6-promise": "^4.2.1",
     "etag": "^1.8.1",
     "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^1.1.5",
+    "file-loader": "^1.1.6",
     "fresh": "^0.5.2",
     "friendly-errors-webpack-plugin": "^1.6.1",
-    "fs-extra": "^4.0.2",
+    "fs-extra": "^5.0.0",
     "glob": "^7.1.2",
     "hash-sum": "^1.0.2",
     "html-minifier": "3.5.7",
@@ -95,7 +88,6 @@
     "minimist": "^1.2.0",
     "open-in-editor": "^2.2.0",
     "opencollective": "^1.0.3",
-    "pify": "^3.0.0",
     "postcss": "^6.0.14",
     "postcss-cssnext": "^3.0.2",
     "postcss-import": "^11.0.0",
@@ -107,57 +99,50 @@
     "serve-static": "^1.13.1",
     "server-destroy": "^1.0.1",
     "source-map": "^0.6.1",
-    "source-map-support": "^0.5.0",
-    "style-resources-loader": "^0.3.0",
-    "uglifyjs-webpack-plugin": "^1.0.1",
+    "style-resources-loader": "^1.0.0",
+    "uglifyjs-webpack-plugin": "^1.1.4",
     "url-loader": "^0.6.2",
-    "vue": "^2.5.9",
-    "vue-loader": "^13.5.0",
-    "vue-meta": "^1.3.1",
+    "vue": "^2.5.13",
+    "vue-loader": "^13.6.0",
+    "vue-meta": "^1.4.0",
     "vue-router": "^3.0.1",
-    "vue-server-renderer": "^2.5.9",
-    "vue-template-compiler": "^2.5.9",
+    "vue-server-renderer": "^2.5.13",
+    "vue-template-compiler": "^2.5.13",
     "vuex": "^3.0.1",
-    "webpack": "^3.8.1",
+    "webpack": "^3.10.0",
     "webpack-bundle-analyzer": "^2.9.0",
-    "webpack-dev-middleware": "^1.12.2",
+    "webpack-dev-middleware": "^2.0.2",
     "webpack-hot-middleware": "^2.21.0",
     "webpack-node-externals": "^1.6.0"
   },
   "devDependencies": {
     "ava": "^0.24.0",
-    "babel-eslint": "^8.0.1",
+    "babel-eslint": "^8.0.3",
     "babel-plugin-array-includes": "^2.0.3",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-istanbul": "^4.1.5",
     "codecov": "^3.0.0",
-    "copy-webpack-plugin": "^4.2.0",
-    "cross-env": "^5.1.1",
-    "eslint": "^4.12.0",
-    "eslint-config-standard": "^10.2.1",
+    "copy-webpack-plugin": "^4.3.0",
+    "cross-env": "^5.1.2",
+    "eslint": "^4.13.1",
+    "eslint-config-standard": "^11.0.0-beta.0",
+    "eslint-config-standard-jsx": "^4.0.2",
     "eslint-plugin-html": "^4.0.1",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
+    "eslint-plugin-react": "^7.5.1",
     "eslint-plugin-standard": "^3.0.1",
     "express": "^4.16.2",
     "finalhandler": "^1.1.0",
-    "jsdom": "^11.3.0",
+    "jsdom": "^11.5.1",
     "json-loader": "^0.5.7",
-    "nyc": "^11.3.0",
+    "nyc": "^11.4.1",
     "puppeteer": "^0.13.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.51.7",
-    "rollup-plugin-alias": "^1.4.0",
-    "rollup-plugin-babel": "^3.0.2",
-    "rollup-plugin-commonjs": "^8.2.6",
-    "rollup-plugin-node-resolve": "^3.0.0",
-    "rollup-plugin-replace": "^2.0.0",
-    "rollup-watch": "^4.3.1",
-    "std-mocks": "^1.0.1",
-    "uglify-js": "^3.2.0"
+    "sinon": "^4.1.2",
+    "uglify-js": "^3.2.2"
   },
   "collective": {
     "type": "opencollective",
diff --git a/build/release-next.js b/scripts/release-next
old mode 100644
new mode 100755
similarity index 99%
rename from build/release-next.js
rename to scripts/release-next
index 051e88518d..618caa40bf
--- a/build/release-next.js
+++ b/scripts/release-next
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 const { readFileSync, writeFileSync } = require('fs-extra')
 const { resolve } = require('path')
 const { spawnSync } = require('child_process')
diff --git a/build/start.js b/scripts/start
similarity index 100%
rename from build/start.js
rename to scripts/start
diff --git a/test/basic.config.defaults.test.js b/test/basic.config.defaults.test.js
index d23ad57a1f..5f7136119c 100644
--- a/test/basic.config.defaults.test.js
+++ b/test/basic.config.defaults.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Options } from '../index'
+import { Nuxt, Options } from '..'
 import { version } from '../package.json'
 
 test('Nuxt.version is same as package', t => {
diff --git a/test/basic.csr.test.js b/test/basic.csr.test.js
index 3c58c37462..0329e398b8 100644
--- a/test/basic.csr.test.js
+++ b/test/basic.csr.test.js
@@ -1,7 +1,8 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Builder } from '../index'
+import { Nuxt, Builder } from '..'
 import * as browser from './helpers/browser'
+import { interceptLog } from './helpers/console'
 
 const port = 4003
 const url = (route) => 'http://localhost:' + port + route
@@ -10,36 +11,46 @@ let nuxt = null
 let page = null
 
 // Init nuxt.js and create server listening on localhost:4003
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
-    dev: false,
+    buildDir: '.nuxt-csr',
+    dev: true,
     head: {
       titleTemplate(titleChunk) {
         return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
       }
+    },
+    build: {
+      stats: false
     }
   }
-  nuxt = new Nuxt(options)
-  await new Builder(nuxt).build()
 
-  await nuxt.listen(port, 'localhost')
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(options)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
-test.before('Start browser', async t => {
+test.serial('Start browser', async t => {
+  t.plan(0) // suppress 'no assertions' warning
   await browser.start({
     // slowMo: 50,
     // headless: false
   })
 })
 
-test('Open /', async t => {
+test.serial('Open /', async t => {
   page = await browser.page(url('/'))
 
   t.is(await page.$text('h1'), 'Index page')
 })
 
-test('/stateless', async t => {
+test.serial('/stateless', async t => {
   const { hook } = await page.nuxt.navigate('/stateless', false)
   const loading = await page.nuxt.loadingData()
 
@@ -48,27 +59,27 @@ test('/stateless', async t => {
   t.is(await page.$text('h1'), 'My component!')
 })
 
-test('/css', async t => {
+test.serial('/css', async t => {
   await page.nuxt.navigate('/css')
 
   t.is(await page.$text('.red'), 'This is red')
   t.is(await page.$eval('.red', (red) => window.getComputedStyle(red).color), 'rgb(255, 0, 0)')
 })
 
-test('/stateful', async t => {
+test.serial('/stateful', async t => {
   await page.nuxt.navigate('/stateful')
 
   t.is(await page.$text('p'), 'The answer is 42')
 })
 
-test('/store', async t => {
+test.serial('/store', async t => {
   await page.nuxt.navigate('/store')
 
   t.is(await page.$text('h1'), 'Vuex Nested Modules')
   t.is(await page.$text('p'), '1')
 })
 
-test('/head', async t => {
+test.serial('/head', async t => {
   const msg = new Promise((resolve) => page.on('console', (msg) => resolve(msg.text)))
   await page.nuxt.navigate('/head')
   const metas = await page.$$attr('meta', 'content')
@@ -79,31 +90,31 @@ test('/head', async t => {
   t.is(metas[0], 'my meta')
 })
 
-test('/async-data', async t => {
+test.serial('/async-data', async t => {
   await page.nuxt.navigate('/async-data')
 
   t.is(await page.$text('p'), 'Nuxt.js')
 })
 
-test('/await-async-data', async t => {
+test.serial('/await-async-data', async t => {
   await page.nuxt.navigate('/await-async-data')
 
   t.is(await page.$text('p'), 'Await Nuxt.js')
 })
 
-test('/callback-async-data', async t => {
+test.serial('/callback-async-data', async t => {
   await page.nuxt.navigate('/callback-async-data')
 
   t.is(await page.$text('p'), 'Callback Nuxt.js')
 })
 
-test('/users/1', async t => {
+test.serial('/users/1', async t => {
   await page.nuxt.navigate('/users/1')
 
   t.is(await page.$text('h1'), 'User: 1')
 })
 
-test('/validate should display a 404', async t => {
+test.serial('/validate should display a 404', async t => {
   await page.nuxt.navigate('/validate')
   const error = await page.nuxt.errorData()
 
@@ -111,79 +122,91 @@ test('/validate should display a 404', async t => {
   t.is(error.message, 'This page could not be found')
 })
 
-test('/validate?valid=true', async t => {
+test.serial('/validate?valid=true', async t => {
   await page.nuxt.navigate('/validate?valid=true')
 
   t.is(await page.$text('h1'), 'I am valid')
 })
 
-test('/redirect', async t => {
+test.serial('/redirect', async t => {
   await page.nuxt.navigate('/redirect')
 
   t.is(await page.$text('h1'), 'Index page')
 })
 
-test('/error', async t => {
+test.serial('/error', async t => {
   await page.nuxt.navigate('/error')
 
   t.deepEqual(await page.nuxt.errorData(), { statusCode: 500 })
   t.is(await page.$text('.title'), 'Error mouahahah')
 })
 
-test('/error2', async t => {
+test.serial('/error2', async t => {
   await page.nuxt.navigate('/error2')
 
   t.is(await page.$text('.title'), 'Custom error')
   t.deepEqual(await page.nuxt.errorData(), { message: 'Custom error' })
 })
 
-test('/redirect2', async t => {
-  await page.nuxt.navigate('/redirect2')
+test.serial('/redirect-middleware', async t => {
+  await page.nuxt.navigate('/redirect-middleware')
 
   t.is(await page.$text('h1'), 'Index page')
 })
 
-test('/redirect3', async t => {
+test.serial('/redirect-external', async t => {
   // New page for redirecting to external link.
   const page = await browser.page(url('/'))
-  await page.nuxt.navigate('/redirect3', false)
+  await page.nuxt.navigate('/redirect-external', false)
   await page.waitForFunction(() => window.location.href === 'https://nuxtjs.org/')
   page.close()
   t.pass()
 })
 
-test('/no-ssr', async t => {
+test.serial('/redirect-name', async t => {
+  await page.nuxt.navigate('/redirect-name')
+
+  t.is(await page.$text('h1'), 'My component!')
+})
+
+test.serial('/no-ssr', async t => {
   await page.nuxt.navigate('/no-ssr')
 
   t.is(await page.$text('h1'), 'Displayed only on client-side')
 })
 
-test('/meta', async t => {
+test.serial('/meta', async t => {
   await page.nuxt.navigate('/meta')
 
   const state = await page.nuxt.storeState()
   t.deepEqual(state.meta, [{ works: true }])
 })
 
-test('/fn-midd', async t => {
+test.serial('/fn-midd', async t => {
   await page.nuxt.navigate('/fn-midd')
 
   t.is(await page.$text('.title'), 'You need to ask the permission')
   t.deepEqual(await page.nuxt.errorData(), { message: 'You need to ask the permission', statusCode: 403 })
 })
 
-test('/fn-midd?please=true', async t => {
+test.serial('/fn-midd?please=true', async t => {
   await page.nuxt.navigate('/fn-midd?please=true')
 
   const h1 = await page.$text('h1')
   t.true(h1.includes('Date:'))
 })
 
-// Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.serial('/router-guard', async t => {
+  await page.nuxt.navigate('/router-guard')
+
+  t.is(await page.$text('p'), 'Nuxt.js')
 })
 
-test.after('Stop browser', async t => {
+// Close server and ask nuxt to stop listening to file changes
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
+})
+
+test.after.always('Stop browser', async t => {
   await browser.stop()
 })
diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index a415ed4322..681685b75d 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -1,29 +1,85 @@
 import test from 'ava'
 import { resolve } from 'path'
-// import rp from 'request-promise-native'
-import { Nuxt, Builder } from '../index.js'
+import { intercept, release } from './helpers/console'
+import { Nuxt, Builder, Utils } from '..'
+import { truncateSync, readFileSync, writeFileSync } from 'fs'
 
 const port = 4001
 const url = (route) => 'http://localhost:' + port + route
+const rootDir = resolve(__dirname, 'fixtures/basic')
+const pluginPath = resolve(rootDir, 'plugins', 'watch.js')
+const pluginContent = readFileSync(pluginPath)
 
 let nuxt = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const options = {
-    rootDir: resolve(__dirname, 'fixtures/basic'),
-    dev: true
+    rootDir,
+    buildDir: '.nuxt-dev',
+    dev: true,
+    build: {
+      stats: false,
+      profile: true,
+      extractCSS: {
+        allChunks: true
+      }
+    },
+    plugins: [
+      '~/plugins/watch.js'
+    ]
   }
-  nuxt = new Nuxt(options)
-  await new Builder(nuxt).build()
 
-  await nuxt.listen(port, 'localhost')
+  const spies = await intercept({ log: true, stderr: true }, async () => {
+    nuxt = new Nuxt(options)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(spies.log.calledWithMatch('DONE'))
+  t.true(spies.log.calledWithMatch('OPEN'))
 })
 
-test('/stateless', async t => {
+test.serial('/extractCSS', async t => {
+  const window = await nuxt.renderAndGetWindow(url('/extractCSS'))
+  const html = window.document.head.innerHTML
+  t.true(html.includes('vendor.css'))
+  t.true(!html.includes('30px'))
+  t.is(window.getComputedStyle(window.document.body).getPropertyValue('font-size'), '30px')
+})
+
+test.serial('remove mixins in live reloading', async t => {
+  const spies = await intercept({ log: true, error: true, stderr: true })
+  await nuxt.renderRoute(url('/'))
+  t.true(spies.log.calledWith('I am mixin'))
+
+  truncateSync(pluginPath)
+  await new Promise(async (resolve, reject) => {
+    let waitTimes = 0
+    while (spies.log.neverCalledWithMatch(/Compiled successfully/)) {
+      if (waitTimes++ >= 20) {
+        t.fail('Dev server doesn\'t reload after 2000ms')
+        reject(Error())
+      }
+      await Utils.waitFor(100)
+    }
+    resolve()
+  })
+  spies.log.reset()
+
+  await nuxt.renderRoute(url('/'))
+  t.true(spies.log.neverCalledWith('I am mixin'))
+  t.is(spies.error.getCall(0).args[0].statusCode, 404)
+  release()
+})
+
+test.serial('/stateless', async t => {
+  const spies = await intercept()
   const window = await nuxt.renderAndGetWindow(url('/stateless'))
   const html = window.document.body.innerHTML
   t.true(html.includes('<h1>My component!</h1>'))
+  t.true(spies.info.calledWithMatch('You are running Vue in development mode.'))
+  release()
 })
 
 // test('/_nuxt/test.hot-update.json should returns empty html', async t => {
@@ -36,6 +92,7 @@ test('/stateless', async t => {
 // })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', async t => {
+test.after.always('Closing server and nuxt.js', async t => {
+  writeFileSync(pluginPath, pluginContent)
   await nuxt.close()
 })
diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js
index e5386e0bcf..65e8874e75 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/basic.fail.generate.test.js
@@ -1,22 +1,32 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Builder, Generator } from '../index.js'
+import { Nuxt, Builder, Generator } from '..'
+import { intercept } from './helpers/console'
 
 test('Fail with routes() which throw an error', async t => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
+    buildDir: '.nuxt-fail',
     dev: false,
+    build: {
+      stats: false
+    },
     generate: {
       async routes() {
         throw new Error('Not today!')
       }
     }
   }
-  const nuxt = new Nuxt(options)
-  const builder = new Builder(nuxt)
-  const generator = new Generator(nuxt, builder)
-  return generator.generate()
-    .catch((e) => {
-      t.true(e.message === 'Not today!')
-    })
+  const spies = await intercept(async () => {
+    const nuxt = new Nuxt(options)
+    const builder = new Builder(nuxt)
+    const generator = new Generator(nuxt, builder)
+
+    return generator.generate()
+      .catch((e) => {
+        t.true(e.message === 'Not today!')
+      })
+  })
+  t.true(spies.log.calledWithMatch('DONE'))
+  t.true(spies.error.withArgs('Could not resolve routes').calledOnce)
 })
diff --git a/test/basic.generate.nosubfolders.test.js b/test/basic.generate.nosubfolders.test.js
deleted file mode 100644
index ce9c1d813a..0000000000
--- a/test/basic.generate.nosubfolders.test.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import test from 'ava'
-import { resolve } from 'path'
-import { existsSync } from 'fs'
-import http from 'http'
-import serveStatic from 'serve-static'
-import finalhandler from 'finalhandler'
-import rp from 'request-promise-native'
-import { Nuxt, Builder, Generator } from '../index.js'
-
-const port = 4002
-const url = (route) => 'http://localhost:' + port + route
-
-let nuxt = null
-let server = null
-
-// Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  const rootDir = resolve(__dirname, 'fixtures/basic')
-  let config = require(resolve(rootDir, 'nuxt.config.js'))
-  config.rootDir = rootDir
-  config.dev = false
-  config.generate.subFolders = false
-
-  nuxt = new Nuxt(config)
-  const builder = new Builder(nuxt)
-  const generator = new Generator(nuxt, builder)
-  try {
-    await generator.generate() // throw an error (of /validate route)
-  } catch (err) {
-  }
-
-  const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'), { extensions: ['html'] })
-  server = http.createServer((req, res) => {
-    serve(req, res, finalhandler(req, res))
-  })
-  server.listen(port)
-})
-
-test('Check ready hook called', async t => {
-  t.true(nuxt.__hook_called__)
-})
-
-test('/stateless', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/stateless'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>My component!</h1>'))
-})
-
-test('/css', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/css'))
-  const element = window.document.querySelector('.red')
-  t.not(element, null)
-  t.is(element.textContent, 'This is red')
-  t.is(element.className, 'red')
-  t.is(window.getComputedStyle(element).color, 'red')
-})
-
-test('/stateful', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/stateful'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<div><p>The answer is 42</p></div>'))
-})
-
-test('/head', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/head'))
-  const html = window.document.body.innerHTML
-  const metas = window.document.getElementsByTagName('meta')
-  t.is(window.document.title, 'My title')
-  t.is(metas[0].getAttribute('content'), 'my meta')
-  t.true(html.includes('<div><h1>I can haz meta tags</h1></div>'))
-})
-
-test('/async-data', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/async-data'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<p>Nuxt.js</p>'))
-})
-
-test('/users/1', async t => {
-  const html = await rp(url('/users/1'))
-  t.true(html.includes('<h1>User: 1</h1>'))
-  t.true(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html')))
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html')))
-})
-
-test('/users/2', async t => {
-  const html = await rp(url('/users/2'))
-  t.true(html.includes('<h1>User: 2</h1>'))
-})
-
-test('/users/3 (payload given)', async t => {
-  const html = await rp(url('/users/3'))
-  t.true(html.includes('<h1>User: 3000</h1>'))
-})
-
-test('/users/4 -> Not found', async t => {
-  try {
-    await rp(url('/users/4'))
-  } catch (error) {
-    t.true(error.statusCode === 404)
-    t.true(error.response.body.includes('Cannot GET /users/4'))
-  }
-})
-
-test('/validate should not be server-rendered', async t => {
-  const html = await rp(url('/validate'))
-  t.true(html.includes('<div id="__nuxt"></div>'))
-  t.true(html.includes('serverRendered:!1'))
-})
-
-test('/validate -> should display a 404', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/validate'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('This page could not be found'))
-})
-
-test('/validate?valid=true', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/validate?valid=true'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('I am valid</h1>'))
-})
-
-test('/redirect should not be server-rendered', async t => {
-  const html = await rp(url('/redirect'))
-  t.true(html.includes('<div id="__nuxt"></div>'))
-  t.true(html.includes('serverRendered:!1'))
-})
-
-test('/redirect -> check redirected source', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/redirect'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>Index page</h1>'))
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after('Closing server', t => {
-  server.close()
-})
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index 0e1020847e..27f169b492 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -1,31 +1,39 @@
 import test from 'ava'
 import { resolve } from 'path'
 import { existsSync } from 'fs'
+import { remove } from 'fs-extra'
 import http from 'http'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
-import { Nuxt, Builder, Generator } from '../index.js'
+import { interceptLog, release } from './helpers/console'
+import { Nuxt, Builder, Generator } from '..'
 
 const port = 4002
 const url = (route) => 'http://localhost:' + port + route
+const rootDir = resolve(__dirname, 'fixtures/basic')
 
 let nuxt = null
 let server = null
+let generator = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  const rootDir = resolve(__dirname, 'fixtures/basic')
+test.serial('Init Nuxt.js', async t => {
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
+  config.buildDir = '.nuxt-generate'
   config.dev = false
-  nuxt = new Nuxt(config)
-  const builder = new Builder(nuxt)
-  const generator = new Generator(nuxt, builder)
-  try {
-    await generator.generate() // throw an error (of /validate route)
-  } catch (err) {
-  }
+  config.build.stats = false
+
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(config)
+    const builder = new Builder(nuxt)
+    generator = new Generator(nuxt, builder)
+
+    await generator.generate()
+  })
+  t.true(logSpy.calledWithMatch('DONE'))
+
   const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
   server = http.createServer((req, res) => {
     serve(req, res, finalhandler(req, res))
@@ -33,17 +41,17 @@ test.before('Init Nuxt.js', async t => {
   server.listen(port)
 })
 
-test('Check ready hook called', async t => {
+test.serial('Check ready hook called', async t => {
   t.true(nuxt.__hook_called__)
 })
 
-test('/stateless', async t => {
+test.serial('/stateless', async t => {
   const window = await nuxt.renderAndGetWindow(url('/stateless'))
   const html = window.document.body.innerHTML
   t.true(html.includes('<h1>My component!</h1>'))
 })
 
-test('/css', async t => {
+test.serial('/css', async t => {
   const window = await nuxt.renderAndGetWindow(url('/css'))
   const element = window.document.querySelector('.red')
   t.not(element, null)
@@ -52,84 +60,106 @@ test('/css', async t => {
   t.is(window.getComputedStyle(element).color, 'red')
 })
 
-test('/stateful', async t => {
+test.serial('/stateful', async t => {
   const window = await nuxt.renderAndGetWindow(url('/stateful'))
   const html = window.document.body.innerHTML
   t.true(html.includes('<div><p>The answer is 42</p></div>'))
 })
 
-test('/head', async t => {
+test.serial('/head', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/head'))
   const html = window.document.body.innerHTML
   const metas = window.document.getElementsByTagName('meta')
   t.is(window.document.title, 'My title')
   t.is(metas[0].getAttribute('content'), 'my meta')
   t.true(html.includes('<div><h1>I can haz meta tags</h1></div>'))
+  release()
+  t.is(logSpy.getCall(0).args[0], 'Body script!')
 })
 
-test('/async-data', async t => {
+test.serial('/async-data', async t => {
   const window = await nuxt.renderAndGetWindow(url('/async-data'))
   const html = window.document.body.innerHTML
   t.true(html.includes('<p>Nuxt.js</p>'))
 })
 
-test('/users/1', async t => {
-  const html = await rp(url('/users/1'))
+test.serial('/users/1/index.html', async t => {
+  const html = await rp(url('/users/1/index.html'))
   t.true(html.includes('<h1>User: 1</h1>'))
   t.true(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html')))
   t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html')))
 })
 
-test('/users/2', async t => {
+test.serial('/users/2', async t => {
   const html = await rp(url('/users/2'))
   t.true(html.includes('<h1>User: 2</h1>'))
 })
 
-test('/users/3 (payload given)', async t => {
+test.serial('/users/3 (payload given)', async t => {
   const html = await rp(url('/users/3'))
   t.true(html.includes('<h1>User: 3000</h1>'))
 })
 
-test('/users/4 -> Not found', async t => {
-  try {
-    await rp(url('/users/4'))
-  } catch (error) {
-    t.true(error.statusCode === 404)
-    t.true(error.response.body.includes('Cannot GET /users/4'))
-  }
+test.serial('/users/4 -> Not found', async t => {
+  const error = await t.throws(rp(url('/users/4')))
+  t.true(error.statusCode === 404)
+  t.true(error.response.body.includes('Cannot GET /users/4'))
 })
 
-test('/validate should not be server-rendered', async t => {
+test.serial('/validate should not be server-rendered', async t => {
   const html = await rp(url('/validate'))
   t.true(html.includes('<div id="__nuxt"></div>'))
   t.true(html.includes('serverRendered:!1'))
 })
 
-test('/validate -> should display a 404', async t => {
+test.serial('/validate -> should display a 404', async t => {
   const window = await nuxt.renderAndGetWindow(url('/validate'))
   const html = window.document.body.innerHTML
   t.true(html.includes('This page could not be found'))
 })
 
-test('/validate?valid=true', async t => {
+test.serial('/validate?valid=true', async t => {
   const window = await nuxt.renderAndGetWindow(url('/validate?valid=true'))
   const html = window.document.body.innerHTML
   t.true(html.includes('I am valid</h1>'))
 })
 
-test('/redirect should not be server-rendered', async t => {
+test.serial('/redirect should not be server-rendered', async t => {
   const html = await rp(url('/redirect'))
   t.true(html.includes('<div id="__nuxt"></div>'))
   t.true(html.includes('serverRendered:!1'))
 })
 
-test('/redirect -> check redirected source', async t => {
+test.serial('/redirect -> check redirected source', async t => {
   const window = await nuxt.renderAndGetWindow(url('/redirect'))
   const html = window.document.body.innerHTML
   t.true(html.includes('<h1>Index page</h1>'))
 })
 
-// Close server and ask nuxt to stop listening to file changes
-test.after('Closing server', t => {
-  server.close()
+test.serial('/users/1 not found', async t => {
+  await remove(resolve(rootDir, 'dist/users'))
+  const error = await t.throws(rp(url('/users/1')))
+  t.true(error.statusCode === 404)
+  t.true(error.response.body.includes('Cannot GET /users/1'))
+})
+
+test.serial('nuxt re-generating with no subfolders', async t => {
+  const logSpy = await interceptLog()
+  nuxt.options.generate.subFolders = false
+  await generator.generate()
+  release()
+  t.true(logSpy.calledWithMatch('DONE'))
+})
+
+test.serial('/users/1.html', async t => {
+  const html = await rp(url('/users/1.html'))
+  t.true(html.includes('<h1>User: 1</h1>'))
+  t.true(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html')))
+  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html')))
+})
+
+// Close server and ask nuxt to stop listening to file changes
+test.after.always('Closing server', async t => {
+  await server.close()
 })
diff --git a/test/basic.ssr.test.js b/test/basic.ssr.test.js
index 42fca2d4a2..5e5ee17305 100755
--- a/test/basic.ssr.test.js
+++ b/test/basic.ssr.test.js
@@ -1,29 +1,39 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import stdMocks from 'std-mocks'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { interceptLog, interceptError, release } from './helpers/console'
 
-const port = 4003
+const port = 4004
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
 
 // Init nuxt.js and create server listening on localhost:4003
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
+    buildDir: '.nuxt-ssr',
     dev: false,
     head: {
       titleTemplate(titleChunk) {
         return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
       }
+    },
+    build: {
+      stats: false
     }
   }
-  nuxt = new Nuxt(options)
-  await new Builder(nuxt).build()
 
-  await nuxt.listen(port, 'localhost')
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(options)
+    const builder = await new Builder(nuxt)
+    await builder.build()
+    await nuxt.listen(port, '0.0.0.0')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
 test('/stateless', async t => {
@@ -60,18 +70,21 @@ test('/store', async t => {
   t.true(html.includes('<p>1</p>'))
 })
 
-test('/head', async t => {
-  stdMocks.use()
+test.serial('/head', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/head'), { virtualConsole: false })
-  const html = window.document.body.innerHTML
-  const metas = window.document.getElementsByTagName('meta')
-  stdMocks.restore()
-  const { stdout } = stdMocks.flush()
-  t.is(stdout[0], 'Body script!\n')
   t.is(window.document.title, 'My title - Nuxt.js')
-  t.is(metas[0].getAttribute('content'), 'my meta')
+
+  const html = window.document.body.innerHTML
   t.true(html.includes('<div><h1>I can haz meta tags</h1></div>'))
   t.true(html.includes('<script data-n-head="true" src="/body.js" data-body="true">'))
+
+  const metas = window.document.getElementsByTagName('meta')
+  t.is(metas[0].getAttribute('content'), 'my meta')
+  release()
+
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Body script!')
 })
 
 test('/async-data', async t => {
@@ -119,7 +132,7 @@ test('/redirect -> check redirected source', async t => {
 
 test('/redirect -> external link', async t => {
   const headers = {}
-  const { html } = await nuxt.renderRoute('/redirect3', {
+  const { html } = await nuxt.renderRoute('/redirect-external', {
     res: {
       setHeader(k, v) {
         headers[k] = v
@@ -137,20 +150,18 @@ test('/special-state -> check window.__NUXT__.test = true', async t => {
 })
 
 test('/error', async t => {
-  try {
-    await nuxt.renderRoute('/error', { req: {}, res: {} })
-  } catch (err) {
-    t.true(err.message.includes('Error mouahahah'))
-  }
+  const err = await t.throws(nuxt.renderRoute('/error', { req: {}, res: {} }))
+  t.true(err.message.includes('Error mouahahah'))
 })
 
-test('/error status code', async t => {
-  try {
-    await rp(url('/error'))
-  } catch (err) {
-    t.true(err.statusCode === 500)
-    t.true(err.response.body.includes('An error occurred in the application and your page could not be served'))
-  }
+test.serial('/error status code', async t => {
+  const errorSpy = await interceptError()
+  const err = await t.throws(rp(url('/error')))
+  t.true(err.statusCode === 500)
+  t.true(err.response.body.includes('An error occurred in the application and your page could not be served'))
+  release()
+  t.true(errorSpy.calledOnce)
+  t.true(errorSpy.args[0][0].message.includes('Error mouahahah'))
 })
 
 test('/error2', async t => {
@@ -161,35 +172,34 @@ test('/error2', async t => {
 })
 
 test('/error2 status code', async t => {
-  try {
-    await rp(url('/error2'))
-  } catch (err) {
-    t.is(err.statusCode, 500)
-    t.true(err.response.body.includes('Custom error'))
-  }
+  const error = await t.throws(rp(url('/error2')))
+  t.is(error.statusCode, 500)
+  t.true(error.response.body.includes('Custom error'))
 })
 
-test('/error-midd', async t => {
-  stdMocks.use()
-  try {
-    await rp(url('/error-midd'))
-  } catch (err) {
-    stdMocks.restore()
-    t.is(err.statusCode, 505)
-    t.true(err.response.body.includes('Middleware Error'))
-    const output = stdMocks.flush()
-    // Don't display error since redirect returns a noopApp
-    t.true(output.stderr.length === 0)
-  }
-})
-
-test('/redirect2', async t => {
-  stdMocks.use()
-  await rp(url('/redirect2')) // Should not console.error
-  stdMocks.restore()
-  const output = stdMocks.flush()
+test.serial('/error-midd', async t => {
+  const errorSpy = await interceptError()
+  const err = await t.throws(rp(url('/error-midd')))
+  t.is(err.statusCode, 505)
+  t.true(err.response.body.includes('Middleware Error'))
+  release()
   // Don't display error since redirect returns a noopApp
-  t.true(output.stderr.length === 0)
+  t.true(errorSpy.notCalled)
+})
+
+test.serial('/redirect-middleware', async t => {
+  const errorSpy = await interceptError()
+  await rp(url('/redirect-middleware')) // Should not console.error
+  release()
+  // Don't display error since redirect returns a noopApp
+  t.true(errorSpy.notCalled)
+})
+
+test('/redirect-name', async t => {
+  const { html, redirected } = await nuxt.renderRoute('/redirect-name')
+  t.true(html.includes('<div id="__nuxt"></div>'))
+  t.true(redirected.path === '/stateless')
+  t.true(redirected.status === 302)
 })
 
 test('/no-ssr', async t => {
@@ -224,7 +234,6 @@ test('/_nuxt/ should return 404', async t => {
 
 test('/meta', async t => {
   const { html } = await nuxt.renderRoute('/meta')
-
   t.true(html.includes('"meta":[{"works":true}]'))
 })
 
@@ -239,7 +248,23 @@ test('/fn-midd?please=true', async t => {
   t.true(html.includes('<h1>Date:'))
 })
 
-// Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test('/router-guard', async t => {
+  const { html } = await nuxt.renderRoute('/router-guard')
+  t.true(html.includes('<p>Nuxt.js</p>'))
+  t.false(html.includes('Router Guard'))
+})
+
+test('/jsx', async t => {
+  const { html } = await nuxt.renderRoute('/jsx')
+  t.true(html.includes('<h1>JSX Page</h1>'))
+})
+
+test('/js-link', async t => {
+  const { html } = await nuxt.renderRoute('/js-link')
+  t.true(html.includes('<h1>vue file is first-class</h1>'))
+})
+
+// Close server and ask nuxt to stop listening to file changes
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/children.patch.test.js b/test/children.patch.test.js
index a66cfbf6ce..a83c36de72 100644
--- a/test/children.patch.test.js
+++ b/test/children.patch.test.js
@@ -1,35 +1,46 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Builder, Utils } from '../index.js'
+import { Nuxt, Builder, Utils } from '..'
 import * as browser from './helpers/browser'
+import { interceptLog } from './helpers/console'
 
-const port = 4005
+const port = 4014
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
+let page
+const dates = {}
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/children'),
-    dev: false
+    buildDir: '.nuxt-patch',
+    dev: false,
+    build: {
+      stats: false
+    }
   }
-  nuxt = new Nuxt(options)
-  await new Builder(nuxt).build()
 
-  await nuxt.listen(port, 'localhost')
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(options)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
-test.before('Start browser', async t => {
+
+test.serial('Start browser', async t => {
+  t.plan(0) // suppress 'no assertions' warning
   await browser.start({
     // slowMo: 50,
     // headless: false
   })
 })
 
-let page
-const dates = {}
-
-test('Loading /patch and keep ', async t => {
+test.serial('Loading /patch and keep ', async t => {
   page = await browser.page(url('/patch'))
 
   const h1 = await page.$text('h1')
@@ -39,7 +50,7 @@ test('Loading /patch and keep ', async t => {
   dates.patch = await page.$text('[data-date-patch]')
 })
 
-test('Navigate to /patch/1', async t => {
+test.serial('Navigate to /patch/1', async t => {
   const { hook } = await page.nuxt.navigate('/patch/1', false)
   const loading = await page.nuxt.loadingData()
   t.is(loading.show, true)
@@ -52,7 +63,7 @@ test('Navigate to /patch/1', async t => {
   t.is(dates.patch, await page.$text('[data-date-patch]'))
 })
 
-test('Navigate to /patch/2', async t => {
+test.serial('Navigate to /patch/2', async t => {
   await page.nuxt.navigate('/patch/2')
   const date = await page.$text('[data-date-id]')
 
@@ -62,19 +73,19 @@ test('Navigate to /patch/2', async t => {
   dates.id = date
 })
 
-test('Navigate to /patch/2?test=true', async t => {
+test.serial('Navigate to /patch/2?test=true', async t => {
   await page.nuxt.navigate('/patch/2?test=true')
   t.is(dates.patch, await page.$text('[data-date-patch]'))
   t.is(dates.id, await page.$text('[data-date-id]'))
 })
 
-test('Navigate to /patch/2#test', async t => {
+test.serial('Navigate to /patch/2#test', async t => {
   await page.nuxt.navigate('/patch/2#test')
   t.is(dates.patch, await page.$text('[data-date-patch]'))
   t.is(dates.id, await page.$text('[data-date-id]'))
 })
 
-test('Navigate to /patch/2/child', async t => {
+test.serial('Navigate to /patch/2/child', async t => {
   await page.nuxt.navigate('/patch/2/child')
   dates.child = await page.$text('[data-date-child]')
   dates.slug = await page.$text('[data-date-child-slug]')
@@ -85,7 +96,7 @@ test('Navigate to /patch/2/child', async t => {
   t.true(+dates.slug > +dates.child)
 })
 
-test('Navigate to /patch/2/child/1', async t => {
+test.serial('Navigate to /patch/2/child/1', async t => {
   await page.nuxt.navigate('/patch/2/child/1')
   const date = await page.$text('[data-date-child-slug]')
 
@@ -96,7 +107,7 @@ test('Navigate to /patch/2/child/1', async t => {
   dates.slug = date
 })
 
-test('Navigate to /patch/2/child/1?foo=bar', async t => {
+test.serial('Navigate to /patch/2/child/1?foo=bar', async t => {
   await page.nuxt.navigate('/patch/2/child/1?foo=bar')
 
   t.is(dates.patch, await page.$text('[data-date-patch]'))
@@ -105,7 +116,7 @@ test('Navigate to /patch/2/child/1?foo=bar', async t => {
   t.is(dates.slug, await page.$text('[data-date-child-slug]'))
 })
 
-test('Search a country', async t => {
+test.serial('Search a country', async t => {
   const countries = await page.$$text('[data-test-search-result]')
   t.is(countries.length, 5)
 
@@ -125,10 +136,11 @@ test('Search a country', async t => {
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
-test.after('Stop browser', async t => {
+
+test.after.always('Stop browser', async t => {
   await page.close()
   await browser.stop()
 })
diff --git a/test/children.test.js b/test/children.test.js
index c648702798..165ee19b09 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -1,22 +1,31 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { interceptLog } from './helpers/console'
 
-const port = 4004
+const port = 4013
 // const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/children'),
-    dev: false
+    dev: false,
+    build: {
+      stats: false
+    }
   }
-  nuxt = new Nuxt(options)
-  await new Builder(nuxt).build()
 
-  await nuxt.listen(port, 'localhost')
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(options)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
 test('/parent', async t => {
@@ -54,6 +63,6 @@ test('/parent/validate-child?key=12345', async t => {
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/cli.test.js b/test/cli.test.js
index 2fe743cb2f..0182d41d07 100644
--- a/test/cli.test.js
+++ b/test/cli.test.js
@@ -1,26 +1,26 @@
+import { promisify } from 'util'
 import test from 'ava'
 import { resolve, sep } from 'path'
 import rp from 'request-promise-native'
-import { Utils } from '../index.js'
-import pify from 'pify'
 import { exec, spawn } from 'child_process'
+import { Utils } from '..'
 
-const execify = pify(exec, { multiArgs: true })
+const execify = promisify(exec)
 const rootDir = resolve(__dirname, 'fixtures/basic')
 
 const port = 4011
 const url = (route) => 'http://localhost:' + port + route
 
-test('bin/nuxt-build', async t => {
+test.serial('bin/nuxt-build', async t => {
   const binBuild = resolve(__dirname, '..', 'bin', 'nuxt-build')
 
-  const [ stdout, stderr ] = await execify(`node ${binBuild} ${rootDir}`)
+  const { stdout, stderr } = await execify(`node ${binBuild} ${rootDir}`)
 
   t.true(stdout.includes('server-bundle.json'))
   t.true(stderr.includes('Building done'))
 })
 
-test('bin/nuxt-start', async t => {
+test.serial('bin/nuxt-start', async t => {
   const binStart = resolve(__dirname, '..', 'bin', 'nuxt-start')
 
   let stdout = ''
@@ -79,10 +79,10 @@ test('bin/nuxt-start', async t => {
   t.is(exitCode, null)
 })
 
-test('bin/nuxt-generate', async t => {
+test.serial('bin/nuxt-generate', async t => {
   const binGenerate = resolve(__dirname, '..', 'bin', 'nuxt-generate')
 
-  const [ stdout, stderr ] = await execify(`node ${binGenerate} ${rootDir}`)
+  const { stdout, stderr } = await execify(`node ${binGenerate} ${rootDir}`)
 
   t.true(stdout.includes('server-bundle.json'))
   t.true(stderr.includes('Destination folder cleaned'))
diff --git a/test/debug.test.js b/test/debug.test.js
index 189721bc16..3a1ccf3ea6 100644
--- a/test/debug.test.js
+++ b/test/debug.test.js
@@ -1,7 +1,8 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { interceptLog, interceptError, release } from './helpers/console'
 
 const port = 4009
 const url = (route) => 'http://localhost:' + port + route
@@ -9,36 +10,87 @@ const url = (route) => 'http://localhost:' + port + route
 let nuxt = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const rootDir = resolve(__dirname, 'fixtures/debug')
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
-  config.dev = false
-  nuxt = new Nuxt(config)
-  await new Builder(nuxt).build()
 
-  await nuxt.listen(port, 'localhost')
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(config)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
-test('/test/_open (open-in-editor)', async t => {
+test.serial('/test/_open (open-in-editor)', async t => {
+  const logSpy = await interceptLog()
   const { body } = await rp(url('/test/_open?file=pages/index.vue'), { resolveWithFullResponse: true })
   t.is(body, 'opened in editor!')
+  release()
+  t.is(logSpy.getCall(0).args[0], '[open in editor]')
+  t.true(logSpy.calledOnce)
 })
 
-test('/test/_open should return error (open-in-editor)', async t => {
+test.serial('/test/_open should return error (open-in-editor)', async t => {
+  const logSpy = await interceptLog()
   const { body } = await rp(url('/test/_open?file='), { resolveWithFullResponse: true })
   t.is(body, 'File is not specified')
+  release()
+  t.is(logSpy.getCall(0).args[0], '[open in editor]')
+  t.true(logSpy.calledOnce)
 })
 
-test('/test/error should return error stack trace (Youch)', async t => {
+test.serial('/test/error should return error stack trace (Youch)', async t => {
+  const errorSpy = await interceptError()
   const { response, error } = await t.throws(nuxt.renderAndGetWindow(url('/test/error')))
   t.is(response.statusCode, 500)
   t.is(response.statusMessage, 'NuxtServerError')
   t.true(error.includes('test youch !'))
   t.true(error.includes('<div class="error-frames">'))
+  release()
+  t.true(errorSpy.calledTwice)
+  t.true(errorSpy.getCall(0).args[0].includes('test youch !'))
+  t.true(errorSpy.getCall(1).args[0].message.includes('test youch !'))
+})
+
+test.serial('/test/error no source-map (Youch)', async t => {
+  const sourceMaps = nuxt.renderer.resources.serverBundle.maps
+  nuxt.renderer.resources.serverBundle.maps = {}
+
+  const errorSpy = await interceptError()
+  const { response, error } = await t.throws(nuxt.renderAndGetWindow(url('/test/error')))
+  t.is(response.statusCode, 500)
+  t.is(response.statusMessage, 'NuxtServerError')
+  t.true(error.includes('test youch !'))
+  t.true(error.includes('<div class="error-frames">'))
+  release()
+  t.true(errorSpy.calledTwice)
+  t.true(errorSpy.getCall(0).args[0].includes('test youch !'))
+  t.true(errorSpy.getCall(1).args[0].message.includes('test youch !'))
+
+  nuxt.renderer.resources.serverBundle.maps = sourceMaps
+})
+
+test.serial('/test/error should return json format error (Youch)', async t => {
+  const opts = {
+    headers: {
+      'accept': 'application/json'
+    },
+    resolveWithFullResponse: true
+  }
+  const errorSpy = await interceptError()
+  const { response: { headers } } = await t.throws(rp(url('/test/error'), opts))
+  t.is(headers['content-type'], 'text/json; charset=utf-8')
+  release()
+  t.true(errorSpy.calledTwice)
+  t.true(errorSpy.getCall(0).args[0].includes('test youch !'))
+  t.true(errorSpy.getCall(1).args[0].message.includes('test youch !'))
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/deprecate.test.js b/test/deprecate.test.js
index e6ae186066..835f33d6d3 100755
--- a/test/deprecate.test.js
+++ b/test/deprecate.test.js
@@ -1,55 +1,52 @@
 import test from 'ava'
-import stdMocks from 'std-mocks'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { intercept, interceptWarn, release } from './helpers/console'
 
 const port = 4010
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
 let builder = null
-let builtErr = null
+let buildSpies = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const rootDir = resolve(__dirname, 'fixtures/deprecate')
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = false
-  nuxt = new Nuxt(config)
-  builder = new Builder(nuxt)
 
-  stdMocks.use({
-    stdout: false,
-    stderr: true
+  buildSpies = await intercept(async () => {
+    nuxt = new Nuxt(config)
+    builder = await new Builder(nuxt)
+    await builder.build()
+    await nuxt.listen(port, 'localhost')
   })
-  await builder.build()
-  stdMocks.restore()
-  builtErr = stdMocks.flush().stderr
 
-  await nuxt.listen(port, 'localhost')
+  t.true(buildSpies.log.calledWithMatch('DONE'))
+  t.true(buildSpies.log.calledWithMatch('OPEN'))
 })
 
-test('Deprecated: context.isServer and context.isClient', async t => {
-  stdMocks.use()
+test.serial('Deprecated: context.isServer and context.isClient', async t => {
+  const warnSpy = await interceptWarn()
   await rp(url('/'))
-  stdMocks.restore()
-  const output = stdMocks.flush()
-  t.true(output.stderr.length === 2)
+  t.true(warnSpy.calledWith('context.isServer has been deprecated, please use process.server instead.'))
+  t.true(warnSpy.calledWith('context.isClient has been deprecated, please use process.client instead.'))
+  t.true(warnSpy.calledTwice)
+  release()
 })
 
-test('Deprecated: dev in build.extend()', async t => {
-  const deprecatedMsg = 'dev has been deprecated in build.extend(), please use isDev'
-  const errors = builtErr.filter(value => value.indexOf(deprecatedMsg) === 0)
-  t.true(errors.length === 2)
+test.serial('Deprecated: dev in build.extend()', async t => {
+  t.true(buildSpies.warn.withArgs('dev has been deprecated in build.extend(), please use isDev').calledTwice)
 })
 
-test('Deprecated: nuxt.plugin()', async t => {
+test.serial('Deprecated: nuxt.plugin()', async t => {
   t.true(nuxt.__builder_plugin)
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/dll.test.js b/test/dll.test.js
index 98d33bef99..c114855f37 100644
--- a/test/dll.test.js
+++ b/test/dll.test.js
@@ -1,12 +1,12 @@
+import { promisify } from 'util'
 import test from 'ava'
 import { resolve } from 'path'
 import fs from 'fs'
-import pify from 'pify'
-import stdMocks from 'std-mocks'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { interceptLog, release } from './helpers/console'
 
-const readFile = pify(fs.readFile)
-const rootDir = resolve(__dirname, './fixtures/dll')
+const readFile = promisify(fs.readFile)
+const rootDir = resolve(__dirname, 'fixtures/dll')
 const dllDir = resolve(rootDir, '.cache/client-dll')
 
 const checkCache = (lib) => {
@@ -19,12 +19,16 @@ const checkCache = (lib) => {
 
 let nuxt
 
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = true
-  nuxt = new Nuxt(config)
-  await new Builder(nuxt).build()
+
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(config)
+    await new Builder(nuxt).build()
+  })
+  t.true(logSpy.calledWithMatch('DONE'))
 })
 
 test('Check vue cache', checkCache('vue'))
@@ -34,15 +38,13 @@ test('Check vue-meta cache', checkCache('vue-meta'))
 test('Check vue-router cache', checkCache('vue-router'))
 
 test('Build with DllReferencePlugin', async t => {
-  stdMocks.use()
+  const logSpy = await interceptLog()
   await new Builder(nuxt).build()
-  stdMocks.restore()
-  const output = stdMocks.flush()
-  const dllLog = output.stdout.filter(value => value === 'Using dll for 3 libs\n')
-  t.true(dllLog.length === 1)
+  release()
+  t.true(logSpy.withArgs('Using dll for 3 libs').calledOnce)
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing nuxt.js', t => {
+test.after.always('Closing nuxt.js', t => {
   nuxt.close()
 })
diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js
index 0d5b98737f..bfe522f72a 100644
--- a/test/dynamic-routes.test.js
+++ b/test/dynamic-routes.test.js
@@ -1,17 +1,26 @@
 import test from 'ava'
 import { resolve } from 'path'
 import fs from 'fs'
-import pify from 'pify'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { promisify } from 'util'
+import { interceptLog } from './helpers/console'
 
-const readFile = pify(fs.readFile)
+const readFile = promisify(fs.readFile)
 
-test.before('Init Nuxt.js', async t => {
-  const nuxt = new Nuxt({
+test.serial('Init Nuxt.js', async t => {
+  const config = {
     rootDir: resolve(__dirname, 'fixtures/dynamic-routes'),
-    dev: false
+    dev: false,
+    build: {
+      stats: false
+    }
+  }
+
+  const logSpy = await interceptLog(async () => {
+    const nuxt = new Nuxt(config)
+    await new Builder(nuxt).build()
   })
-  await new Builder(nuxt).build()
+  t.true(logSpy.calledWithMatch('DONE'))
 })
 
 test('Check .nuxt/router.js', t => {
diff --git a/test/error.test.js b/test/error.test.js
index 96bea41a2f..6621818c9d 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -1,6 +1,8 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Builder } from '../index.js'
+import rp from 'request-promise-native'
+import { Nuxt, Builder } from '..'
+import { interceptLog, interceptError, release } from './helpers/console'
 
 const port = 4005
 const url = (route) => 'http://localhost:' + port + route
@@ -8,37 +10,61 @@ const url = (route) => 'http://localhost:' + port + route
 let nuxt = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/error'),
-    dev: false
+    dev: false,
+    build: {
+      stats: false
+    }
   }
-  nuxt = new Nuxt(options)
-  await new Builder(nuxt).build()
 
-  await nuxt.listen(port, 'localhost')
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(options)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
-test('/ should display an error', async t => {
-  try {
-    await nuxt.renderRoute('/')
-  } catch (e) {
-    t.true(e.message.includes('not_defined is not defined'))
-  }
+test.serial('/ should display an error', async t => {
+  const error = await t.throws(nuxt.renderRoute('/'))
+  t.true(error.message.includes('not_defined is not defined'))
 })
 
-test('/404 should display an error too', async t => {
+test.serial('/404 should display an error too', async t => {
   let { error } = await nuxt.renderRoute('/404')
   t.true(error.message.includes('This page could not be found'))
 })
 
-test('/ with renderAndGetWindow()', async t => {
+test.serial('/ with renderAndGetWindow()', async t => {
+  const errorSpy = await interceptError()
   const err = await t.throws(nuxt.renderAndGetWindow(url('/')))
   t.is(err.response.statusCode, 500)
   t.is(err.response.statusMessage, 'NuxtServerError')
+  release()
+  t.true(errorSpy.calledOnce)
+  t.true(errorSpy.getCall(0).args[0].message.includes('render function or template not defined in component: anonymous'))
+})
+
+test.serial('/ with text/json content', async t => {
+  const opts = {
+    headers: {
+      'accept': 'application/json'
+    },
+    resolveWithFullResponse: true
+  }
+  const errorSpy = await interceptError()
+  const { response: { headers } } = await t.throws(rp(url('/'), opts))
+  t.is(headers['content-type'], 'text/json; charset=utf-8')
+  release()
+  t.true(errorSpy.calledOnce)
+  t.true(errorSpy.getCall(0).args[0].message.includes('render function or template not defined in component: anonymous'))
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/express.test.js b/test/express.test.js
index 531aa606a0..62b74149a0 100644
--- a/test/express.test.js
+++ b/test/express.test.js
@@ -1,8 +1,9 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
 import express from 'express'
 import rp from 'request-promise-native'
+import { interceptLog } from './helpers/console'
 
 const port = 4000
 const url = (route) => 'http://localhost:' + port + route
@@ -11,17 +12,21 @@ let nuxt
 let app
 
 // Init nuxt.js and create express server
-test.before('Init Nuxt.js', async t => {
-  const options = {
+test.serial('Init Nuxt.js', async t => {
+  const config = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
-    dev: false
+    buildDir: '.nuxt-express',
+    dev: false,
+    build: {
+      stats: false
+    }
   }
 
-  // Create nuxt instace
-  nuxt = new Nuxt(options)
-
-  // Build
-  await new Builder(nuxt).build()
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(config)
+    await new Builder(nuxt).build()
+  })
+  t.true(logSpy.calledWithMatch('DONE'))
 
   // Create express app
   app = express()
diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js
index 369382e815..439bec51ea 100644
--- a/test/fixtures/basic/nuxt.config.js
+++ b/test/fixtures/basic/nuxt.config.js
@@ -20,6 +20,7 @@ module.exports = {
   },
   transition: false,
   build: {
+    scopeHoisting: true,
     postcss: [
       require('postcss-cssnext')()
     ]
diff --git a/test/fixtures/basic/pages/extractCSS.vue b/test/fixtures/basic/pages/extractCSS.vue
new file mode 100644
index 0000000000..ec788f2e74
--- /dev/null
+++ b/test/fixtures/basic/pages/extractCSS.vue
@@ -0,0 +1,9 @@
+<template>
+  <div></div>
+</template>
+
+<style>
+body {
+  font-size: 30px;
+}
+</style>
diff --git a/test/fixtures/basic/pages/js-link.js b/test/fixtures/basic/pages/js-link.js
new file mode 100644
index 0000000000..efba7fa697
--- /dev/null
+++ b/test/fixtures/basic/pages/js-link.js
@@ -0,0 +1,2 @@
+export default {
+}
diff --git a/test/fixtures/basic/pages/js-link.vue b/test/fixtures/basic/pages/js-link.vue
new file mode 100644
index 0000000000..f69c87b3c5
--- /dev/null
+++ b/test/fixtures/basic/pages/js-link.vue
@@ -0,0 +1,5 @@
+<template>
+  <h1>vue file is first-class</h1>
+</template>
+
+<script src="./js-link.js"></script>
diff --git a/test/fixtures/basic/pages/jsx.js b/test/fixtures/basic/pages/jsx.js
new file mode 100644
index 0000000000..88923dce9d
--- /dev/null
+++ b/test/fixtures/basic/pages/jsx.js
@@ -0,0 +1,7 @@
+export default {
+  render() {
+    return <div class='container'>
+      <h1>JSX Page</h1>
+    </div>
+  }
+}
diff --git a/test/fixtures/basic/pages/redirect3.vue b/test/fixtures/basic/pages/redirect-external.vue
similarity index 100%
rename from test/fixtures/basic/pages/redirect3.vue
rename to test/fixtures/basic/pages/redirect-external.vue
diff --git a/test/fixtures/basic/pages/redirect2.vue b/test/fixtures/basic/pages/redirect-middleware.vue
similarity index 100%
rename from test/fixtures/basic/pages/redirect2.vue
rename to test/fixtures/basic/pages/redirect-middleware.vue
diff --git a/test/fixtures/basic/pages/redirect-name.vue b/test/fixtures/basic/pages/redirect-name.vue
new file mode 100644
index 0000000000..0797e27eaa
--- /dev/null
+++ b/test/fixtures/basic/pages/redirect-name.vue
@@ -0,0 +1,11 @@
+<template>
+  <div>Redirecting...</div>
+</template>
+
+<script>
+export default {
+  fetch({ redirect }) {
+    return redirect({name: 'stateless'})
+  }
+}
+</script>
diff --git a/test/fixtures/basic/pages/router-guard.vue b/test/fixtures/basic/pages/router-guard.vue
new file mode 100644
index 0000000000..ae5e319c1f
--- /dev/null
+++ b/test/fixtures/basic/pages/router-guard.vue
@@ -0,0 +1,11 @@
+<template>
+  <div>Router Guard</div>
+</template>
+
+<script>
+export default {
+  beforeRouteEnter(to, from, next) {
+    next({path: '/async-data'})
+  }
+}
+</script>
diff --git a/test/fixtures/basic/plugins/watch.js b/test/fixtures/basic/plugins/watch.js
new file mode 100644
index 0000000000..b243a212ab
--- /dev/null
+++ b/test/fixtures/basic/plugins/watch.js
@@ -0,0 +1,12 @@
+import Vue from 'vue'
+
+const Plugin = {
+  install(Vue) {
+    Vue.mixin({
+      created() {
+        console.log('I am mixin') // eslint-disable-line no-console
+      }
+    })
+  }
+}
+Vue.use(Plugin)
diff --git a/test/fixtures/debug/nuxt.config.js b/test/fixtures/debug/nuxt.config.js
index 2bb2464225..8de5df3d80 100644
--- a/test/fixtures/debug/nuxt.config.js
+++ b/test/fixtures/debug/nuxt.config.js
@@ -2,12 +2,13 @@ module.exports = {
   router: {
     base: '/test/'
   },
+  dev: true, // Needed for _open middleware
   debug: true,
-  build: {
-    scopeHoisting: true
-  },
   editor: {
     cmd: 'echo',
     pattern: ''
+  },
+  build: {
+    stats: false
   }
 }
diff --git a/test/fixtures/deprecate/nuxt.config.js b/test/fixtures/deprecate/nuxt.config.js
index 2fc7d1f9ba..94975ec291 100755
--- a/test/fixtures/deprecate/nuxt.config.js
+++ b/test/fixtures/deprecate/nuxt.config.js
@@ -3,6 +3,7 @@ module.exports = {
     '~/modules/hooks'
   ],
   build: {
+    stats: false,
     extend(config, options) {
       if (options.dev) {
         // Please use isDev instead of dev
diff --git a/test/fixtures/dll/nuxt.config.js b/test/fixtures/dll/nuxt.config.js
index d2f540265b..455b772a14 100644
--- a/test/fixtures/dll/nuxt.config.js
+++ b/test/fixtures/dll/nuxt.config.js
@@ -1,5 +1,6 @@
 module.exports = {
   build: {
+    stats: false,
     dll: true,
     extend(config, options) {
       if (options.isClient) {
diff --git a/test/fixtures/module/modules/middleware/use-middleware.js b/test/fixtures/module/modules/middleware/use-middleware.js
new file mode 100644
index 0000000000..f6156520c3
--- /dev/null
+++ b/test/fixtures/module/modules/middleware/use-middleware.js
@@ -0,0 +1,3 @@
+module.exports = function (req, res, next) {
+  res.end('Use external middleware')
+}
diff --git a/test/fixtures/module/nuxt.config.js b/test/fixtures/module/nuxt.config.js
index 63b3a2f62a..52b8aad778 100755
--- a/test/fixtures/module/nuxt.config.js
+++ b/test/fixtures/module/nuxt.config.js
@@ -21,5 +21,15 @@ module.exports = {
     hook('build:done', builder => {
       builder.__build_done__ = true
     })
+    // Add hook for renderer
+    hook('render:before', (renderer) => {
+      renderer.useMiddleware({
+        path: '/use-middleware',
+        handler: '~/modules/middleware/use-middleware'
+      })
+    })
+  },
+  build: {
+    stats: false
   }
 }
diff --git a/test/fixtures/spa/nuxt.config.js b/test/fixtures/spa/nuxt.config.js
index bcbf687d27..79358e6611 100644
--- a/test/fixtures/spa/nuxt.config.js
+++ b/test/fixtures/spa/nuxt.config.js
@@ -1,6 +1,8 @@
 module.exports = {
-  rootDir: __dirname,
   mode: 'spa',
   dev: false,
-  transition: false
+  transition: false,
+  build: {
+    stats: false
+  }
 }
diff --git a/test/fixtures/ssr/nuxt.config.js b/test/fixtures/ssr/nuxt.config.js
new file mode 100644
index 0000000000..20d8e8a969
--- /dev/null
+++ b/test/fixtures/ssr/nuxt.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  dev: false,
+  render: {
+    resourceHints: false
+  },
+  build: {
+    stats: false,
+    extractCSS: true
+  }
+}
diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js
index bd564d5e8a..523a672110 100644
--- a/test/fixtures/with-config/nuxt.config.js
+++ b/test/fixtures/with-config/nuxt.config.js
@@ -42,12 +42,22 @@ module.exports = {
     }
   },
   build: {
-    // extractCSS: true,
+    stats: false,
     publicPath: '/orion/',
     analyze: {
       analyzerMode: 'disabled',
       generateStatsFile: true
     },
+    styleResources: {
+      patterns: [
+        '~/assets/pre-process.scss'
+      ]
+    },
+    babel: {
+      presets({ isServer }) {
+        return null // Coverage: Return null, so defaults will be used.
+      }
+    },
     extend(config, options) {
       return Object.assign({}, config, {
         devtool: 'nosources-source-map'
diff --git a/test/generator.test.js b/test/generator.test.js
index 7fe1855e76..9ebbed4235 100644
--- a/test/generator.test.js
+++ b/test/generator.test.js
@@ -1,5 +1,5 @@
 import test from 'ava'
-import { Nuxt, Generator } from '../index.js'
+import { Nuxt, Generator } from '..'
 
 test('initRoutes with routes (fn => array)', async t => {
   const array = ['/1', '/2', '/3', '/4']
diff --git a/test/helpers/console.js b/test/helpers/console.js
new file mode 100644
index 0000000000..6a89271b90
--- /dev/null
+++ b/test/helpers/console.js
@@ -0,0 +1,136 @@
+import sinon from 'sinon'
+
+let context = null
+
+export function release() {
+  if (context === null) {
+    process.stderr.write('Console spy context was empty, did a previous test already release it?\n')
+    return
+  }
+
+  if (context.log) {
+    console.log = context.log // eslint-disable-line no-console
+  }
+  if (context.info) {
+    console.info = context.info // eslint-disable-line no-console
+  }
+  if (context.warn) {
+    console.warn = context.warn // eslint-disable-line no-console
+  }
+  if (context.error) {
+    console.error = context.error // eslint-disable-line no-console
+  }
+  if (context.stdout) {
+    process.stdout.write = context.stdout
+  }
+  if (context.stderr) {
+    process.stderr.write = context.stderr
+  }
+
+  context = null
+}
+
+export async function intercept(levels, msg, cb) {
+  if (context !== null) {
+    process.stderr.write('Console spy context was not empty, did a previous test not release it?\n')
+  }
+  context = {}
+
+  if (cb === undefined && typeof msg === 'function') {
+    cb = msg
+    msg = undefined
+
+    if (typeof levels === 'string') {
+      msg = levels
+      levels = undefined
+    }
+  }
+
+  if (cb === undefined && msg === undefined && typeof levels === 'function') {
+    cb = levels
+    levels = undefined
+  }
+
+  const all = levels === undefined || levels === {}
+  const spies = {}
+
+  if (all || levels.log) {
+    context.log = console.log // eslint-disable-line no-console
+    spies.log = console.log = sinon.spy() // eslint-disable-line no-console
+  }
+
+  if (all || levels.info) {
+    context.info = console.info // eslint-disable-line no-console
+    spies.info = console.info = sinon.spy() // eslint-disable-line no-console
+  }
+
+  if (all || levels.warn) {
+    context.warn = console.warn // eslint-disable-line no-console
+    spies.warn = console.warn = sinon.spy() // eslint-disable-line no-console
+  }
+
+  if (all || levels.error) {
+    context.error = console.error // eslint-disable-line no-console
+    spies.error = console.error = sinon.spy() // eslint-disable-line no-console
+  }
+
+  if (levels && levels.stdout) {
+    context.stdout = process.stdout.write
+    spies.stdout = process.stdout.write = sinon.spy()
+  }
+
+  if (levels && levels.stderr) {
+    context.stderr = process.stderr.write
+    spies.stderr = process.stderr.write = sinon.spy()
+  }
+
+  if (cb) {
+    if (msg) {
+      if (context.stdout) {
+        context.stdout(`  ${msg}`)
+      } else {
+        process.stdout.write(`  ${msg}`)
+      }
+    }
+
+    await cb()
+
+    release()
+
+    if (msg) {
+      process.stdout.write('\n')
+    }
+  }
+
+  return spies
+}
+
+export async function interceptLog(msg, cb) {
+  const { log } = await intercept({ log: true }, msg, cb)
+  return log
+}
+
+export async function interceptInfo(msg, cb) {
+  const { info } = await intercept({ info: true }, msg, cb)
+  return info
+}
+
+export async function interceptWarn(msg, cb) {
+  const { warn } = await intercept({ warn: true }, msg, cb)
+  return warn
+}
+
+export async function interceptError(msg, cb) {
+  const { error } = await intercept({ error: true }, msg, cb)
+  return error
+}
+
+export async function interceptStdout(msg, cb) {
+  const { stdout } = await intercept({ stdout: true }, msg, cb)
+  return stdout
+}
+
+export async function interceptStderr(msg, cb) {
+  const { stderr } = await intercept({ stderr: true }, msg, cb)
+  return stderr
+}
diff --git a/test/index.test.js b/test/index.test.js
index c30f96be7e..bc706544e0 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -1,12 +1,12 @@
 import test from 'ava'
 import { resolve } from 'path'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
 
 test('Nuxt.js Class', t => {
   t.is(typeof Nuxt, 'function')
 })
 
-test.serial('Nuxt.js Instance', async t => {
+test('Nuxt.js Instance', async t => {
   const nuxt = new Nuxt({
     rootDir: resolve(__dirname, 'fixtures', 'empty')
   })
@@ -17,7 +17,7 @@ test.serial('Nuxt.js Instance', async t => {
   t.is(nuxt.initialized, true)
 })
 
-test.serial('Fail to build when no pages/ directory but is in the parent', t => {
+test('Fail to build when no pages/ directory but is in the parent', t => {
   const nuxt = new Nuxt({
     dev: false,
     rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
@@ -29,7 +29,7 @@ test.serial('Fail to build when no pages/ directory but is in the parent', t =>
   })
 })
 
-test.serial('Fail to build when no pages/ directory', t => {
+test('Fail to build when no pages/ directory', t => {
   const nuxt = new Nuxt({
     dev: false,
     rootDir: resolve(__dirname)
diff --git a/test/module.test.js b/test/module.test.js
index d8fceedfb1..7fd46e7c98 100755
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -1,69 +1,71 @@
 import test from 'ava'
-import stdMocks from 'std-mocks'
 import { resolve, normalize } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { intercept } from './helpers/console'
 
 const port = 4006
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
 let builder = null
-let builtErr = null
+let buildSpies = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+test.serial('Init Nuxt.js', async t => {
   const rootDir = resolve(__dirname, 'fixtures/module')
-  let config = require(resolve(rootDir, 'nuxt.config.js'))
+  const config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = false
   nuxt = new Nuxt(config)
   builder = new Builder(nuxt)
 
-  stdMocks.use({
-    stdout: false,
-    stderr: true
+  buildSpies = await intercept({ log: true, error: true }, async () => {
+    await builder.build()
+    await nuxt.listen(port, 'localhost')
   })
-  await builder.build()
-  stdMocks.restore()
-  builtErr = stdMocks.flush().stderr
 
-  await nuxt.listen(port, 'localhost')
+  t.true(buildSpies.log.calledWithMatch('DONE'))
+  t.true(buildSpies.log.calledWithMatch('OPEN'))
 })
 
-test('Vendor', async t => {
+test.serial('Vendor', async t => {
   t.true(nuxt.options.build.vendor.indexOf('lodash') !== -1, 'lodash added to config')
 })
 
-test('Plugin', async t => {
+test.serial('Plugin', async t => {
   t.true(normalize(nuxt.options.plugins[0].src)
     .includes(normalize('fixtures/module/.nuxt/basic.reverse.')), 'plugin added to config')
   const { html } = await nuxt.renderRoute('/')
   t.true(html.includes('<h1>TXUN</h1>'), 'plugin works')
 })
 
+test.serial('Hooks', async t => {
+  t.is(nuxt.__module_hook, 1)
+  t.is(nuxt.__renderer_hook, 2)
+  t.is(nuxt.__builder_hook, 3)
+})
+
+test.serial('Hooks - Functional', async t => {
+  t.true(nuxt.__ready_called__)
+  t.true(builder.__build_done__)
+})
+
+test.serial('Hooks - Error', async t => {
+  t.true(buildSpies.error.calledWithMatch(/build:extendRoutes/))
+})
+
 test('Middleware', async t => {
   let response = await rp(url('/api'))
   t.is(response, 'It works!', '/api response is correct')
 })
 
-test('Hooks', async t => {
-  t.is(nuxt.__module_hook, 1)
-  t.is(nuxt.__renderer_hook, 2)
-  t.is(nuxt.__builder_hook, 3)
-})
-
-test('Hooks - Functional', async t => {
-  t.true(nuxt.__ready_called__)
-  t.true(builder.__build_done__)
-})
-
-test('Hooks - Error', async t => {
-  const errors = builtErr.filter(value => value.indexOf('build:extendRoutes') >= 0)
-  t.true(errors.length === 1)
+test('Hooks - Use external middleware before render', async t => {
+  let response = await rp(url('/use-middleware'))
+  t.is(response, 'Use external middleware')
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/spa.test.js b/test/spa.test.js
index 8188960bb8..41b179020b 100755
--- a/test/spa.test.js
+++ b/test/spa.test.js
@@ -1,10 +1,11 @@
 import test from 'ava'
-import stdMocks from 'std-mocks'
-import { Nuxt, Builder } from '../index.js'
+import { resolve } from 'path'
+import { Nuxt, Builder } from '..'
+import { interceptLog, release } from './helpers/console'
 
 let nuxt = null
 
-const port = 4004
+const port = 4012
 const url = (route) => 'http://localhost:' + port + route
 
 const renderRoute = async _url => {
@@ -15,39 +16,63 @@ const renderRoute = async _url => {
 }
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  nuxt = new Nuxt(require('./fixtures/spa/nuxt.config'))
-  await new Builder(nuxt).build()
-  await nuxt.listen(port, 'localhost')
+test.serial('Init Nuxt.js', async t => {
+  const rootDir = resolve(__dirname, 'fixtures/spa')
+  const config = require(resolve(rootDir, 'nuxt.config.js'))
+  config.rootDir = rootDir
+
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(config)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
-test('/ (basic spa)', async t => {
+test.serial('/ (basic spa)', async t => {
+  const logSpy = await interceptLog()
   const { html } = await renderRoute('/')
   t.true(html.includes('Hello SPA!'))
+  release()
+  t.true(logSpy.withArgs('created').notCalled)
+  t.true(logSpy.withArgs('mounted').calledOnce)
 })
 
-test('/custom (custom layout)', async t => {
+test.serial('/custom (custom layout)', async t => {
+  const logSpy = await interceptLog()
   const { html } = await renderRoute('/custom')
   t.true(html.includes('Custom layout'))
+  release()
+  t.true(logSpy.withArgs('created').calledOnce)
+  t.true(logSpy.withArgs('mounted').calledOnce)
 })
 
-test('/custom (not default layout)', async t => {
+test.serial('/custom (not default layout)', async t => {
+  const logSpy = await interceptLog()
   const { head } = await renderRoute('/custom')
   t.false(head.includes('src="/_nuxt/layouts/default.'))
+  release()
+  t.true(logSpy.withArgs('created').calledOnce)
+  t.true(logSpy.withArgs('mounted').calledOnce)
 })
 
-test('/custom (call mounted and created once)', async t => {
-  stdMocks.use()
+test.serial('/custom (call mounted and created once)', async t => {
+  const logSpy = await interceptLog()
   await renderRoute('/custom')
-  stdMocks.restore()
-  const output = stdMocks.flush()
-  const creates = output.stdout.filter(value => value === 'created\n')
-  t.true(creates.length === 1)
-  const mounts = output.stdout.filter(value => value === 'mounted\n')
-  t.true(mounts.length === 1)
+  release()
+  t.true(logSpy.withArgs('created').calledOnce)
+  t.true(logSpy.withArgs('mounted').calledOnce)
+})
+
+test('/_nuxt/ (access publicPath in spa mode)', async t => {
+  const { response: { statusCode, statusMessage } } = await t.throws(renderRoute('/_nuxt/'))
+  t.is(statusCode, 404)
+  t.is(statusMessage, 'ResourceNotFound')
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/ssr.test.js b/test/ssr.test.js
index 267aaba508..99735578b4 100755
--- a/test/ssr.test.js
+++ b/test/ssr.test.js
@@ -3,6 +3,7 @@ import { resolve } from 'path'
 import { Nuxt, Builder, Utils } from '..'
 import { uniq } from 'lodash'
 import rp from 'request-promise-native'
+import { interceptLog } from './helpers/console'
 
 const port = 4008
 let nuxt = null
@@ -17,20 +18,19 @@ const url = (route) => 'http://localhost:' + port + route
 const isWindows = /^win/.test(process.platform)
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  const options = {
-    rootDir: resolve(__dirname, 'fixtures/ssr'),
-    dev: false,
-    render: {
-      resourceHints: false
-    },
-    build: {
-      extractCSS: true
-    }
-  }
-  nuxt = new Nuxt(options)
-  await new Builder(nuxt).build()
-  await nuxt.listen(port, 'localhost')
+test.serial('Init Nuxt.js', async t => {
+  const rootDir = resolve(__dirname, 'fixtures/ssr')
+  const config = require(resolve(rootDir, 'nuxt.config.js'))
+  config.rootDir = rootDir
+
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(config)
+    await new Builder(nuxt).build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
 // == Uniq Test ==
@@ -121,6 +121,6 @@ test('stress test with asyncData', async t => {
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/test/utils.test.js b/test/utils.test.js
index ef834f2b89..c21244f7a6 100644
--- a/test/utils.test.js
+++ b/test/utils.test.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import ansiHTML from 'ansi-html'
-import { Utils } from '../index.js'
+import { Utils } from '..'
 
 test('encodeHtml', t => {
   const html = '<h1>Hello</h1>'
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 0dd726da0c..d70faa13b1 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -1,12 +1,14 @@
 import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt, Builder } from '../index.js'
+import { Nuxt, Builder } from '..'
+import { interceptLog, release } from './helpers/console'
 
 const port = 4007
 const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
+let builder = null
 
 // Init nuxt.js and create server listening on localhost:4000
 test.before('Init Nuxt.js', async t => {
@@ -14,14 +16,25 @@ test.before('Init Nuxt.js', async t => {
   let config = require(resolve(rootDir, 'nuxt.config.js'))
   config.rootDir = rootDir
   config.dev = false
-  nuxt = new Nuxt(config)
-  await new Builder(nuxt).build()
-  await nuxt.listen(port, 'localhost')
+
+  const logSpy = await interceptLog(async () => {
+    nuxt = new Nuxt(config)
+    builder = new Builder(nuxt)
+    await builder.build()
+    await nuxt.listen(port, 'localhost')
+  })
+
+  t.true(logSpy.calledWithMatch('DONE'))
+  t.true(logSpy.calledWithMatch('OPEN'))
 })
 
-test('/', async t => {
+test.serial('/', async t => {
+  const logSpy = await interceptLog()
   const { html } = await nuxt.renderRoute('/')
   t.true(html.includes('<h1>I have custom configurations</h1>'))
+  release()
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
 })
 
 test('/ (global styles inlined)', async t => {
@@ -49,40 +62,65 @@ test('/ (custom postcss.config.js)', async t => {
   t.true(html.includes('::-webkit-input-placeholder'))
 })
 
-test('/test/ (router base)', async t => {
+test.serial('/test/ (router base)', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/'))
+
   const html = window.document.body.innerHTML
   t.is(window.__NUXT__.layout, 'default')
   t.true(html.includes('<h1>Default layout</h1>'))
   t.true(html.includes('<h1>I have custom configurations</h1>'))
+  release()
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
 })
 
-test('/test/about (custom layout)', async t => {
+test.serial('/test/about (custom layout)', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/about'))
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
+  release()
+
   const html = window.document.body.innerHTML
   t.is(window.__NUXT__.layout, 'custom')
   t.true(html.includes('<h1>Custom layout</h1>'))
   t.true(html.includes('<h1>About page</h1>'))
 })
 
-test('/test/desktop (custom layout in desktop folder)', async t => {
+test.serial('/test/desktop (custom layout in desktop folder)', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/desktop'))
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
+  release()
+
   const html = window.document.body.innerHTML
   t.is(window.__NUXT__.layout, 'desktop/default')
   t.true(html.includes('<h1>Default desktop layout</h1>'))
   t.true(html.includes('<h1>Desktop page</h1>'))
 })
 
-test('/test/mobile (custom layout in mobile folder)', async t => {
+test.serial('/test/mobile (custom layout in mobile folder)', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/mobile'))
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
+  release()
+
   const html = window.document.body.innerHTML
   t.is(window.__NUXT__.layout, 'mobile/default')
   t.true(html.includes('<h1>Default mobile layout</h1>'))
   t.true(html.includes('<h1>Mobile page</h1>'))
 })
 
-test('/test/env', async t => {
+test.serial('/test/env', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/env'))
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
+  release()
+
   const html = window.document.body.innerHTML
   t.true(html.includes('<h1>Custom env layout</h1>'))
   t.true(html.includes('"bool": true'))
@@ -94,20 +132,35 @@ test('/test/env', async t => {
   t.true(html.includes('"obj": {'))
 })
 
-test('/test/error', async t => {
+test.serial('/test/error', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/error'))
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
+  release()
+
   const html = window.document.body.innerHTML
   t.true(html.includes('Error page'))
 })
 
-test('/test/user-agent', async t => {
+test.serial('/test/user-agent', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/user-agent'))
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
+  release()
+
   const html = window.document.body.innerHTML
   t.true(html.includes('<pre>Mozilla'))
 })
 
-test('/test/about-bis (added with extendRoutes)', async t => {
+test.serial('/test/about-bis (added with extendRoutes)', async t => {
+  const logSpy = await interceptLog()
   const window = await nuxt.renderAndGetWindow(url('/test/about-bis'))
+  t.true(logSpy.calledOnce)
+  t.is(logSpy.args[0][0], 'Test plugin!')
+  release()
+
   const html = window.document.body.innerHTML
   t.true(html.includes('<h1>Custom layout</h1>'))
   t.true(html.includes('<h1>About page</h1>'))
@@ -128,7 +181,18 @@ test('Check /test.txt should return 404', async t => {
   t.is(err.response.statusCode, 404)
 })
 
-// Close server and ask nuxt to stop listening to file changes
-test.after('Closing server and nuxt.js', t => {
-  nuxt.close()
+test('Check build.styleResources for style-resources-loader', async t => {
+  const loaders = builder.styleLoader('scss')
+  const loader = loaders.find(l => l.loader === 'style-resources-loader')
+  t.is(typeof loader, 'object')
+  t.deepEqual(loader.options, {
+    patterns: [
+      '~/assets/pre-process.scss'
+    ]
+  })
+})
+
+// Close server and ask nuxt to stop listening to file changes
+test.after.always('Closing server and nuxt.js', async t => {
+  await nuxt.close()
 })
diff --git a/yarn.lock b/yarn.lock
index 3d8627d9c8..f8b203955c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -38,53 +38,54 @@
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-"@babel/code-frame@7.0.0-beta.32", "@babel/code-frame@^7.0.0-beta.31":
-  version "7.0.0-beta.32"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.32.tgz#04f231b8ec70370df830d9926ce0f5add074ec4c"
+"@babel/code-frame@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35"
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/helper-function-name@7.0.0-beta.32":
-  version "7.0.0-beta.32"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.32.tgz#6161af4419f1b4e3ed2d28c0c79c160e218be1f3"
+"@babel/helper-function-name@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57"
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.32"
-    "@babel/template" "7.0.0-beta.32"
-    "@babel/types" "7.0.0-beta.32"
+    "@babel/helper-get-function-arity" "7.0.0-beta.31"
+    "@babel/template" "7.0.0-beta.31"
+    "@babel/traverse" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
 
-"@babel/helper-get-function-arity@7.0.0-beta.32":
-  version "7.0.0-beta.32"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.32.tgz#93721a99db3757de575a83bab7c453299abca568"
+"@babel/helper-get-function-arity@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493"
   dependencies:
-    "@babel/types" "7.0.0-beta.32"
+    "@babel/types" "7.0.0-beta.31"
 
-"@babel/template@7.0.0-beta.32":
-  version "7.0.0-beta.32"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.32.tgz#e1d9fdbd2a7bcf128f2f920744a67dab18072495"
+"@babel/template@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.32"
-    "@babel/types" "7.0.0-beta.32"
-    babylon "7.0.0-beta.32"
+    "@babel/code-frame" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
+    babylon "7.0.0-beta.31"
     lodash "^4.2.0"
 
-"@babel/traverse@^7.0.0-beta.31":
-  version "7.0.0-beta.32"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.32.tgz#b78b754c6e1af3360626183738e4c7a05951bc99"
+"@babel/traverse@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.32"
-    "@babel/helper-function-name" "7.0.0-beta.32"
-    "@babel/types" "7.0.0-beta.32"
-    babylon "7.0.0-beta.32"
+    "@babel/code-frame" "7.0.0-beta.31"
+    "@babel/helper-function-name" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
+    babylon "7.0.0-beta.31"
     debug "^3.0.1"
     globals "^10.0.0"
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/types@7.0.0-beta.32", "@babel/types@^7.0.0-beta.31":
-  version "7.0.0-beta.32"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.32.tgz#c317d0ecc89297b80bbcb2f50608e31f6452a5ff"
+"@babel/types@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.2.0"
@@ -109,8 +110,8 @@
   resolved "https://registry.yarnpkg.com/@std/esm/-/esm-0.16.0.tgz#2a7a33ecb7f1701cebd4c87df6d0d945ed51f730"
 
 "@types/node@*":
-  version "8.0.53"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.2.tgz#83b8103fa9a2c2e83d78f701a9aa7c9539739aa5"
 
 abab@^1.0.3:
   version "1.0.4"
@@ -175,8 +176,8 @@ ajv@^4.9.1:
     json-stable-stringify "^1.0.1"
 
 ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.4.0.tgz#32d1cf08dbc80c432f426f12e10b2511f6b46474"
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -307,6 +308,13 @@ array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
 
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -325,6 +333,10 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
 asn1.js@^4.0.0:
   version "4.9.2"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
@@ -388,15 +400,15 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^7.1.1, autoprefixer@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.6.tgz#fb933039f74af74a83e71225ce78d9fd58ba84d7"
+autoprefixer@^7.1.1, autoprefixer@^7.2.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.3.tgz#c2841e38b7940c2d0a9bbffd72c75f33637854f8"
   dependencies:
-    browserslist "^2.5.1"
-    caniuse-lite "^1.0.30000748"
+    browserslist "^2.10.0"
+    caniuse-lite "^1.0.30000783"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.13"
+    postcss "^6.0.14"
     postcss-value-parser "^3.2.3"
 
 ava-init@^0.2.0:
@@ -541,14 +553,14 @@ babel-core@^6.17.0, babel-core@^6.26.0:
     slash "^1.0.0"
     source-map "^0.5.6"
 
-babel-eslint@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.2.tgz#e44fb9a037d749486071d52d65312f5c20aa7530"
+babel-eslint@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.3.tgz#f29ecf02336be438195325cd47c468da81ee4e98"
   dependencies:
-    "@babel/code-frame" "^7.0.0-beta.31"
-    "@babel/traverse" "^7.0.0-beta.31"
-    "@babel/types" "^7.0.0-beta.31"
-    babylon "^7.0.0-beta.31"
+    "@babel/code-frame" "7.0.0-beta.31"
+    "@babel/traverse" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
+    babylon "7.0.0-beta.31"
 
 babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.0"
@@ -658,8 +670,8 @@ babel-helper-replace-supers@^6.24.1:
     babel-types "^6.24.1"
 
 babel-helper-vue-jsx-merge-props@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
 
 babel-helpers@^6.24.1:
   version "6.24.1"
@@ -730,10 +742,6 @@ babel-plugin-jsx-v-model@^2.0.1:
     html-tags "^2.0.0"
     svg-tags "^1.0.0"
 
-babel-plugin-jsx-vue-functional@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-vue-functional/-/babel-plugin-jsx-vue-functional-2.1.0.tgz#5630a0c86fe1904d28c30465e6bf1cf71235a239"
-
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -1017,25 +1025,24 @@ babel-preset-env@^1.6.0:
     invariant "^2.2.2"
     semver "^5.3.0"
 
-babel-preset-vue-app@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-vue-app/-/babel-preset-vue-app-1.3.2.tgz#53e98ac012a4edd3f8356cc6aafa000a6e980292"
+babel-preset-vue-app@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-vue-app/-/babel-preset-vue-app-2.0.0.tgz#3849f42986dc6597f3c8aa21cc0bdfcc5fda4aa6"
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-plugin-transform-object-rest-spread "^6.26.0"
     babel-plugin-transform-runtime "^6.15.0"
     babel-preset-env "^1.6.0"
-    babel-preset-vue "^1.2.1"
+    babel-preset-vue "^2.0.0"
     babel-runtime "^6.20.0"
 
-babel-preset-vue@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-1.2.1.tgz#b0de8977e0ce981fc6824cf0a537917a02a6fe87"
+babel-preset-vue@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-2.0.0.tgz#441f7cf75836a0fa908a5df62bc243f8f9109d2c"
   dependencies:
     babel-helper-vue-jsx-merge-props "^2.0.2"
     babel-plugin-jsx-event-modifiers "^2.0.2"
     babel-plugin-jsx-v-model "^2.0.1"
-    babel-plugin-jsx-vue-functional "^2.1.0"
     babel-plugin-syntax-jsx "^6.18.0"
     babel-plugin-transform-vue-jsx "^3.5.0"
 
@@ -1091,9 +1098,9 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.32, babylon@^7.0.0-beta.31:
-  version "7.0.0-beta.32"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.32.tgz#e9033cb077f64d6895f4125968b37dc0a8c3bc6e"
+babylon@7.0.0-beta.31:
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f"
 
 babylon@^6.1.0, babylon@^6.18.0:
   version "6.18.0"
@@ -1135,7 +1142,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
+bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1181,8 +1188,8 @@ boom@5.x.x:
     hoek "4.x.x"
 
 boxen@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.2.tgz#3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1190,7 +1197,7 @@ boxen@^1.2.1:
     cli-boxes "^1.0.0"
     string-width "^2.0.0"
     term-size "^1.2.0"
-    widest-line "^1.0.0"
+    widest-line "^2.0.0"
 
 brace-expansion@^1.1.7:
   version "1.1.8"
@@ -1215,12 +1222,6 @@ browser-process-hrtime@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
 
-browser-resolve@^1.11.0:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
-  dependencies:
-    resolve "1.1.7"
-
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
@@ -1280,12 +1281,12 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^2.0.0, browserslist@^2.1.2, browserslist@^2.5.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.1.tgz#b72d3982ab01b5cd24da62ff6d45573886aff275"
+browserslist@^2.0.0, browserslist@^2.1.2, browserslist@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
   dependencies:
-    caniuse-lite "^1.0.30000770"
-    electron-to-chromium "^1.3.27"
+    caniuse-lite "^1.0.30000780"
+    electron-to-chromium "^1.3.28"
 
 buf-compare@^1.0.0:
   version "1.0.1"
@@ -1303,7 +1304,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1315,7 +1316,7 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
-cacache@^10.0.0:
+cacache@^10.0.0, cacache@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.1.tgz#3e05f6e616117d9b54665b1b20c8aeb93ea5d36f"
   dependencies:
@@ -1409,16 +1410,12 @@ caniuse-api@^2.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000770"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000770.tgz#cf68ae1cb8a82f6d3c35df41c62dc6973e470244"
+  version "1.0.30000784"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000784.tgz#1be95012d9489c7719074f81aee57dbdffe6361b"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000770:
-  version "1.0.30000770"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000770.tgz#bc8e7f50b073273390db6ab357378909a14e9bdb"
-
-caniuse-lite@^1.0.30000772:
-  version "1.0.30000772"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000772.tgz#78129622cabfed7af1ff38b64ab680a6a0865420"
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000783, caniuse-lite@^1.0.30000784:
+  version "1.0.30000784"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1462,8 +1459,8 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
     supports-color "^4.0.0"
 
 chardet@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.0.tgz#0bbe1355ac44d7a3ed4a925707c4ef70f8190f6c"
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
 chokidar@^1.4.2, chokidar@^1.7.0:
   version "1.7.0"
@@ -1602,7 +1599,7 @@ codecov@^3.0.0:
     request "2.81.0"
     urlgrey "0.4.4"
 
-color-convert@^1.3.0, color-convert@^1.8.2, color-convert@^1.9.0:
+color-convert@^1.3.0, color-convert@^1.8.2, color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
@@ -1618,7 +1615,7 @@ color-string@^0.3.0:
   dependencies:
     color-name "^1.0.0"
 
-color-string@^1.4.0:
+color-string@^1.4.0, color-string@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
   dependencies:
@@ -1640,6 +1637,13 @@ color@^1.0.3:
     color-convert "^1.8.2"
     color-string "^1.4.0"
 
+color@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color/-/color-2.0.1.tgz#e4ed78a3c4603d0891eba5430b04b86314f4c839"
+  dependencies:
+    color-convert "^1.9.1"
+    color-string "^1.5.2"
+
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -1658,13 +1662,9 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.11.x, commander@~2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
 commander@2.12.x, commander@^2.9.0, commander@~2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.1.tgz#468635c4168d06145b9323356d1da84d14ac4a7a"
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
 
 common-path-prefix@^1.0.0:
   version "1.0.0"
@@ -1803,16 +1803,20 @@ copy-concurrently@^1.0.0:
     rimraf "^2.5.4"
     run-queue "^1.0.0"
 
-copy-webpack-plugin@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.2.3.tgz#4a3c61089f3b635777f0f0af346c338b39d63755"
+copy-webpack-plugin@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.3.0.tgz#cfdf4d131c78d66917a1bb863f86630497aacf42"
   dependencies:
-    bluebird "^3.5.1"
-    glob "^7.1.2"
+    cacache "^10.0.1"
+    find-cache-dir "^1.0.0"
+    globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^0.2.15"
     lodash "^4.3.0"
     minimatch "^3.0.4"
+    p-limit "^1.0.0"
+    pify "^3.0.0"
+    serialize-javascript "^1.4.0"
 
 core-assert@^0.2.0:
   version "0.2.1"
@@ -1821,9 +1825,13 @@ core-assert@^0.2.0:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+
 core-js@^2.0.0, core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -1874,9 +1882,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74"
+cross-env@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.2.tgz#f35755034822a4798a2678656ab9692e2c20c8df"
   dependencies:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
@@ -1941,6 +1949,13 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
+css-hot-loader@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/css-hot-loader/-/css-hot-loader-1.3.4.tgz#cd58b9419cd7ec82350b1d60713d86e480a8b286"
+  dependencies:
+    loader-utils "^1.1.0"
+    normalize-url "^1.9.1"
+
 css-loader@^0.28.7:
   version "0.28.7"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
@@ -2091,7 +2106,7 @@ debug-log@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.4.1, debug@^2.6.8:
+debug@2.6.9, debug@^2.2.0, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -2189,6 +2204,10 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
+diff@^3.1.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2197,6 +2216,13 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -2204,7 +2230,7 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.2:
+doctrine@^2.0.0, doctrine@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
   dependencies:
@@ -2308,9 +2334,15 @@ ejs@^2.5.6:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.27:
-  version "1.3.27"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
+electron-releases@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
+
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.28:
+  version "1.3.30"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
+  dependencies:
+    electron-releases "^2.1.0"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2369,10 +2401,10 @@ equal-length@^1.0.0:
   resolved "https://registry.yarnpkg.com/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
 
 errno@^0.1.3, errno@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
   dependencies:
-    prr "~0.0.0"
+    prr "~1.0.1"
 
 error-ex@^1.2.0:
   version "1.3.1"
@@ -2386,6 +2418,24 @@ error-stack-parser@^2.0.0:
   dependencies:
     stackframe "^1.0.3"
 
+es-abstract@^1.7.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.1"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
   version "0.10.37"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
@@ -2416,9 +2466,9 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-es6-promise@^4.0.3, es6-promise@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
+es6-promise@^4.0.3, es6-promise@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.1.tgz#3b98a6714ba1b9267428b2c00e6265b16dab0205"
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -2480,9 +2530,13 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-standard@^10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
+eslint-config-standard-jsx@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz#009e53c4ddb1e9ee70b4650ffe63a7f39f8836e1"
+
+eslint-config-standard@^11.0.0-beta.0:
+  version "11.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-11.0.0-beta.0.tgz#f8afe69803d95c685a4b8392b8793188eb03cbb3"
 
 eslint-import-resolver-node@^0.3.1:
   version "0.3.1"
@@ -2532,6 +2586,15 @@ eslint-plugin-promise@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.6.0.tgz#54b7658c8f454813dc2a870aff8152ec4969ba75"
 
+eslint-plugin-react@^7.5.1:
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz#52e56e8d80c810de158859ef07b880d2f56ee30b"
+  dependencies:
+    doctrine "^2.0.0"
+    has "^1.0.1"
+    jsx-ast-utils "^2.0.0"
+    prop-types "^15.6.0"
+
 eslint-plugin-standard@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
@@ -2543,9 +2606,9 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint@^4.12.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.12.0.tgz#a7ce78eba8cc8f2443acfbbc870cc31a65135884"
+eslint@^4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
@@ -2636,18 +2699,6 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
-estree-walker@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
-
-estree-walker@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
-
-estree-walker@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854"
-
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -2769,10 +2820,14 @@ extract-zip@^1.6.5:
     mkdirp "0.5.0"
     yauzl "2.4.1"
 
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
 fast-deep-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
@@ -2793,6 +2848,18 @@ fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
+fbjs@^0.8.16:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.9"
+
 fd-slicer@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -2812,9 +2879,9 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.5.tgz#91c25b6b6fbe56dae99f10a425fd64933b5c9daa"
+file-loader@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.6.tgz#7b9a8f2c58f00a77fddf49e940f7ac978a3ea0e8"
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
@@ -2955,6 +3022,12 @@ form-data@~2.3.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+formatio@1.2.0, formatio@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
+  dependencies:
+    samsam "1.x"
+
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -2978,9 +3051,9 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
+fs-extra@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -3023,7 +3096,7 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.0.2, function-bind@^1.1.0:
+function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -3105,8 +3178,8 @@ globals@^10.0.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
 
 globals@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.0.1.tgz#12a87bb010e5154396acc535e1e43fc753b0e5e8"
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
 
 globals@^9.18.0:
   version "9.18.0"
@@ -3133,6 +3206,17 @@ globby@^6.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -3209,6 +3293,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -3310,7 +3398,7 @@ html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
-html-minifier@3.5.7:
+html-minifier@3.5.7, html-minifier@^3.2.3:
   version "3.5.7"
   resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.7.tgz#511e69bb5a8e7677d1012ebe03819aa02ca06208"
   dependencies:
@@ -3323,19 +3411,6 @@ html-minifier@3.5.7:
     relateurl "0.2.x"
     uglify-js "3.2.x"
 
-html-minifier@^3.2.3:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.6.tgz#7e4e661a09999599c7d8e8a2b8d7fb7430bb5c3e"
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.1.x"
-    commander "2.11.x"
-    he "1.1.x"
-    ncname "1.0.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.1.x"
-
 html-tags@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
@@ -3401,11 +3476,11 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
 https-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz#1391bee7fd66aeabc0df2a1fa90f58954f43e443"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz#a7ce4382a1ba8266ee848578778122d491260fd9"
   dependencies:
     agent-base "^4.1.0"
-    debug "^2.4.1"
+    debug "^3.1.0"
 
 hullabaloo-config-manager@^1.1.0:
   version "1.1.1"
@@ -3452,7 +3527,7 @@ ignore-by-default@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
-ignore@^3.3.3, ignore@^3.3.6:
+ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
@@ -3546,8 +3621,8 @@ inquirer@^3.0.6:
     through "^2.3.6"
 
 interpret@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
 invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
@@ -3595,12 +3670,20 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
+is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
 is-ci@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies:
     ci-info "^1.0.0"
 
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
@@ -3670,10 +3753,6 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -3701,10 +3780,10 @@ is-observable@^0.2.0:
     symbol-observable "^0.2.2"
 
 is-observable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.0.0.tgz#b77c3ffd4bea2175bdbc3ffac0f7b349d3e02c92"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
   dependencies:
-    symbol-observable "^1.0.4"
+    symbol-observable "^1.1.0"
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
@@ -3717,8 +3796,8 @@ is-path-in-cwd@^1.0.0:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
   dependencies:
     path-is-inside "^1.0.1"
 
@@ -3742,11 +3821,15 @@ is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
-is-resolvable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
-    tryit "^1.0.1"
+    has "^1.0.1"
+
+is-resolvable@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4"
 
 is-retry-allowed@^1.0.0:
   version "1.1.0"
@@ -3762,6 +3845,10 @@ is-svg@^2.0.0:
   dependencies:
     html-comment-regex "^1.1.0"
 
+is-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -3800,6 +3887,13 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
+isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -3852,8 +3946,8 @@ istanbul-reports@^1.1.3:
     handlebars "^4.0.3"
 
 js-base64@^2.1.9:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
 
 js-string-escape@^1.0.1:
   version "1.0.1"
@@ -3881,9 +3975,9 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jsdom@^11.3.0:
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.4.0.tgz#a3941a9699cbb0d61f8ab86f6f28f4ad5ea60d04"
+jsdom@^11.5.1:
+  version "11.5.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.5.1.tgz#5df753b8d0bca20142ce21f4f6c039f99a992929"
   dependencies:
     abab "^1.0.3"
     acorn "^5.1.2"
@@ -3896,6 +3990,7 @@ jsdom@^11.3.0:
     domexception "^1.0.0"
     escodegen "^1.9.0"
     html-encoding-sniffer "^1.0.1"
+    left-pad "^1.2.0"
     nwmatcher "^1.4.3"
     parse5 "^3.0.2"
     pn "^1.0.0"
@@ -3966,6 +4061,16 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jsx-ast-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  dependencies:
+    array-includes "^3.0.3"
+
+just-extend@^1.1.26:
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
+
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4000,6 +4105,10 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+left-pad@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4090,6 +4199,10 @@ lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -4127,21 +4240,39 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+log-symbols@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
+  dependencies:
+    chalk "^2.0.1"
+
+loglevelnext@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.0.tgz#9cc52bed418bd8cf64e29424c4cd3fe9d4311317"
+
+lolex@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
+
+lolex@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.1.tgz#3d2319894471ea0950ef64692ead2a5318cff362"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0:
+loose-envify@^1.0.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
     js-tokens "^3.0.0"
 
-loud-rejection@^1.0.0, loud-rejection@^1.2.0:
+loud-rejection@^1.0.0, loud-rejection@^1.2.0, loud-rejection@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
   dependencies:
@@ -4167,12 +4298,6 @@ macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
-magic-string@^0.22.4:
-  version "0.22.4"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
-  dependencies:
-    vlq "^0.2.1"
-
 make-dir@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
@@ -4288,8 +4413,8 @@ miller-rabin@^4.0.0:
     brorand "^1.0.1"
 
 "mime-db@>= 1.30.0 < 2":
-  version "1.31.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.31.0.tgz#a49cd8f3ebf3ed1a482b60561d9105ad40ca74cb"
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414"
 
 mime-db@~1.30.0:
   version "1.30.0"
@@ -4306,13 +4431,13 @@ mime@1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
 mime@^1.3.4, mime@^1.4.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.5.0.tgz#59c20e03ae116089edeb7d3b34a6788c5b3cccea"
-
-mime@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
+mime@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b"
+
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -4381,10 +4506,14 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@2.0.0, ms@^2.0.0:
+ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -4420,6 +4549,16 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+nise@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-1.2.0.tgz#079d6cadbbcb12ba30e38f1c999f36ad4d6baa53"
+  dependencies:
+    formatio "^1.2.0"
+    just-extend "^1.1.26"
+    lolex "^1.6.0"
+    path-to-regexp "^1.7.0"
+    text-encoding "^0.6.4"
+
 no-case@^2.2.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
@@ -4433,6 +4572,13 @@ node-fetch@1.6.3:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
@@ -4503,7 +4649,7 @@ normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
-normalize-url@^1.4.0:
+normalize-url@^1.4.0, normalize-url@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
   dependencies:
@@ -4545,9 +4691,9 @@ nwmatcher@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
-nyc@^11.3.0:
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.3.0.tgz#a42bc17b3cfa41f7b15eb602bc98b2633ddd76f0"
+nyc@^11.4.1:
+  version "11.4.1"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.4.1.tgz#13fdf7e7ef22d027c61d174758f6978a68f4f5e5"
   dependencies:
     archy "^1.0.0"
     arrify "^1.0.1"
@@ -4572,7 +4718,7 @@ nyc@^11.3.0:
     resolve-from "^2.0.0"
     rimraf "^2.5.4"
     signal-exit "^3.0.1"
-    spawn-wrap "=1.3.8"
+    spawn-wrap "^1.4.2"
     test-exclude "^4.1.1"
     yargs "^10.0.3"
     yargs-parser "^8.0.0"
@@ -4585,17 +4731,18 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
-object-keys@^1.0.10, object-keys@^1.0.8:
+object-keys@^1.0.11, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
 object.assign@^4.0.1:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   dependencies:
     define-properties "^1.1.2"
-    function-bind "^1.1.0"
-    object-keys "^1.0.10"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
 
 object.omit@^2.0.0:
   version "2.0.1"
@@ -4719,7 +4866,7 @@ p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
-p-limit@^1.1.0:
+p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
 
@@ -4848,6 +4995,12 @@ path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
 
+path-to-regexp@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  dependencies:
+    isarray "0.0.1"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -4862,6 +5015,12 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
 pbkdf2@^3.0.3:
   version "3.0.14"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
@@ -5002,11 +5161,11 @@ postcss-color-function@^4.0.0:
     postcss-value-parser "^3.3.0"
 
 postcss-color-gray@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-4.0.0.tgz#681bf305097dd66bfef0e1e6282d5d99b5acc95d"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz#e5581ed57eaa826fb652ca11b1e2b7b136a9f9df"
   dependencies:
-    color "^1.0.3"
-    postcss "^6.0.1"
+    color "^2.0.1"
+    postcss "^6.0.14"
     postcss-message-helpers "^2.0.0"
     reduce-function-call "^1.0.2"
 
@@ -5493,8 +5652,8 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 prettier@^1.7.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
 
 pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
@@ -5548,6 +5707,20 @@ promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
 
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  dependencies:
+    asap "~2.0.3"
+
+prop-types@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proxy-addr@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
@@ -5559,9 +5732,9 @@ proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
 
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
 
 pseudomap@^1.0.2:
   version "1.0.2"
@@ -5768,8 +5941,8 @@ reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7:
     reduce-function-call "^1.0.1"
 
 reduce-css-calc@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.1.tgz#f4ecd7a00ec3e5683773f208067ad7da117b9db0"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.3.tgz#63c4c6325ffbbf4ea6c23f1d4deb47c3953f3b81"
   dependencies:
     css-unit-converter "^1.1.1"
     postcss-value-parser "^3.3.0"
@@ -5789,8 +5962,8 @@ regenerator-runtime@^0.10.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
 regenerator-runtime@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
 regenerator-transform@^0.10.0:
   version "0.10.1"
@@ -5967,10 +6140,6 @@ require-precompiled@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
 
-require-relative@0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -5996,11 +6165,7 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-resolve@1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3, resolve@^1.4.0:
+resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3, resolve@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
@@ -6027,7 +6192,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -6040,71 +6205,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-alias@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-alias/-/rollup-plugin-alias-1.4.0.tgz#120cba7c46621c03138f0ca6fd5dd2ade9872db9"
-  dependencies:
-    slash "^1.0.0"
-
-rollup-plugin-babel@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.2.tgz#a2765dea0eaa8aece351c983573300d17497495b"
-  dependencies:
-    rollup-pluginutils "^1.5.0"
-
-rollup-plugin-commonjs@^8.2.6:
-  version "8.2.6"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz#27e5b9069ff94005bb01e01bb46a1e4873784677"
-  dependencies:
-    acorn "^5.2.1"
-    estree-walker "^0.5.0"
-    magic-string "^0.22.4"
-    resolve "^1.4.0"
-    rollup-pluginutils "^2.0.1"
-
-rollup-plugin-node-resolve@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
-  dependencies:
-    browser-resolve "^1.11.0"
-    builtin-modules "^1.1.0"
-    is-module "^1.0.0"
-    resolve "^1.1.6"
-
-rollup-plugin-replace@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.0.0.tgz#19074089c8ed57184b8cc64e967a03d095119277"
-  dependencies:
-    magic-string "^0.22.4"
-    minimatch "^3.0.2"
-    rollup-pluginutils "^2.0.1"
-
-rollup-pluginutils@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
-  dependencies:
-    estree-walker "^0.2.1"
-    minimatch "^3.0.2"
-
-rollup-pluginutils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
-  dependencies:
-    estree-walker "^0.3.0"
-    micromatch "^2.3.11"
-
-rollup-watch@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.3.1.tgz#5aa1eaeab787addf368905d102b39d6fc5ce4a8b"
-  dependencies:
-    chokidar "^1.7.0"
-    require-relative "0.8.7"
-    rollup-pluginutils "^2.0.1"
-
-rollup@^0.51.7:
-  version "0.51.8"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.51.8.tgz#58bd0b642885f4770b5f93cc64f14e4233c2236d"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -6135,6 +6235,10 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+samsam@1.x:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
+
 sax@^1.2.1, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -6202,7 +6306,7 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
-setimmediate@^1.0.4:
+setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
@@ -6241,6 +6345,18 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+sinon@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.1.3.tgz#fc599eda47ed9f1a694ce774b94ab44260bd7ac5"
+  dependencies:
+    diff "^3.1.0"
+    formatio "1.2.0"
+    lodash.get "^4.4.2"
+    lolex "^2.2.0"
+    nise "^1.2.0"
+    supports-color "^4.4.0"
+    type-detect "^4.0.5"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -6313,16 +6429,16 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-spawn-wrap@=1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.8.tgz#fa2a79b990cbb0bb0018dca6748d88367b19ec31"
+spawn-wrap@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c"
   dependencies:
     foreground-child "^1.5.6"
     mkdirp "^0.5.0"
     os-homedir "^1.0.1"
-    rimraf "^2.3.3"
+    rimraf "^2.6.2"
     signal-exit "^3.0.2"
-    which "^1.2.4"
+    which "^1.3.0"
 
 spdx-correct@~1.0.0:
   version "1.0.2"
@@ -6382,12 +6498,6 @@ statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
-std-mocks@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/std-mocks/-/std-mocks-1.0.1.tgz#d3388876d7beeba3c70fbd8e2bcaf46eb07d79fe"
-  dependencies:
-    lodash "^4.11.1"
-
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -6505,13 +6615,12 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-style-resources-loader@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-0.3.0.tgz#e57aca9baa11bad8e3ab28f415eaf565d6a113bc"
+style-resources-loader@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.0.0.tgz#a2290ca7366e4d1f90c93d304a55194bfd2e8dc0"
   dependencies:
     glob "^7.1.2"
     loader-utils "^1.1.0"
-    webpack "^3.8.1"
 
 supports-color@^2.0.0:
   version "2.0.0"
@@ -6530,8 +6639,8 @@ supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
     has-flag "^2.0.0"
 
 supports-color@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.0.1.tgz#1c5331f22250c84202805b2f17adf16699f3a39a"
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
   dependencies:
     has-flag "^2.0.0"
 
@@ -6555,9 +6664,9 @@ symbol-observable@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
-symbol-observable@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+symbol-observable@^1.0.4, symbol-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"
 
 symbol-tree@^3.2.1:
   version "3.2.2"
@@ -6615,6 +6724,10 @@ test-exclude@^4.1.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
+text-encoding@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
+
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -6639,10 +6752,6 @@ time-require@^0.1.2:
     pretty-ms "^0.2.1"
     text-table "^0.2.0"
 
-time-stamp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
-
 time-zone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
@@ -6703,10 +6812,6 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
-tryit@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
-
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -6727,6 +6832,10 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
+
 type-is@~1.6.15:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
@@ -6738,23 +6847,20 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-es@^3.1.3:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.10.tgz#f1840c3b52771d17555a02ce158cf46f689384bd"
+ua-parser-js@^0.7.9:
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+
+uglify-es@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.2.2.tgz#15c62b7775002c81b7987a1c49ecd3f126cace73"
   dependencies:
-    commander "~2.11.0"
+    commander "~2.12.1"
     source-map "~0.6.1"
 
-uglify-js@3.1.x:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.10.tgz#c4a5f9b5c6276b40cb971c1d97c9eeb26af9509c"
-  dependencies:
-    commander "~2.11.0"
-    source-map "~0.6.1"
-
-uglify-js@3.2.x, uglify-js@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.2.0.tgz#cb411ee4ca0e0cadbfe3a4e1a1da97e6fa0d19c1"
+uglify-js@3.2.x, uglify-js@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.2.2.tgz#870e4b34ed733d179284f9998efd3293f7fd73f6"
   dependencies:
     commander "~2.12.1"
     source-map "~0.6.1"
@@ -6780,15 +6886,16 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-uglifyjs-webpack-plugin@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.1.tgz#6167c5aae218ee8109de8920bb769b8acbc55d03"
+uglifyjs-webpack-plugin@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.4.tgz#e43ad6e736c315024eb99481a7cc9362d6a066be"
   dependencies:
     cacache "^10.0.0"
     find-cache-dir "^1.0.0"
     schema-utils "^0.3.0"
+    serialize-javascript "^1.4.0"
     source-map "^0.6.1"
-    uglify-es "^3.1.3"
+    uglify-es "^3.2.1"
     webpack-sources "^1.0.1"
     worker-farm "^1.4.1"
 
@@ -6881,6 +6988,10 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+url-join@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.2.tgz#c072756967ad24b8b59e5741551caac78f50b8b7"
+
 url-loader@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
@@ -6959,10 +7070,6 @@ viewport-dimensions@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz#de740747db5387fd1725f5175e91bac76afdf36c"
 
-vlq@^0.2.1:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
-
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -6973,9 +7080,9 @@ vue-hot-reload-api@^2.2.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
 
-vue-loader@^13.5.0:
-  version "13.5.0"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.5.0.tgz#52f7b3790a267eff80012b77ea187a54586dd5d4"
+vue-loader@^13.6.0:
+  version "13.6.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.6.0.tgz#c1c9570e1e57475f8acb02cda35551b812f88086"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -6991,9 +7098,9 @@ vue-loader@^13.5.0:
     vue-style-loader "^3.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-meta@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-1.3.1.tgz#1c46c9af6119c61934a5b2783538b062c03be2c7"
+vue-meta@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-1.4.0.tgz#8f3bee11b73a7c035b2edc6679186fd81989e36d"
   dependencies:
     deepmerge "^2.0.0"
     lodash.isplainobject "^4.0.6"
@@ -7003,9 +7110,9 @@ vue-router@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9"
 
-vue-server-renderer@^2.5.9:
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.9.tgz#936e42ba9a8d31ada2da36f29b7386c787908489"
+vue-server-renderer@^2.5.13:
+  version "2.5.13"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.13.tgz#6a0d421a0fd3e2b7357b59495d744b7e9279d68e"
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -7023,9 +7130,9 @@ vue-style-loader@^3.0.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.9:
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.9.tgz#7fabc73c8d3d12d32340cd86c5fc33e00e86d686"
+vue-template-compiler@^2.5.13:
+  version "2.5.13"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz#12a2aa0ecd6158ac5e5f14d294b0993f399c3d38"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -7034,9 +7141,9 @@ vue-template-es2015-compiler@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
 
-vue@^2.5.9:
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.9.tgz#b2380cd040915dca69881dafd121d760952e65f7"
+vue@^2.5.13:
+  version "2.5.13"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.13.tgz#95bd31e20efcf7a7f39239c9aa6787ce8cf578e1"
 
 vuex@^3.0.1:
   version "3.0.1"
@@ -7070,15 +7177,17 @@ webpack-bundle-analyzer@^2.9.0:
     opener "^1.4.3"
     ws "^3.3.1"
 
-webpack-dev-middleware@^1.12.2:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+webpack-dev-middleware@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.2.tgz#cbfaf5477e2179a2be0a989752acaa9bbd38b02c"
   dependencies:
+    loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
-    mime "^1.5.0"
+    mime "^2.0.3"
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
-    time-stamp "^2.0.0"
+    url-join "^2.0.2"
+    webpack-log "^1.0.1"
 
 webpack-hot-middleware@^2.21.0:
   version "2.21.0"
@@ -7089,20 +7198,28 @@ webpack-hot-middleware@^2.21.0:
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
+webpack-log@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.0.2.tgz#880298b80ff81a4e30baa6e28dc44f4637b4bbf1"
+  dependencies:
+    chalk "^2.1.0"
+    log-symbols "^2.1.0"
+    loglevelnext "^1.0.0"
+
 webpack-node-externals@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz#232c62ec6092b100635a3d29d83c1747128df9bd"
 
 webpack-sources@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.2.tgz#d0148ec083b3b5ccef1035a6b3ec16442983b27a"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
+webpack@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -7137,9 +7254,13 @@ whatwg-encoding@^1.0.1:
   dependencies:
     iconv-lite "0.4.19"
 
+whatwg-fetch@>=0.10.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+
 whatwg-url@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.3.0.tgz#597ee5488371abe7922c843397ddec1ae94c048d"
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.0"
@@ -7153,7 +7274,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.4, which@^1.2.9:
+which@^1.2.9, which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -7165,11 +7286,11 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
-widest-line@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
+widest-line@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
   dependencies:
-    string-width "^1.0.1"
+    string-width "^2.1.1"
 
 window-size@0.1.0:
   version "0.1.0"
@@ -7246,8 +7367,8 @@ write@^0.2.1:
     mkdirp "^0.5.1"
 
 ws@^3.0.0, ws@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -7290,8 +7411,8 @@ yargs-parser@^7.0.0:
     camelcase "^4.1.0"
 
 yargs-parser@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.0.0.tgz#21d476330e5a82279a4b881345bf066102e219c6"
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
   dependencies:
     camelcase "^4.1.0"