From b19571616d4fcbf8099b6383fb6d4a6b89dd6cea Mon Sep 17 00:00:00 2001
From: Christian Raidl <christian.raidl@outlook.com>
Date: Wed, 20 Jul 2016 20:39:29 +0200
Subject: [PATCH 001/339] fix path to config file (#202)

---
 docs/proxy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/proxy.md b/docs/proxy.md
index e8b39b982a..bc61676409 100644
--- a/docs/proxy.md
+++ b/docs/proxy.md
@@ -2,10 +2,10 @@
 
 When integrating this boilerplate with an existing backend, a common need is to access the backend API when using the dev server. To achieve that, we can run the dev server and the API backend side-by-side (or remotely), and let the dev server proxy all API requests to the actual backend.
 
-To configure the proxy rules, edit `dev.proxyTable` option in `config.js`. The dev server is using [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) for proxying, so you should refer to its docs for detailed usage. But here's a simple example:
+To configure the proxy rules, edit `dev.proxyTable` option in `config/index.js`. The dev server is using [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) for proxying, so you should refer to its docs for detailed usage. But here's a simple example:
 
 ``` js
-// config.js
+// config/index.js
 module.exports = {
   // ...
   dev: {

From a20fbea351ed04a1a64e3b12975e11a7db06a6fb Mon Sep 17 00:00:00 2001
From: Ian Walter <public@iankwalter.com>
Date: Tue, 26 Jul 2016 12:33:03 -0400
Subject: [PATCH 002/339] Adding Babel register to Nightwatch conf (#197)

* Adding babel register to nightwatch conf

* Using babel-register package

* Alphabetizing babel-register dependency
---
 template/package.json                | 1 +
 template/test/e2e/nightwatch.conf.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/template/package.json b/template/package.json
index aa54b6842c..68b508b7dd 100644
--- a/template/package.json
+++ b/template/package.json
@@ -29,6 +29,7 @@
     "babel-plugin-transform-runtime": "^6.0.0",
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-stage-2": "^6.0.0",
+    "babel-register": "^6.0.0",
     "connect-history-api-fallback": "^1.1.0",
     "css-loader": "^0.23.0",
     {{#lint}}
diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index b5d911ce57..424f7f516c 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -1,3 +1,5 @@
+require('babel-register')
+
 // http://nightwatchjs.org/guide#settings-file
 module.exports = {
   "src_folders": ["test/e2e/specs"],

From 548807d1d508b9a86f311cc491992170b1eb2aa3 Mon Sep 17 00:00:00 2001
From: PPxu <xyang0110@126.com>
Date: Fri, 12 Aug 2016 11:50:16 +0800
Subject: [PATCH 003/339] Remove unnecessary comma (#218)

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

diff --git a/template/config/index.js b/template/config/index.js
index 18debfe046..207dfbd4e0 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -27,6 +27,6 @@ module.exports = {
     // (https://github.com/webpack/css-loader#sourcemaps)
     // In our experience, they generally work as expected,
     // just be aware of this issue when enabling this option.
-    cssSourceMap: false,
+    cssSourceMap: false
   }
 }

From 4982f1f348fd264650fc13993ee243e02e6c7bc0 Mon Sep 17 00:00:00 2001
From: ahui <540886643@qq.com>
Date: Fri, 12 Aug 2016 13:01:45 +0800
Subject: [PATCH 004/339] assets utils (#206)

---
 template/build/utils.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index d294e35892..d15685f73a 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -3,7 +3,9 @@ var config = require('../config')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 exports.assetsPath = function (_path) {
-  return path.posix.join(config.build.assetsSubDirectory, _path)
+  var assetsSubDirectory = process.env.NODE_ENV === 'production' ?
+                            config.build.assetsPublicPath : config.dev.assetsPublicPath
+  return path.posix.join(assetsSubDirectory, _path)
 }
 
 exports.cssLoaders = function (options) {

From 3ecc67da6cf992f62e79862862588fad51f42ebf Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Fri, 12 Aug 2016 08:47:37 +0200
Subject: [PATCH 005/339] fix typo in assetspath

---
 template/build/utils.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index d15685f73a..4ec8d0bb37 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -3,8 +3,9 @@ var config = require('../config')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 exports.assetsPath = function (_path) {
-  var assetsSubDirectory = process.env.NODE_ENV === 'production' ?
-                            config.build.assetsPublicPath : config.dev.assetsPublicPath
+  var assetsSubDirectory = process.env.NODE_ENV === 'production'
+    ? config.build.assetsSubDirectory
+    : config.dev.assetsSubDirectory
   return path.posix.join(assetsSubDirectory, _path)
 }
 

From fccf3408273f48a52f1ff991368232e66ffc230f Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 18 Aug 2016 19:39:25 -0700
Subject: [PATCH 006/339] 1.0 compatibility branch.

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

diff --git a/README.md b/README.md
index d9f61eaffd..1cbcea3c70 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This is a project template for [vue-cli](https://github.com/vuejs/vue-cli). **It
 
 ``` bash
 $ npm install -g vue-cli
-$ vue init webpack my-project
+$ vue init webpack#1.0 my-project
 $ cd my-project
 $ npm install
 $ npm run dev

From c43bb4f17929047bb3db2aca35b5f894006b6de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Thu, 8 Sep 2016 17:04:41 +0200
Subject: [PATCH 007/339] Fix #238 hello.spec.js lint for 1.0 (#252)

* initial commit

* forgot two lines
---
 template/test/unit/specs/Hello.spec.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/template/test/unit/specs/Hello.spec.js b/template/test/unit/specs/Hello.spec.js
index 835ad99fc9..72808462da 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/Hello.spec.js
@@ -1,12 +1,12 @@
-import Vue from 'vue'
-import Hello from 'src/components/Hello'
+import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Hello from 'src/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 describe('Hello.vue', () => {
   it('should render correct contents', () => {
     const vm = new Vue({
       template: '<div><hello></hello></div>',
-      components: { Hello }
-    }).$mount()
-    expect(vm.$el.querySelector('.hello h1').textContent).to.contain('Hello World!')
-  })
-})
+      components: { Hello }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+    }).$mount(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    expect(vm.$el.querySelector('.hello h1').textContent).to.contain('Hello World!'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From bb14dc6912f09d9888604a534dbe2a55235ed194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Thu, 8 Sep 2016 17:06:58 +0200
Subject: [PATCH 008/339] Fix #237 npm eslint without e2e tests 1.0 (#249)

* fix #238

* Revert "fix #238"

This reverts commit ffa7024cf0832012f99e4b74477a853a9e334ecf.

* fix #237 for 1.0

* fix wrong placement of quotation mark
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 68b508b7dd..c940a343e7 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,7 +14,7 @@
     "e2e": "node test/e2e/runner.js",
     {{/e2e}}
     "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}"{{#lint}},
-    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"{{/lint}}
+    "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
     "vue": "^1.0.21",

From 49b3ac5de552ab82ac6b44f3bb197bfc54063688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 12 Sep 2016 08:48:41 +0200
Subject: [PATCH 009/339] [1.0] add nightwatch global with devServer's defined
 URL:Port (fix #241) (#257)

* provide devServer URL, especially the port from /config/index.js as a global in night watch's browser object

* fix missing colon

* move variable assignment into the exported function b/c "browser" object is not avail outside.

* remove whitespace

* add support for process.env.PORT in night watch global
---
 template/test/e2e/nightwatch.conf.js | 6 +++++-
 template/test/e2e/specs/test.js      | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index 424f7f516c..00e85f6a46 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -1,4 +1,5 @@
 require('babel-register')
+var config = require('../../config')
 
 // http://nightwatchjs.org/guide#settings-file
 module.exports = {
@@ -20,7 +21,10 @@ module.exports = {
     "default": {
       "selenium_port": 4444,
       "selenium_host": "localhost",
-      "silent": true
+      "silent": true,
+      "globals": {
+        "devServerURL": "http://localhost:" + (process.env.PORT || config.dev.port)
+      }
     },
 
     "chrome": {
diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
index 49bc7f70a5..685880b450 100644
--- a/template/test/e2e/specs/test.js
+++ b/template/test/e2e/specs/test.js
@@ -3,8 +3,14 @@
 
 module.exports = {
   'default e2e tests': function (browser) {
+
+    // automatically uses dev Server port from /config.index.js
+    // default: http://localhost:8080
+    // see nightwatch.conf.js
+    var devServer = browser.globals.devServerURL
+
     browser
-    .url('http://localhost:8080')
+    .url(devServer)
       .waitForElementVisible('#app', 5000)
       .assert.elementPresent('.logo')
       .assert.containsText('h1', 'Hello World!')

From 5a0785097e5d0db79b60c8fe244ea62617afd383 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 18 Aug 2016 19:37:40 -0700
Subject: [PATCH 010/339] Vue 2.0 compat

---
 README.md             | 2 ++
 template/index.html   | 2 +-
 template/package.json | 4 ++--
 template/src/App.vue  | 7 ++++++-
 template/src/main.js  | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1cbcea3c70..72cb34f19c 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 > A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.
 
+> This template is Vue 2.0 compatible. For Vue 1.x please look at 1.0 branch.
+
 ## Documentation
 
 Common topics are discussed in the [docs](http://vuejs-templates.github.io/webpack). Make sure to read it!
diff --git a/template/index.html b/template/index.html
index 52a1947de0..60edbcf0d2 100644
--- a/template/index.html
+++ b/template/index.html
@@ -5,7 +5,7 @@
     <title>{{ name }}</title>
   </head>
   <body>
-    <app></app>
+    <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>
 </html>
diff --git a/template/package.json b/template/package.json
index c940a343e7..7e397ab08a 100644
--- a/template/package.json
+++ b/template/package.json
@@ -17,7 +17,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^1.0.21",
+    "vue": "^2.0.0-rc.2",
     "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
@@ -84,7 +84,7 @@
     "url-loader": "^0.5.7",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.3.0",
+    "vue-loader": "^9.3.2",
     "vue-style-loader": "^1.0.0",
     "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.4.0",
diff --git a/template/src/App.vue b/template/src/App.vue
index 0d1d960438..d509cdb3c6 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <img class="logo" src="./assets/logo.png">
+    <img class="logo" :src="logo">
     <hello></hello>
     <p>
       Welcome to your Vue.js app!
@@ -26,6 +26,11 @@
 import Hello from './components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 export default {
+  data () {
+    return {
+      logo: require('./assets/logo.png')
+    }
+  },
   components: {
     Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
diff --git a/template/src/main.js b/template/src/main.js
index 249a4e47f8..30a1d080e3 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -3,6 +3,6 @@ import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 /* eslint-disable no-new */
 new Vue({
-  el: 'body',
-  components: { App }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  el: '#app',
+  render: h => h(App){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From b0b4728145f5abd9ba2ac43ae6dbac3af7fc1eac Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 18 Aug 2016 20:08:12 -0700
Subject: [PATCH 011/339] Fix tests.

---
 template/src/components/Hello.vue      | 6 +-----
 template/test/e2e/specs/test.js        | 2 +-
 template/test/unit/specs/Hello.spec.js | 8 ++++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/template/src/components/Hello.vue b/template/src/components/Hello.vue
index 1eaa4320a9..ba323fd101 100644
--- a/template/src/components/Hello.vue
+++ b/template/src/components/Hello.vue
@@ -8,11 +8,7 @@
 export default {
   data{{#unless_eq lintConfig "airbnb"}} {{/unless_eq}}() {
     return {
-      // note: changing this line won't causes changes
-      // with hot-reload because the reloaded component
-      // preserves its current state and we are modifying
-      // its initial state.
-      msg: 'Hello World!'{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+      msg: 'Hello Vue!'{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
     }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
index 685880b450..1b01394e94 100644
--- a/template/test/e2e/specs/test.js
+++ b/template/test/e2e/specs/test.js
@@ -13,7 +13,7 @@ module.exports = {
     .url(devServer)
       .waitForElementVisible('#app', 5000)
       .assert.elementPresent('.logo')
-      .assert.containsText('h1', 'Hello World!')
+      .assert.containsText('h1', 'Hello Vue!')
       .assert.elementCount('p', 3)
       .end()
   }
diff --git a/template/test/unit/specs/Hello.spec.js b/template/test/unit/specs/Hello.spec.js
index 72808462da..56c7a91841 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/Hello.spec.js
@@ -4,9 +4,9 @@ import Hello from 'src/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}
 describe('Hello.vue', () => {
   it('should render correct contents', () => {
     const vm = new Vue({
-      template: '<div><hello></hello></div>',
-      components: { Hello }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-    }).$mount(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    expect(vm.$el.querySelector('.hello h1').textContent).to.contain('Hello World!'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+      el: document.createElement('div'),
+      render: (h) => h(Hello){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+    }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    expect(vm.$el.querySelector('.hello h1').textContent).to.equal('Hello Vue!'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 3beae48bc0bebaac580e82f67a0d40582853c17c Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Fri, 19 Aug 2016 16:49:33 -0700
Subject: [PATCH 012/339] More direct 1.0 usage note.

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

diff --git a/README.md b/README.md
index 72cb34f19c..51e3868b66 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 > A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.
 
-> This template is Vue 2.0 compatible. For Vue 1.x please look at 1.0 branch.
+> This template is Vue 2.0 compatible. For Vue 1.x use this command: `vue init webpack#1.0 my-project`
 
 ## Documentation
 

From 5a615eb3a2fcb739e871f923109d8671bf7338f5 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 25 Aug 2016 16:45:27 -0700
Subject: [PATCH 013/339] vue-style-loader not needed

- already included in vue-loader
- bump to rc.3
---
 template/package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/template/package.json b/template/package.json
index 7e397ab08a..fb1c6dc7d9 100644
--- a/template/package.json
+++ b/template/package.json
@@ -17,7 +17,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.0.0-rc.2",
+    "vue": "^2.0.0-rc.3",
     "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
@@ -84,8 +84,7 @@
     "url-loader": "^0.5.7",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
-    "vue-loader": "^9.3.2",
-    "vue-style-loader": "^1.0.0",
+    "vue-loader": "^9.4.0",
     "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",

From 2a90e75bdda4c7636f0d20df1e9723e385c335c5 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 25 Aug 2016 16:48:17 -0700
Subject: [PATCH 014/339] No need for image src workaround.

---
 template/src/App.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/template/src/App.vue b/template/src/App.vue
index d509cdb3c6..0d1d960438 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <img class="logo" :src="logo">
+    <img class="logo" src="./assets/logo.png">
     <hello></hello>
     <p>
       Welcome to your Vue.js app!
@@ -26,11 +26,6 @@
 import Hello from './components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 export default {
-  data () {
-    return {
-      logo: require('./assets/logo.png')
-    }
-  },
   components: {
     Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}

From 461003054d64257458220260d6d2080daf2a04e3 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 25 Aug 2016 18:27:22 -0700
Subject: [PATCH 015/339] vue-html-loader not needed anymore.

---
 template/build/webpack.base.conf.js | 4 ----
 template/package.json               | 1 -
 2 files changed, 5 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 0757609dcb..c9cda6d8b1 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -56,10 +56,6 @@ module.exports = {
         test: /\.json$/,
         loader: 'json'
       },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         loader: 'url',
diff --git a/template/package.json b/template/package.json
index fb1c6dc7d9..e2858d961d 100644
--- a/template/package.json
+++ b/template/package.json
@@ -83,7 +83,6 @@
     "shelljs": "^0.6.0",
     "url-loader": "^0.5.7",
     "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
     "vue-loader": "^9.4.0",
     "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.4.0",

From 25f566c2c48d62672c7be1fb46e6d17d10c51cc7 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 1 Sep 2016 08:44:00 -0400
Subject: [PATCH 016/339] Add autoprefixer and bump to latest version.

---
 template/build/webpack.base.conf.js | 7 ++++++-
 template/package.json               | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index c9cda6d8b1..94fd5d01cd 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -80,6 +80,11 @@ module.exports = {
   },
   {{/lint}}
   vue: {
-    loaders: utils.cssLoaders()
+    loaders: utils.cssLoaders(),
+    postcss: [
+      require('autoprefixer')({
+        browsers: ['last 2 versions']
+      })
+    ]
   }
 }
diff --git a/template/package.json b/template/package.json
index e2858d961d..6e3916d043 100644
--- a/template/package.json
+++ b/template/package.json
@@ -17,10 +17,11 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.0.0-rc.3",
+    "vue": "^2.0.0-rc.4",
     "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
+    "autoprefixer": "^6.4.0",
     "babel-core": "^6.0.0",
     {{#lint}}
     "babel-eslint": "^6.1.2",

From f9357b6e572e59e2ced002cba7f92a136b4903f9 Mon Sep 17 00:00:00 2001
From: Niall O'Brien <me@niallobrien.me>
Date: Tue, 13 Sep 2016 08:24:26 +0100
Subject: [PATCH 017/339] Bumps Vue.js to the latest RC (#259)

Bumps Vue.js dependency to RC v5.
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 6e3916d043..8fd26d7611 100644
--- a/template/package.json
+++ b/template/package.json
@@ -17,7 +17,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.0.0-rc.4",
+    "vue": "^2.0.0-rc.5",
     "babel-runtime": "^6.0.0"
   },
   "devDependencies": {

From 2c8051c24f7c52dfa521e3cbb8d36118d94ec140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 14 Sep 2016 16:42:14 +0200
Subject: [PATCH 018/339] Add select option to init process: Standalone or
 runtime-only? (solve #242) (#256)

* add election between standalone and runtime-only to meta.json

* add alias to webpack con if standalone version was selected

* Add comment to main.js informing the user about the aliased behavior of "import Vue from 'due'" if standalone build was selected.
---
 meta.json                           | 16 ++++++++++++++++
 template/build/webpack.base.conf.js |  4 ++++
 template/src/main.js                |  6 ++++++
 3 files changed, 26 insertions(+)

diff --git a/meta.json b/meta.json
index adab39b114..577254f0cd 100644
--- a/meta.json
+++ b/meta.json
@@ -15,6 +15,22 @@
       "type": "string",
       "message": "Author"
     },
+    "build": {
+      "type": "list",
+      "message": "Vue comes in two build versions, which do you want to use?",
+      "choices": [
+        {
+          "name": "Runtime-only: lighter, but no support for templates defined in .html files (.vue files are fine)",
+          "value": "runtime",
+          "short": "tuntime"
+        },
+        {
+          "name": "Standalone: heavier, because it includes the template parser to allow templates in .html files",
+          "value": "standalone",
+          "short": "standalone"
+        }
+      ]
+    },
     "lint": {
       "type": "confirm",
       "message": "Use ESLint to lint your code?"
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 94fd5d01cd..7dba383d8f 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -16,6 +16,10 @@ module.exports = {
     extensions: ['', '.js', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
+      {{#if_eq build "standalone"}}
+      // nessessary to make "import Vue from 'vue'" load the standalone version.
+      'vue': 'vue/dist/vue',
+      {{/if_eq}}
       'src': path.resolve(__dirname, '../src'),
       'assets': path.resolve(__dirname, '../src/assets'),
       'components': path.resolve(__dirname, '../src/components')
diff --git a/template/src/main.js b/template/src/main.js
index 30a1d080e3..035c38100b 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -1,3 +1,9 @@
+{{#if_eq build "standalone"}}
+// The following line loads the standalone build of Vue instead of the runtime-only build,
+// so you don't have to do: import Vue from 'vue/dist/vue'
+// (also, importing Vue standalone this way breaks vue-loader, so don't do it)
+// This is done with an alias defined in /build/webpack.base.conf.js
+{{/if_eq}}
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 

From 1dd28cb0a5d501c0465e220ddcfbe321953a50f8 Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Wed, 21 Sep 2016 01:19:27 -0400
Subject: [PATCH 019/339] Update README with link to 2.0 docs

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

diff --git a/README.md b/README.md
index 51e3868b66..a187098a7c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@
 
 ## Documentation
 
-Common topics are discussed in the [docs](http://vuejs-templates.github.io/webpack). Make sure to read it!
+- [For this template](http://vuejs-templates.github.io/webpack): common questions specific to this template are answered and each part is described in greater detail
+- [For Vue 2.0](http://rc.vuejs.org/guide/): general information about how to work with Vue, not specific to this template
 
 ## Usage
 

From c5136d0c0210b2fbcb2af9384144ca54dbfb8339 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 22 Sep 2016 14:56:03 -0700
Subject: [PATCH 020/339] Fix typo.

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

diff --git a/meta.json b/meta.json
index 577254f0cd..36b5fd69d3 100644
--- a/meta.json
+++ b/meta.json
@@ -22,7 +22,7 @@
         {
           "name": "Runtime-only: lighter, but no support for templates defined in .html files (.vue files are fine)",
           "value": "runtime",
-          "short": "tuntime"
+          "short": "runtime"
         },
         {
           "name": "Standalone: heavier, because it includes the template parser to allow templates in .html files",

From be6a9258ef64631d574b87cf47a60725814cfec0 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Fri, 23 Sep 2016 08:15:18 +0200
Subject: [PATCH 021/339] extend due alias functionality to work with
 standalone as Vue's default export.

---
 template/build/webpack.base.conf.js | 6 ++++--
 template/src/main.js                | 8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 7dba383d8f..b20cc47ffc 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -16,10 +16,12 @@ module.exports = {
     extensions: ['', '.js', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
-      {{#if_eq build "standalone"}}
-      // nessessary to make "import Vue from 'vue'" load the standalone version.
+      {{#if_eq build "standalone"}}∞
       'vue': 'vue/dist/vue',
       {{/if_eq}}
+      {{#if_eq build "runtime"}}∞
+      'vue': 'vue/dist/vue.common.js',
+      {{/if_eq}}
       'src': path.resolve(__dirname, '../src'),
       'assets': path.resolve(__dirname, '../src/assets'),
       'components': path.resolve(__dirname, '../src/components')
diff --git a/template/src/main.js b/template/src/main.js
index 035c38100b..33994e9b07 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -1,8 +1,6 @@
-{{#if_eq build "standalone"}}
-// The following line loads the standalone build of Vue instead of the runtime-only build,
-// so you don't have to do: import Vue from 'vue/dist/vue'
-// (also, importing Vue standalone this way breaks vue-loader, so don't do it)
-// This is done with an alias defined in /build/webpack.base.conf.js
+{{#if_eq build "runtime"}}
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 {{/if_eq}}
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From c19a905af531a4caf74db81de188d92e42b7941b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 27 Sep 2016 09:21:41 +0200
Subject: [PATCH 022/339] =?UTF-8?q?Remove=20strange=20'=E2=88=9E'=20char?=
 =?UTF-8?q?=20from=20code.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Got in there with my last commit, no idea how...
---
 template/build/webpack.base.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index b20cc47ffc..2858d901dc 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -16,10 +16,10 @@ module.exports = {
     extensions: ['', '.js', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
-      {{#if_eq build "standalone"}}∞
+      {{#if_eq build "standalone"}}
       'vue': 'vue/dist/vue',
       {{/if_eq}}
-      {{#if_eq build "runtime"}}∞
+      {{#if_eq build "runtime"}}
       'vue': 'vue/dist/vue.common.js',
       {{/if_eq}}
       'src': path.resolve(__dirname, '../src'),

From 718e9b5c44cb6bc24de7ba67df33bf0fc6c27434 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Tue, 27 Sep 2016 21:19:07 -0700
Subject: [PATCH 023/339] AirBnB linter config support.

---
 .../e2e/custom-assertions/elementCount.js     | 16 ++++----
 template/test/e2e/runner.js                   | 26 ++++++-------
 template/test/e2e/specs/test.js               | 13 +++----
 template/test/unit/index.js                   | 10 ++---
 template/test/unit/karma.conf.js              | 38 +++++++++----------
 5 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/template/test/e2e/custom-assertions/elementCount.js b/template/test/e2e/custom-assertions/elementCount.js
index c0d5fe00af..c0103f9431 100644
--- a/template/test/e2e/custom-assertions/elementCount.js
+++ b/template/test/e2e/custom-assertions/elementCount.js
@@ -7,20 +7,20 @@
 // for how to write custom assertions see
 // http://nightwatchjs.org/guide#writing-custom-assertions
 exports.assertion = function (selector, count) {
-  this.message = 'Testing if element <' + selector + '> has count: ' + count
-  this.expected = count
+  this.message = 'Testing if element <' + selector + '> has count: ' + count{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  this.expected = count{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   this.pass = function (val) {
-    return val === this.expected
+    return val === this.expected{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }
   this.value = function (res) {
-    return res.value
+    return res.value{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }
   this.command = function (cb) {
-    var self = this
+    var self = this{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     return this.api.execute(function (selector) {
-      return document.querySelectorAll(selector).length
+      return document.querySelectorAll(selector).length{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     }, [selector], function (res) {
-      cb.call(self, res)
-    })
+      cb.call(self, res){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }
 }
diff --git a/template/test/e2e/runner.js b/template/test/e2e/runner.js
index 2a5c6ef97d..6c86165a25 100644
--- a/template/test/e2e/runner.js
+++ b/template/test/e2e/runner.js
@@ -1,6 +1,6 @@
 // 1. start the dev server using production config
-process.env.NODE_ENV = 'testing'
-var server = require('../../build/dev-server.js')
+process.env.NODE_ENV = 'testing'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var server = require('../../build/dev-server.js'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 // 2. run the nightwatch test suite against it
 // to run in additional browsers:
@@ -9,23 +9,23 @@ var server = require('../../build/dev-server.js')
 // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
 // For more information on Nightwatch's config file, see
 // http://nightwatchjs.org/guide#settings-file
-var opts = process.argv.slice(2)
+var opts = process.argv.slice(2){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 if (opts.indexOf('--config') === -1) {
-  opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js'])
+  opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 }
 if (opts.indexOf('--env') === -1) {
-  opts = opts.concat(['--env', 'chrome'])
+  opts = opts.concat(['--env', 'chrome']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 }
 
-var spawn = require('cross-spawn')
-var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' })
+var spawn = require('cross-spawn'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 runner.on('exit', function (code) {
-  server.close()
-  process.exit(code)
-})
+  server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  process.exit(code){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 runner.on('error', function (err) {
-  server.close()
-  throw err
-})
+  server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  throw err{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
index 1b01394e94..55ab705cfc 100644
--- a/template/test/e2e/specs/test.js
+++ b/template/test/e2e/specs/test.js
@@ -2,19 +2,18 @@
 // http://nightwatchjs.org/guide#usage
 
 module.exports = {
-  'default e2e tests': function (browser) {
-
+  'default e2e tests': function {{#if_eq lintConfig "airbnb"}}test{{/if_eq}}(browser) {
     // automatically uses dev Server port from /config.index.js
     // default: http://localhost:8080
     // see nightwatch.conf.js
-    var devServer = browser.globals.devServerURL
+    const devServer = browser.globals.devServerURL{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
     browser
-    .url(devServer)
+      .url(devServer)
       .waitForElementVisible('#app', 5000)
       .assert.elementPresent('.logo')
       .assert.containsText('h1', 'Hello Vue!')
       .assert.elementCount('p', 3)
-      .end()
-  }
-}
+      .end(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index 422025148f..5385e3b7cc 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -1,13 +1,13 @@
 // Polyfill fn.bind() for PhantomJS
 /* eslint-disable no-extend-native */
-Function.prototype.bind = require('function-bind')
+Function.prototype.bind = require('function-bind'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 // require all test files (files that ends with .spec.js)
-var testsContext = require.context('./specs', true, /\.spec$/)
-testsContext.keys().forEach(testsContext)
+const testsContext = require.context('./specs', true, /\.spec$/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+testsContext.keys().forEach(testsContext){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 // require all src files except main.js for coverage.
 // you can also change this to match only the subset of files that
 // you want coverage for.
-var srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/)
-srcContext.keys().forEach(srcContext)
+const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+srcContext.keys().forEach(srcContext){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/unit/karma.conf.js b/template/test/unit/karma.conf.js
index 048b72905c..addc1817d8 100644
--- a/template/test/unit/karma.conf.js
+++ b/template/test/unit/karma.conf.js
@@ -3,12 +3,12 @@
 // we are also using it with karma-webpack
 //   https://github.com/webpack/karma-webpack
 
-var path = require('path')
-var merge = require('webpack-merge')
-var baseConfig = require('../../build/webpack.base.conf')
-var utils = require('../../build/utils')
-var webpack = require('webpack')
-var projectRoot = path.resolve(__dirname, '../../')
+var path = require('path'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var merge = require('webpack-merge'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var baseConfig = require('../../build/webpack.base.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var utils = require('../../build/utils'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var webpack = require('webpack'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var projectRoot = path.resolve(__dirname, '../../'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 var webpackConfig = merge(baseConfig, {
   // use inline sourcemap for karma-sourcemap-loader
@@ -26,26 +26,26 @@ var webpackConfig = merge(baseConfig, {
       'process.env': require('../../config/test.env')
     })
   ]
-})
+}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 // no need for app entry during tests
-delete webpackConfig.entry
+delete webpackConfig.entry{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 // make sure isparta loader is applied before eslint
-webpackConfig.module.preLoaders = webpackConfig.module.preLoaders || []
+webpackConfig.module.preLoaders = webpackConfig.module.preLoaders || []{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 webpackConfig.module.preLoaders.unshift({
   test: /\.js$/,
   loader: 'isparta',
-  include: path.resolve(projectRoot, 'src')
-})
+  include: path.resolve(projectRoot, 'src'){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 // only apply babel for test files when using isparta
 webpackConfig.module.loaders.some(function (loader, i) {
   if (loader.loader === 'babel') {
-    loader.include = path.resolve(projectRoot, 'test/unit')
-    return true
+    loader.include = path.resolve(projectRoot, 'test/unit'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    return true{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }
-})
+}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 module.exports = function (config) {
   config.set({
@@ -62,14 +62,14 @@ module.exports = function (config) {
     },
     webpack: webpackConfig,
     webpackMiddleware: {
-      noInfo: true
+      noInfo: true{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
     },
     coverageReporter: {
       dir: './coverage',
       reporters: [
         { type: 'lcov', subdir: '.' },
-        { type: 'text-summary' }
+        { type: 'text-summary' }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
       ]
-    }
-  })
-}
+    }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 2aea5d00058074bedd8ddc33dddfa427d5673b2d Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Tue, 27 Sep 2016 21:23:33 -0700
Subject: [PATCH 024/339] Bump Vue version and this template version.

---
 package.json          | 2 +-
 template/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c890df2410..0816e552d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/package.json b/template/package.json
index 8fd26d7611..20e2aeb1ea 100644
--- a/template/package.json
+++ b/template/package.json
@@ -17,7 +17,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.0.0-rc.5",
+    "vue": "^2.0.0-rc.8",
     "babel-runtime": "^6.0.0"
   },
   "devDependencies": {

From da11f18efb7c2134c00d49e38f4d4f1284a2a933 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Sep 2016 19:03:00 -0400
Subject: [PATCH 025/339] bump dependencies

---
 template/package.json                | 47 ++++++++++++++--------------
 template/test/e2e/nightwatch.conf.js |  2 +-
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/template/package.json b/template/package.json
index 20e2aeb1ea..5024db1f0e 100644
--- a/template/package.json
+++ b/template/package.json
@@ -24,7 +24,7 @@
     "autoprefixer": "^6.4.0",
     "babel-core": "^6.0.0",
     {{#lint}}
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^7.0.0",
     {{/lint}}
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -32,16 +32,16 @@
     "babel-preset-stage-2": "^6.0.0",
     "babel-register": "^6.0.0",
     "connect-history-api-fallback": "^1.1.0",
-    "css-loader": "^0.23.0",
+    "css-loader": "^0.25.0",
     {{#lint}}
-    "eslint": "^2.10.2",
+    "eslint": "^3.6.1",
     "eslint-friendly-formatter": "^2.0.5",
-    "eslint-loader": "^1.3.0",
+    "eslint-loader": "^1.5.0",
     "eslint-plugin-html": "^1.3.0",
     {{#if_eq lintConfig "standard"}}
-    "eslint-config-standard": "^5.1.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
+    "eslint-config-standard": "^6.1.0",
+    "eslint-plugin-promise": "^2.0.1",
+    "eslint-plugin-standard": "^2.0.1",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
     "eslint-config-airbnb-base": "^3.0.1",
@@ -51,22 +51,22 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
+    "file-loader": "^0.9.0",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.12.0",
+    "http-proxy-middleware": "^0.17.2",
     "json-loader": "^0.5.4",
     {{#unit}}
-    "karma": "^0.13.15",
-    "karma-coverage": "^0.5.5",
-    "karma-mocha": "^0.2.2",
+    "karma": "^1.3.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.2.0",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sinon-chai": "^1.2.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.24",
+    "karma-spec-reporter": "0.0.26",
     "karma-webpack": "^1.7.0",
     "lolex": "^1.4.0",
-    "mocha": "^2.4.5",
+    "mocha": "^3.1.0",
     "chai": "^3.5.0",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
@@ -76,18 +76,17 @@
     {{/unit}}
     {{#e2e}}
     "chromedriver": "^2.21.2",
-    "cross-spawn": "^2.1.5",
-    "nightwatch": "^0.8.18",
-    "selenium-server": "2.53.0",
+    "cross-spawn": "^4.0.2",
+    "nightwatch": "^0.9.8",
+    "selenium-server": "2.53.1",
     {{/e2e}}
-    "ora": "^0.2.0",
-    "shelljs": "^0.6.0",
+    "ora": "^0.3.0",
+    "shelljs": "^0.7.4",
     "url-loader": "^0.5.7",
-    "vue-hot-reload-api": "^1.2.0",
     "vue-loader": "^9.4.0",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
+    "webpack": "^1.13.2",
+    "webpack-dev-middleware": "^1.8.3",
+    "webpack-hot-middleware": "^2.12.2",
+    "webpack-merge": "^0.14.1"
   }
 }
diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index 00e85f6a46..a5e55e908c 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -9,7 +9,7 @@ module.exports = {
 
   "selenium": {
     "start_process": true,
-    "server_path": "node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.0.jar",
+    "server_path": "node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar",
     "host": "127.0.0.1",
     "port": 4444,
     "cli_args": {

From 58137e8527a277fc509749f8220109ec7b8a3256 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Sep 2016 19:05:51 -0400
Subject: [PATCH 026/339] no longer need babel-runtime in deps

---
 template/package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/package.json b/template/package.json
index 5024db1f0e..29c6cf00e3 100644
--- a/template/package.json
+++ b/template/package.json
@@ -17,8 +17,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.0.0-rc.8",
-    "babel-runtime": "^6.0.0"
+    "vue": "^2.0.0-rc.8"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",

From cf36da6b401bec05000dda319e4a65cb7a37479d Mon Sep 17 00:00:00 2001
From: Sebastian <vuchl@gmx.de>
Date: Thu, 29 Sep 2016 17:00:03 +0200
Subject: [PATCH 027/339] clear up the README that the master branch is using
 Vue2 bei default now (#285)

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

diff --git a/README.md b/README.md
index a187098a7c..1bceead358 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ This is a project template for [vue-cli](https://github.com/vuejs/vue-cli). **It
 
 ``` bash
 $ npm install -g vue-cli
-$ vue init webpack#1.0 my-project
+$ vue init webpack my-project
 $ cd my-project
 $ npm install
 $ npm run dev

From 8b344a751b9b3baeb4e6896ecddaa4fc25c4da05 Mon Sep 17 00:00:00 2001
From: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Date: Sat, 1 Oct 2016 17:44:55 +0200
Subject: [PATCH 028/339] Some extra cleaning (#287)

---
 meta.json           | 1 +
 template/.gitignore | 6 +++++-
 template/README.md  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta.json b/meta.json
index 36b5fd69d3..5e76e9e90c 100644
--- a/meta.json
+++ b/meta.json
@@ -68,6 +68,7 @@
   },
   "filters": {
     ".eslintrc.js": "lint",
+    ".eslintignore": "lint",
     "test/unit/**/*": "unit",
     "test/e2e/**/*": "e2e"
   },
diff --git a/template/.gitignore b/template/.gitignore
index be86a2b16a..631bd574e9 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -2,6 +2,10 @@
 node_modules/
 dist/
 npm-debug.log
-selenium-debug.log
+{{#unit}}
 test/unit/coverage
+{{/unit}}
+{{#e2e}}
 test/e2e/reports
+selenium-debug.log
+{{/e2e}}
diff --git a/template/README.md b/template/README.md
index 9410e7a3e4..b090e8fe9c 100644
--- a/template/README.md
+++ b/template/README.md
@@ -13,12 +13,16 @@ npm run dev
 
 # build for production with minification
 npm run build
+{{#unit}}
 
 # run unit tests
 npm run unit
+{{/unit}}
+{{#e2e}}
 
 # run e2e tests
 npm run e2e
+{{/e2e}}
 
 # run all tests
 npm test

From 1f9450bde915c4b361b66166f5738ddd022b6b41 Mon Sep 17 00:00:00 2001
From: Markus Sorg <markus.sorg@gmail.com>
Date: Sat, 1 Oct 2016 20:46:20 +0200
Subject: [PATCH 029/339] Update Vue version from 2.0.0-rc.8 to 2.0.1 (#291)

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

diff --git a/template/package.json b/template/package.json
index 29c6cf00e3..0594845d64 100644
--- a/template/package.json
+++ b/template/package.json
@@ -17,7 +17,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.0.0-rc.8"
+    "vue": "^2.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",

From a705edde15a0c53c71162eafb58e4c90ded5ad3d Mon Sep 17 00:00:00 2001
From: Markus Sorg <markus.sorg@gmail.com>
Date: Sun, 2 Oct 2016 03:07:03 +0200
Subject: [PATCH 030/339] Open default browser on npm run dev (#292)

---
 template/build/dev-server.js | 5 ++++-
 template/package.json        | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 3833a2af58..3833ac1c25 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -2,6 +2,7 @@ var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
 var config = require('../config')
+var opn = require('opn')
 var proxyMiddleware = require('http-proxy-middleware')
 var webpackConfig = process.env.NODE_ENV === 'testing'
   ? require('./webpack.prod.conf')
@@ -61,5 +62,7 @@ module.exports = app.listen(port, function (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:' + port + '\n')
+  var uri = 'http://localhost:' + port
+  console.log('Listening at ' + uri + '\n')
+  opn(uri)
 })
diff --git a/template/package.json b/template/package.json
index 0594845d64..226c1558d1 100644
--- a/template/package.json
+++ b/template/package.json
@@ -79,6 +79,7 @@
     "nightwatch": "^0.9.8",
     "selenium-server": "2.53.1",
     {{/e2e}}
+    "opn": "^4.0.2",
     "ora": "^0.3.0",
     "shelljs": "^0.7.4",
     "url-loader": "^0.5.7",

From ca7bcdfa853c8deac633d07cc2756bcdace88053 Mon Sep 17 00:00:00 2001
From: Julien Fradin <julien@frad.in>
Date: Sun, 2 Oct 2016 22:46:03 +0200
Subject: [PATCH 031/339] Adding vue-style-loader (#290)

Fresh install throws error on `npm run dev`:

```
ERROR in ./src/App.vue
Module not found: Error: Cannot resolve module 'vue-style-loader'
```
---
 template/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/package.json b/template/package.json
index 226c1558d1..14a9faa62b 100644
--- a/template/package.json
+++ b/template/package.json
@@ -84,6 +84,7 @@
     "shelljs": "^0.7.4",
     "url-loader": "^0.5.7",
     "vue-loader": "^9.4.0",
+    "vue-style-loader": "^1.0.0",
     "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.8.3",
     "webpack-hot-middleware": "^2.12.2",

From 362a094581f232822463bf05e9cf4f4d323f9b46 Mon Sep 17 00:00:00 2001
From: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Date: Sun, 2 Oct 2016 22:52:09 +0200
Subject: [PATCH 032/339] Don't add test.env.js if no tests (#294)

---
 meta.json => meta.js                | 14 ++++++++++++--
 template/README.md                  |  2 ++
 template/build/dev-server.js        |  4 ++--
 template/build/webpack.prod.conf.js |  8 ++++----
 template/package.json               | 12 ++++--------
 5 files changed, 24 insertions(+), 16 deletions(-)
 rename meta.json => meta.js (89%)

diff --git a/meta.json b/meta.js
similarity index 89%
rename from meta.json
rename to meta.js
index 5e76e9e90c..07c85103ed 100644
--- a/meta.json
+++ b/meta.js
@@ -1,4 +1,13 @@
-{
+module.exports = {
+  "helpers": {
+    "if_or": function (v1, v2, options) {
+      if (v1 || v2) {
+        return options.fn(this);
+      }
+
+      return options.inverse(this);
+    }
+  },
   "prompts": {
     "name": {
       "type": "string",
@@ -69,8 +78,9 @@
   "filters": {
     ".eslintrc.js": "lint",
     ".eslintignore": "lint",
+    "config/test.env.js": "unit || e2e",
     "test/unit/**/*": "unit",
     "test/e2e/**/*": "e2e"
   },
   "completeMessage": "To get started:\n\n  cd {{destDirName}}\n  npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack"
-}
+};
diff --git a/template/README.md b/template/README.md
index b090e8fe9c..aca6ae08ad 100644
--- a/template/README.md
+++ b/template/README.md
@@ -23,9 +23,11 @@ npm run unit
 # run e2e tests
 npm run e2e
 {{/e2e}}
+{{#if_or unit e2e}}
 
 # run all tests
 npm test
+{{/if_or}}
 ```
 
 For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 3833ac1c25..a13fe96fcf 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -4,9 +4,9 @@ var webpack = require('webpack')
 var config = require('../config')
 var opn = require('opn')
 var proxyMiddleware = require('http-proxy-middleware')
-var webpackConfig = process.env.NODE_ENV === 'testing'
+var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('./webpack.prod.conf')
-  : require('./webpack.dev.conf')
+  : {{/if_or}}require('./webpack.dev.conf')
 
 // default port where dev server listens for incoming traffic
 var port = process.env.PORT || config.dev.port
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 6119f700f1..da43276dd5 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -6,9 +6,9 @@ var merge = require('webpack-merge')
 var baseWebpackConfig = require('./webpack.base.conf')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
-var env = process.env.NODE_ENV === 'testing'
+var env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('../config/test.env')
-  : config.build.env
+  : {{/if_or}}config.build.env
 
 var webpackConfig = merge(baseWebpackConfig, {
   module: {
@@ -43,9 +43,9 @@ var webpackConfig = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      filename: process.env.NODE_ENV === 'testing'
+      filename: {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
         ? 'index.html'
-        : config.build.index,
+        : {{/if_or}}config.build.index,
       template: 'index.html',
       inject: true,
       minify: {
diff --git a/template/package.json b/template/package.json
index 14a9faa62b..fafd959488 100644
--- a/template/package.json
+++ b/template/package.json
@@ -6,14 +6,10 @@
   "private": true,
   "scripts": {
     "dev": "node build/dev-server.js",
-    "build": "node build/build.js",
-    {{#unit}}
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    {{/unit}}
-    {{#e2e}}
-    "e2e": "node test/e2e/runner.js",
-    {{/e2e}}
-    "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}"{{#lint}},
+    "build": "node build/build.js"{{#unit}},
+    "unit": "karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
+    "e2e": "node test/e2e/runner.js"{{/e2e}}{{#if_or unit e2e}},
+    "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}"{{/if_or}}{{#lint}},
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {

From adeaab5b61d6d290873e0a115fe0b477a430acf1 Mon Sep 17 00:00:00 2001
From: anishkny <anishkny@gmail.com>
Date: Sun, 2 Oct 2016 14:42:45 -0700
Subject: [PATCH 033/339] Should copy from static/* instead of static/ (#293)

I am not sure about this, but I think when building for production (via `npm run build`), the script should copy from "static/*" (note extra asterisk) instead of "static/". Please correct me if I am wrong.
---
 template/build/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/build.js b/template/build/build.js
index 37f5a820df..f28277f0c4 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -20,7 +20,7 @@ spinner.start()
 var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
 rm('-rf', assetsPath)
 mkdir('-p', assetsPath)
-cp('-R', 'static/', assetsPath)
+cp('-R', 'static/*', assetsPath)
 
 webpack(webpackConfig, function (err, stats) {
   spinner.stop()

From 7a5de88f5156c4c5b56a422ff115fce5fc865f2c Mon Sep 17 00:00:00 2001
From: Guido Bouman <m@guido.vc>
Date: Thu, 6 Oct 2016 23:34:00 +0200
Subject: [PATCH 034/339] Resolve imports (#300)

* Add import resolver for AirBnB

So we don't have to disable the mighty `import/no-unresolved` rule.

* Add eslint-import-resolver-webpack to package.json
---
 template/.eslintrc.js | 13 ++++++++++---
 template/package.json |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index e6c7ff5ff4..ac9464cf94 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -15,6 +15,16 @@ module.exports = {
   plugins: [
     'html'
   ],
+  {{#if_eq lintConfig "airbnb"}}
+  // check if imports actually resolve
+  'settings': {
+    'import/resolver': {
+      'webpack': {
+        'config': 'build/webpack.base.conf.js'
+      }
+    }
+  },
+  {{/if_eq}}
   // add your custom rules here
   'rules': {
     {{#if_eq lintConfig "standard"}}
@@ -23,9 +33,6 @@ module.exports = {
     // allow async-await
     'generator-star-spacing': 0,
     {{/if_eq}}
-    {{#if_eq lintConfig "airbnb"}}
-    'import/no-unresolved': 0,
-    {{/if_eq}}
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
   }
diff --git a/template/package.json b/template/package.json
index fafd959488..ceee06b8d1 100644
--- a/template/package.json
+++ b/template/package.json
@@ -40,6 +40,7 @@
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
     "eslint-config-airbnb-base": "^3.0.1",
+    "eslint-import-resolver-webpack": "^0.6.0",
     "eslint-plugin-import": "^1.8.1",
     {{/if_eq}}
     {{/lint}}

From 9dc4082b5742f4539ea793c2bffb17a765f5227e Mon Sep 17 00:00:00 2001
From: Guido Bouman <m@guido.vc>
Date: Fri, 7 Oct 2016 04:11:23 +0200
Subject: [PATCH 035/339] Update AirBnB base config packages (#301)

* Update AirBnB base config packages

* Don't require .vue extension for imports.
---
 template/.eslintrc.js | 7 +++++++
 template/package.json | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index ac9464cf94..3b74f949c1 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -33,6 +33,13 @@ module.exports = {
     // allow async-await
     'generator-star-spacing': 0,
     {{/if_eq}}
+    {{#if_eq lintConfig "airbnb"}}
+    // don't require .vue extension when importing
+    'import/extensions': ['error', 'always', {
+      'js': 'never',
+      'vue': 'never'
+    }],
+    {{/if_eq}}
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
   }
diff --git a/template/package.json b/template/package.json
index ceee06b8d1..1059541557 100644
--- a/template/package.json
+++ b/template/package.json
@@ -29,7 +29,7 @@
     "connect-history-api-fallback": "^1.1.0",
     "css-loader": "^0.25.0",
     {{#lint}}
-    "eslint": "^3.6.1",
+    "eslint": "^3.7.1",
     "eslint-friendly-formatter": "^2.0.5",
     "eslint-loader": "^1.5.0",
     "eslint-plugin-html": "^1.3.0",
@@ -39,9 +39,9 @@
     "eslint-plugin-standard": "^2.0.1",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
-    "eslint-config-airbnb-base": "^3.0.1",
+    "eslint-config-airbnb-base": "^8.0.0",
     "eslint-import-resolver-webpack": "^0.6.0",
-    "eslint-plugin-import": "^1.8.1",
+    "eslint-plugin-import": "^1.16.0",
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",

From ea454257a6c3d24063e41923d6104eaa7df4446c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 11 Oct 2016 22:13:27 +0200
Subject: [PATCH 036/339] fix vue alias (#314)

---
 template/build/webpack.base.conf.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 2858d901dc..0a7e186b28 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -17,10 +17,7 @@ module.exports = {
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
       {{#if_eq build "standalone"}}
-      'vue': 'vue/dist/vue',
-      {{/if_eq}}
-      {{#if_eq build "runtime"}}
-      'vue': 'vue/dist/vue.common.js',
+      'vue$': 'vue/dist/vue',
       {{/if_eq}}
       'src': path.resolve(__dirname, '../src'),
       'assets': path.resolve(__dirname, '../src/assets'),

From 1c11a4f6216b696ff0095309ff3b5129e1e33af3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 16 Oct 2016 15:16:08 +0800
Subject: [PATCH 037/339] update default content

---
 template/src/App.vue              | 50 +++++--------------------------
 template/src/components/Hello.vue | 35 ++++++++++++++++++++--
 2 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/template/src/App.vue b/template/src/App.vue
index 0d1d960438..0ff42ba29d 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -1,24 +1,7 @@
 <template>
   <div id="app">
-    <img class="logo" src="./assets/logo.png">
+    <img src="./assets/logo.png">
     <hello></hello>
-    <p>
-      Welcome to your Vue.js app!
-    </p>
-    <p>
-      To get a better understanding of how this boilerplate works, check out
-      <a href="http://vuejs-templates.github.io/webpack" target="_blank">its documentation</a>.
-      It is also recommended to go through the docs for
-      <a href="http://webpack.github.io/" target="_blank">Webpack</a> and
-      <a href="http://vuejs.github.io/vue-loader/" target="_blank">vue-loader</a>.
-      If you have any issues with the setup, please file an issue at this boilerplate's
-      <a href="https://github.com/vuejs-templates/webpack" target="_blank">repository</a>.
-    </p>
-    <p>
-      You may also want to checkout
-      <a href="https://github.com/vuejs/vue-router/" target="_blank">vue-router</a> for routing and
-      <a href="https://github.com/vuejs/vuex/" target="_blank">vuex</a> for state management.
-    </p>
   </div>
 </template>
 
@@ -26,6 +9,7 @@
 import Hello from './components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 export default {
+  name: 'app',
   components: {
     Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
@@ -33,32 +17,12 @@ export default {
 </script>
 
 <style>
-html {
-  height: 100%;
-}
-
-body {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
 #app {
-  color: #2c3e50;
-  margin-top: -100px;
-  max-width: 600px;
-  font-family: Source Sans Pro, Helvetica, sans-serif;
+  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
   text-align: center;
-}
-
-#app a {
-  color: #42b983;
-  text-decoration: none;
-}
-
-.logo {
-  width: 100px;
-  height: 100px
+  color: #2c3e50;
+  margin-top: 60px;
 }
 </style>
diff --git a/template/src/components/Hello.vue b/template/src/components/Hello.vue
index ba323fd101..dc7251a0f2 100644
--- a/template/src/components/Hello.vue
+++ b/template/src/components/Hello.vue
@@ -1,14 +1,31 @@
 <template>
   <div class="hello">
     <h1>\{{ msg }}</h1>
+    <h2>Essential Links</h2>
+    <ul>
+      <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
+      <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
+      <li><a href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
+      <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
+      <br>
+      <li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
+    </ul>
+    <h2>Ecosystem</h2>
+    <ul>
+      <li><a href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
+      <li><a href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
+      <li><a href="http://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
+      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
+    </ul>
   </div>
 </template>
 
 <script>
 export default {
+  name: 'hello',
   data{{#unless_eq lintConfig "airbnb"}} {{/unless_eq}}() {
     return {
-      msg: 'Hello Vue!'{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+      msg: 'Welcome to Your Vue.js App'{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
     }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
@@ -16,7 +33,21 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
-h1 {
+h1, h2 {
+  font-weight: normal;
+}
+
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+
+a {
   color: #42b983;
 }
 </style>

From 0095ebad27291b38154d38b087ebf785dc873236 Mon Sep 17 00:00:00 2001
From: Dan Gamble <dangamble89@gmail.com>
Date: Sun, 16 Oct 2016 14:52:17 +0100
Subject: [PATCH 038/339] Fix link to Vue guide (#320)

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

diff --git a/README.md b/README.md
index 1bceead358..fb5643327c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 ## Documentation
 
 - [For this template](http://vuejs-templates.github.io/webpack): common questions specific to this template are answered and each part is described in greater detail
-- [For Vue 2.0](http://rc.vuejs.org/guide/): general information about how to work with Vue, not specific to this template
+- [For Vue 2.0](http://vuejs.org/guide/): general information about how to work with Vue, not specific to this template
 
 ## Usage
 

From a6f36cc726222dc5321d779a25d5dce1b86d8ea2 Mon Sep 17 00:00:00 2001
From: Sobolev Nikita <mail@sobolevn.me>
Date: Tue, 18 Oct 2016 07:57:56 +0300
Subject: [PATCH 039/339] Fixed issue when the initial tests were failing.
 (#323)

Changes:
1. Fixed unit-test, changed the title
2. Fixed e2e-test, changed the title and element to expect

Closes #322
---
 template/test/e2e/specs/test.js        | 6 +++---
 template/test/unit/specs/Hello.spec.js | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
index 55ab705cfc..f619020098 100644
--- a/template/test/e2e/specs/test.js
+++ b/template/test/e2e/specs/test.js
@@ -11,9 +11,9 @@ module.exports = {
     browser
       .url(devServer)
       .waitForElementVisible('#app', 5000)
-      .assert.elementPresent('.logo')
-      .assert.containsText('h1', 'Hello Vue!')
-      .assert.elementCount('p', 3)
+      .assert.elementPresent('.hello')
+      .assert.containsText('h1', 'Welcome to Your Vue.js App')
+      .assert.elementCount('img', 1)
       .end(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/unit/specs/Hello.spec.js b/template/test/unit/specs/Hello.spec.js
index 56c7a91841..9d550cb908 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/Hello.spec.js
@@ -7,6 +7,7 @@ describe('Hello.vue', () => {
       el: document.createElement('div'),
       render: (h) => h(Hello){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
     }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    expect(vm.$el.querySelector('.hello h1').textContent).to.equal('Hello Vue!'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    expect(vm.$el.querySelector('.hello h1').textContent)
+      .to.equal('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 4c893280a04bc1380cf3042c6b276d363434f37e Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Tue, 18 Oct 2016 00:58:29 -0400
Subject: [PATCH 040/339] update default build and build descriptions (#321)

---
 meta.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta.js b/meta.js
index 07c85103ed..f1f673ffe2 100644
--- a/meta.js
+++ b/meta.js
@@ -26,17 +26,17 @@ module.exports = {
     },
     "build": {
       "type": "list",
-      "message": "Vue comes in two build versions, which do you want to use?",
+      "message": "Vue build",
       "choices": [
         {
-          "name": "Runtime-only: lighter, but no support for templates defined in .html files (.vue files are fine)",
-          "value": "runtime",
-          "short": "runtime"
-        },
-        {
-          "name": "Standalone: heavier, because it includes the template parser to allow templates in .html files",
+          "name": "Runtime + Compiler: recommended for most users",
           "value": "standalone",
           "short": "standalone"
+        },
+        {
+          "name": "Runtime-only: about 6KB lighter min+gzip, but templates (or any Vue-specific HTML) are ONLY allowed in .vue files - render functions are required elsewhere",
+          "value": "runtime",
+          "short": "runtime"
         }
       ]
     },

From fe84b0009594258b9e99e4a1a8aabf87e63ec498 Mon Sep 17 00:00:00 2001
From: DCzajkowski <dare.czajkowski@gmail.com>
Date: Wed, 19 Oct 2016 04:52:59 +0200
Subject: [PATCH 041/339] Added Prerenderer SPA Plugin installation guide
 (#328)

* Added Prerenderer SPA Plugin installation guide

Added a Getting Started section for using the Prerenderer SPA Plugin

* Update instructions for prerender-spa-plugin
---
 docs/prerender.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/prerender.md b/docs/prerender.md
index 7684bfd776..cc45f19bc8 100644
--- a/docs/prerender.md
+++ b/docs/prerender.md
@@ -1,3 +1,31 @@
 # Prerendering for SEO
 
 If you want to prerender routes that will not significantly change once pushed to production, use this Webpack plugin: [prerender-spa-plugin](https://www.npmjs.com/package/prerender-spa-plugin), which has been tested for use with Vue. For pages that _do_ frequently change, [Prerender.io](https://prerender.io/) and [Netlify](https://www.netlify.com/pricing) both offer plans for regularly re-prerendering your content for search engines.
+
+## Using `prerender-spa-plugin`
+
+1. Install it as a dev dependency:
+
+```bash
+npm install --save-dev prerender-spa-plugin
+```
+
+2. Require it in **build/webpack.prod.conf.js**:
+
+```js
+// This line should go at the top of the file where other 'imports' live in
+var PrerenderSpaPlugin = require('prerender-spa-plugin')
+```
+
+3. Configure it in the `plugins` array (also in **build/webpack.prod.conf.js**):
+
+```js
+new PrerenderSpaPlugin(
+  // Path to compiled app
+  path.join(__dirname, '../dist'),
+  // List of endpoints you wish to prerender
+  [ '/' ]
+)
+```
+
+If you also wanted to prerender `/about` and `/contact`, then that array would be `[ '/', '/about', '/contact' ]`.

From d96fd809882f61b6c3e93c0bab1e4e5f9bfd602f Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Tue, 18 Oct 2016 22:53:24 -0400
Subject: [PATCH 042/339] Update main.js (#327)

---
 template/src/main.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/template/src/main.js b/template/src/main.js
index 33994e9b07..6cb0a0eaf6 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -8,5 +8,11 @@ import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
+  {{#if_eq build "runtime"}}
   render: h => h(App){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  {{/if_eq}}
+  {{#if_eq build "standalone"}}
+  template: '<App/>',
+  components: { App }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  {{/if_eq}}
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 8eb7e1c740a8b0398d7d9cb94bf5714745bb9e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 19 Oct 2016 04:55:55 +0200
Subject: [PATCH 043/339] Source maps option for vue css loaders (#315)

* adding source map option to vue-loader's css loaders.

* enable source maps for preprocessor loaders of vue-loader when config demands it.

* use config.dev.env
---
 template/build/dev-server.js        | 3 ++-
 template/build/utils.js             | 2 ++
 template/build/webpack.base.conf.js | 9 ++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index a13fe96fcf..abe5da2499 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -1,7 +1,8 @@
+var config = require('../config')
+if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env
 var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
-var config = require('../config')
 var opn = require('opn')
 var proxyMiddleware = require('http-proxy-middleware')
 var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
diff --git a/template/build/utils.js b/template/build/utils.js
index 4ec8d0bb37..5b90db1470 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -25,6 +25,8 @@ exports.cssLoaders = function (options) {
       return loader + (options.sourceMap ? extraParamChar + 'sourceMap' : '')
     }).join('!')
 
+    // Extract CSS when that option is specified
+    // (which is the case during production build)
     if (options.extract) {
       return ExtractTextPlugin.extract('vue-style-loader', sourceLoader)
     } else {
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 0a7e186b28..0f44d05ee0 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -3,6 +3,13 @@ var config = require('../config')
 var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
 
+var env = process.env.NODE_ENV
+// check env & config/index.js to decide weither to enable CSS Sourcemaps for the
+// various preprocessor loaders added to vue-loader at the end of this file
+var cssSourceMapDev = (env === 'development' && config.dev.cssSourceMap)
+var cssSourceMapProd = (env === 'production' && config.build.productionSourceMap)
+var useCssSourceMap = cssSourceMapDev || cssSourceMapProd
+
 module.exports = {
   entry: {
     app: './src/main.js'
@@ -83,7 +90,7 @@ module.exports = {
   },
   {{/lint}}
   vue: {
-    loaders: utils.cssLoaders(),
+    loaders: utils.cssLoaders({ sourceMap: useCssSourceMap }),
     postcss: [
       require('autoprefixer')({
         browsers: ['last 2 versions']

From 17351f5e3b1306a117aaa80b7d575b9aa3144866 Mon Sep 17 00:00:00 2001
From: Steve King <stevejohnking@gmail.com>
Date: Sun, 23 Oct 2016 22:55:12 -0700
Subject: [PATCH 044/339] Fix some typos in docs (#331)

---
 docs/env.md       | 2 +-
 docs/static.md    | 2 +-
 docs/structure.md | 2 +-
 docs/unit.md      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/env.md b/docs/env.md
index 18b68a0557..211ca5d0f3 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -44,7 +44,7 @@ As we can see, `test.env` inherits the `dev.env` and the `dev.env` inherits the
 
 ### Usage
 
-It is simple to use the environment variables to your code. For example:
+It is simple to use the environment variables in your code. For example:
 
 ```js
 Vue.config.debug = process.env.DEBUG_MODE
diff --git a/docs/static.md b/docs/static.md
index 3d5f2dc966..f9f9a3ce71 100644
--- a/docs/static.md
+++ b/docs/static.md
@@ -12,7 +12,7 @@ Since these assets may be inlined/copied/renamed during build, they are essentia
 
 ### Asset Resolving Rules
 
-- **Relative URLs**, e.g. `./assets/logo.png` will be interpreted as a module dependency. They will be replaced with a auto-generated URL based on your Webpack output configuration.
+- **Relative URLs**, e.g. `./assets/logo.png` will be interpreted as a module dependency. They will be replaced with an auto-generated URL based on your Webpack output configuration.
 
 - **Non-prefixed URLs**, e.g. `assets/logo.png` will be treated the same as the relative URLs and translated into `./assets/logo.png`.
 
diff --git a/docs/structure.md b/docs/structure.md
index 7b02166e29..b6137feac9 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -60,7 +60,7 @@ Contains e2e test related files. See [End-to-end Testing](e2e.md) for more detai
 
 ### `index.html`
 
-This is the **template** `index.html` for our single page application. During development and builds, Webpack will generate assets, and the URLs for those generated assets will automatically injected into this template to render the final HTML.
+This is the **template** `index.html` for our single page application. During development and builds, Webpack will generate assets, and the URLs for those generated assets will be automatically injected into this template to render the final HTML.
 
 ### `package.json`
 
diff --git a/docs/unit.md b/docs/unit.md
index 7d732c0689..6162681d45 100644
--- a/docs/unit.md
+++ b/docs/unit.md
@@ -14,7 +14,7 @@ And the files:
 
 - `index.js`
 
-  This the entry file used by `karma-webpack` to bundle all the test code and source code (for coverage purposes). You can ignore it for the most part.
+  This is the entry file used by `karma-webpack` to bundle all the test code and source code (for coverage purposes). You can ignore it for the most part.
 
 - `specs/`
 

From 2ce08d49552080f993afbfb2ca1fde63e833e733 Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Wed, 26 Oct 2016 00:51:45 -0400
Subject: [PATCH 045/339] automatically check versions of node and npm (#330)

---
 template/build/build.js          |  1 +
 template/build/check-versions.js | 45 ++++++++++++++++++++++++++++++++
 template/build/dev-server.js     |  1 +
 template/package.json            |  6 +++++
 4 files changed, 53 insertions(+)
 create mode 100644 template/build/check-versions.js

diff --git a/template/build/build.js b/template/build/build.js
index f28277f0c4..b3c9aad410 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -1,4 +1,5 @@
 // https://github.com/shelljs/shelljs
+require('./check-versions')()
 require('shelljs/global')
 env.NODE_ENV = 'production'
 
diff --git a/template/build/check-versions.js b/template/build/check-versions.js
new file mode 100644
index 0000000000..e2b6cf74c2
--- /dev/null
+++ b/template/build/check-versions.js
@@ -0,0 +1,45 @@
+var semver = require('semver')
+var chalk = require('chalk')
+var packageConfig = require('../package.json')
+var exec = function (cmd) {
+  return require('child_process')
+    .execSync(cmd).toString().trim()
+}
+
+var versionRequirements = [
+  {
+    name: 'node',
+    currentVersion: semver.clean(process.version),
+    versionRequirement: packageConfig.engines.node
+  },
+  {
+    name: 'npm',
+    currentVersion: exec('npm --version'),
+    versionRequirement: packageConfig.engines.npm
+  }
+]
+
+module.exports = function () {
+  var warnings = []
+  for (var i = 0; i < versionRequirements.length; i++) {
+    var mod = versionRequirements[i]
+    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
+      warnings.push(mod.name + ': ' +
+        chalk.red(mod.currentVersion) + ' should be ' +
+        chalk.green(mod.versionRequirement)
+      )
+    }
+  }
+
+  if (warnings.length) {
+    console.log('')
+    console.log(chalk.yellow('To use this template, you must update following to modules:'))
+    console.log()
+    for (var i = 0; i < warnings.length; i++) {
+      var warning = warnings[i]
+      console.log('  ' + warning)
+    }
+    console.log()
+    process.exit(1)
+  }
+}
diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index abe5da2499..528f7a9c1b 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -1,3 +1,4 @@
+require('./check-versions')()
 var config = require('../config')
 if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env
 var path = require('path')
diff --git a/template/package.json b/template/package.json
index 1059541557..3390d2c653 100644
--- a/template/package.json
+++ b/template/package.json
@@ -26,6 +26,7 @@
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-stage-2": "^6.0.0",
     "babel-register": "^6.0.0",
+    "chalk": "^1.1.3",
     "connect-history-api-fallback": "^1.1.0",
     "css-loader": "^0.25.0",
     {{#lint}}
@@ -76,6 +77,7 @@
     "nightwatch": "^0.9.8",
     "selenium-server": "2.53.1",
     {{/e2e}}
+    "semver": "^5.3.0",
     "opn": "^4.0.2",
     "ora": "^0.3.0",
     "shelljs": "^0.7.4",
@@ -86,5 +88,9 @@
     "webpack-dev-middleware": "^1.8.3",
     "webpack-hot-middleware": "^2.12.2",
     "webpack-merge": "^0.14.1"
+  },
+  "engines": {
+    "node": ">= 4.0.0",
+    "npm": ">= 3.0.0"
   }
 }

From 3225018bc1455219efa4f517aacf97f256d81fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hi=E1=BB=83n=20=C4=90=C3=A0o=20Vinh?= <neo.go.vn@gmail.com>
Date: Fri, 28 Oct 2016 06:13:22 +0700
Subject: [PATCH 046/339] Fix references (#339)

* Fix docs/commands

* Fix docs/pre-processors

* Fix template/build
---
 docs/commands.md                    | 2 +-
 docs/pre-processors.md              | 2 +-
 template/build/utils.js             | 2 +-
 template/build/webpack.prod.conf.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/commands.md b/docs/commands.md
index 736f17d4cd..40b9209d6b 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -28,7 +28,7 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 
 - Supports ES2015 in test files.
 - Supports all webpack loaders.
-- Easy [mock injection](http://vuejs.github.io/vue-loader/workflow/testing-with-mocks.html).
+- Easy [mock injection](http://vuejs.github.io/vue-loader/en/workflow/testing-with-mocks.html).
 
 ### `npm run e2e`
 
diff --git a/docs/pre-processors.md b/docs/pre-processors.md
index e3b0ef6367..957e41c9e0 100644
--- a/docs/pre-processors.md
+++ b/docs/pre-processors.md
@@ -37,7 +37,7 @@ module.exports = {
 }
 ```
 
-See [vue-loader's related documentation](http://vuejs.github.io/vue-loader/features/postcss.html) for more details.
+See [vue-loader's related documentation](http://vuejs.github.io/vue-loader/en/features/postcss.html) for more details.
 
 ### Standalone CSS Files
 
diff --git a/template/build/utils.js b/template/build/utils.js
index 5b90db1470..dc3cdd0114 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -34,7 +34,7 @@ exports.cssLoaders = function (options) {
     }
   }
 
-  // http://vuejs.github.io/vue-loader/configurations/extract-css.html
+  // http://vuejs.github.io/vue-loader/en/configurations/extract-css.html
   return {
     css: generateLoaders(['css']),
     postcss: generateLoaders(['css']),
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index da43276dd5..41db643a96 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -27,7 +27,7 @@ var webpackConfig = merge(baseWebpackConfig, {
     })
   },
   plugins: [
-    // http://vuejs.github.io/vue-loader/workflow/production.html
+    // http://vuejs.github.io/vue-loader/en/workflow/production.html
     new webpack.DefinePlugin({
       'process.env': env
     }),

From 94e921d0603cb3ec94b05e7a98706f0a38d0a9f0 Mon Sep 17 00:00:00 2001
From: moonoulong <moonoulong@gmail.com>
Date: Wed, 2 Nov 2016 05:22:14 +0800
Subject: [PATCH 047/339] Fix: fix e2e test open browser (#345)

---
 template/build/dev-server.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 528f7a9c1b..21bd0119d1 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -66,5 +66,9 @@ module.exports = app.listen(port, function (err) {
   }
   var uri = 'http://localhost:' + port
   console.log('Listening at ' + uri + '\n')
-  opn(uri)
+
+  // when env is testing, don't need open it
+  if (process.env.NODE_ENV !== 'testing') {
+    opn(uri)
+  }
 })

From 00ee08a52765fdca3c9feaf9f9a7173635e6623d Mon Sep 17 00:00:00 2001
From: Kettan <iamken1204@gmail.com>
Date: Wed, 9 Nov 2016 11:05:05 +0800
Subject: [PATCH 048/339] fix typo of OccurrenceOrderPlugin

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

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 41db643a96..c0f9d7ecbb 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -36,7 +36,7 @@ var webpackConfig = merge(baseWebpackConfig, {
         warnings: false
       }
     }),
-    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.optimize.OccurrenceOrderPlugin(),
     // extract css into its own file
     new ExtractTextPlugin(utils.assetsPath('css/[name].[contenthash].css')),
     // generate dist index.html with correct asset hash for caching.

From 460a83dabd7390a1ea0bc8dcdba71725c734fccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 9 Nov 2016 22:18:09 +0100
Subject: [PATCH 049/339] correct process.env.NODE_ENV

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

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 21bd0119d1..7dd61548aa 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -1,6 +1,6 @@
 require('./check-versions')()
 var config = require('../config')
-if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env
+if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env.NODE_ENV
 var path = require('path')
 var express = require('express')
 var webpack = require('webpack')

From 86bf16061c14f0ed6206dda00ef331ee207bf85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 9 Nov 2016 22:19:14 +0100
Subject: [PATCH 050/339] fix the fix

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

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 7dd61548aa..ceeb1c3a34 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -1,6 +1,6 @@
 require('./check-versions')()
 var config = require('../config')
-if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env.NODE_ENV
+if (!process.env.NODE_ENV) process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
 var path = require('path')
 var express = require('express')
 var webpack = require('webpack')

From 177f6d9429b1e4cfa4f0abb43223f508211866e8 Mon Sep 17 00:00:00 2001
From: "Bernhard E. Reiter" <bernhard.reiter+github@intevation.de>
Date: Thu, 10 Nov 2016 17:02:46 +0100
Subject: [PATCH 051/339] Update link to karma

* Using tls now
* Pointig to the top level, because v1.0 is released.
---
 docs/commands.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/commands.md b/docs/commands.md
index 40b9209d6b..de7a5becef 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -24,7 +24,7 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 
 ### `npm run unit`
 
-> Run unit tests in PhantomJS with [Karma](http://karma-runner.github.io/0.13/index.html). See [Unit Testing](unit.md) for more details.
+> Run unit tests in PhantomJS with [Karma](https://karma-runner.github.io/). See [Unit Testing](unit.md) for more details.
 
 - Supports ES2015 in test files.
 - Supports all webpack loaders.

From caaa9ea23706d1108c5c17c986eb830137adf5ae Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <bernhard@intevation.de>
Date: Thu, 10 Nov 2016 17:09:01 +0100
Subject: [PATCH 052/339] Updates link to karma website.

---
 docs/unit.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/unit.md b/docs/unit.md
index 6162681d45..510dadbedf 100644
--- a/docs/unit.md
+++ b/docs/unit.md
@@ -2,7 +2,7 @@
 
 An overview of the tools used by this boilerplate for unit testing:
 
-- [Karma](http://karma-runner.github.io/0.13/index.html): the test runner that launches browsers, runs the tests and reports the results to us.
+- [Karma](https://karma-runner.github.io/): the test runner that launches browsers, runs the tests and reports the results to us.
 - [karma-webpack](https://github.com/webpack/karma-webpack): the plugin for Karma that bundles our tests using Webpack.
 - [Mocha](https://mochajs.org/): the test framework that we write test specs with.
 - [Chai](http://chaijs.com/): test assertion library that provides better assertion syntax.
@@ -22,11 +22,11 @@ And the files:
 
 - `karma.conf.js`
 
-  This is the Karma configuration file. See [Karma docs](http://karma-runner.github.io/0.13/index.html) for more details.
+  This is the Karma configuration file. See [Karma docs](https://karma-runner.github.io/) for more details.
 
 ## Running Tests in More Browsers
 
-You can run the tests in multiple real browsers by installing more [karma launchers](http://karma-runner.github.io/0.13/config/browsers.html) and adjusting the `browsers` field in `test/unit/karma.conf.js`.
+You can run the tests in multiple real browsers by installing more [karma launchers](https://karma-runner.github.io/1.0/config/browsers.html) and adjusting the `browsers` field in `test/unit/karma.conf.js`.
 
 ## Mocking Dependencies
 

From 6e7eb5ab7884416bed0f420bfb631d66b2dc324d Mon Sep 17 00:00:00 2001
From: Wayne Harris <WayneHarris@users.noreply.github.com>
Date: Sat, 19 Nov 2016 15:58:32 +0000
Subject: [PATCH 053/339] Spelling Correction

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

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 0f44d05ee0..17125054b0 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -4,7 +4,7 @@ var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
 
 var env = process.env.NODE_ENV
-// check env & config/index.js to decide weither to enable CSS Sourcemaps for the
+// check env & config/index.js to decide whether to enable CSS Sourcemaps for the
 // various preprocessor loaders added to vue-loader at the end of this file
 var cssSourceMapDev = (env === 'development' && config.dev.cssSourceMap)
 var cssSourceMapProd = (env === 'production' && config.build.productionSourceMap)

From 3ed1833e5c4ba8e4c7924ec74523393385490c68 Mon Sep 17 00:00:00 2001
From: Wayne Harris <WayneHarris@users.noreply.github.com>
Date: Sat, 19 Nov 2016 16:00:22 +0000
Subject: [PATCH 054/339] Update webpack.base.conf.js

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

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 17125054b0..d84d1271cc 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -4,7 +4,7 @@ var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
 
 var env = process.env.NODE_ENV
-// check env & config/index.js to decide whether to enable CSS Sourcemaps for the
+// check env & config/index.js to decide whether to enable CSS source maps for the
 // various preprocessor loaders added to vue-loader at the end of this file
 var cssSourceMapDev = (env === 'development' && config.dev.cssSourceMap)
 var cssSourceMapProd = (env === 'production' && config.build.productionSourceMap)

From 67d9f407f9d97c32aeba7905fdc1ead394af5388 Mon Sep 17 00:00:00 2001
From: Schuyler Cebulskie <Gawdl3y@gmail.com>
Date: Sun, 20 Nov 2016 02:00:49 -0500
Subject: [PATCH 055/339] Fix another "occurrence" typo

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

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 7e1a104fe0..3cc7a20364 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -21,7 +21,7 @@ module.exports = merge(baseWebpackConfig, {
       'process.env': config.dev.env
     }),
     // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
-    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin

From d74750e768a3bce55f8af9c34ba879ab0a1ad313 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 22 Nov 2016 11:38:03 -0500
Subject: [PATCH 056/339] bump vue and vue-loader

---
 template/build/webpack.base.conf.js | 2 +-
 template/package.json               | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 0f44d05ee0..dfb39c2f11 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -24,7 +24,7 @@ module.exports = {
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
       {{#if_eq build "standalone"}}
-      'vue$': 'vue/dist/vue',
+      'vue$': 'vue/dist/vue.common.js',
       {{/if_eq}}
       'src': path.resolve(__dirname, '../src'),
       'assets': path.resolve(__dirname, '../src/assets'),
diff --git a/template/package.json b/template/package.json
index 3390d2c653..39fbb0442f 100644
--- a/template/package.json
+++ b/template/package.json
@@ -13,7 +13,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.0.1"
+    "vue": "^2.1.0"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",
@@ -82,8 +82,9 @@
     "ora": "^0.3.0",
     "shelljs": "^0.7.4",
     "url-loader": "^0.5.7",
-    "vue-loader": "^9.4.0",
+    "vue-loader": "^10.0.0",
     "vue-style-loader": "^1.0.0",
+    "vue-template-compiler": "^2.1.0",
     "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.8.3",
     "webpack-hot-middleware": "^2.12.2",

From 25aed12778d29897a4a0edb6029bbbfc7039b88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 5 Dec 2016 21:09:45 +0100
Subject: [PATCH 057/339] fix condition

it should be "standalone", since there is no alias when runtime is selectzd.
---
 template/src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/src/main.js b/template/src/main.js
index 6cb0a0eaf6..74ae998824 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -1,4 +1,4 @@
-{{#if_eq build "runtime"}}
+{{#if_eq build "standalone"}}
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 {{/if_eq}}

From 7b8bf42062dc8185e4c720ca50e524c709054357 Mon Sep 17 00:00:00 2001
From: Leo Deng <myst.dg@gmail.com>
Date: Tue, 6 Dec 2016 16:36:51 +0800
Subject: [PATCH 058/339] use webpack alias

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

diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index 5385e3b7cc..37a7da1d21 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -9,5 +9,5 @@ testsContext.keys().forEach(testsContext){{#if_eq lintConfig "airbnb"}};{{/if_eq
 // require all src files except main.js for coverage.
 // you can also change this to match only the subset of files that
 // you want coverage for.
-const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const srcContext = require.context('src', true, /^\.\/(?!main(\.js)?$)/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 srcContext.keys().forEach(srcContext){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 5a1b7024912bcb51cbb461ad344bdbeb4ac34b8e Mon Sep 17 00:00:00 2001
From: Leo Deng <myst.dg@gmail.com>
Date: Tue, 6 Dec 2016 16:37:33 +0800
Subject: [PATCH 059/339] solve eslint warnings for double quotes

---
 template/test/e2e/nightwatch.conf.js | 54 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index a5e55e908c..2fc3af0b56 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -3,43 +3,43 @@ var config = require('../../config')
 
 // http://nightwatchjs.org/guide#settings-file
 module.exports = {
-  "src_folders": ["test/e2e/specs"],
-  "output_folder": "test/e2e/reports",
-  "custom_assertions_path": ["test/e2e/custom-assertions"],
+  'src_folders': ['test/e2e/specs'],
+  'output_folder': 'test/e2e/reports',
+  'custom_assertions_path': ['test/e2e/custom-assertions'],
 
-  "selenium": {
-    "start_process": true,
-    "server_path": "node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar",
-    "host": "127.0.0.1",
-    "port": 4444,
-    "cli_args": {
-      "webdriver.chrome.driver": require('chromedriver').path
+  'selenium': {
+    'start_process': true,
+    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar',
+    'host': '127.0.0.1',
+    'port': 4444,
+    'cli_args': {
+      'webdriver.chrome.driver': require('chromedriver').path
     }
   },
 
-  "test_settings": {
-    "default": {
-      "selenium_port": 4444,
-      "selenium_host": "localhost",
-      "silent": true,
-      "globals": {
-        "devServerURL": "http://localhost:" + (process.env.PORT || config.dev.port)
+  'test_settings': {
+    'default': {
+      'selenium_port': 4444,
+      'selenium_host': 'localhost',
+      'silent': true,
+      'globals': {
+        'devServerURL': 'http://localhost:' + (process.env.PORT || config.dev.port)
       }
     },
 
-    "chrome": {
-      "desiredCapabilities": {
-        "browserName": "chrome",
-        "javascriptEnabled": true,
-        "acceptSslCerts": true
+    'chrome': {
+      'desiredCapabilities': {
+        'browserName': 'chrome',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
       }
     },
 
-    "firefox": {
-      "desiredCapabilities": {
-        "browserName": "firefox",
-        "javascriptEnabled": true,
-        "acceptSslCerts": true
+    'firefox': {
+      'desiredCapabilities': {
+        'browserName': 'firefox',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
       }
     }
   }

From 925a786028014d7d992f2ce821544746ba0ae388 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 8 Dec 2016 12:56:45 +0100
Subject: [PATCH 060/339] Uptade eslint-plugin-promise to v3

Fix #400
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 39fbb0442f..4e59beabad 100644
--- a/template/package.json
+++ b/template/package.json
@@ -36,7 +36,7 @@
     "eslint-plugin-html": "^1.3.0",
     {{#if_eq lintConfig "standard"}}
     "eslint-config-standard": "^6.1.0",
-    "eslint-plugin-promise": "^2.0.1",
+    "eslint-plugin-promise": "^3.4.0",
     "eslint-plugin-standard": "^2.0.1",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}

From 78510ac3f6d812b70092ba110aa4ba5d70b6f2d8 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 8 Dec 2016 12:41:43 +0100
Subject: [PATCH 061/339] Replace isparta with babel-plugin-istanbul

- Used arrays on the include webpack.base field because it's more
flexible
- Changed the include path to the src directory
- Added cross-env when launching karma. This is necessary for coverage
---
 template/.babelrc                   |  7 ++++++-
 template/build/webpack.base.conf.js | 12 +++++++++---
 template/package.json               |  5 +++--
 template/test/unit/karma.conf.js    | 16 ++++------------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/template/.babelrc b/template/.babelrc
index 41789cacd9..27d30786de 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,5 +1,10 @@
 {
   "presets": ["es2015", "stage-2"],
   "plugins": ["transform-runtime"],
-  "comments": false
+  "comments": false,
+  "env": {
+    "test": {
+      "plugins": [ "istanbul" ]
+    }
+  }
 }
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index dfb39c2f11..bc3ba0f836 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -40,13 +40,17 @@ module.exports = {
       {
         test: /\.vue$/,
         loader: 'eslint',
-        include: projectRoot,
+        include: [
+          path.join(projectRoot, 'src')
+        ],
         exclude: /node_modules/
       },
       {
         test: /\.js$/,
         loader: 'eslint',
-        include: projectRoot,
+        include: [
+          path.join(projectRoot, 'src')
+        ],
         exclude: /node_modules/
       }
     ],
@@ -59,7 +63,9 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel',
-        include: projectRoot,
+        include: [
+          path.join(projectRoot, 'src')
+        ],
         exclude: /node_modules/
       },
       {
diff --git a/template/package.json b/template/package.json
index 39fbb0442f..472ecc44a3 100644
--- a/template/package.json
+++ b/template/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "dev": "node build/dev-server.js",
     "build": "node build/build.js"{{#unit}},
-    "unit": "karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
+    "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
     "e2e": "node test/e2e/runner.js"{{/e2e}}{{#if_or unit e2e}},
     "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}"{{/if_or}}{{#lint}},
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
@@ -54,6 +54,7 @@
     "http-proxy-middleware": "^0.17.2",
     "json-loader": "^0.5.4",
     {{#unit}}
+    "cross-env": "^3.1.3",
     "karma": "^1.3.0",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.2.0",
@@ -68,7 +69,7 @@
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
     "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
+    "babel-plugin-istanbul": "^3.0.0",
     "phantomjs-prebuilt": "^2.1.3",
     {{/unit}}
     {{#e2e}}
diff --git a/template/test/unit/karma.conf.js b/template/test/unit/karma.conf.js
index addc1817d8..b074a16cbe 100644
--- a/template/test/unit/karma.conf.js
+++ b/template/test/unit/karma.conf.js
@@ -18,7 +18,7 @@ var webpackConfig = merge(baseConfig, {
   devtool: '#inline-source-map',
   vue: {
     loaders: {
-      js: 'isparta'
+      js: 'babel-loader'
     }
   },
   plugins: [
@@ -31,18 +31,10 @@ var webpackConfig = merge(baseConfig, {
 // no need for app entry during tests
 delete webpackConfig.entry{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-// make sure isparta loader is applied before eslint
-webpackConfig.module.preLoaders = webpackConfig.module.preLoaders || []{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-webpackConfig.module.preLoaders.unshift({
-  test: /\.js$/,
-  loader: 'isparta',
-  include: path.resolve(projectRoot, 'src'){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-
-// only apply babel for test files when using isparta
+// Use babel for test files too
 webpackConfig.module.loaders.some(function (loader, i) {
-  if (loader.loader === 'babel') {
-    loader.include = path.resolve(projectRoot, 'test/unit'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  if (/^babel(-loader)?$/.test(loader.loader)) {
+    loader.include.push(path.resolve(projectRoot, 'test/unit')){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     return true{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 001224e4426700782314188fb3c70bd1e617acee Mon Sep 17 00:00:00 2001
From: Leo Deng <myst.dg@gmail.com>
Date: Wed, 14 Dec 2016 09:12:47 +0800
Subject: [PATCH 062/339] remove unnecessary quotes

---
 template/test/e2e/nightwatch.conf.js | 52 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index 2fc3af0b56..8fb4d9d290 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -3,43 +3,43 @@ var config = require('../../config')
 
 // http://nightwatchjs.org/guide#settings-file
 module.exports = {
-  'src_folders': ['test/e2e/specs'],
-  'output_folder': 'test/e2e/reports',
-  'custom_assertions_path': ['test/e2e/custom-assertions'],
+  src_folders: ['test/e2e/specs'],
+  output_folder: 'test/e2e/reports',
+  custom_assertions_path: ['test/e2e/custom-assertions'],
 
-  'selenium': {
-    'start_process': true,
-    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar',
-    'host': '127.0.0.1',
-    'port': 4444,
-    'cli_args': {
+  selenium: {
+    start_process: true,
+    server_path: 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar',
+    host: '127.0.0.1',
+    port: 4444,
+    cli_args: {
       'webdriver.chrome.driver': require('chromedriver').path
     }
   },
 
-  'test_settings': {
-    'default': {
-      'selenium_port': 4444,
-      'selenium_host': 'localhost',
-      'silent': true,
-      'globals': {
-        'devServerURL': 'http://localhost:' + (process.env.PORT || config.dev.port)
+  test_settings: {
+    default: {
+      selenium_port: 4444,
+      selenium_host: 'localhost',
+      silent: true,
+      globals: {
+        devServerURL: 'http://localhost:' + (process.env.PORT || config.dev.port)
       }
     },
 
-    'chrome': {
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
+    chrome: {
+      desiredCapabilities: {
+        browserName: 'chrome',
+        javascriptEnabled: true,
+        acceptSslCerts: true
       }
     },
 
-    'firefox': {
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
+    firefox: {
+      desiredCapabilities: {
+        browserName: 'firefox',
+        javascriptEnabled: true,
+        acceptSslCerts: true
       }
     }
   }

From c239e014ccc384fde37879bd485501ffba89eafd Mon Sep 17 00:00:00 2001
From: zzh699 <zzh699@gmail.com>
Date: Wed, 14 Dec 2016 16:47:14 +0800
Subject: [PATCH 063/339] FIX: can't resolve json files in require call

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

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index ddd327c8ad..9a16375c41 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -20,7 +20,7 @@ module.exports = {
     filename: '[name].js'
   },
   resolve: {
-    extensions: ['', '.js', '.vue'],
+    extensions: ['', '.js', '.json', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
       {{#if_eq build "standalone"}}

From 53176248e3f1dc2343a94c3b62c566d51c9a2beb Mon Sep 17 00:00:00 2001
From: zzh699 <zzh699@gmail.com>
Date: Wed, 14 Dec 2016 19:29:36 +0800
Subject: [PATCH 064/339] FIX: prioritize vue before json in resolve extensions

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

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 9a16375c41..0d9ed928bb 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -20,7 +20,7 @@ module.exports = {
     filename: '[name].js'
   },
   resolve: {
-    extensions: ['', '.js', '.json', '.vue'],
+    extensions: ['', '.js', '.vue', '.json'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
       {{#if_eq build "standalone"}}

From eae8c8dce116d628f374dfb6b7ff677dd75ae4d5 Mon Sep 17 00:00:00 2001
From: EGOIST <0x142857@gmail.com>
Date: Thu, 29 Dec 2016 17:41:05 +0800
Subject: [PATCH 065/339] add friendly-errors-webpack-plugin

---
 template/build/dev-server.js       | 9 ++++-----
 template/build/webpack.dev.conf.js | 4 +++-
 template/package.json              | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index ceeb1c3a34..2fbc3b98fc 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -21,13 +21,12 @@ var compiler = webpack(webpackConfig)
 
 var devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: webpackConfig.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
+  quiet: true
 })
 
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
+var hotMiddleware = require('webpack-hot-middleware')(compiler, {
+  log: () => {}
+})
 // force page reload when html-webpack-plugin template changes
 compiler.plugin('compilation', function (compilation) {
   compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 3cc7a20364..c9e6cc0c65 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -4,6 +4,7 @@ var merge = require('webpack-merge')
 var utils = require('./utils')
 var baseWebpackConfig = require('./webpack.base.conf')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
+var FriendlyErrors = require('friendly-errors-webpack-plugin')
 
 // add hot-reload related code to entry chunks
 Object.keys(baseWebpackConfig.entry).forEach(function (name) {
@@ -29,6 +30,7 @@ module.exports = merge(baseWebpackConfig, {
       filename: 'index.html',
       template: 'index.html',
       inject: true
-    })
+    }),
+    new FriendlyErrors()
   ]
 })
diff --git a/template/package.json b/template/package.json
index 4e59beabad..1a286612b6 100644
--- a/template/package.json
+++ b/template/package.json
@@ -49,6 +49,7 @@
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
+    "friendly-errors-webpack-plugin": "^1.1.2",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
     "http-proxy-middleware": "^0.17.2",

From 4363b3ccc99d02f88ba7f0267ba408c400121e9a Mon Sep 17 00:00:00 2001
From: EGOIST <0x142857@gmail.com>
Date: Thu, 29 Dec 2016 17:57:06 +0800
Subject: [PATCH 066/339] log url when bundle is valid

---
 template/build/dev-server.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 2fbc3b98fc..244554b7a3 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -58,13 +58,17 @@ app.use(hotMiddleware)
 var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
 app.use(staticPath, express.static('./static'))
 
+var uri = 'http://localhost:' + port
+
+devMiddleware.waitUntilValid(function () {
+  console.log('> Listening at ' + uri + '\n')
+})
+
 module.exports = app.listen(port, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  var uri = 'http://localhost:' + port
-  console.log('Listening at ' + uri + '\n')
 
   // when env is testing, don't need open it
   if (process.env.NODE_ENV !== 'testing') {

From 49456eb8c53252d6d238cc0e27e3bcfd6732e1a5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 15:47:14 -0500
Subject: [PATCH 067/339] upgrade to webpack 2

---
 meta.js                              |   1 +
 template/build/build.js              |  32 +++++----
 template/build/utils.js              |   5 +-
 template/build/vue-loader.conf.js    |  17 +++++
 template/build/webpack.base.conf.js  |  94 ++++++++++---------------
 template/build/webpack.dev.conf.js   |   9 ++-
 template/build/webpack.prod.conf.js  |   9 +--
 template/build/webpack.test.conf.js  |  24 +++++++
 template/package.json                | 100 +++++++++++++--------------
 template/test/e2e/nightwatch.conf.js |   2 +-
 template/test/unit/karma.conf.js     |  36 +---------
 11 files changed, 157 insertions(+), 172 deletions(-)
 create mode 100644 template/build/vue-loader.conf.js
 create mode 100644 template/build/webpack.test.conf.js

diff --git a/meta.js b/meta.js
index f1f673ffe2..05722baec2 100644
--- a/meta.js
+++ b/meta.js
@@ -80,6 +80,7 @@ module.exports = {
     ".eslintignore": "lint",
     "config/test.env.js": "unit || e2e",
     "test/unit/**/*": "unit",
+    "build/webpack.test.conf.js": "unit",
     "test/e2e/**/*": "e2e"
   },
   "completeMessage": "To get started:\n\n  cd {{destDirName}}\n  npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack"
diff --git a/template/build/build.js b/template/build/build.js
index b3c9aad410..7e29b911df 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -1,27 +1,25 @@
 // https://github.com/shelljs/shelljs
 require('./check-versions')()
-require('shelljs/global')
-env.NODE_ENV = 'production'
 
-var path = require('path')
-var config = require('../config')
+process.env.NODE_ENV = 'production'
+
 var ora = require('ora')
+var path = require('path')
+var chalk = require('chalk')
+var shell = require('shelljs')
 var webpack = require('webpack')
+var config = require('../config')
 var webpackConfig = require('./webpack.prod.conf')
 
-console.log(
-  '  Tip:\n' +
-  '  Built files are meant to be served over an HTTP server.\n' +
-  '  Opening index.html over file:// won\'t work.\n'
-)
-
 var spinner = ora('building for production...')
 spinner.start()
 
 var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
-rm('-rf', assetsPath)
-mkdir('-p', assetsPath)
-cp('-R', 'static/*', assetsPath)
+shell.rm('-rf', assetsPath)
+shell.mkdir('-p', assetsPath)
+shell.config.silent = true
+shell.cp('-R', 'static/*', assetsPath)
+shell.config.silent = false
 
 webpack(webpackConfig, function (err, stats) {
   spinner.stop()
@@ -32,5 +30,11 @@ webpack(webpackConfig, function (err, stats) {
     children: false,
     chunks: false,
     chunkModules: false
-  }) + '\n')
+  }) + '\n\n')
+
+  console.log(chalk.cyan('  Build complete.\n'))
+  console.log(chalk.yellow(
+    '  Tip: built files are meant to be served over an HTTP server.\n' +
+    '  Opening index.html over file:// won\'t work.\n'
+  ))
 })
diff --git a/template/build/utils.js b/template/build/utils.js
index dc3cdd0114..26848a0a86 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -28,7 +28,10 @@ exports.cssLoaders = function (options) {
     // Extract CSS when that option is specified
     // (which is the case during production build)
     if (options.extract) {
-      return ExtractTextPlugin.extract('vue-style-loader', sourceLoader)
+      return ExtractTextPlugin.extract({
+        loader: sourceLoader,
+        fallbackLoader: 'vue-style-loader'
+      })
     } else {
       return ['vue-style-loader', sourceLoader].join('!')
     }
diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
new file mode 100644
index 0000000000..a86af01c9e
--- /dev/null
+++ b/template/build/vue-loader.conf.js
@@ -0,0 +1,17 @@
+var utils = require('./utils')
+var config = require('../config')
+var isProduction = process.env.NODE_ENV === 'production'
+
+module.exports = {
+  loaders: utils.cssLoaders({
+    sourceMap: isProduction
+      ? config.build.productionSourceMap
+      : config.dev.cssSourceMap,
+    extract: isProduction
+  }),
+  postcss: [
+    require('autoprefixer')({
+      browsers: ['last 2 versions']
+    })
+  ]
+}
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index a792e6896c..81fc0737db 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -1,14 +1,12 @@
 var path = require('path')
-var config = require('../config')
 var utils = require('./utils')
-var projectRoot = path.resolve(__dirname, '../')
+var config = require('../config')
+var vueLoaderConfig = require('./vue-loader.conf')
+var eslintFriendlyFormatter = require('eslint-friendly-formatter')
 
-var env = process.env.NODE_ENV
-// check env & config/index.js to decide whether to enable CSS source maps for the
-// various preprocessor loaders added to vue-loader at the end of this file
-var cssSourceMapDev = (env === 'development' && config.dev.cssSourceMap)
-var cssSourceMapProd = (env === 'production' && config.build.productionSourceMap)
-var useCssSourceMap = cssSourceMapDev || cssSourceMapProd
+function resolve (dir) {
+  return path.join(__dirname, '..', dir)
+}
 
 module.exports = {
   entry: {
@@ -16,65 +14,58 @@ module.exports = {
   },
   output: {
     path: config.build.assetsRoot,
-    publicPath: process.env.NODE_ENV === 'production' ? config.build.assetsPublicPath : config.dev.assetsPublicPath,
-    filename: '[name].js'
+    filename: '[name].js',
+    publicPath: process.env.NODE_ENV === 'production'
+      ? config.build.assetsPublicPath
+      : config.dev.assetsPublicPath
   },
   resolve: {
-    extensions: ['', '.js', '.vue', '.json'],
-    fallback: [path.join(__dirname, '../node_modules')],
+    extensions: ['.js', '.vue', '.json'],
+    modules: [
+      resolve('src'),
+      resolve('node_modules')
+    ],
     alias: {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.common.js',
       {{/if_eq}}
-      'src': path.resolve(__dirname, '../src'),
-      'assets': path.resolve(__dirname, '../src/assets'),
-      'components': path.resolve(__dirname, '../src/components')
+      'src': resolve('src'),
+      'assets': resolve('src/assets'),
+      'components': resolve('src/components')
     }
   },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
   module: {
-    {{#lint}}
-    preLoaders: [
+    rules: [
+      {{#lint}}
       {
-        test: /\.vue$/,
-        loader: 'eslint',
-        include: [
-          path.join(projectRoot, 'src')
-        ],
-        exclude: /node_modules/
+        test: /\.(js|vue)$/,
+        loader: 'eslint-loader',
+        enforce: "pre",
+        include: [resolve('src'), resolve('test')],
+        exclude: /node_modules/,
+        options: {
+          formatter: eslintFriendlyFormatter
+        }
       },
-      {
-        test: /\.js$/,
-        loader: 'eslint',
-        include: [
-          path.join(projectRoot, 'src')
-        ],
-        exclude: /node_modules/
-      }
-    ],
-    {{/lint}}
-    loaders: [
+      {{/lint}}
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader',
+        options: vueLoaderConfig
       },
       {
         test: /\.js$/,
-        loader: 'babel',
-        include: [
-          path.join(projectRoot, 'src')
-        ],
+        loader: 'babel-loader',
+        include: [resolve('src'), resolve('test')],
         exclude: /node_modules/
       },
       {
         test: /\.json$/,
-        loader: 'json'
+        loader: 'json-loader'
       },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url',
+        loader: 'url-loader',
         query: {
           limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]')
@@ -82,25 +73,12 @@ module.exports = {
       },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url',
+        loader: 'url-loader',
         query: {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
       }
     ]
-  },
-  {{#lint}}
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  },
-  {{/lint}}
-  vue: {
-    loaders: utils.cssLoaders({ sourceMap: useCssSourceMap }),
-    postcss: [
-      require('autoprefixer')({
-        browsers: ['last 2 versions']
-      })
-    ]
   }
 }
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index c9e6cc0c65..bd474ce656 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -4,7 +4,7 @@ var merge = require('webpack-merge')
 var utils = require('./utils')
 var baseWebpackConfig = require('./webpack.base.conf')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
-var FriendlyErrors = require('friendly-errors-webpack-plugin')
+var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 
 // add hot-reload related code to entry chunks
 Object.keys(baseWebpackConfig.entry).forEach(function (name) {
@@ -13,7 +13,7 @@ Object.keys(baseWebpackConfig.entry).forEach(function (name) {
 
 module.exports = merge(baseWebpackConfig, {
   module: {
-    loaders: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap })
+    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap })
   },
   // eval-source-map is faster for development
   devtool: '#eval-source-map',
@@ -22,15 +22,14 @@ module.exports = merge(baseWebpackConfig, {
       'process.env': config.dev.env
     }),
     // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
-    new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin(),
+    new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
       inject: true
     }),
-    new FriendlyErrors()
+    new FriendlyErrorsPlugin()
   ]
 })
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index c0f9d7ecbb..2ee19e7852 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -12,7 +12,7 @@ var env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
 
 var webpackConfig = merge(baseWebpackConfig, {
   module: {
-    loaders: utils.styleLoaders({ sourceMap: config.build.productionSourceMap, extract: true })
+    rules: utils.styleLoaders({ sourceMap: config.build.productionSourceMap, extract: true })
   },
   devtool: config.build.productionSourceMap ? '#source-map' : false,
   output: {
@@ -20,12 +20,6 @@ var webpackConfig = merge(baseWebpackConfig, {
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
     chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
   },
-  vue: {
-    loaders: utils.cssLoaders({
-      sourceMap: config.build.productionSourceMap,
-      extract: true
-    })
-  },
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html
     new webpack.DefinePlugin({
@@ -36,7 +30,6 @@ var webpackConfig = merge(baseWebpackConfig, {
         warnings: false
       }
     }),
-    new webpack.optimize.OccurrenceOrderPlugin(),
     // extract css into its own file
     new ExtractTextPlugin(utils.assetsPath('css/[name].[contenthash].css')),
     // generate dist index.html with correct asset hash for caching.
diff --git a/template/build/webpack.test.conf.js b/template/build/webpack.test.conf.js
new file mode 100644
index 0000000000..8e4385cff6
--- /dev/null
+++ b/template/build/webpack.test.conf.js
@@ -0,0 +1,24 @@
+// This is the webpack config used for unit tests.
+
+var utils = require('./utils')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+
+var webpackConfig = merge(baseConfig, {
+  // use inline sourcemap for karma-sourcemap-loader
+  module: {
+    rules: utils.styleLoaders()
+  },
+  devtool: '#inline-source-map',
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': require('../config/test.env')
+    })
+  ]
+})
+
+// no need for app entry during tests
+delete webpackConfig.entry
+
+module.exports = webpackConfig
diff --git a/template/package.json b/template/package.json
index 7da22a9b3d..8cbfa83446 100644
--- a/template/package.json
+++ b/template/package.json
@@ -13,84 +13,84 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.1.0"
+    "vue": "^2.1.10"
   },
   "devDependencies": {
-    "autoprefixer": "^6.4.0",
-    "babel-core": "^6.0.0",
+    "autoprefixer": "^6.7.2",
+    "babel-core": "^6.22.1",
     {{#lint}}
-    "babel-eslint": "^7.0.0",
+    "babel-eslint": "^7.1.1",
     {{/lint}}
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "babel-register": "^6.0.0",
+    "babel-loader": "^6.2.10",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-preset-es2015": "^6.22.0",
+    "babel-preset-stage-2": "^6.22.0",
+    "babel-register": "^6.22.0",
     "chalk": "^1.1.3",
-    "connect-history-api-fallback": "^1.1.0",
-    "css-loader": "^0.25.0",
+    "connect-history-api-fallback": "^1.3.0",
+    "css-loader": "^0.26.1",
     {{#lint}}
-    "eslint": "^3.7.1",
-    "eslint-friendly-formatter": "^2.0.5",
-    "eslint-loader": "^1.5.0",
-    "eslint-plugin-html": "^1.3.0",
+    "eslint": "^3.14.1",
+    "eslint-friendly-formatter": "^2.0.7",
+    "eslint-loader": "^1.6.1",
+    "eslint-plugin-html": "^2.0.0",
     {{#if_eq lintConfig "standard"}}
-    "eslint-config-standard": "^6.1.0",
+    "eslint-config-standard": "^6.2.1",
     "eslint-plugin-promise": "^3.4.0",
     "eslint-plugin-standard": "^2.0.1",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
-    "eslint-config-airbnb-base": "^8.0.0",
-    "eslint-import-resolver-webpack": "^0.6.0",
-    "eslint-plugin-import": "^1.16.0",
+    "eslint-config-airbnb-base": "^11.0.1",
+    "eslint-import-resolver-webpack": "^0.8.1",
+    "eslint-plugin-import": "^2.2.0",
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.9.0",
-    "friendly-errors-webpack-plugin": "^1.1.2",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.17.2",
+    "express": "^4.14.1",
+    "extract-text-webpack-plugin": "^2.0.0-rc.2",
+    "file-loader": "^0.10.0",
+    "friendly-errors-webpack-plugin": "^1.1.3",
+    "function-bind": "^1.1.0",
+    "html-webpack-plugin": "^2.28.0",
+    "http-proxy-middleware": "^0.17.3",
     "json-loader": "^0.5.4",
     {{#unit}}
-    "cross-env": "^3.1.3",
-    "karma": "^1.3.0",
+    "cross-env": "^3.1.4",
+    "karma": "^1.4.1",
     "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.2.0",
-    "karma-phantomjs-launcher": "^1.0.0",
-    "karma-sinon-chai": "^1.2.0",
+    "karma-mocha": "^1.3.0",
+    "karma-phantomjs-launcher": "^1.0.2",
+    "karma-sinon-chai": "^1.2.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.26",
-    "karma-webpack": "^1.7.0",
-    "lolex": "^1.4.0",
-    "mocha": "^3.1.0",
+    "karma-webpack": "^2.0.2",
+    "lolex": "^1.5.2",
+    "mocha": "^3.2.0",
     "chai": "^3.5.0",
-    "sinon": "^1.17.3",
+    "sinon": "^1.17.7",
     "sinon-chai": "^2.8.0",
     "inject-loader": "^2.0.1",
-    "babel-plugin-istanbul": "^3.0.0",
-    "phantomjs-prebuilt": "^2.1.3",
+    "babel-plugin-istanbul": "^3.1.2",
+    "phantomjs-prebuilt": "^2.1.14",
     {{/unit}}
     {{#e2e}}
-    "chromedriver": "^2.21.2",
-    "cross-spawn": "^4.0.2",
-    "nightwatch": "^0.9.8",
-    "selenium-server": "2.53.1",
+    "chromedriver": "^2.27.2",
+    "cross-spawn": "^5.0.1",
+    "nightwatch": "^0.9.12",
+    "selenium-server": "^2.53.1",
     {{/e2e}}
     "semver": "^5.3.0",
     "opn": "^4.0.2",
-    "ora": "^0.3.0",
-    "shelljs": "^0.7.4",
+    "ora": "^1.1.0",
+    "shelljs": "^0.7.6",
     "url-loader": "^0.5.7",
-    "vue-loader": "^10.0.0",
-    "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.1.0",
-    "webpack": "^1.13.2",
-    "webpack-dev-middleware": "^1.8.3",
-    "webpack-hot-middleware": "^2.12.2",
-    "webpack-merge": "^0.14.1"
+    "vue-loader": "^10.3.0",
+    "vue-style-loader": "^2.0.0",
+    "vue-template-compiler": "^2.1.10",
+    "webpack": "^2.2.1",
+    "webpack-dev-middleware": "^1.10.0",
+    "webpack-hot-middleware": "^2.16.1",
+    "webpack-merge": "^2.6.1"
   },
   "engines": {
     "node": ">= 4.0.0",
diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index 8fb4d9d290..6726325de6 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -9,7 +9,7 @@ module.exports = {
 
   selenium: {
     start_process: true,
-    server_path: 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar',
+    server_path: require('selenium-server').path,
     host: '127.0.0.1',
     port: 4444,
     cli_args: {
diff --git a/template/test/unit/karma.conf.js b/template/test/unit/karma.conf.js
index b074a16cbe..4e523fe2f8 100644
--- a/template/test/unit/karma.conf.js
+++ b/template/test/unit/karma.conf.js
@@ -3,41 +3,7 @@
 // we are also using it with karma-webpack
 //   https://github.com/webpack/karma-webpack
 
-var path = require('path'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var merge = require('webpack-merge'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var baseConfig = require('../../build/webpack.base.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var utils = require('../../build/utils'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var webpack = require('webpack'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var projectRoot = path.resolve(__dirname, '../../'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-
-var webpackConfig = merge(baseConfig, {
-  // use inline sourcemap for karma-sourcemap-loader
-  module: {
-    loaders: utils.styleLoaders()
-  },
-  devtool: '#inline-source-map',
-  vue: {
-    loaders: {
-      js: 'babel-loader'
-    }
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': require('../../config/test.env')
-    })
-  ]
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-
-// no need for app entry during tests
-delete webpackConfig.entry{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-
-// Use babel for test files too
-webpackConfig.module.loaders.some(function (loader, i) {
-  if (/^babel(-loader)?$/.test(loader.loader)) {
-    loader.include.push(path.resolve(projectRoot, 'test/unit')){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    return true{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  }
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var webpackConfig = require('../../build/webpack.test.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 module.exports = function (config) {
   config.set({

From e9c2b9e063e1a2afed1d6205f31d01623bca2d82 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 15:58:20 -0500
Subject: [PATCH 068/339] add test script

---
 circle.yml   | 7 +++++++
 package.json | 3 +++
 test.sh      | 9 +++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 circle.yml
 create mode 100644 test.sh

diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000000..4d2212d694
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,7 @@
+machine:
+  node:
+    version: 6
+
+test:
+  override:
+    - bash test.sh
diff --git a/package.json b/package.json
index 0816e552d4..f3863623c7 100644
--- a/package.json
+++ b/package.json
@@ -6,5 +6,8 @@
   "scripts": {
     "docs": "cd docs && gitbook serve",
     "deploy-docs": "bash ./deploy-docs.sh"
+  },
+  "devDependencies": {
+    "vue-cli": "^2.8.1"
   }
 }
diff --git a/test.sh b/test.sh
new file mode 100644
index 0000000000..5f0d4f119d
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,9 @@
+set -e
+
+yes "" | ./node_modules/.bin/vue init . test
+
+cd test
+npm install
+npm run lint
+npm test
+npm run build

From 56d0ad9e6356a48005afe8e0751dcfa4f6c15a2f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 16:20:33 -0500
Subject: [PATCH 069/339] use modules:false in babelrc

---
 template/.babelrc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index 27d30786de..aafe54c994 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,5 +1,8 @@
 {
-  "presets": ["es2015", "stage-2"],
+  "presets": [
+    ["es2015", { "modules": false }],
+    "stage-2"
+  ],
   "plugins": ["transform-runtime"],
   "comments": false,
   "env": {

From fc4b323ddacd051600825b8b8d98ed18d3961c98 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 16:20:47 -0500
Subject: [PATCH 070/339] remove redundant exclude

---
 template/build/webpack.base.conf.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 81fc0737db..8701762e41 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -42,7 +42,6 @@ module.exports = {
         loader: 'eslint-loader',
         enforce: "pre",
         include: [resolve('src'), resolve('test')],
-        exclude: /node_modules/,
         options: {
           formatter: eslintFriendlyFormatter
         }
@@ -56,8 +55,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
-        include: [resolve('src'), resolve('test')],
-        exclude: /node_modules/
+        include: [resolve('src'), resolve('test')]
       },
       {
         test: /\.json$/,

From 9495b16989807e91f015a7da17402f2deff13d0e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 16:27:20 -0500
Subject: [PATCH 071/339] small tweak

---
 template/build/webpack.prod.conf.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 2ee19e7852..445de2507c 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -12,7 +12,10 @@ var env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
 
 var webpackConfig = merge(baseWebpackConfig, {
   module: {
-    rules: utils.styleLoaders({ sourceMap: config.build.productionSourceMap, extract: true })
+    rules: utils.styleLoaders({
+      sourceMap: config.build.productionSourceMap,
+      extract: true
+    })
   },
   devtool: config.build.productionSourceMap ? '#source-map' : false,
   output: {

From 81c60bed40fcbcc90b2bdd666649ddf188f104ac Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 16:28:25 -0500
Subject: [PATCH 072/339] bump selenium

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

diff --git a/template/package.json b/template/package.json
index 8cbfa83446..5e055145e8 100644
--- a/template/package.json
+++ b/template/package.json
@@ -77,7 +77,7 @@
     "chromedriver": "^2.27.2",
     "cross-spawn": "^5.0.1",
     "nightwatch": "^0.9.12",
-    "selenium-server": "^2.53.1",
+    "selenium-server": "^3.0.1",
     {{/e2e}}
     "semver": "^5.3.0",
     "opn": "^4.0.2",

From e53a87cacff652bb49681483aa2aebf6b5ef62b6 Mon Sep 17 00:00:00 2001
From: CodinCat <a55951234@gmail.com>
Date: Sat, 4 Feb 2017 05:36:35 +0800
Subject: [PATCH 073/339] Use #cheap-module-eval-source-map for development
 (#440)

---
 template/build/webpack.dev.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index bd474ce656..ea5f923130 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -15,8 +15,8 @@ module.exports = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap })
   },
-  // eval-source-map is faster for development
-  devtool: '#eval-source-map',
+  // cheap-module-eval-source-map is faster for development
+  devtool: '#cheap-module-eval-source-map',
   plugins: [
     new webpack.DefinePlugin({
       'process.env': config.dev.env

From f3833446ba5f9c2cd5cc5db482d018677c7e6c31 Mon Sep 17 00:00:00 2001
From: Bill Criswell <bill.criswell@gmail.com>
Date: Fri, 3 Feb 2017 17:29:03 -0500
Subject: [PATCH 074/339] Add an option for vue-router (#415)

* adding a router option

* don't turn on history mode automatically
---
 meta.js                      |  7 ++++++-
 template/package.json        |  3 ++-
 template/src/App.vue         |  8 ++++++++
 template/src/main.js         |  7 +++++++
 template/src/router/index.js | 16 ++++++++++++++++
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 template/src/router/index.js

diff --git a/meta.js b/meta.js
index 05722baec2..bc0fc74675 100644
--- a/meta.js
+++ b/meta.js
@@ -40,6 +40,10 @@ module.exports = {
         }
       ]
     },
+    "router": {
+      "type": "confirm",
+      "message": "Install vue-router?"
+    },
     "lint": {
       "type": "confirm",
       "message": "Use ESLint to lint your code?"
@@ -81,7 +85,8 @@ module.exports = {
     "config/test.env.js": "unit || e2e",
     "test/unit/**/*": "unit",
     "build/webpack.test.conf.js": "unit",
-    "test/e2e/**/*": "e2e"
+    "test/e2e/**/*": "e2e",
+    "src/router/**/*": "router"
   },
   "completeMessage": "To get started:\n\n  cd {{destDirName}}\n  npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack"
 };
diff --git a/template/package.json b/template/package.json
index 5e055145e8..d464e7bde4 100644
--- a/template/package.json
+++ b/template/package.json
@@ -13,7 +13,8 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.1.10"
+    "vue": "^2.1.10"{{#router}},
+    "vue-router": "^2.1.1"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
diff --git a/template/src/App.vue b/template/src/App.vue
index 0ff42ba29d..f534841844 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -1,18 +1,26 @@
 <template>
   <div id="app">
     <img src="./assets/logo.png">
+    {{#router}}
+    <router-view></router-view>
+    {{else}}
     <hello></hello>
+    {{/router}}
   </div>
 </template>
 
 <script>
+{{#unless router}}
 import Hello from './components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
+{{/unless}}
 export default {
   name: 'app',
+  {{#unless router}}
   components: {
     Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  {{/unless}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 </script>
 
diff --git a/template/src/main.js b/template/src/main.js
index 74ae998824..d950964baf 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -4,10 +4,17 @@
 {{/if_eq}}
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+{{#router}}
+
+import router from './router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+{{/router}}
 
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
+  {{#router}}
+  router,
+  {{/router}}
   {{#if_eq build "runtime"}}
   render: h => h(App){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   {{/if_eq}}
diff --git a/template/src/router/index.js b/template/src/router/index.js
new file mode 100644
index 0000000000..6a2879c04c
--- /dev/null
+++ b/template/src/router/index.js
@@ -0,0 +1,16 @@
+import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Router from 'vue-router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
+Vue.use(Router){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
+import Hello from '../components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
+export default new Router({
+  routes: [
+    {
+      path: '/',
+      name: 'Hello',
+      component: Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+    }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  ]{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From ceedad5329cb658efc1e5e02dbab4ff776899612 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 17:00:58 -0500
Subject: [PATCH 075/339] style tweaks

---
 template/build/check-versions.js    | 8 ++++----
 template/build/dev-server.js        | 8 ++++++--
 template/build/webpack.dev.conf.js  | 4 ++--
 template/build/webpack.prod.conf.js | 4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/template/build/check-versions.js b/template/build/check-versions.js
index e2b6cf74c2..6548ba18e1 100644
--- a/template/build/check-versions.js
+++ b/template/build/check-versions.js
@@ -1,9 +1,9 @@
-var semver = require('semver')
 var chalk = require('chalk')
+var semver = require('semver')
 var packageConfig = require('../package.json')
-var exec = function (cmd) {
-  return require('child_process')
-    .execSync(cmd).toString().trim()
+
+function exec (cmd) {
+  return require('child_process').execSync(cmd).toString().trim()
 }
 
 var versionRequirements = [
diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 244554b7a3..534dea7ed7 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -1,10 +1,14 @@
 require('./check-versions')()
+
 var config = require('../config')
-if (!process.env.NODE_ENV) process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
+}
+
+var opn = require('opn')
 var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
-var opn = require('opn')
 var proxyMiddleware = require('http-proxy-middleware')
 var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('./webpack.prod.conf')
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index ea5f923130..5470402d03 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -1,7 +1,7 @@
-var config = require('../config')
+var utils = require('./utils')
 var webpack = require('webpack')
+var config = require('../config')
 var merge = require('webpack-merge')
-var utils = require('./utils')
 var baseWebpackConfig = require('./webpack.base.conf')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
 var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 445de2507c..5608d4c1ff 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -1,11 +1,11 @@
 var path = require('path')
-var config = require('../config')
 var utils = require('./utils')
 var webpack = require('webpack')
+var config = require('../config')
 var merge = require('webpack-merge')
 var baseWebpackConfig = require('./webpack.base.conf')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('../config/test.env')
   : {{/if_or}}config.build.env

From 21135ad5c75485d6efbbda01963f6961dc870881 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 17:39:28 -0500
Subject: [PATCH 076/339] tweak router changes

---
 template/package.json        | 2 +-
 template/src/App.vue         | 6 ++----
 template/src/main.js         | 1 -
 template/src/router/index.js | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/template/package.json b/template/package.json
index d464e7bde4..5dde32c171 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "vue": "^2.1.10"{{#router}},
-    "vue-router": "^2.1.1"{{/router}}
+    "vue-router": "^2.2.0"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
diff --git a/template/src/App.vue b/template/src/App.vue
index f534841844..74a25d1dfa 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -15,12 +15,10 @@ import Hello from './components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 {{/unless}}
 export default {
-  name: 'app',
-  {{#unless router}}
+  name: 'app'{{#router}}{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{else}},
   components: {
     Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-  }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-  {{/unless}}
+  }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{/router}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 </script>
 
diff --git a/template/src/main.js b/template/src/main.js
index d950964baf..221d39b52f 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -5,7 +5,6 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 {{#router}}
-
 import router from './router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 {{/router}}
 
diff --git a/template/src/router/index.js b/template/src/router/index.js
index 6a2879c04c..2f09025d9d 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -3,7 +3,7 @@ import Router from 'vue-router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 Vue.use(Router){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-import Hello from '../components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Hello from 'components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 export default new Router({
   routes: [

From 6adb694b38d4d63c610a1ed5f500c5e3f2c76c4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sebastian=20kr=C3=A4mer?= <sk@dotob.de>
Date: Fri, 3 Feb 2017 23:53:56 +0100
Subject: [PATCH 077/339] removed .js extension from .editorconfig (#428)

---
 docs/structure.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/structure.md b/docs/structure.md
index b6137feac9..6511c5d2d6 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -26,7 +26,7 @@
 │   │   ├── runner.js           # test runner script
 │   │   └── nightwatch.conf.js  # test runner config file
 ├── .babelrc                    # babel config
-├── .editorconfig.js            # editor config
+├── .editorconfig               # editor config
 ├── .eslintrc.js                # eslint config
 ├── index.html                  # index.html template
 └── package.json                # build scripts and dependencies

From 2e6fe33cf6f8e304ca0cbb1b867e431a3be106c5 Mon Sep 17 00:00:00 2001
From: Leo Deng <myst729@users.noreply.github.com>
Date: Sat, 4 Feb 2017 06:55:31 +0800
Subject: [PATCH 078/339] introduce bundle analyzer plugin in production build
 (#437)

---
 template/README.md                  | 3 +++
 template/build/webpack.prod.conf.js | 5 +++++
 template/config/index.js            | 7 ++++++-
 template/package.json               | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/template/README.md b/template/README.md
index aca6ae08ad..a69064231a 100644
--- a/template/README.md
+++ b/template/README.md
@@ -13,6 +13,9 @@ npm run dev
 
 # build for production with minification
 npm run build
+
+# build for production and view the bundle analyzer report
+npm run build --report
 {{#unit}}
 
 # run unit tests
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 5608d4c1ff..a2d757ec4f 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -95,4 +95,9 @@ if (config.build.productionGzip) {
   )
 }
 
+if (config.build.bundleAnalyzerReport) {
+  var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+  webpackConfig.plugins.push(new BundleAnalyzerPlugin())
+}
+
 module.exports = webpackConfig
diff --git a/template/config/index.js b/template/config/index.js
index 207dfbd4e0..356c361499 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -14,7 +14,12 @@ module.exports = {
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
-    productionGzipExtensions: ['js', 'css']
+    productionGzipExtensions: ['js', 'css'],
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
   },
   dev: {
     env: require('./dev.env'),
diff --git a/template/package.json b/template/package.json
index 5dde32c171..24cf1285a3 100644
--- a/template/package.json
+++ b/template/package.json
@@ -55,6 +55,7 @@
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.17.3",
     "json-loader": "^0.5.4",
+    "webpack-bundle-analyzer": "^2.2.1",
     {{#unit}}
     "cross-env": "^3.1.4",
     "karma": "^1.4.1",

From 1f87b1e84d1b2bf6d038d04790442ec6589d1b79 Mon Sep 17 00:00:00 2001
From: Bill Criswell <bill.criswell@gmail.com>
Date: Fri, 3 Feb 2017 17:59:34 -0500
Subject: [PATCH 079/339] Set `env: { browser: true }` in .eslintrc.js (#447)

* set env to browser and link to config

* move config
---
 template/.eslintrc.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 3b74f949c1..5d1bdc98ec 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -1,9 +1,14 @@
+// http://eslint.org/docs/user-guide/configuring
+
 module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
     sourceType: 'module'
   },
+  env: {
+    browser: true,
+  },
   {{#if_eq lintConfig "standard"}}
   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
   extends: 'standard',

From 097f26869f8720f4b6281394f98ec3922e43b5f1 Mon Sep 17 00:00:00 2001
From: ChaiMaoYuan <945852046@qq.com>
Date: Sat, 4 Feb 2017 07:00:22 +0800
Subject: [PATCH 080/339] fix open browser always (#466)

---
 template/build/dev-server.js | 4 +++-
 template/config/index.js     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 534dea7ed7..2b56bc85e1 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -16,6 +16,8 @@ var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
 
 // default port where dev server listens for incoming traffic
 var port = process.env.PORT || config.dev.port
+// automatically open browser, if not set will be false
+var autoOpenBrowser = !!config.dev.autoOpenBrowser
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 var proxyTable = config.dev.proxyTable
@@ -75,7 +77,7 @@ module.exports = app.listen(port, function (err) {
   }
 
   // when env is testing, don't need open it
-  if (process.env.NODE_ENV !== 'testing') {
+  if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
     opn(uri)
   }
 })
diff --git a/template/config/index.js b/template/config/index.js
index 356c361499..196da1fa7d 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -24,6 +24,7 @@ module.exports = {
   dev: {
     env: require('./dev.env'),
     port: 8080,
+    autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {},

From 1ecd9a762b4132e7862982bc991710bb90b36481 Mon Sep 17 00:00:00 2001
From: Ates Goral <ates@magnetiq.com>
Date: Fri, 3 Feb 2017 18:03:09 -0500
Subject: [PATCH 081/339] Support filter option for full control on path
 matching (#469)

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

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 2b56bc85e1..1049eb374e 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -47,7 +47,7 @@ Object.keys(proxyTable).forEach(function (context) {
   if (typeof options === 'string') {
     options = { target: options }
   }
-  app.use(proxyMiddleware(context, options))
+  app.use(proxyMiddleware(options.filter || context, options))
 })
 
 // handle fallback for HTML5 history API

From fc38c7c73a8150833ce996cdfd3ad922c39cc4a9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 17:59:00 -0500
Subject: [PATCH 082/339] readme

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

diff --git a/README.md b/README.md
index fb5643327c..67b68fb1c3 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ $ npm run dev
   - HTML minified with [html-minifier](https://github.com/kangax/html-minifier).
   - CSS across all components extracted into a single file and minified with [cssnano](https://github.com/ben-eb/cssnano).
   - All static assets compiled with version hashes for efficient long-term caching, and a production `index.html` is auto-generated with proper URLs to these generated assets.
+  - Use `npm run build --report`to build with bundle size analytics.
 
 - `npm run unit`: Unit tests run in PhantomJS with [Karma](http://karma-runner.github.io/0.13/index.html) + [Mocha](http://mochajs.org/) + [karma-webpack](https://github.com/webpack/karma-webpack).
   - Supports ES2015 in test files.

From eefcf99d54adcc38b79e0ce114c7c731620cfe3c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 18:08:44 -0500
Subject: [PATCH 083/339] improve docs for proxy matching

---
 docs/proxy.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/proxy.md b/docs/proxy.md
index bc61676409..fc822ea647 100644
--- a/docs/proxy.md
+++ b/docs/proxy.md
@@ -24,3 +24,18 @@ module.exports = {
 ```
 
 The above example will proxy the request `/api/posts/1` to `http://jsonplaceholder.typicode.com/posts/1`.
+
+## URL Matching
+
+In addition to static urls you can also use glob patterns to match URLs, e.g. `/api/**`. See [Context Matching](https://github.com/chimurai/http-proxy-middleware#context-matching) for more details. In addition, you can provide a `filter` option that can be a custom function to determine whether a request should be proxied:
+
+``` js
+proxyTable: {
+  '*': {
+    target: 'http://jsonplaceholder.typicode.com',
+    filter: function (pathname, req) {
+      return pathname.match('^/api') && req.method === 'GET'
+    }
+  }
+}
+```

From 49d9256b422bbca42097fff734cec95a7f0e4e59 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 18:09:26 -0500
Subject: [PATCH 084/339] update docs script

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

diff --git a/package.json b/package.json
index f3863623c7..0d0a591880 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
     "docs": "cd docs && gitbook serve",
-    "deploy-docs": "bash ./deploy-docs.sh"
+    "docs:deploy": "bash ./deploy-docs.sh"
   },
   "devDependencies": {
     "vue-cli": "^2.8.1"

From 0b8051f9b60270cd6883ad39f643da977d050e06 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 6 Feb 2017 11:36:46 -0500
Subject: [PATCH 085/339] fix no-lint config

---
 template/build/webpack.base.conf.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 8701762e41..cfee6a41a3 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -2,7 +2,6 @@ var path = require('path')
 var utils = require('./utils')
 var config = require('../config')
 var vueLoaderConfig = require('./vue-loader.conf')
-var eslintFriendlyFormatter = require('eslint-friendly-formatter')
 
 function resolve (dir) {
   return path.join(__dirname, '..', dir)
@@ -43,7 +42,7 @@ module.exports = {
         enforce: "pre",
         include: [resolve('src'), resolve('test')],
         options: {
-          formatter: eslintFriendlyFormatter
+          formatter: require('eslint-friendly-formatter')
         }
       },
       {{/lint}}

From a5993a5a6ef69670ec7ef45c5234648436c1e6bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20B=C3=A4r?= <stbaer@users.noreply.github.com>
Date: Tue, 7 Feb 2017 00:46:16 +0800
Subject: [PATCH 086/339] removed .json loader from webpack base config (#489)

---
 template/build/webpack.base.conf.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index cfee6a41a3..9a9987270a 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -56,10 +56,6 @@ module.exports = {
         loader: 'babel-loader',
         include: [resolve('src'), resolve('test')]
       },
-      {
-        test: /\.json$/,
-        loader: 'json-loader'
-      },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         loader: 'url-loader',

From ca9faaf281dc27ccea5733d06674163ddfe46cf4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 6 Feb 2017 11:48:06 -0500
Subject: [PATCH 087/339] remove json-loader dep since webpack includes it by
 itself now

---
 template/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 24cf1285a3..ef3b41a218 100644
--- a/template/package.json
+++ b/template/package.json
@@ -54,7 +54,6 @@
     "function-bind": "^1.1.0",
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.17.3",
-    "json-loader": "^0.5.4",
     "webpack-bundle-analyzer": "^2.2.1",
     {{#unit}}
     "cross-env": "^3.1.4",

From 48fb5dc83f6f0ed788c987a0cc6111ad2cda5129 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <a.sumaran@gmail.com>
Date: Mon, 6 Feb 2017 11:55:20 -0500
Subject: [PATCH 088/339] Move import at the top to prevent eslint error (#478)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By doing this it fixes the following error

```
 ERROR  Failed to compile with 1 errors

 error  in ./src/router/index.js


  ✘  https://google.com/#q=import%2Ffirst  Import in body of module; reorder to top
  /Users/asumaran/www/my-project/src/router/index.js:6:1
  import Hello from 'components/Hello';
   ^


✘ 1 problem (1 error, 0 warnings)
```
---
 template/src/router/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/src/router/index.js b/template/src/router/index.js
index 2f09025d9d..e610a74f4a 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -1,10 +1,9 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import Router from 'vue-router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Hello from 'components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 Vue.use(Router){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-import Hello from 'components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-
 export default new Router({
   routes: [
     {

From 763f644463dfd9c2f980686cf066c479974c783c Mon Sep 17 00:00:00 2001
From: Betsy Haibel <betsy.haibel@gmail.com>
Date: Mon, 6 Feb 2017 12:01:52 -0500
Subject: [PATCH 089/339] update ExtractTextPlugin config to version 2 options
 (#490)

---
 template/build/utils.js             | 4 ++--
 template/build/webpack.prod.conf.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index 26848a0a86..7dc098c8df 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -29,8 +29,8 @@ exports.cssLoaders = function (options) {
     // (which is the case during production build)
     if (options.extract) {
       return ExtractTextPlugin.extract({
-        loader: sourceLoader,
-        fallbackLoader: 'vue-style-loader'
+        use: sourceLoader,
+        fallback: 'vue-style-loader'
       })
     } else {
       return ['vue-style-loader', sourceLoader].join('!')
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index a2d757ec4f..34501b4218 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -34,7 +34,9 @@ var webpackConfig = merge(baseWebpackConfig, {
       }
     }),
     // extract css into its own file
-    new ExtractTextPlugin(utils.assetsPath('css/[name].[contenthash].css')),
+    new ExtractTextPlugin({
+      filename: utils.assetsPath('css/[name].[contenthash].css')
+    }),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin

From 32a4fb647bbdf1a93ea034a5fe673baf1fc22e38 Mon Sep 17 00:00:00 2001
From: INOUE Takuya <inouetakuya5@gmail.com>
Date: Tue, 7 Feb 2017 02:16:37 +0900
Subject: [PATCH 090/339] Fix unit testing (Airbnb style lint) (#351)

* Improve unit testing referring the official guide

Unit Testing - vue.js
https://vuejs.org/v2/guide/unit-testing.html

* Allow optionalDependencies

https://google.com/#q=import%2Fno-extraneous-dependencies  'function-bind' should be listed in the project's dependencies, not devDependencies
/project-path/test/unit/index.js
Function.prototype.bind = require('function-bind');
                            ^
---
 template/.eslintrc.js                  | 4 ++++
 template/test/unit/specs/Hello.spec.js | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 5d1bdc98ec..00b5b5717a 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -44,6 +44,10 @@ module.exports = {
       'js': 'never',
       'vue': 'never'
     }],
+    // allow optionalDependencies
+    'import/no-extraneous-dependencies': ['error', {
+      'optionalDependencies': ['test/unit/index.js']
+    }],
     {{/if_eq}}
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
diff --git a/template/test/unit/specs/Hello.spec.js b/template/test/unit/specs/Hello.spec.js
index 9d550cb908..4609352a4f 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/Hello.spec.js
@@ -3,10 +3,8 @@ import Hello from 'src/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}
 
 describe('Hello.vue', () => {
   it('should render correct contents', () => {
-    const vm = new Vue({
-      el: document.createElement('div'),
-      render: (h) => h(Hello){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-    }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    const Constructor = Vue.extend(Hello){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    const vm = new Constructor().$mount(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     expect(vm.$el.querySelector('.hello h1').textContent)
       .to.equal('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 8a6b4ec484d45d615103041063a3539b1d228b8d Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva@users.noreply.github.com>
Date: Tue, 7 Feb 2017 12:45:00 +0100
Subject: [PATCH 091/339] Hide cd project when generating in current dir (#498)

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

diff --git a/meta.js b/meta.js
index bc0fc74675..bc1e241137 100644
--- a/meta.js
+++ b/meta.js
@@ -88,5 +88,5 @@ module.exports = {
     "test/e2e/**/*": "e2e",
     "src/router/**/*": "router"
   },
-  "completeMessage": "To get started:\n\n  cd {{destDirName}}\n  npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack"
+  "completeMessage": "To get started:\n\n  {{^inPlace}}cd {{destDirName}}\n  {{/inPlace}}npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack"
 };

From 13e6c58925a7f48ac9d78acf3321e5294677d872 Mon Sep 17 00:00:00 2001
From: Limichange <limichange@hotmail.com>
Date: Fri, 10 Feb 2017 19:21:35 +0800
Subject: [PATCH 092/339] Fixed broken js sourcemaps in production (#504)

Fixed #500
---
 template/build/webpack.prod.conf.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 34501b4218..6248c06d13 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -31,7 +31,8 @@ var webpackConfig = merge(baseWebpackConfig, {
     new webpack.optimize.UglifyJsPlugin({
       compress: {
         warnings: false
-      }
+      },
+      sourceMap: true
     }),
     // extract css into its own file
     new ExtractTextPlugin({

From dca51607aa95f206b21df4473ae436b2db74ddd2 Mon Sep 17 00:00:00 2001
From: "Jonathan M. Hethey" <jonathan.hethey@gmail.com>
Date: Thu, 16 Feb 2017 10:55:20 +0100
Subject: [PATCH 093/339] updates extract-text-webpack-plugin RC

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

diff --git a/template/package.json b/template/package.json
index ef3b41a218..6e35e2125e 100644
--- a/template/package.json
+++ b/template/package.json
@@ -48,7 +48,7 @@
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.14.1",
-    "extract-text-webpack-plugin": "^2.0.0-rc.2",
+    "extract-text-webpack-plugin": "^2.0.0-rc.3",
     "file-loader": "^0.10.0",
     "friendly-errors-webpack-plugin": "^1.1.3",
     "function-bind": "^1.1.0",

From 46d6bcac46c852244f1f2435a999522fa748a924 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 17 Feb 2017 08:52:48 -0500
Subject: [PATCH 094/339] use optimize css plugin

---
 template/build/webpack.prod.conf.js | 5 +++++
 template/package.json               | 1 +
 2 files changed, 6 insertions(+)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 6248c06d13..225cd8c71b 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -6,6 +6,8 @@ var merge = require('webpack-merge')
 var baseWebpackConfig = require('./webpack.base.conf')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+
 var env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('../config/test.env')
   : {{/if_or}}config.build.env
@@ -38,6 +40,9 @@ var webpackConfig = merge(baseWebpackConfig, {
     new ExtractTextPlugin({
       filename: utils.assetsPath('css/[name].[contenthash].css')
     }),
+    // Compress extracted CSS. We are using this plugin so that possible
+    // duplicated CSS from different components can be deduped.
+    new optimizeCSSPlugin(),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
diff --git a/template/package.json b/template/package.json
index ef3b41a218..82e71adccc 100644
--- a/template/package.json
+++ b/template/package.json
@@ -82,6 +82,7 @@
     {{/e2e}}
     "semver": "^5.3.0",
     "opn": "^4.0.2",
+    "optimize-css-assets-webpack-plugin": "^1.3.0",
     "ora": "^1.1.0",
     "shelljs": "^0.7.6",
     "url-loader": "^0.5.7",

From 9800a05dbbdfd929bfb695cbe6b957b890bb99d0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 17 Feb 2017 09:09:29 -0500
Subject: [PATCH 095/339] fix typo

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

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 225cd8c71b..838039c8c1 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -42,7 +42,7 @@ var webpackConfig = merge(baseWebpackConfig, {
     }),
     // Compress extracted CSS. We are using this plugin so that possible
     // duplicated CSS from different components can be deduped.
-    new optimizeCSSPlugin(),
+    new OptimizeCSSPlugin(),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin

From 88564101f6280f049e4d012c0463244b0600d3d1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 18 Feb 2017 22:10:23 -0500
Subject: [PATCH 096/339] bump vue-loader

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

diff --git a/template/package.json b/template/package.json
index 82e71adccc..da74c8805f 100644
--- a/template/package.json
+++ b/template/package.json
@@ -86,7 +86,7 @@
     "ora": "^1.1.0",
     "shelljs": "^0.7.6",
     "url-loader": "^0.5.7",
-    "vue-loader": "^10.3.0",
+    "vue-loader": "^11.0.0",
     "vue-style-loader": "^2.0.0",
     "vue-template-compiler": "^2.1.10",
     "webpack": "^2.2.1",

From 17876a4778f8ca4d2463cda177604a748dd3e047 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 18 Feb 2017 22:27:37 -0500
Subject: [PATCH 097/339] minimize css in code-split chunk as well

---
 template/build/utils.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index 7dc098c8df..973f68febe 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -11,8 +11,13 @@ exports.assetsPath = function (_path) {
 
 exports.cssLoaders = function (options) {
   options = options || {}
+  var isProduction = process.env.NODE_ENV === 'production'
+  var cssLoader = 'css' + (isProduction ? '?minimize' : '')
+
   // generate loader string to be used with extract text plugin
-  function generateLoaders (loaders) {
+  function generateLoaders (loader) {
+    var loaders = [cssLoader]
+    if (loader) loaders.push(loader)
     var sourceLoader = loaders.map(function (loader) {
       var extraParamChar
       if (/\?/.test(loader)) {
@@ -23,7 +28,7 @@ exports.cssLoaders = function (options) {
         extraParamChar = '?'
       }
       return loader + (options.sourceMap ? extraParamChar + 'sourceMap' : '')
-    }).join('!')
+    })
 
     // Extract CSS when that option is specified
     // (which is the case during production build)
@@ -33,19 +38,19 @@ exports.cssLoaders = function (options) {
         fallback: 'vue-style-loader'
       })
     } else {
-      return ['vue-style-loader', sourceLoader].join('!')
+      return ['vue-style-loader'].concat(sourceLoader)
     }
   }
 
   // http://vuejs.github.io/vue-loader/en/configurations/extract-css.html
   return {
-    css: generateLoaders(['css']),
-    postcss: generateLoaders(['css']),
-    less: generateLoaders(['css', 'less']),
-    sass: generateLoaders(['css', 'sass?indentedSyntax']),
-    scss: generateLoaders(['css', 'sass']),
-    stylus: generateLoaders(['css', 'stylus']),
-    styl: generateLoaders(['css', 'stylus'])
+    css: generateLoaders(),
+    postcss: generateLoaders(),
+    less: generateLoaders('less'),
+    sass: generateLoaders('sass?indentedSyntax'),
+    scss: generateLoaders('sass'),
+    stylus: generateLoaders('stylus'),
+    styl: generateLoaders('stylus')
   }
 }
 

From 284b6ed9e8838740b88ecd3591c92c8abe41b22f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 19 Feb 2017 23:43:43 -0500
Subject: [PATCH 098/339] tweak cssLoader util

---
 template/build/utils.js | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index 973f68febe..ad1ac2748d 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -11,34 +11,36 @@ exports.assetsPath = function (_path) {
 
 exports.cssLoaders = function (options) {
   options = options || {}
-  var isProduction = process.env.NODE_ENV === 'production'
-  var cssLoader = 'css' + (isProduction ? '?minimize' : '')
+
+  var cssLoader = {
+    loader: 'css-loader',
+    options: {
+      minimize: process.env.NODE_ENV === 'production',
+      sourceMap: options.sourceMap
+    }
+  }
 
   // generate loader string to be used with extract text plugin
   function generateLoaders (loader) {
     var loaders = [cssLoader]
-    if (loader) loaders.push(loader)
-    var sourceLoader = loaders.map(function (loader) {
-      var extraParamChar
-      if (/\?/.test(loader)) {
-        loader = loader.replace(/\?/, '-loader?')
-        extraParamChar = '&'
-      } else {
-        loader = loader + '-loader'
-        extraParamChar = '?'
-      }
-      return loader + (options.sourceMap ? extraParamChar + 'sourceMap' : '')
-    })
+    if (loader) {
+      loaders.push({
+        loader: loader + '-loader',
+        options: {
+          sourceMap: options.sourceMap
+        }
+      })
+    }
 
     // Extract CSS when that option is specified
     // (which is the case during production build)
     if (options.extract) {
       return ExtractTextPlugin.extract({
-        use: sourceLoader,
+        use: loaders,
         fallback: 'vue-style-loader'
       })
     } else {
-      return ['vue-style-loader'].concat(sourceLoader)
+      return ['vue-style-loader'].concat(loaders)
     }
   }
 
@@ -62,7 +64,7 @@ exports.styleLoaders = function (options) {
     var loader = loaders[extension]
     output.push({
       test: new RegExp('\\.' + extension + '$'),
-      loader: loader
+      use: loader
     })
   }
   return output

From 1a606e7f4304740a8105b628841c98deba087507 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 20 Feb 2017 08:49:42 -0500
Subject: [PATCH 099/339] fix lang="sass"

---
 template/build/utils.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index ad1ac2748d..3f2ef2a54b 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -21,14 +21,14 @@ exports.cssLoaders = function (options) {
   }
 
   // generate loader string to be used with extract text plugin
-  function generateLoaders (loader) {
+  function generateLoaders (loader, loaderOptions) {
     var loaders = [cssLoader]
     if (loader) {
       loaders.push({
         loader: loader + '-loader',
-        options: {
+        options: Object.assign({}, loaderOptions, {
           sourceMap: options.sourceMap
-        }
+        })
       })
     }
 
@@ -49,7 +49,7 @@ exports.cssLoaders = function (options) {
     css: generateLoaders(),
     postcss: generateLoaders(),
     less: generateLoaders('less'),
-    sass: generateLoaders('sass?indentedSyntax'),
+    sass: generateLoaders('sass', { indentedSyntax: true }),
     scss: generateLoaders('sass'),
     stylus: generateLoaders('stylus'),
     styl: generateLoaders('stylus')

From 8cff712d78e824dbeae0758a0c3f7e9db42d3f63 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 20 Feb 2017 11:10:25 -0500
Subject: [PATCH 100/339] simplify build.js with copy-webpack-plugin

---
 template/build/build.js             | 41 +++++++++++++----------------
 template/build/webpack.prod.conf.js | 11 +++++++-
 template/package.json               |  3 ++-
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/template/build/build.js b/template/build/build.js
index 7e29b911df..6b8add100c 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -1,12 +1,11 @@
-// https://github.com/shelljs/shelljs
 require('./check-versions')()
 
 process.env.NODE_ENV = 'production'
 
 var ora = require('ora')
+var rm = require('rimraf')
 var path = require('path')
 var chalk = require('chalk')
-var shell = require('shelljs')
 var webpack = require('webpack')
 var config = require('../config')
 var webpackConfig = require('./webpack.prod.conf')
@@ -14,27 +13,23 @@ var webpackConfig = require('./webpack.prod.conf')
 var spinner = ora('building for production...')
 spinner.start()
 
-var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
-shell.rm('-rf', assetsPath)
-shell.mkdir('-p', assetsPath)
-shell.config.silent = true
-shell.cp('-R', 'static/*', assetsPath)
-shell.config.silent = false
-
-webpack(webpackConfig, function (err, stats) {
-  spinner.stop()
+rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
   if (err) throw err
-  process.stdout.write(stats.toString({
-    colors: true,
-    modules: false,
-    children: false,
-    chunks: false,
-    chunkModules: false
-  }) + '\n\n')
+  webpack(webpackConfig, function (err, stats) {
+    spinner.stop()
+    if (err) throw err
+    process.stdout.write(stats.toString({
+      colors: true,
+      modules: false,
+      children: false,
+      chunks: false,
+      chunkModules: false
+    }) + '\n\n')
 
-  console.log(chalk.cyan('  Build complete.\n'))
-  console.log(chalk.yellow(
-    '  Tip: built files are meant to be served over an HTTP server.\n' +
-    '  Opening index.html over file:// won\'t work.\n'
-  ))
+    console.log(chalk.cyan('  Build complete.\n'))
+    console.log(chalk.yellow(
+      '  Tip: built files are meant to be served over an HTTP server.\n' +
+      '  Opening index.html over file:// won\'t work.\n'
+    ))
+  })
 })
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 838039c8c1..5b0ffea3bc 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -4,6 +4,7 @@ var webpack = require('webpack')
 var config = require('../config')
 var merge = require('webpack-merge')
 var baseWebpackConfig = require('./webpack.base.conf')
+var CopyWebpackPlugin = require('copy-webpack-plugin')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
@@ -81,7 +82,15 @@ var webpackConfig = merge(baseWebpackConfig, {
     new webpack.optimize.CommonsChunkPlugin({
       name: 'manifest',
       chunks: ['vendor']
-    })
+    }),
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.build.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
   ]
 })
 
diff --git a/template/package.json b/template/package.json
index da74c8805f..e2582b6585 100644
--- a/template/package.json
+++ b/template/package.json
@@ -29,6 +29,7 @@
     "babel-register": "^6.22.0",
     "chalk": "^1.1.3",
     "connect-history-api-fallback": "^1.3.0",
+    "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.26.1",
     {{#lint}}
     "eslint": "^3.14.1",
@@ -84,7 +85,7 @@
     "opn": "^4.0.2",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "ora": "^1.1.0",
-    "shelljs": "^0.7.6",
+    "rimraf": "^2.6.0",
     "url-loader": "^0.5.7",
     "vue-loader": "^11.0.0",
     "vue-style-loader": "^2.0.0",

From 801bc02f9d4cef8265cbabf89a9f2917899288df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 25 Feb 2017 11:54:33 +0100
Subject: [PATCH 101/339] WIP: Cleanup bad aliases and resolve config (fix
 #513) (#516)

* remove src dir from resolve:modules

* change aliases in webpack config

* fix alias in router/index

* fix spec

* fix unit/index

* removed unnecessary resolve: modules block.
---
 template/build/webpack.base.conf.js    | 8 +-------
 template/src/router/index.js           | 2 +-
 template/test/unit/index.js            | 2 +-
 template/test/unit/specs/Hello.spec.js | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 9a9987270a..a0c78b7dea 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -20,17 +20,11 @@ module.exports = {
   },
   resolve: {
     extensions: ['.js', '.vue', '.json'],
-    modules: [
-      resolve('src'),
-      resolve('node_modules')
-    ],
     alias: {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.common.js',
       {{/if_eq}}
-      'src': resolve('src'),
-      'assets': resolve('src/assets'),
-      'components': resolve('src/components')
+      '@': resolve('src'),
     }
   },
   module: {
diff --git a/template/src/router/index.js b/template/src/router/index.js
index e610a74f4a..4443677ef4 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import Router from 'vue-router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import Hello from 'components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Hello from '@/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 Vue.use(Router){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index 37a7da1d21..5385e3b7cc 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -9,5 +9,5 @@ testsContext.keys().forEach(testsContext){{#if_eq lintConfig "airbnb"}};{{/if_eq
 // require all src files except main.js for coverage.
 // you can also change this to match only the subset of files that
 // you want coverage for.
-const srcContext = require.context('src', true, /^\.\/(?!main(\.js)?$)/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 srcContext.keys().forEach(srcContext){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/unit/specs/Hello.spec.js b/template/test/unit/specs/Hello.spec.js
index 4609352a4f..1b276f47dc 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/Hello.spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import Hello from 'src/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Hello from '@/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 describe('Hello.vue', () => {
   it('should render correct contents', () => {

From 4cdb907363d38c06b79f9a47cb41b976a57589d1 Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Sat, 25 Feb 2017 10:56:14 +0000
Subject: [PATCH 102/339] use babel-preset-env (#501)

babel-preset-es2015 is getting a bit old in the tooth, babel-preset-env
is automatically updated and allows selective down-leveling.
---
 README.md             | 2 +-
 docs/commands.md      | 2 +-
 docs/unit.md          | 2 +-
 template/.babelrc     | 2 +-
 template/package.json | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 67b68fb1c3..8c139941cd 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ $ npm run dev
   - Use `npm run build --report`to build with bundle size analytics.
 
 - `npm run unit`: Unit tests run in PhantomJS with [Karma](http://karma-runner.github.io/0.13/index.html) + [Mocha](http://mochajs.org/) + [karma-webpack](https://github.com/webpack/karma-webpack).
-  - Supports ES2015 in test files.
+  - Supports ES2015+ in test files.
   - Supports all webpack loaders.
   - Easy mock injection.
 
diff --git a/docs/commands.md b/docs/commands.md
index de7a5becef..9fb5a1152b 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -26,7 +26,7 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 
 > Run unit tests in PhantomJS with [Karma](https://karma-runner.github.io/). See [Unit Testing](unit.md) for more details.
 
-- Supports ES2015 in test files.
+- Supports ES2015+ in test files.
 - Supports all webpack loaders.
 - Easy [mock injection](http://vuejs.github.io/vue-loader/en/workflow/testing-with-mocks.html).
 
diff --git a/docs/unit.md b/docs/unit.md
index 510dadbedf..faeb527c16 100644
--- a/docs/unit.md
+++ b/docs/unit.md
@@ -18,7 +18,7 @@ And the files:
 
 - `specs/`
 
-  This directory is where you write your actual tests. You can use full ES2015 and all supported Webpack loaders in your tests.
+  This directory is where you write your actual tests. You can use full ES2015+ and all supported Webpack loaders in your tests.
 
 - `karma.conf.js`
 
diff --git a/template/.babelrc b/template/.babelrc
index aafe54c994..23b44af0d6 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    ["es2015", { "modules": false }],
+    ["env", { "modules": false }],
     "stage-2"
   ],
   "plugins": ["transform-runtime"],
diff --git a/template/package.json b/template/package.json
index 9b1d017aa0..c6906f24d2 100644
--- a/template/package.json
+++ b/template/package.json
@@ -24,7 +24,7 @@
     {{/lint}}
     "babel-loader": "^6.2.10",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-es2015": "^6.22.0",
+    "babel-preset-env": "^1.1.8",
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
     "chalk": "^1.1.3",

From 688f825de31f4196206079dcaa575d8594ac8361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sun, 26 Feb 2017 11:57:54 +0100
Subject: [PATCH 103/339] make babel convert ES Modules in test env (solve
 #528)

To use inject-loader properly with webpack 2, babel has to convert ES imports to commonJS, while in dev/prod, webpack can handle ES6 modules for us.
---
 template/.babelrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/.babelrc b/template/.babelrc
index 23b44af0d6..ead46fbc18 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -7,6 +7,7 @@
   "comments": false,
   "env": {
     "test": {
+      "presets": ["env", "stage-2"]
       "plugins": [ "istanbul" ]
     }
   }

From e95537b94177814190f3b64c0a7e44805998729a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sun, 26 Feb 2017 11:58:29 +0100
Subject: [PATCH 104/339] fix missing comma

---
 template/.babelrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index ead46fbc18..13f0e47164 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -7,7 +7,7 @@
   "comments": false,
   "env": {
     "test": {
-      "presets": ["env", "stage-2"]
+      "presets": ["env", "stage-2"],
       "plugins": [ "istanbul" ]
     }
   }

From 9c0582221221ea6f236a5cc48954975c9d7ff8a9 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 26 Feb 2017 12:07:53 +0100
Subject: [PATCH 105/339] update extract-text-webpack-plugin to 2.0.0

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

diff --git a/template/package.json b/template/package.json
index c6906f24d2..6df455ab20 100644
--- a/template/package.json
+++ b/template/package.json
@@ -49,7 +49,7 @@
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.14.1",
-    "extract-text-webpack-plugin": "^2.0.0-rc.3",
+    "extract-text-webpack-plugin": "^2.0.0",
     "file-loader": "^0.10.0",
     "friendly-errors-webpack-plugin": "^1.1.3",
     "function-bind": "^1.1.0",

From 02f3504c7628606aa8a6ed6af6b9deaa49e18e8c Mon Sep 17 00:00:00 2001
From: Limichange <limichange@hotmail.com>
Date: Sun, 26 Feb 2017 22:19:51 +0800
Subject: [PATCH 106/339] Ignore yarn-error.log (#551)

---
 template/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/.gitignore b/template/.gitignore
index 631bd574e9..77f963bfe1 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -2,6 +2,7 @@
 node_modules/
 dist/
 npm-debug.log
+yarn-error.log
 {{#unit}}
 test/unit/coverage
 {{/unit}}

From 847fef31a12fafb138938c03bfcdd9d80c9c84e1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 26 Feb 2017 08:16:24 -0500
Subject: [PATCH 107/339] bump to 2.2.1

---
 template/build/webpack.base.conf.js | 2 +-
 template/package.json               | 4 ++--
 template/src/main.js                | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index a0c78b7dea..94636ffd87 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -22,7 +22,7 @@ module.exports = {
     extensions: ['.js', '.vue', '.json'],
     alias: {
       {{#if_eq build "standalone"}}
-      'vue$': 'vue/dist/vue.common.js',
+      'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
       '@': resolve('src'),
     }
diff --git a/template/package.json b/template/package.json
index 6df455ab20..11886ae6b4 100644
--- a/template/package.json
+++ b/template/package.json
@@ -13,7 +13,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.1.10"{{#router}},
+    "vue": "^2.2.1"{{#router}},
     "vue-router": "^2.2.0"{{/router}}
   },
   "devDependencies": {
@@ -89,7 +89,7 @@
     "url-loader": "^0.5.7",
     "vue-loader": "^11.0.0",
     "vue-style-loader": "^2.0.0",
-    "vue-template-compiler": "^2.1.10",
+    "vue-template-compiler": "^2.2.1",
     "webpack": "^2.2.1",
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.16.1",
diff --git a/template/src/main.js b/template/src/main.js
index 221d39b52f..6bf845ced8 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -8,6 +8,8 @@ import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import router from './router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 {{/router}}
 
+Vue.devtool.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

From 3caa013b559f90fcce781d17b7a9cd9e2d3796a8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 26 Feb 2017 09:35:12 -0500
Subject: [PATCH 108/339] use babel-preset-latest instead of env, use
 .postcssrc

---
 template/.babelrc                 | 6 ++++--
 template/.postcssrc.js            | 8 ++++++++
 template/build/vue-loader.conf.js | 7 +------
 template/package.json             | 9 +++++++--
 template/src/main.js              | 2 +-
 template/test/unit/index.js       | 3 +++
 6 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 template/.postcssrc.js

diff --git a/template/.babelrc b/template/.babelrc
index 13f0e47164..6e6c00aa1a 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,13 +1,15 @@
 {
   "presets": [
-    ["env", { "modules": false }],
+    ["latest", {
+      "es2015": { "modules": false }
+    }],
     "stage-2"
   ],
   "plugins": ["transform-runtime"],
   "comments": false,
   "env": {
     "test": {
-      "presets": ["env", "stage-2"],
+      "presets": ["latest", "stage-2"],
       "plugins": [ "istanbul" ]
     }
   }
diff --git a/template/.postcssrc.js b/template/.postcssrc.js
new file mode 100644
index 0000000000..ea9a5ab875
--- /dev/null
+++ b/template/.postcssrc.js
@@ -0,0 +1,8 @@
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+  "plugins": {
+    // to edit target browsers: use "browserlist" field in package.json
+    "autoprefixer": {}
+  }
+}
diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index a86af01c9e..7aee79bae4 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -8,10 +8,5 @@ module.exports = {
       ? config.build.productionSourceMap
       : config.dev.cssSourceMap,
     extract: isProduction
-  }),
-  postcss: [
-    require('autoprefixer')({
-      browsers: ['last 2 versions']
-    })
-  ]
+  })
 }
diff --git a/template/package.json b/template/package.json
index 11886ae6b4..1134e63a72 100644
--- a/template/package.json
+++ b/template/package.json
@@ -24,7 +24,7 @@
     {{/lint}}
     "babel-loader": "^6.2.10",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-env": "^1.1.8",
+    "babel-preset-latest": "^6.22.0",
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
     "chalk": "^1.1.3",
@@ -98,5 +98,10 @@
   "engines": {
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
-  }
+  },
+  "browserlist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
 }
diff --git a/template/src/main.js b/template/src/main.js
index 6bf845ced8..bd38d98ee4 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -8,7 +8,7 @@ import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import router from './router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 {{/router}}
 
-Vue.devtool.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+Vue.config.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 /* eslint-disable no-new */
 new Vue({
diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index 5385e3b7cc..233c54c7c2 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -1,3 +1,6 @@
+import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+Vue.config.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
 // Polyfill fn.bind() for PhantomJS
 /* eslint-disable no-extend-native */
 Function.prototype.bind = require('function-bind'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 60e75d945dfbe79b3da856accb3c55d2473cd731 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 26 Feb 2017 09:36:17 -0500
Subject: [PATCH 109/339] update structure

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

diff --git a/docs/structure.md b/docs/structure.md
index 6511c5d2d6..8daf54301b 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -4,7 +4,7 @@
 .
 ├── build/                      # webpack config files
 │   └── ...
-├── config/                     
+├── config/
 │   ├── index.js                # main project config
 │   └── ...
 ├── src/
@@ -26,8 +26,9 @@
 │   │   ├── runner.js           # test runner script
 │   │   └── nightwatch.conf.js  # test runner config file
 ├── .babelrc                    # babel config
-├── .editorconfig               # editor config
+├── .postcssrc.js               # postcss config
 ├── .eslintrc.js                # eslint config
+├── .editorconfig               # editor config
 ├── index.html                  # index.html template
 └── package.json                # build scripts and dependencies
 ```

From 9d99ed88beff2c8b55a747024c4756ba42655799 Mon Sep 17 00:00:00 2001
From: alex <xalexec@gmail.com>
Date: Fri, 3 Mar 2017 13:30:39 +0800
Subject: [PATCH 110/339] fix vue-loader version (#568)

fix  https://github.com/vuejs/vue-loader/pull/677#event-984831236
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 1134e63a72..2902925c2a 100644
--- a/template/package.json
+++ b/template/package.json
@@ -87,7 +87,7 @@
     "ora": "^1.1.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.7",
-    "vue-loader": "^11.0.0",
+    "vue-loader": "^11.1.4",
     "vue-style-loader": "^2.0.0",
     "vue-template-compiler": "^2.2.1",
     "webpack": "^2.2.1",

From 545d3a8693bfae1d9db3fd36fafd757c7d602f3c Mon Sep 17 00:00:00 2001
From: "Anders D. Thomsen" <dtinc88@gmail.com>
Date: Fri, 3 Mar 2017 10:44:03 +0100
Subject: [PATCH 111/339] (doc): Added a note on npm run dev (#565)

If port 8080 is in use on the machine npm run dev will fail without too much information to go on. reading through issues it looked like several people has experienced this and the first comment is always if port 8080 is in use. This edit might get more people going faster.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8c139941cd..ea4c750559 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@ $ npm install
 $ npm run dev
 ```
 
+If port 8080 is already in use on your machine you must change the port number in `/config/index.js`. Otherwise `npm run dev` will fail.
+
 ## What's Included
 
 - `npm run dev`: first-in-class development experience.

From 8d674f9ce27db74d41a28e71a7d724766b7f158e Mon Sep 17 00:00:00 2001
From: pastdevr <programmer-autodidact@hotmail.com>
Date: Sat, 4 Mar 2017 18:08:11 +0300
Subject: [PATCH 112/339] Fix broken link to doc for configuration file. (#573)

---
 template/test/e2e/nightwatch.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index 6726325de6..e9ad88fe17 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -1,7 +1,7 @@
 require('babel-register')
 var config = require('../../config')
 
-// http://nightwatchjs.org/guide#settings-file
+// http://nightwatchjs.org/getingstarted#settings-file
 module.exports = {
   src_folders: ['test/e2e/specs'],
   output_folder: 'test/e2e/reports',

From c07d2382fcc8b02682273f2755b2e7cdfc505e60 Mon Sep 17 00:00:00 2001
From: Gerald <gera2ld@163.com>
Date: Tue, 7 Mar 2017 10:15:17 +0800
Subject: [PATCH 113/339] fix browserslist in package.json

close vuejs-templates/webpack#572
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 2902925c2a..1f97c34ce6 100644
--- a/template/package.json
+++ b/template/package.json
@@ -99,7 +99,7 @@
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
   },
-  "browserlist": [
+  "browserslist": [
     "> 1%",
     "last 2 versions",
     "not ie <= 8"

From 424cd3f6d101ffeb57f48bca55d7951b35af60e0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 7 Mar 2017 13:54:44 +0800
Subject: [PATCH 114/339] use babel-preset-env

---
 template/.babelrc     | 4 +---
 template/package.json | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/template/.babelrc b/template/.babelrc
index 6e6c00aa1a..26289e5359 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,8 +1,6 @@
 {
   "presets": [
-    ["latest", {
-      "es2015": { "modules": false }
-    }],
+    ["env", { "modules": false }],
     "stage-2"
   ],
   "plugins": ["transform-runtime"],
diff --git a/template/package.json b/template/package.json
index 2902925c2a..9bde059afa 100644
--- a/template/package.json
+++ b/template/package.json
@@ -24,7 +24,7 @@
     {{/lint}}
     "babel-loader": "^6.2.10",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-latest": "^6.22.0",
+    "babel-preset-env": "^1.2.1",
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
     "chalk": "^1.1.3",

From 8cccb625e5b2935a6932483a703f3c44c465a70d Mon Sep 17 00:00:00 2001
From: unfw <williammpickett@gmail.com>
Date: Tue, 7 Mar 2017 14:22:11 -0700
Subject: [PATCH 115/339] Update .babelrc for preset-env for test

Preset env was changed for for dev/prod but not for unit test
---
 template/.babelrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index 26289e5359..13f0e47164 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -7,7 +7,7 @@
   "comments": false,
   "env": {
     "test": {
-      "presets": ["latest", "stage-2"],
+      "presets": ["env", "stage-2"],
       "plugins": [ "istanbul" ]
     }
   }

From 358ad2c26a8e76c7b04f4c0ce5f5fa7be69d60ee Mon Sep 17 00:00:00 2001
From: Limichange <limichange@hotmail.com>
Date: Thu, 9 Mar 2017 17:09:58 +0800
Subject: [PATCH 116/339] Upgrade vue (#587)

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

diff --git a/template/package.json b/template/package.json
index a57c58dce1..a3a02f348f 100644
--- a/template/package.json
+++ b/template/package.json
@@ -13,7 +13,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.2.1"{{#router}},
+    "vue": "^2.2.2"{{#router}},
     "vue-router": "^2.2.0"{{/router}}
   },
   "devDependencies": {

From d373e13c86d1266d6bad3cde714d1a6fb1a4107c Mon Sep 17 00:00:00 2001
From: Adam Biggs <adam.biggs@lightmaker.com>
Date: Fri, 10 Mar 2017 15:17:14 -0800
Subject: [PATCH 117/339] Replace `function-bind` with `karma-phantomjs-shim`
 shim all missing features in PhantomJS

---
 template/package.json            | 2 +-
 template/test/unit/index.js      | 4 ----
 template/test/unit/karma.conf.js | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/template/package.json b/template/package.json
index a3a02f348f..755908d13a 100644
--- a/template/package.json
+++ b/template/package.json
@@ -52,7 +52,6 @@
     "extract-text-webpack-plugin": "^2.0.0",
     "file-loader": "^0.10.0",
     "friendly-errors-webpack-plugin": "^1.1.3",
-    "function-bind": "^1.1.0",
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.17.3",
     "webpack-bundle-analyzer": "^2.2.1",
@@ -62,6 +61,7 @@
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
     "karma-phantomjs-launcher": "^1.0.2",
+    "karma-phantomjs-shim": "^1.4.0",
     "karma-sinon-chai": "^1.2.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.26",
diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index 233c54c7c2..d0e39a0be7 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -1,10 +1,6 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 Vue.config.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-// Polyfill fn.bind() for PhantomJS
-/* eslint-disable no-extend-native */
-Function.prototype.bind = require('function-bind'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-
 // require all test files (files that ends with .spec.js)
 const testsContext = require.context('./specs', true, /\.spec$/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 testsContext.keys().forEach(testsContext){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/unit/karma.conf.js b/template/test/unit/karma.conf.js
index 4e523fe2f8..591a22db83 100644
--- a/template/test/unit/karma.conf.js
+++ b/template/test/unit/karma.conf.js
@@ -12,7 +12,7 @@ module.exports = function (config) {
     //    http://karma-runner.github.io/0.13/config/browsers.html
     // 2. add it to the `browsers` array below.
     browsers: ['PhantomJS'],
-    frameworks: ['mocha', 'sinon-chai'],
+    frameworks: ['mocha', 'sinon-chai', 'phantomjs-shim'],
     reporters: ['spec', 'coverage'],
     files: ['./index.js'],
     preprocessors: {

From 0815d03948946dad33da3be4e2b9fdf9863b98a6 Mon Sep 17 00:00:00 2001
From: Daniel Perez <perez.jose_21@hotmail.com>
Date: Tue, 14 Mar 2017 13:38:39 -0400
Subject: [PATCH 118/339] Update package.json (#597)

Bump vue-template-compiler version to 2.2.4
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index a3a02f348f..5c420a2a93 100644
--- a/template/package.json
+++ b/template/package.json
@@ -89,7 +89,7 @@
     "url-loader": "^0.5.7",
     "vue-loader": "^11.1.4",
     "vue-style-loader": "^2.0.0",
-    "vue-template-compiler": "^2.2.1",
+    "vue-template-compiler": "^2.2.4",
     "webpack": "^2.2.1",
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.16.1",

From c72105e2a9e79d2e49508e489cf03e85ccb21a90 Mon Sep 17 00:00:00 2001
From: Sam Herbert <sam@samherbert.net>
Date: Tue, 14 Mar 2017 11:39:11 -0600
Subject: [PATCH 119/339] (docs): Remove broken link to deployment notes (#580)

- Remove anchor reference to non-existent anchor

note: I could not find a reference to "deployment notes"... it may be referencing `backend.md`, which is already linked to in the same block.
---
 docs/commands.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/commands.md b/docs/commands.md
index 9fb5a1152b..2a067d8ce0 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -20,7 +20,6 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 - HTML minified with [html-minifier](https://github.com/kangax/html-minifier).
 - CSS across all components extracted into a single file and minified with [cssnano](https://github.com/ben-eb/cssnano).
 - All static assets compiled with version hashes for efficient long-term caching, and a production `index.html` is auto-generated with proper URLs to these generated assets.
-- Also see [deployment notes](#how-do-i-deploy-built-assets-with-my-backend-framework).
 
 ### `npm run unit`
 

From 54d3bd247d421f8ce9938988283ce9c7badf554f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 22 Mar 2017 14:54:30 +0800
Subject: [PATCH 120/339] only use safe optimizations for css minification

---
 template/build/webpack.prod.conf.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 5b0ffea3bc..7977f5ce80 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -43,7 +43,11 @@ var webpackConfig = merge(baseWebpackConfig, {
     }),
     // Compress extracted CSS. We are using this plugin so that possible
     // duplicated CSS from different components can be deduped.
-    new OptimizeCSSPlugin(),
+    new OptimizeCSSPlugin({
+      cssProcessorOptions: {
+        safe: true
+      }
+    }),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin

From 8b84b308d14f41405d0865c47643be8ca32cfe5a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Mar 2017 16:17:51 +0800
Subject: [PATCH 121/339] increase e2e test initial waiting for CI

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

diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
index f619020098..1667446cd8 100644
--- a/template/test/e2e/specs/test.js
+++ b/template/test/e2e/specs/test.js
@@ -10,7 +10,7 @@ module.exports = {
 
     browser
       .url(devServer)
-      .waitForElementVisible('#app', 5000)
+      .waitForElementVisible('#app', 10000)
       .assert.elementPresent('.hello')
       .assert.containsText('h1', 'Welcome to Your Vue.js App')
       .assert.elementCount('img', 1)

From d399afa403273862da2420881f01eba00aca47ae Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Mar 2017 16:43:13 +0800
Subject: [PATCH 122/339] adjust dev server configuration

---
 template/build/dev-server.js    | 24 +++++++++++------
 template/test/e2e/runner.js     | 48 +++++++++++++++++----------------
 template/test/e2e/specs/test.js |  2 +-
 3 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 1049eb374e..724bc51f6d 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -66,18 +66,26 @@ app.use(staticPath, express.static('./static'))
 
 var uri = 'http://localhost:' + port
 
-devMiddleware.waitUntilValid(function () {
-  console.log('> Listening at ' + uri + '\n')
+var _resolve
+var readyPromise = new Promise(resolve => {
+  _resolve = resolve
 })
 
-module.exports = app.listen(port, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-
+console.log('> Starting dev server...')
+devMiddleware.waitUntilValid(() => {
+  console.log('> Listening at ' + uri + '\n')
   // when env is testing, don't need open it
   if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
     opn(uri)
   }
+  _resolve()
 })
+
+var server = app.listen(port)
+
+module.exports = {
+  ready: readyPromise,
+  close: () => {
+    server.close()
+  }
+}
diff --git a/template/test/e2e/runner.js b/template/test/e2e/runner.js
index 6c86165a25..6b30c61e17 100644
--- a/template/test/e2e/runner.js
+++ b/template/test/e2e/runner.js
@@ -2,30 +2,32 @@
 process.env.NODE_ENV = 'testing'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 var server = require('../../build/dev-server.js'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-// 2. run the nightwatch test suite against it
-// to run in additional browsers:
-//    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
-//    2. add it to the --env flag below
-// or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
-// For more information on Nightwatch's config file, see
-// http://nightwatchjs.org/guide#settings-file
-var opts = process.argv.slice(2){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-if (opts.indexOf('--config') === -1) {
-  opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-}
-if (opts.indexOf('--env') === -1) {
-  opts = opts.concat(['--env', 'chrome']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-}
+server.ready.then(() => {
+  // 2. run the nightwatch test suite against it
+  // to run in additional browsers:
+  //    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
+  //    2. add it to the --env flag below
+  // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
+  // For more information on Nightwatch's config file, see
+  // http://nightwatchjs.org/guide#settings-file
+  var opts = process.argv.slice(2){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  if (opts.indexOf('--config') === -1) {
+    opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  }
+  if (opts.indexOf('--env') === -1) {
+    opts = opts.concat(['--env', 'chrome']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  }
 
-var spawn = require('cross-spawn'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  var spawn = require('cross-spawn'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-runner.on('exit', function (code) {
-  server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  process.exit(code){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  runner.on('exit', function (code) {
+    server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    process.exit(code){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-runner.on('error', function (err) {
-  server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  throw err{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  runner.on('error', function (err) {
+    server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    throw err{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
index 1667446cd8..f619020098 100644
--- a/template/test/e2e/specs/test.js
+++ b/template/test/e2e/specs/test.js
@@ -10,7 +10,7 @@ module.exports = {
 
     browser
       .url(devServer)
-      .waitForElementVisible('#app', 10000)
+      .waitForElementVisible('#app', 5000)
       .assert.elementPresent('.hello')
       .assert.containsText('h1', 'Welcome to Your Vue.js App')
       .assert.elementCount('img', 1)

From 7df83234f68e8a6d83c407af8507ec08c4204fbd Mon Sep 17 00:00:00 2001
From: Brandon Max <bmax@users.noreply.github.com>
Date: Sun, 26 Mar 2017 16:53:02 -0400
Subject: [PATCH 123/339] Fix broken link in comment (#631)

from `http://vuejs.github.io/vue-loader/en/configurations/extract-css.html` to `https://vue-loader.vuejs.org/en/configurations/extract-css.html`
---
 template/build/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index 3f2ef2a54b..b1d54b4d6c 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -44,7 +44,7 @@ exports.cssLoaders = function (options) {
     }
   }
 
-  // http://vuejs.github.io/vue-loader/en/configurations/extract-css.html
+  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
   return {
     css: generateLoaders(),
     postcss: generateLoaders(),

From d2d8241103e3306ba21a00f21b411eb7d04a2bea Mon Sep 17 00:00:00 2001
From: liyl <295697141@qq.com>
Date: Mon, 27 Mar 2017 04:56:56 +0800
Subject: [PATCH 124/339] template format (#627)

---
 template/build/webpack.base.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 94636ffd87..01683463c3 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -24,7 +24,7 @@ module.exports = {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
-      '@': resolve('src'),
+      '@': resolve('src')
     }
   },
   module: {
@@ -33,7 +33,7 @@ module.exports = {
       {
         test: /\.(js|vue)$/,
         loader: 'eslint-loader',
-        enforce: "pre",
+        enforce: 'pre',
         include: [resolve('src'), resolve('test')],
         options: {
           formatter: require('eslint-friendly-formatter')

From 4d30e4be6262058ec56ec2237f829deca69b73a1 Mon Sep 17 00:00:00 2001
From: Aspectis <aspectis@users.noreply.github.com>
Date: Sun, 26 Mar 2017 22:57:22 +0200
Subject: [PATCH 125/339] Use single quotes (#626)


From dc0d2fc442091f873b9b181a5237b844a878d7d1 Mon Sep 17 00:00:00 2001
From: Thanakron Tandavas <ttandavas@gmail.com>
Date: Mon, 27 Mar 2017 03:58:01 +0700
Subject: [PATCH 126/339] add prerender instructions for using history mode
 (#620)

* add prerender instructions for using history mode

* fix typo
---
 docs/prerender.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/prerender.md b/docs/prerender.md
index cc45f19bc8..d69e34965d 100644
--- a/docs/prerender.md
+++ b/docs/prerender.md
@@ -29,3 +29,11 @@ new PrerenderSpaPlugin(
 ```
 
 If you also wanted to prerender `/about` and `/contact`, then that array would be `[ '/', '/about', '/contact' ]`.
+
+4. Enable history mode for `vue-router`:
+```js
+const router = new VueRouter({
+  mode: 'history',
+  routes: [...]
+})
+```

From 19f9cacb1566266d6c57c81a6896ebc08a802a42 Mon Sep 17 00:00:00 2001
From: mo khan <mokhan@users.noreply.github.com>
Date: Sun, 26 Mar 2017 14:58:31 -0600
Subject: [PATCH 127/339] Fix type in e2e docs. (#610)

---
 docs/e2e.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/e2e.md b/docs/e2e.md
index 58481f1680..1525fa4854 100644
--- a/docs/e2e.md
+++ b/docs/e2e.md
@@ -18,7 +18,7 @@ Let's take a look at the files in the `test/e2e` directory:
 
 - `specs/`
 
-  You actual tests! See [Nightwatch's docs on writing tests](http://nightwatchjs.org/guide#writing-tests) and [API reference](http://nightwatchjs.org/api) for more details.
+  Your actual tests! See [Nightwatch's docs on writing tests](http://nightwatchjs.org/guide#writing-tests) and [API reference](http://nightwatchjs.org/api) for more details.
 
 ### Running Tests in More Browsers
 

From 26654f98a2b1c05757ddc1870107ceb041358e76 Mon Sep 17 00:00:00 2001
From: Shailendher <shailusmilez@gmail.com>
Date: Sun, 26 Mar 2017 22:59:54 +0200
Subject: [PATCH 128/339] Updated .gitignore to exclude log files with suffixes
 (#596)

e.g file: npm-debug.log.4178510676
partially fixes #554
reference: https://github.com/github/gitignore/blob/master/Node.gitignore
---
 template/.gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/template/.gitignore b/template/.gitignore
index 77f963bfe1..1ecac1d283 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -1,8 +1,9 @@
 .DS_Store
 node_modules/
 dist/
-npm-debug.log
-yarn-error.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 {{#unit}}
 test/unit/coverage
 {{/unit}}

From f78054e9d3d40fcf5ebf3224b6117c4a46d8c097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E7=A3=8A?= <ice@micua.com>
Date: Mon, 27 Mar 2017 05:05:01 +0800
Subject: [PATCH 129/339] Update url-loader config (#590)

> Rule.query only exists for compatibility reasons. Use Rule.options instead.
---
 template/build/webpack.base.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 01683463c3..0f161198d4 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -53,7 +53,7 @@ module.exports = {
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         loader: 'url-loader',
-        query: {
+        options: {
           limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]')
         }
@@ -61,7 +61,7 @@ module.exports = {
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         loader: 'url-loader',
-        query: {
+        options: {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }

From f759d17efa08ea3bb0989d297335d6aafdda2e0c Mon Sep 17 00:00:00 2001
From: Alex Lee <kokomini@qq.com>
Date: Mon, 27 Mar 2017 11:34:58 +0800
Subject: [PATCH 130/339] Update vue-router version

vue-router v2.3.0 fix some issues
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 5c420a2a93..1004a2fcfb 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "vue": "^2.2.2"{{#router}},
-    "vue-router": "^2.2.0"{{/router}}
+    "vue-router": "^2.3.0"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",

From 5f1c11c7e3855da8da92aed16f3dfc673653159c Mon Sep 17 00:00:00 2001
From: Toilal <toilal.dev@gmail.com>
Date: Sat, 1 Apr 2017 14:37:07 +0200
Subject: [PATCH 131/339] Fix eslint issue when running unit tests

---
 template/test/unit/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index 233c54c7c2..949c19f1aa 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
 Vue.config.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 // Polyfill fn.bind() for PhantomJS

From 37c3705ea50c40ac59696c10748440bb507b5431 Mon Sep 17 00:00:00 2001
From: Ivan Fraixedes <ifcdev@gmail.com>
Date: Tue, 4 Apr 2017 15:11:25 +0200
Subject: [PATCH 132/339] Fix typo in nightwatch.conf.js

Fix typo in the URL which point to the docs commented in the nightwatch.conf.js file
---
 template/test/e2e/nightwatch.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/test/e2e/nightwatch.conf.js b/template/test/e2e/nightwatch.conf.js
index e9ad88fe17..f019c0ac44 100644
--- a/template/test/e2e/nightwatch.conf.js
+++ b/template/test/e2e/nightwatch.conf.js
@@ -1,7 +1,7 @@
 require('babel-register')
 var config = require('../../config')
 
-// http://nightwatchjs.org/getingstarted#settings-file
+// http://nightwatchjs.org/gettingstarted#settings-file
 module.exports = {
   src_folders: ['test/e2e/specs'],
   output_folder: 'test/e2e/reports',

From 3b5ab6f0278d890b1396ff72085f6044117008a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Kr=C3=B6ger?= <write@morkro.de>
Date: Wed, 5 Apr 2017 18:36:36 +0200
Subject: [PATCH 133/339] Fixed naming of Airbnb

---
 meta.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta.js b/meta.js
index bc1e241137..e2e2fdffa1 100644
--- a/meta.js
+++ b/meta.js
@@ -59,9 +59,9 @@ module.exports = {
           "short": "Standard"
         },
         {
-          "name": "AirBNB (https://github.com/airbnb/javascript)",
+          "name": "Airbnb (https://github.com/airbnb/javascript)",
           "value": "airbnb",
-          "short": "AirBNB"
+          "short": "Airbnb"
         },
         {
           "name": "none (configure it yourself)",

From 7cbebdb4f3a6d787a8cc98b15e8937e94835a66d Mon Sep 17 00:00:00 2001
From: Daniel Perez <perez.jose_21@hotmail.com>
Date: Thu, 6 Apr 2017 11:47:55 -0400
Subject: [PATCH 134/339] Bumping up a few versions

This will update a few versions, one of them allowing us to get rid of that warning that's been bothering a few people (myself included) so much.
```(node:33278) DeprecationWarning: loaderUtils.parseQuery() received a non-string value which can be problematic, see https://github.com/webpack/loader-utils/issues/56
parseQuery() will be replaced with getOptions() in the next major version of loader-utils.```
---
 template/package.json | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/template/package.json b/template/package.json
index 5c420a2a93..c3a1f1f303 100644
--- a/template/package.json
+++ b/template/package.json
@@ -13,8 +13,8 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.2.2"{{#router}},
-    "vue-router": "^2.2.0"{{/router}}
+    "vue": "^2.2.6"{{#router}},
+    "vue-router": "^2.3.1"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
@@ -24,17 +24,17 @@
     {{/lint}}
     "babel-loader": "^6.2.10",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-env": "^1.2.1",
+    "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
     "chalk": "^1.1.3",
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.26.1",
+    "css-loader": "^0.28.0",
     {{#lint}}
-    "eslint": "^3.14.1",
+    "eslint": "^3.19.0",
     "eslint-friendly-formatter": "^2.0.7",
-    "eslint-loader": "^1.6.1",
+    "eslint-loader": "^1.7.1",
     "eslint-plugin-html": "^2.0.0",
     {{#if_eq lintConfig "standard"}}
     "eslint-config-standard": "^6.2.1",
@@ -42,7 +42,7 @@
     "eslint-plugin-standard": "^2.0.1",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
-    "eslint-config-airbnb-base": "^11.0.1",
+    "eslint-config-airbnb-base": "^11.1.3",
     "eslint-import-resolver-webpack": "^0.8.1",
     "eslint-plugin-import": "^2.2.0",
     {{/if_eq}}
@@ -50,29 +50,29 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.14.1",
     "extract-text-webpack-plugin": "^2.0.0",
-    "file-loader": "^0.10.0",
+    "file-loader": "^0.11.1",
     "friendly-errors-webpack-plugin": "^1.1.3",
     "function-bind": "^1.1.0",
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.17.3",
     "webpack-bundle-analyzer": "^2.2.1",
     {{#unit}}
-    "cross-env": "^3.1.4",
+    "cross-env": "^4.0.0",
     "karma": "^1.4.1",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
     "karma-phantomjs-launcher": "^1.0.2",
-    "karma-sinon-chai": "^1.2.4",
+    "karma-sinon-chai": "^1.3.1",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.26",
+    "karma-spec-reporter": "0.0.30",
     "karma-webpack": "^2.0.2",
     "lolex": "^1.5.2",
     "mocha": "^3.2.0",
     "chai": "^3.5.0",
-    "sinon": "^1.17.7",
+    "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
-    "inject-loader": "^2.0.1",
-    "babel-plugin-istanbul": "^3.1.2",
+    "inject-loader": "^3.0.0",
+    "babel-plugin-istanbul": "^4.1.1",
     "phantomjs-prebuilt": "^2.1.14",
     {{/unit}}
     {{#e2e}}
@@ -84,16 +84,16 @@
     "semver": "^5.3.0",
     "opn": "^4.0.2",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
-    "ora": "^1.1.0",
+    "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.7",
-    "vue-loader": "^11.1.4",
-    "vue-style-loader": "^2.0.0",
-    "vue-template-compiler": "^2.2.4",
-    "webpack": "^2.2.1",
+    "vue-loader": "^11.3.4",
+    "vue-style-loader": "^2.0.5",
+    "vue-template-compiler": "^2.2.6",
+    "webpack": "^2.3.3",
     "webpack-dev-middleware": "^1.10.0",
-    "webpack-hot-middleware": "^2.16.1",
-    "webpack-merge": "^2.6.1"
+    "webpack-hot-middleware": "^2.18.0",
+    "webpack-merge": "^4.1.0"
   },
   "engines": {
     "node": ">= 4.0.0",

From b84451b506aad94567dd20b8ab569f0a4c4736c8 Mon Sep 17 00:00:00 2001
From: Johnathan Kent <jk.pcxo+github@gmail.com>
Date: Thu, 6 Apr 2017 16:59:00 -0600
Subject: [PATCH 135/339] clarifying and updating a few paths in code examples
 (#594)

---
 docs/backend.md | 1 +
 docs/linter.md  | 1 +
 docs/static.md  | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/backend.md b/docs/backend.md
index 7a836dc0b7..d03eebc9d7 100644
--- a/docs/backend.md
+++ b/docs/backend.md
@@ -5,6 +5,7 @@ If you are building a purely-static app (one that is deployed separately from th
 Let's take a look at the default `config/index.js`:
 
 ``` js
+// config/index.js
 var path = require('path')
 
 module.exports = {
diff --git a/docs/linter.md b/docs/linter.md
index 0bc3be10f5..f5ad42f662 100644
--- a/docs/linter.md
+++ b/docs/linter.md
@@ -7,6 +7,7 @@ If you are not happy with the default linting rules, you have several options:
 1. Overwrite individual rules in `.eslintrc.js`. For example, you can add the following rule to enforce semicolons instead of omitting them:
 
   ``` js
+  // .eslintrc.js
   "semi": [2, "always"]
   ```
 
diff --git a/docs/static.md b/docs/static.md
index f9f9a3ce71..ab2fb02a97 100644
--- a/docs/static.md
+++ b/docs/static.md
@@ -41,7 +41,7 @@ In comparison, files in `static/` are not processed by Webpack at all: they are
 As an example, with the following default values:
 
 ``` js
-// config.js
+// config/index.js
 module.exports = {
   // ...
   build: {

From 28adbe5f9aa01257b9a852cd70c2328f37859c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?=
 <zhaoshengdong@meituan.com>
Date: Fri, 7 Apr 2017 20:27:20 +0800
Subject: [PATCH 136/339] update: check-version (fix#656)

---
 template/build/check-versions.js | 11 +++++++----
 template/package.json            |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/template/build/check-versions.js b/template/build/check-versions.js
index 6548ba18e1..100f3a0fe3 100644
--- a/template/build/check-versions.js
+++ b/template/build/check-versions.js
@@ -1,7 +1,7 @@
 var chalk = require('chalk')
 var semver = require('semver')
 var packageConfig = require('../package.json')
-
+var shell = require('shelljs')
 function exec (cmd) {
   return require('child_process').execSync(cmd).toString().trim()
 }
@@ -12,12 +12,15 @@ var versionRequirements = [
     currentVersion: semver.clean(process.version),
     versionRequirement: packageConfig.engines.node
   },
-  {
+]
+
+if (shell.which('npm')) {
+  versionRequirements.push({
     name: 'npm',
     currentVersion: exec('npm --version'),
     versionRequirement: packageConfig.engines.npm
-  }
-]
+  })
+}
 
 module.exports = function () {
   var warnings = []
diff --git a/template/package.json b/template/package.json
index 5c420a2a93..fce39a7819 100644
--- a/template/package.json
+++ b/template/package.json
@@ -82,6 +82,7 @@
     "selenium-server": "^3.0.1",
     {{/e2e}}
     "semver": "^5.3.0",
+    "shelljs": "^0.7.6",
     "opn": "^4.0.2",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "ora": "^1.1.0",

From d3bfb7a037e72c09847233afd8050219bab70b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Monta=C3=B1ez?= <codeams@gmail.com>
Date: Fri, 7 Apr 2017 12:11:53 -0500
Subject: [PATCH 137/339] Upgrade sinon

Karma-sinon-chai now requires sinon ^2.1.0
https://github.com/kmees/karma-sinon-chai/commit/bca7e7a2d6e90d4c7c6a6884550c2b3228596d23
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 5c420a2a93..842fc28910 100644
--- a/template/package.json
+++ b/template/package.json
@@ -69,7 +69,7 @@
     "lolex": "^1.5.2",
     "mocha": "^3.2.0",
     "chai": "^3.5.0",
-    "sinon": "^1.17.7",
+    "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "inject-loader": "^2.0.1",
     "babel-plugin-istanbul": "^3.1.2",

From 2c338748de6b329e1c3409a8ca3a224345494be9 Mon Sep 17 00:00:00 2001
From: Aaron Cunningham <aa.cunningham@outlook.com>
Date: Sat, 8 Apr 2017 12:41:05 -0700
Subject: [PATCH 138/339] Fix typo, "Handing" to "Handling"

---
 docs/static.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/static.md b/docs/static.md
index f9f9a3ce71..3407dfa988 100644
--- a/docs/static.md
+++ b/docs/static.md
@@ -1,4 +1,4 @@
-# Handing Static Assets
+# Handling Static Assets
 
 You will notice in the project structure we have two directories for static assets: `src/assets` and `static/`. What is the difference between them?
 

From 6f7c03d85021c426aaa7465406a43bcf503a13d9 Mon Sep 17 00:00:00 2001
From: Andrei Kashcha <anvaka@gmail.com>
Date: Sat, 8 Apr 2017 16:00:52 -0700
Subject: [PATCH 139/339] `npm start` to start the dev server

Just a small alias to make launching the service more convenient.
---
 template/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/package.json b/template/package.json
index 99e706d6c5..ca6a4960e3 100644
--- a/template/package.json
+++ b/template/package.json
@@ -6,6 +6,7 @@
   "private": true,
   "scripts": {
     "dev": "node build/dev-server.js",
+    "start": "node build/dev-server.js",
     "build": "node build/build.js"{{#unit}},
     "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
     "e2e": "node test/e2e/runner.js"{{/e2e}}{{#if_or unit e2e}},

From 75dacdfbc20f8346f97b120fdcda0c5f4e925056 Mon Sep 17 00:00:00 2001
From: BelinChung <belinchung@gmail.com>
Date: Mon, 10 Apr 2017 13:48:31 +0800
Subject: [PATCH 140/339] Upgrade url-loader to ^0.5.8

When you require a module which handle by url-loader (example: main.js ===> require('assets/img/logo.png'))
An error may be reported
```
Module build failed: Error: parseQuery should get a string as first argument
```
`loader-utils@0.2.16` was fixed this issue and `url-loader@0.5.8` upgraded `loader-utils` to `v1.1.0`
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 7c3519d6aa..9b20d6b6ff 100644
--- a/template/package.json
+++ b/template/package.json
@@ -88,7 +88,7 @@
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "ora": "^1.1.0",
     "rimraf": "^2.6.0",
-    "url-loader": "^0.5.7",
+    "url-loader": "^0.5.8",
     "vue-loader": "^11.1.4",
     "vue-style-loader": "^2.0.0",
     "vue-template-compiler": "^2.2.4",

From f734a437b7fbf178dab8f8b049e075298e0198e5 Mon Sep 17 00:00:00 2001
From: Stephen Lee <jboat1314@gmail.com>
Date: Fri, 14 Apr 2017 15:34:24 +0800
Subject: [PATCH 141/339] Fix typo [semicolones -> semicolons] (#674)

---
 docs/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pre-processors.md b/docs/pre-processors.md
index 957e41c9e0..9d377dfe09 100644
--- a/docs/pre-processors.md
+++ b/docs/pre-processors.md
@@ -20,7 +20,7 @@ Once installed, you can use the pre-processors inside your `*.vue` components us
 
 ### A note on SASS syntax
 
-- `lang="scss"` corresponds to the CSS-superset syntax (with curly braces and semicolones).
+- `lang="scss"` corresponds to the CSS-superset syntax (with curly braces and semicolons).
 - `lang="sass"` corresponds to the indentation-based syntax.
 
 ### PostCSS

From 40c9aeb2050d3c2e8c0c52ef22440ccdd1c5f8c3 Mon Sep 17 00:00:00 2001
From: Adam Woods <adam.tomato@gmail.com>
Date: Sun, 16 Apr 2017 19:25:25 +0800
Subject: [PATCH 142/339] alias sass-loader to scss-loader for unit testing so
 that vue-loader works in injection mode when using lang="scss" in a component

---
 template/build/webpack.test.conf.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/template/build/webpack.test.conf.js b/template/build/webpack.test.conf.js
index 8e4385cff6..9cef1dfd97 100644
--- a/template/build/webpack.test.conf.js
+++ b/template/build/webpack.test.conf.js
@@ -11,6 +11,11 @@ var webpackConfig = merge(baseConfig, {
     rules: utils.styleLoaders()
   },
   devtool: '#inline-source-map',
+  resolveLoader: {
+    alias: {
+      'scss-loader': 'sass-loader'
+    }
+  },
   plugins: [
     new webpack.DefinePlugin({
       'process.env': require('../config/test.env')

From 55edf523126f97e443c51aed0dbac5324adc59bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 19 Apr 2017 10:11:45 +0200
Subject: [PATCH 143/339] Update webpack.test.conf.js

add code comments.
---
 template/build/webpack.test.conf.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/build/webpack.test.conf.js b/template/build/webpack.test.conf.js
index 9cef1dfd97..d6c8c8dd31 100644
--- a/template/build/webpack.test.conf.js
+++ b/template/build/webpack.test.conf.js
@@ -13,6 +13,8 @@ var webpackConfig = merge(baseConfig, {
   devtool: '#inline-source-map',
   resolveLoader: {
     alias: {
+      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option 
+      // see discussion at https://github.com/vuejs/vue-loader/issues/724
       'scss-loader': 'sass-loader'
     }
   },

From afb187fece033341afb69a6eca61b8b6efa4a8da Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 May 2017 09:48:40 +0800
Subject: [PATCH 144/339] bump deps

---
 template/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/template/package.json b/template/package.json
index ae104e7928..3f496f06ad 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,7 +14,7 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.2.6"{{#router}},
+    "vue": "^2.3.3"{{#router}},
     "vue-router": "^2.3.1"{{/router}}
   },
   "devDependencies": {
@@ -89,10 +89,10 @@
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
-    "vue-loader": "^11.3.4",
-    "vue-style-loader": "^2.0.5",
-    "vue-template-compiler": "^2.2.6",
-    "webpack": "^2.3.3",
+    "vue-loader": "^12.1.0",
+    "vue-style-loader": "^3.0.1",
+    "vue-template-compiler": "^2.3.3",
+    "webpack": "^2.6.1",
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.18.0",
     "webpack-merge": "^4.1.0"

From 8563cdb8d8d1e4abaef64f7695697b70957b9490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Thu, 22 Jun 2017 09:36:27 +0200
Subject: [PATCH 145/339] babel should keep code comments. (fix #730) (#753)

They are necessary for webpacks "magic comments" to work, e.g. with `import(/* webpackChunkName: "chunk1" */ './component.vue')`
---
 template/.babelrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index 13f0e47164..a2a58cffcc 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -4,7 +4,6 @@
     "stage-2"
   ],
   "plugins": ["transform-runtime"],
-  "comments": false,
   "env": {
     "test": {
       "presets": ["env", "stage-2"],

From 065f24cb0ff7bb315dcd4e69c04731793f18732c Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Wed, 28 Jun 2017 03:54:58 +0530
Subject: [PATCH 146/339] build: Configure targets.browser for babel-preset-env
 (#763)

---
 template/.babelrc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index a2a58cffcc..63826f65f4 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,6 +1,11 @@
 {
   "presets": [
-    ["env", { "modules": false }],
+    ["env", {
+      "modules": false,
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
+    }],
     "stage-2"
   ],
   "plugins": ["transform-runtime"],

From 703c29eb857031c135d8afca63ff3313eec17b52 Mon Sep 17 00:00:00 2001
From: Scott Bedard <scottbedard@users.noreply.github.com>
Date: Tue, 27 Jun 2017 15:43:35 -0700
Subject: [PATCH 147/339] Remove inconsistent spacing (#754)

---
 template/.babelrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index 63826f65f4..c06df4d53a 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -12,7 +12,7 @@
   "env": {
     "test": {
       "presets": ["env", "stage-2"],
-      "plugins": [ "istanbul" ]
+      "plugins": ["istanbul"]
     }
   }
 }

From 19ea95c82a84479f6ef5843e2ff3dca2b998c725 Mon Sep 17 00:00:00 2001
From: Edd Yerburgh <edward.yerburgh@gmail.com>
Date: Wed, 28 Jun 2017 08:39:25 +0100
Subject: [PATCH 148/339] feat(gitignore): include common editor directories
 (#774)

* feat(gitignore): include common editor directories

add common editor files and directories to .gitignore

closes #772

* feat(gitignore): remove .vscode directory

remove .vscode directory from .gitignore
---
 template/.gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/template/.gitignore b/template/.gitignore
index 1ecac1d283..0ef2f13f49 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -11,3 +11,10 @@ test/unit/coverage
 test/e2e/reports
 selenium-debug.log
 {{/e2e}}
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

From 9992f5a058c53f32b03d9a8743612188c04698af Mon Sep 17 00:00:00 2001
From: Ffloriel <Ffloriel@users.noreply.github.com>
Date: Thu, 13 Jul 2017 11:20:06 +0200
Subject: [PATCH 149/339] Video audio loader (#765)

* gitignore vscode

* media loader

audio and video tag

* Remove vscode gitignore

* Add \n back

* fix missing closing bracket

* add default values (img, image)
---
 template/build/vue-loader.conf.js   | 8 +++++++-
 template/build/webpack.base.conf.js | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index 7aee79bae4..8a346d5222 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -8,5 +8,11 @@ module.exports = {
       ? config.build.productionSourceMap
       : config.dev.cssSourceMap,
     extract: isProduction
-  })
+  }),
+  transformToRequire: {
+    video: 'src',
+    source: 'src',
+    img: 'src',
+    image: 'xlink:href'
+  }
 }
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 0f161198d4..71f0fdcf87 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -58,6 +58,14 @@ module.exports = {
           name: utils.assetsPath('img/[name].[hash:7].[ext]')
         }
       },
+      {
+        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('media/[name].[hash:7].[ext]')
+        }
+      },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         loader: 'url-loader',

From d7c572d6734bb6511e5103a3f0e79be9a8443f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20Katranc=C4=B1?= <katranci@users.noreply.github.com>
Date: Thu, 13 Jul 2017 12:21:23 +0300
Subject: [PATCH 150/339] Upgrade vue-router to v2.6.0 (#777)

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

diff --git a/template/package.json b/template/package.json
index 3f496f06ad..36ad746930 100644
--- a/template/package.json
+++ b/template/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "vue": "^2.3.3"{{#router}},
-    "vue-router": "^2.3.1"{{/router}}
+    "vue-router": "^2.6.0"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",

From 5f4d89f3733acbb5745f360b4c398ce640ef93eb Mon Sep 17 00:00:00 2001
From: dahong <337097324@qq.com>
Date: Thu, 13 Jul 2017 17:28:51 +0800
Subject: [PATCH 151/339] Fix console error (#784)

Fix console error`Failed to load resource: net::ERR_INCOMPLETE_CHUNKED_ENCODING`
---
 template/build/dev-server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 724bc51f6d..b389974d31 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -31,7 +31,8 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
 })
 
 var hotMiddleware = require('webpack-hot-middleware')(compiler, {
-  log: () => {}
+  log: () => {},
+  heartbeat: 2000
 })
 // force page reload when html-webpack-plugin template changes
 compiler.plugin('compilation', function (compilation) {

From 10524e4185a8cf1fb90ae8beeec3868b24603d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Fri, 14 Jul 2017 10:13:56 +0200
Subject: [PATCH 152/339] Fix proxy example (fix #780)

the glob pattern was too narrow, woudl not catch subpaths.
---
 docs/proxy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/proxy.md b/docs/proxy.md
index fc822ea647..60b5151c2f 100644
--- a/docs/proxy.md
+++ b/docs/proxy.md
@@ -31,7 +31,7 @@ In addition to static urls you can also use glob patterns to match URLs, e.g. `/
 
 ``` js
 proxyTable: {
-  '*': {
+  '**': {
     target: 'http://jsonplaceholder.typicode.com',
     filter: function (pathname, req) {
       return pathname.match('^/api') && req.method === 'GET'

From 0e75e9eca4cda2655b3f8e73afae87d68378ce5e Mon Sep 17 00:00:00 2001
From: Aspectis <aspectis@users.noreply.github.com>
Date: Sat, 15 Jul 2017 12:41:32 +0200
Subject: [PATCH 153/339] Fix autoprefixer explanation (#798)

The parameter to set in package.json is named "browserslist".
---
 template/.postcssrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/.postcssrc.js b/template/.postcssrc.js
index ea9a5ab875..09948d63e9 100644
--- a/template/.postcssrc.js
+++ b/template/.postcssrc.js
@@ -2,7 +2,7 @@
 
 module.exports = {
   "plugins": {
-    // to edit target browsers: use "browserlist" field in package.json
+    // to edit target browsers: use "browserslist" field in package.json
     "autoprefixer": {}
   }
 }

From db40d7f5af18ca1b7c30cc7691dfe54831e427e5 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sat, 15 Jul 2017 16:14:07 +0530
Subject: [PATCH 154/339] chore: Bump dev dependencies for template (#790)

---
 template/package.json | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/template/package.json b/template/package.json
index 36ad746930..859bfc74cb 100644
--- a/template/package.json
+++ b/template/package.json
@@ -18,25 +18,26 @@
     "vue-router": "^2.6.0"{{/router}}
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.2",
+    "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
     {{#lint}}
     "babel-eslint": "^7.1.1",
     {{/lint}}
-    "babel-loader": "^6.2.10",
+    "babel-loader": "^7.1.1",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
-    "chalk": "^1.1.3",
+    "chalk": "^2.0.1",
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",
+    "cssnano": "^3.10.0",
     {{#lint}}
     "eslint": "^3.19.0",
-    "eslint-friendly-formatter": "^2.0.7",
+    "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^2.0.0",
+    "eslint-plugin-html": "^3.0.0",
     {{#if_eq lintConfig "standard"}}
     "eslint-config-standard": "^6.2.1",
     "eslint-plugin-promise": "^3.4.0",
@@ -57,7 +58,7 @@
     "http-proxy-middleware": "^0.17.3",
     "webpack-bundle-analyzer": "^2.2.1",
     {{#unit}}
-    "cross-env": "^4.0.0",
+    "cross-env": "^5.0.1",
     "karma": "^1.4.1",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
@@ -65,7 +66,7 @@
     "karma-phantomjs-shim": "^1.4.0",
     "karma-sinon-chai": "^1.3.1",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.30",
+    "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
     "lolex": "^1.5.2",
     "mocha": "^3.2.0",
@@ -84,8 +85,8 @@
     {{/e2e}}
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
-    "opn": "^4.0.2",
-    "optimize-css-assets-webpack-plugin": "^1.3.0",
+    "opn": "^5.1.0",
+    "optimize-css-assets-webpack-plugin": "^2.0.0",
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",

From e1f781e3bd890112eded8b3c1781eaaa402d6432 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Tue, 1 Aug 2017 10:29:01 +0530
Subject: [PATCH 155/339] fix: Use false to disable webpack-hot-middleware log
 (#778)

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

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index b389974d31..9d2fe14b15 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -31,7 +31,7 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
 })
 
 var hotMiddleware = require('webpack-hot-middleware')(compiler, {
-  log: () => {},
+  log: false,
   heartbeat: 2000
 })
 // force page reload when html-webpack-plugin template changes

From 92aa34bb281a54fcca77e17033d1fd6de1831ae8 Mon Sep 17 00:00:00 2001
From: Swapnil Agarwal <swapagarwal@users.noreply.github.com>
Date: Mon, 28 Aug 2017 04:38:16 +0530
Subject: [PATCH 156/339] Move Chat: Gitter -> Discord (#869)

---
 template/src/components/Hello.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/src/components/Hello.vue b/template/src/components/Hello.vue
index dc7251a0f2..2abf221cdb 100644
--- a/template/src/components/Hello.vue
+++ b/template/src/components/Hello.vue
@@ -5,7 +5,7 @@
     <ul>
       <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
       <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
-      <li><a href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
+      <li><a href="https://chat.vuejs.org" target="_blank">Community Chat</a></li>
       <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
       <br>
       <li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>

From 2654005a8b15db29540e565de6e6a7ab777e1e2b Mon Sep 17 00:00:00 2001
From: Akiho Nagao <akifo@users.noreply.github.com>
Date: Mon, 28 Aug 2017 08:10:47 +0900
Subject: [PATCH 157/339] Remove unnecessary space and comma (#866)

---
 template/build/check-versions.js    | 2 +-
 template/build/webpack.test.conf.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/check-versions.js b/template/build/check-versions.js
index 100f3a0fe3..b3e7e17e34 100644
--- a/template/build/check-versions.js
+++ b/template/build/check-versions.js
@@ -11,7 +11,7 @@ var versionRequirements = [
     name: 'node',
     currentVersion: semver.clean(process.version),
     versionRequirement: packageConfig.engines.node
-  },
+  }
 ]
 
 if (shell.which('npm')) {
diff --git a/template/build/webpack.test.conf.js b/template/build/webpack.test.conf.js
index d6c8c8dd31..48f64cc319 100644
--- a/template/build/webpack.test.conf.js
+++ b/template/build/webpack.test.conf.js
@@ -13,7 +13,7 @@ var webpackConfig = merge(baseConfig, {
   devtool: '#inline-source-map',
   resolveLoader: {
     alias: {
-      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option 
+      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option
       // see discussion at https://github.com/vuejs/vue-loader/issues/724
       'scss-loader': 'sass-loader'
     }

From d8a9340a71e21cfa81b8dc2cfcc087fef51264e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alain=20H=C3=A9la=C3=AFli?= <helaili@github.com>
Date: Mon, 28 Aug 2017 01:12:47 +0200
Subject: [PATCH 158/339] load webpack.prod.conf when NODE_ENV=production
 (#864)

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

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 9d2fe14b15..a99d6db2ca 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -10,7 +10,7 @@ var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
 var proxyMiddleware = require('http-proxy-middleware')
-var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
+var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing' || 'production'
   ? require('./webpack.prod.conf')
   : {{/if_or}}require('./webpack.dev.conf')
 

From a34532a30245bc03e2fda1323b172008510f6a84 Mon Sep 17 00:00:00 2001
From: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Date: Mon, 28 Aug 2017 01:14:03 +0200
Subject: [PATCH 159/339] Return exit code 1 when npm run build fails (#854)

---
 template/build/build.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/template/build/build.js b/template/build/build.js
index 6b8add100c..a645011612 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -26,6 +26,11 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
       chunkModules: false
     }) + '\n\n')
 
+    if (stats.hasErrors()) {
+      console.log(chalk.red('  Build failed with errors.\n'))
+      process.exit(1)
+    }
+
     console.log(chalk.cyan('  Build complete.\n'))
     console.log(chalk.yellow(
       '  Tip: built files are meant to be served over an HTTP server.\n' +

From 9d6e72a77df863ee2ea89e672691bb7b8c81e198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Fontcuberta?= <adria@calidae.com>
Date: Mon, 28 Aug 2017 01:16:03 +0200
Subject: [PATCH 160/339] fix standard eslint config link (#834)

---
 template/.eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 00b5b5717a..c10f039ffc 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -10,7 +10,7 @@ module.exports = {
     browser: true,
   },
   {{#if_eq lintConfig "standard"}}
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  // https://github.com/standard/standard/blob/master/docs/RULES-en.md
   extends: 'standard',
   {{/if_eq}}
   {{#if_eq lintConfig "airbnb"}}

From ebee3dc2199e84c8f36c0e050bd70ee00612a6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <gucong@gmail.com>
Date: Mon, 28 Aug 2017 07:18:26 +0800
Subject: [PATCH 161/339] fix ci build faild (#857)

---
 circle.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 4d2212d694..8290c039d3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,12 @@
 machine:
   node:
-    version: 6
+    version: stable
+
+dependencies:
+  pre:
+    - sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
+    - sudo apt-get update
+    - sudo apt-get install google-chrome-stable
 
 test:
   override:

From 1b4b9882d3bdd1eb9f7f98536dccf11f7fcb14bf Mon Sep 17 00:00:00 2001
From: Adam Lynch <contact@adamlynch.com>
Date: Mon, 28 Aug 2017 10:34:55 +0100
Subject: [PATCH 162/339] Removing Vue.config.debug usage from documentation
 (#871)

* Removing Vue.config.debug usage from documentation

It has been removed; https://vuejs.org/v2/guide/migration.html#Vue-config-debug-removed

* Update env.md
---
 docs/env.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/env.md b/docs/env.md
index 211ca5d0f3..600ddb94f6 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -42,10 +42,10 @@ So, the environment variables are:
 
 As we can see, `test.env` inherits the `dev.env` and the `dev.env` inherits the `prod.env`.
 
-### Usage
+### Usage		
 
-It is simple to use the environment variables in your code. For example:
+It is simple to use the environment variables in your code. For example:		
 
-```js
-Vue.config.debug = process.env.DEBUG_MODE
-```
\ No newline at end of file
+```js		
+Vue.config.productionTip = process.env.NODE_ENV === 'production'		
+```

From b0f6240b4a4d86d544673873c3633afaa2fda4d7 Mon Sep 17 00:00:00 2001
From: kakahikari <kakahikari@gmail.com>
Date: Mon, 28 Aug 2017 17:35:17 +0800
Subject: [PATCH 163/339] fixed vue-router dependency(need vue-loader@^13.0.0)
 (#876)

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

diff --git a/template/package.json b/template/package.json
index 859bfc74cb..e1c6c04625 100644
--- a/template/package.json
+++ b/template/package.json
@@ -90,7 +90,7 @@
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
-    "vue-loader": "^12.1.0",
+    "vue-loader": "^13.0.4",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.3.3",
     "webpack": "^2.6.1",

From 0afaaf6f183bec87f2167732a0acb22edfa1da17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 28 Aug 2017 11:36:44 +0200
Subject: [PATCH 164/339] bump vue & vue-router dependencies

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

diff --git a/template/package.json b/template/package.json
index e1c6c04625..9993ae34b4 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,8 +14,8 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.3.3"{{#router}},
-    "vue-router": "^2.6.0"{{/router}}
+    "vue": "^2.4.2"{{#router}},
+    "vue-router": "^2.7.0"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

From 079e92ededbcdd6573d79d421070c5fdad47f292 Mon Sep 17 00:00:00 2001
From: Scott Olmstead <solmstead25@users.noreply.github.com>
Date: Mon, 28 Aug 2017 05:45:24 -0400
Subject: [PATCH 165/339] Specify the address to listen on (#759)

Currently, this causes the dev server to listen on all addresses by default, which is not the intended behavior, imo.
---
 template/build/dev-server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index a99d6db2ca..a84db511b4 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -82,7 +82,7 @@ devMiddleware.waitUntilValid(() => {
   _resolve()
 })
 
-var server = app.listen(port)
+var server = app.listen(port, 'localhost')
 
 module.exports = {
   ready: readyPromise,

From 0880d9bd1ccbe72ce55c77cdf6f15c6b04e3bb8d Mon Sep 17 00:00:00 2001
From: wangmeng <wm.keepgoing@gmail.com>
Date: Mon, 28 Aug 2017 17:49:45 +0800
Subject: [PATCH 166/339] add HashedModuleIdsPlugin when build (#870)

---
 template/build/webpack.prod.conf.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 7977f5ce80..e40a340c5d 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -67,6 +67,8 @@ var webpackConfig = merge(baseWebpackConfig, {
       // necessary to consistently work with multiple chunks via CommonsChunkPlugin
       chunksSortMode: 'dependency'
     }),
+    // keep module.id stable when vender modules does not change
+    new webpack.HashedModuleIdsPlugin(),
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',

From 7c1e230fa10b466bdeb6e4f48a2786905842830e Mon Sep 17 00:00:00 2001
From: Adam Biggs <adam.biggs@lmpm.com>
Date: Mon, 28 Aug 2017 03:04:57 -0700
Subject: [PATCH 167/339] Add support for linked modules (#688)

---
 template/build/webpack.base.conf.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 71f0fdcf87..a4ad0c80e2 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -1,10 +1,11 @@
 var path = require('path')
+var fs = require('fs')
 var utils = require('./utils')
 var config = require('../config')
 var vueLoaderConfig = require('./vue-loader.conf')
 
 function resolve (dir) {
-  return path.join(__dirname, '..', dir)
+  return fs.realpathSync(__dirname + '/' + path.join('..', dir))
 }
 
 module.exports = {
@@ -24,8 +25,9 @@ module.exports = {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
-      '@': resolve('src')
-    }
+      '@': resolve('src'),
+    },
+    symlinks: false
   },
   module: {
     rules: [

From 1ec29285b4f913a6bc7102f7349fe46fa76129ac Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Mon, 28 Aug 2017 15:41:50 +0530
Subject: [PATCH 168/339] chore(package): rm unused lolex dependency(dev)
 (#803)

---
 template/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 9993ae34b4..a9738f8961 100644
--- a/template/package.json
+++ b/template/package.json
@@ -68,7 +68,6 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "lolex": "^1.5.2",
     "mocha": "^3.2.0",
     "chai": "^3.5.0",
     "sinon": "^2.1.0",

From eaccc50f1800185b68efa4a82568ef6c91d48224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 28 Aug 2017 15:37:07 +0200
Subject: [PATCH 169/339] fix #877

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

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index a84db511b4..2be47b58ec 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -10,7 +10,7 @@ var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
 var proxyMiddleware = require('http-proxy-middleware')
-var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing' || 'production'
+var webpackConfig = {{#if_or unit e2e}}(process.env.NODE_ENV === 'testing' || process.env.NODE_ENV === 'production')
   ? require('./webpack.prod.conf')
   : {{/if_or}}require('./webpack.dev.conf')
 

From 0866970cdaa5a9d771d88b13460f5f32cc7becf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 29 Aug 2017 07:46:01 +0200
Subject: [PATCH 170/339] Revert #688, fix #879

We have to investigate how we can get #688 work without the error reported in #879
---
 template/build/webpack.base.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index a4ad0c80e2..39918abe20 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -5,7 +5,7 @@ var config = require('../config')
 var vueLoaderConfig = require('./vue-loader.conf')
 
 function resolve (dir) {
-  return fs.realpathSync(__dirname + '/' + path.join('..', dir))
+  return path.join(__dirname, '..', dir)
 }
 
 module.exports = {

From a56d4c63406709491b9bc76466462b6089099aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 29 Aug 2017 16:29:41 +0200
Subject: [PATCH 171/339] revert: #759

That's actually not a good idea when you e.g. want to access the dev server from your mobile.
---
 template/build/dev-server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 2be47b58ec..e3c7b55708 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -82,7 +82,7 @@ devMiddleware.waitUntilValid(() => {
   _resolve()
 })
 
-var server = app.listen(port, 'localhost')
+var server = app.listen(port)
 
 module.exports = {
   ready: readyPromise,

From b7fc3020c07ef6377d16c63336fecdfd0b1caf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Thu, 31 Aug 2017 19:01:14 +0200
Subject: [PATCH 172/339] match vue-template-compiler version

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

diff --git a/template/package.json b/template/package.json
index a9738f8961..7840f38186 100644
--- a/template/package.json
+++ b/template/package.json
@@ -91,7 +91,7 @@
     "url-loader": "^0.5.8",
     "vue-loader": "^13.0.4",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.3.3",
+    "vue-template-compiler": "^2.4.2",
     "webpack": "^2.6.1",
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.18.0",

From 5ebed8d8c0e565fd5a217cb17feb0b870f9e92d3 Mon Sep 17 00:00:00 2001
From: Subramanya Chakravarthy <chanty.chakravarthy@gmail.com>
Date: Fri, 1 Sep 2017 11:24:27 +0530
Subject: [PATCH 173/339] Update vue-loader link (#886)

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

diff --git a/docs/README.md b/docs/README.md
index dd31c1696f..0f139a4470 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # Introduction
 
-This boilerplate is targeted towards large, serious projects and assumes you are somewhat familiar with Webpack and `vue-loader`. Make sure to also read [`vue-loader`'s documentation](http://vuejs.github.io/vue-loader/index.html) for common workflow recipes.
+This boilerplate is targeted towards large, serious projects and assumes you are somewhat familiar with Webpack and `vue-loader`. Make sure to also read [`vue-loader`'s documentation](https://vue-loader.vuejs.org/) for common workflow recipes.
 
 If you just want to try out `vue-loader` or whip out a quick prototype, use the [webpack-simple](https://github.com/vuejs-templates/webpack-simple) template instead.
 

From 024bbf7ea0830e6f03ff0afe8e2c5ef187f334ef Mon Sep 17 00:00:00 2001
From: Rob Wierzbowski <rob.wierzbowski@gmail.com>
Date: Sat, 2 Sep 2017 17:21:33 -0400
Subject: [PATCH 174/339] Remove unused fs require from webpack.base.conf.js
 (#893)

---
 template/build/webpack.base.conf.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 39918abe20..15b2fde677 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -1,5 +1,4 @@
 var path = require('path')
-var fs = require('fs')
 var utils = require('./utils')
 var config = require('../config')
 var vueLoaderConfig = require('./vue-loader.conf')

From fb39683846944f874244f88be4b05a1a2f1b7c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 5 Sep 2017 11:55:13 +0200
Subject: [PATCH 175/339] cleanup some leftover from reverting #688

---
 template/build/webpack.base.conf.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 15b2fde677..8ed61a75ae 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -25,8 +25,7 @@ module.exports = {
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
       '@': resolve('src'),
-    },
-    symlinks: false
+    }
   },
   module: {
     rules: [

From 313c5ade0c03531ff15d4c506bb3623843d80871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 5 Sep 2017 11:59:48 +0200
Subject: [PATCH 176/339] Merge some small fixes (#900)

* Remove unused fs require from webpack.base.conf.js (#893)

* cleanup some leftover from reverting #688
---
 template/build/webpack.base.conf.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 39918abe20..8ed61a75ae 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -1,5 +1,4 @@
 var path = require('path')
-var fs = require('fs')
 var utils = require('./utils')
 var config = require('../config')
 var vueLoaderConfig = require('./vue-loader.conf')
@@ -26,8 +25,7 @@ module.exports = {
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
       '@': resolve('src'),
-    },
-    symlinks: false
+    }
   },
   module: {
     rules: [

From 8d215b4b185212e3e3e869464fe487301e1bf229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 30 Sep 2017 11:41:13 +0200
Subject: [PATCH 177/339] update to webpack 3.*, bump relevant dependencies
 (#891)

---
 template/build/dev-server.js | 14 ++++++++------
 template/package.json        | 14 +++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index e3c7b55708..1c58a3abb0 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -35,12 +35,14 @@ var hotMiddleware = require('webpack-hot-middleware')(compiler, {
   heartbeat: 2000
 })
 // force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({ action: 'reload' })
-    cb()
-  })
-})
+// currently disabled until this is resolved:
+// https://github.com/jantimon/html-webpack-plugin/issues/680
+// compiler.plugin('compilation', function (compilation) {
+//   compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+//     hotMiddleware.publish({ action: 'reload' })
+//     cb()
+//   })
+// })
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
diff --git a/template/package.json b/template/package.json
index 7840f38186..cadcae51f5 100644
--- a/template/package.json
+++ b/template/package.json
@@ -51,12 +51,12 @@
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.14.1",
-    "extract-text-webpack-plugin": "^2.0.0",
+    "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.1",
-    "friendly-errors-webpack-plugin": "^1.1.3",
-    "html-webpack-plugin": "^2.28.0",
+    "friendly-errors-webpack-plugin": "^1.6.1",
+    "html-webpack-plugin": "^2.30.1",
     "http-proxy-middleware": "^0.17.3",
-    "webpack-bundle-analyzer": "^2.2.1",
+    "webpack-bundle-analyzer": "^2.9.0",
     {{#unit}}
     "cross-env": "^5.0.1",
     "karma": "^1.4.1",
@@ -92,9 +92,9 @@
     "vue-loader": "^13.0.4",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.4.2",
-    "webpack": "^2.6.1",
-    "webpack-dev-middleware": "^1.10.0",
-    "webpack-hot-middleware": "^2.18.0",
+    "webpack": "^3.5.5",
+    "webpack-dev-middleware": "^1.12.0",
+    "webpack-hot-middleware": "^2.18.2",
     "webpack-merge": "^4.1.0"
   },
   "engines": {

From 17da89e9bfdca5998c39a51028589617912c70a0 Mon Sep 17 00:00:00 2001
From: Ivan Boldyrev <iboldurev@gmail.com>
Date: Sat, 30 Sep 2017 12:42:03 +0300
Subject: [PATCH 178/339] Add support custom port on dev (#880)

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

diff --git a/template/config/index.js b/template/config/index.js
index 196da1fa7d..bfb6f9915b 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -23,7 +23,7 @@ module.exports = {
   },
   dev: {
     env: require('./dev.env'),
-    port: 8080,
+    port: process.env.PORT || 8080,
     autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',

From 17ed63b1b3a0eaaebd3f593c08c32107a7cb7e01 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sat, 30 Sep 2017 15:12:38 +0530
Subject: [PATCH 179/339] refactor: Use const/let instead of var with strict
 mode (#801)

---
 docs/backend.md                     |  3 ++-
 docs/prerender.md                   |  2 +-
 template/build/build.js             | 17 ++++++------
 template/build/check-versions.js    | 21 ++++++++-------
 template/build/dev-client.js        |  3 ++-
 template/build/dev-server.js        | 41 +++++++++++++++--------------
 template/build/utils.js             | 21 ++++++++-------
 template/build/vue-loader.conf.js   |  7 ++---
 template/build/webpack.base.conf.js |  9 ++++---
 template/build/webpack.dev.conf.js  | 15 ++++++-----
 template/build/webpack.prod.conf.js | 29 ++++++++++----------
 template/build/webpack.test.conf.js | 11 ++++----
 template/config/dev.env.js          |  5 ++--
 template/config/index.js            |  3 ++-
 template/config/prod.env.js         |  1 +
 template/config/test.env.js         |  5 ++--
 16 files changed, 104 insertions(+), 89 deletions(-)

diff --git a/docs/backend.md b/docs/backend.md
index d03eebc9d7..fcc6611349 100644
--- a/docs/backend.md
+++ b/docs/backend.md
@@ -6,7 +6,8 @@ Let's take a look at the default `config/index.js`:
 
 ``` js
 // config/index.js
-var path = require('path')
+'use strict'
+const path = require('path')
 
 module.exports = {
   build: {
diff --git a/docs/prerender.md b/docs/prerender.md
index d69e34965d..fea46f8baa 100644
--- a/docs/prerender.md
+++ b/docs/prerender.md
@@ -14,7 +14,7 @@ npm install --save-dev prerender-spa-plugin
 
 ```js
 // This line should go at the top of the file where other 'imports' live in
-var PrerenderSpaPlugin = require('prerender-spa-plugin')
+const PrerenderSpaPlugin = require('prerender-spa-plugin')
 ```
 
 3. Configure it in the `plugins` array (also in **build/webpack.prod.conf.js**):
diff --git a/template/build/build.js b/template/build/build.js
index a645011612..30f036a180 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -1,16 +1,17 @@
+'use strict'
 require('./check-versions')()
 
 process.env.NODE_ENV = 'production'
 
-var ora = require('ora')
-var rm = require('rimraf')
-var path = require('path')
-var chalk = require('chalk')
-var webpack = require('webpack')
-var config = require('../config')
-var webpackConfig = require('./webpack.prod.conf')
+const ora = require('ora')
+const rm = require('rimraf')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.prod.conf')
 
-var spinner = ora('building for production...')
+const spinner = ora('building for production...')
 spinner.start()
 
 rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
diff --git a/template/build/check-versions.js b/template/build/check-versions.js
index b3e7e17e34..ca407bb16f 100644
--- a/template/build/check-versions.js
+++ b/template/build/check-versions.js
@@ -1,12 +1,13 @@
-var chalk = require('chalk')
-var semver = require('semver')
-var packageConfig = require('../package.json')
-var shell = require('shelljs')
+'use strict'
+const chalk = require('chalk')
+const semver = require('semver')
+const packageConfig = require('../package.json')
+const shell = require('shelljs')
 function exec (cmd) {
   return require('child_process').execSync(cmd).toString().trim()
 }
 
-var versionRequirements = [
+const versionRequirements = [
   {
     name: 'node',
     currentVersion: semver.clean(process.version),
@@ -23,9 +24,9 @@ if (shell.which('npm')) {
 }
 
 module.exports = function () {
-  var warnings = []
-  for (var i = 0; i < versionRequirements.length; i++) {
-    var mod = versionRequirements[i]
+  const warnings = []
+  for (let i = 0; i < versionRequirements.length; i++) {
+    const mod = versionRequirements[i]
     if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
       warnings.push(mod.name + ': ' +
         chalk.red(mod.currentVersion) + ' should be ' +
@@ -38,8 +39,8 @@ module.exports = function () {
     console.log('')
     console.log(chalk.yellow('To use this template, you must update following to modules:'))
     console.log()
-    for (var i = 0; i < warnings.length; i++) {
-      var warning = warnings[i]
+    for (let i = 0; i < warnings.length; i++) {
+      const warning = warnings[i]
       console.log('  ' + warning)
     }
     console.log()
diff --git a/template/build/dev-client.js b/template/build/dev-client.js
index 18aa1e2195..54693bd79b 100644
--- a/template/build/dev-client.js
+++ b/template/build/dev-client.js
@@ -1,6 +1,7 @@
 /* eslint-disable */
+'use strict'
 require('eventsource-polyfill')
-var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
+const hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
 
 hotClient.subscribe(function (event) {
   if (event.action === 'reload') {
diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 1c58a3abb0..604d32ef0f 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -1,36 +1,37 @@
+'use strict'
 require('./check-versions')()
 
-var config = require('../config')
+const config = require('../config')
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
 }
 
-var opn = require('opn')
-var path = require('path')
-var express = require('express')
-var webpack = require('webpack')
-var proxyMiddleware = require('http-proxy-middleware')
-var webpackConfig = {{#if_or unit e2e}}(process.env.NODE_ENV === 'testing' || process.env.NODE_ENV === 'production')
+const opn = require('opn')
+const path = require('path')
+const express = require('express')
+const webpack = require('webpack')
+const proxyMiddleware = require('http-proxy-middleware')
+const webpackConfig = {{#if_or unit e2e}}(process.env.NODE_ENV === 'testing' || process.env.NODE_ENV === 'production')
   ? require('./webpack.prod.conf')
   : {{/if_or}}require('./webpack.dev.conf')
 
 // default port where dev server listens for incoming traffic
-var port = process.env.PORT || config.dev.port
+const port = process.env.PORT || config.dev.port
 // automatically open browser, if not set will be false
-var autoOpenBrowser = !!config.dev.autoOpenBrowser
+const autoOpenBrowser = !!config.dev.autoOpenBrowser
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var proxyTable = config.dev.proxyTable
+const proxyTable = config.dev.proxyTable
 
-var app = express()
-var compiler = webpack(webpackConfig)
+const app = express()
+const compiler = webpack(webpackConfig)
 
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: webpackConfig.output.publicPath,
   quiet: true
 })
 
-var hotMiddleware = require('webpack-hot-middleware')(compiler, {
+const hotMiddleware = require('webpack-hot-middleware')(compiler, {
   log: false,
   heartbeat: 2000
 })
@@ -46,7 +47,7 @@ var hotMiddleware = require('webpack-hot-middleware')(compiler, {
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
+  const options = proxyTable[context]
   if (typeof options === 'string') {
     options = { target: options }
   }
@@ -64,13 +65,13 @@ app.use(devMiddleware)
 app.use(hotMiddleware)
 
 // serve pure static assets
-var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
+const staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
 app.use(staticPath, express.static('./static'))
 
-var uri = 'http://localhost:' + port
+const uri = 'http://localhost:' + port
 
-var _resolve
-var readyPromise = new Promise(resolve => {
+let _resolve
+const readyPromise = new Promise(resolve => {
   _resolve = resolve
 })
 
@@ -84,7 +85,7 @@ devMiddleware.waitUntilValid(() => {
   _resolve()
 })
 
-var server = app.listen(port)
+const server = app.listen(port)
 
 module.exports = {
   ready: readyPromise,
diff --git a/template/build/utils.js b/template/build/utils.js
index b1d54b4d6c..4ac71cb2c9 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -1,9 +1,10 @@
-var path = require('path')
-var config = require('../config')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
+'use strict'
+const path = require('path')
+const config = require('../config')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 exports.assetsPath = function (_path) {
-  var assetsSubDirectory = process.env.NODE_ENV === 'production'
+  const assetsSubDirectory = process.env.NODE_ENV === 'production'
     ? config.build.assetsSubDirectory
     : config.dev.assetsSubDirectory
   return path.posix.join(assetsSubDirectory, _path)
@@ -12,7 +13,7 @@ exports.assetsPath = function (_path) {
 exports.cssLoaders = function (options) {
   options = options || {}
 
-  var cssLoader = {
+  const cssLoader = {
     loader: 'css-loader',
     options: {
       minimize: process.env.NODE_ENV === 'production',
@@ -22,7 +23,7 @@ exports.cssLoaders = function (options) {
 
   // generate loader string to be used with extract text plugin
   function generateLoaders (loader, loaderOptions) {
-    var loaders = [cssLoader]
+    const loaders = [cssLoader]
     if (loader) {
       loaders.push({
         loader: loader + '-loader',
@@ -58,10 +59,10 @@ exports.cssLoaders = function (options) {
 
 // Generate loaders for standalone style files (outside of .vue)
 exports.styleLoaders = function (options) {
-  var output = []
-  var loaders = exports.cssLoaders(options)
-  for (var extension in loaders) {
-    var loader = loaders[extension]
+  const output = []
+  const loaders = exports.cssLoaders(options)
+  for (const extension in loaders) {
+    const loader = loaders[extension]
     output.push({
       test: new RegExp('\\.' + extension + '$'),
       use: loader
diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index 8a346d5222..eece58fe1b 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -1,6 +1,7 @@
-var utils = require('./utils')
-var config = require('../config')
-var isProduction = process.env.NODE_ENV === 'production'
+'use strict'
+const utils = require('./utils')
+const config = require('../config')
+const isProduction = process.env.NODE_ENV === 'production'
 
 module.exports = {
   loaders: utils.cssLoaders({
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 8ed61a75ae..f0f56c5115 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -1,7 +1,8 @@
-var path = require('path')
-var utils = require('./utils')
-var config = require('../config')
-var vueLoaderConfig = require('./vue-loader.conf')
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const config = require('../config')
+const vueLoaderConfig = require('./vue-loader.conf')
 
 function resolve (dir) {
   return path.join(__dirname, '..', dir)
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 5470402d03..6f25d63458 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -1,10 +1,11 @@
-var utils = require('./utils')
-var webpack = require('webpack')
-var config = require('../config')
-var merge = require('webpack-merge')
-var baseWebpackConfig = require('./webpack.base.conf')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
-var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+'use strict'
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.base.conf')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 
 // add hot-reload related code to entry chunks
 Object.keys(baseWebpackConfig.entry).forEach(function (name) {
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index e40a340c5d..f48e223e47 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -1,19 +1,20 @@
-var path = require('path')
-var utils = require('./utils')
-var webpack = require('webpack')
-var config = require('../config')
-var merge = require('webpack-merge')
-var baseWebpackConfig = require('./webpack.base.conf')
-var CopyWebpackPlugin = require('copy-webpack-plugin')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
-var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 
-var env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
+const env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('../config/test.env')
   : {{/if_or}}config.build.env
 
-var webpackConfig = merge(baseWebpackConfig, {
+const webpackConfig = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({
       sourceMap: config.build.productionSourceMap,
@@ -101,7 +102,7 @@ var webpackConfig = merge(baseWebpackConfig, {
 })
 
 if (config.build.productionGzip) {
-  var CompressionWebpackPlugin = require('compression-webpack-plugin')
+  const CompressionWebpackPlugin = require('compression-webpack-plugin')
 
   webpackConfig.plugins.push(
     new CompressionWebpackPlugin({
@@ -119,7 +120,7 @@ if (config.build.productionGzip) {
 }
 
 if (config.build.bundleAnalyzerReport) {
-  var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
   webpackConfig.plugins.push(new BundleAnalyzerPlugin())
 }
 
diff --git a/template/build/webpack.test.conf.js b/template/build/webpack.test.conf.js
index 48f64cc319..c81abfceea 100644
--- a/template/build/webpack.test.conf.js
+++ b/template/build/webpack.test.conf.js
@@ -1,11 +1,12 @@
+'use strict'
 // This is the webpack config used for unit tests.
 
-var utils = require('./utils')
-var webpack = require('webpack')
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.base.conf')
+const utils = require('./utils')
+const webpack = require('webpack')
+const merge = require('webpack-merge')
+const baseConfig = require('./webpack.base.conf')
 
-var webpackConfig = merge(baseConfig, {
+const webpackConfig = merge(baseConfig, {
   // use inline sourcemap for karma-sourcemap-loader
   module: {
     rules: utils.styleLoaders()
diff --git a/template/config/dev.env.js b/template/config/dev.env.js
index efead7c840..1e22973ae7 100644
--- a/template/config/dev.env.js
+++ b/template/config/dev.env.js
@@ -1,5 +1,6 @@
-var merge = require('webpack-merge')
-var prodEnv = require('./prod.env')
+'use strict'
+const merge = require('webpack-merge')
+const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"'
diff --git a/template/config/index.js b/template/config/index.js
index bfb6f9915b..da62ed3bb5 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,6 @@
+'use strict'
 // see http://vuejs-templates.github.io/webpack for documentation.
-var path = require('path')
+const path = require('path')
 
 module.exports = {
   build: {
diff --git a/template/config/prod.env.js b/template/config/prod.env.js
index 773d263d31..a6f997616e 100644
--- a/template/config/prod.env.js
+++ b/template/config/prod.env.js
@@ -1,3 +1,4 @@
+'use strict'
 module.exports = {
   NODE_ENV: '"production"'
 }
diff --git a/template/config/test.env.js b/template/config/test.env.js
index 89f90deb22..c2824a307a 100644
--- a/template/config/test.env.js
+++ b/template/config/test.env.js
@@ -1,5 +1,6 @@
-var merge = require('webpack-merge')
-var devEnv = require('./dev.env')
+'use strict'
+const merge = require('webpack-merge')
+const devEnv = require('./dev.env')
 
 module.exports = merge(devEnv, {
   NODE_ENV: '"testing"'

From 845bcb7b0058f2b9c02d32517ca4d068543817f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?=
 <hh_2013@foxmail.com>
Date: Sat, 30 Sep 2017 04:43:06 -0500
Subject: [PATCH 180/339] Docs: add babel-minify in comment (fixes #867).
 (#896)

---
 template/build/webpack.prod.conf.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index f48e223e47..6a3a0bf207 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -32,6 +32,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     new webpack.DefinePlugin({
       'process.env': env
     }),
+    // UglifyJs do not support ES6+, you can also use babel-minify for better treeshaking: https://github.com/babel/minify
     new webpack.optimize.UglifyJsPlugin({
       compress: {
         warnings: false

From 038c52e09ee7b5236bfe125888052e0b3d2582f1 Mon Sep 17 00:00:00 2001
From: Quentin DANJOU <quentin1.danjou@epitech.eu>
Date: Sat, 30 Sep 2017 17:49:16 +0800
Subject: [PATCH 181/339] Create LICENSE (#942)

Add LICENSE same as vue repository
---
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..b65dd9e62e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-present, Yuxi (Evan) You
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

From 25dfaf696685ae17afe2fd43d086cb3d400eda22 Mon Sep 17 00:00:00 2001
From: adi518 <adisahar1@hotmail.com>
Date: Sat, 30 Sep 2017 14:36:27 +0300
Subject: [PATCH 182/339] Add dynamic port allocation (#913)

* Add dynamic port allocation

* Add error handling to port allocation

* Remove forgotten listen statement from dev-server.js

* Set dynamically allocated port to environment variable `PORT`
---
 template/build/dev-server.js | 32 ++++++++++++++++++++++----------
 template/package.json        |  1 +
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 604d32ef0f..af76f3e6a6 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -70,23 +70,35 @@ app.use(staticPath, express.static('./static'))
 
 const uri = 'http://localhost:' + port
 
-let _resolve
-const readyPromise = new Promise(resolve => {
+var _resolve
+var _reject
+var readyPromise = new Promise((resolve, reject) => {
   _resolve = resolve
+  _reject = reject
 })
 
+var server
+var portfinder = require('portfinder')
+portfinder.basePort = port
+
 console.log('> Starting dev server...')
 devMiddleware.waitUntilValid(() => {
-  console.log('> Listening at ' + uri + '\n')
-  // when env is testing, don't need open it
-  if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
-    opn(uri)
-  }
-  _resolve()
+  portfinder.getPort((err, port) => {
+    if (err) {
+      _reject(err)
+    }
+    process.env.PORT = port
+    var uri = 'http://localhost:' + port
+    console.log('> Listening at ' + uri + '\n')
+    // when env is testing, don't need open it
+    if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
+      opn(uri)
+    }
+    server = app.listen(port)
+    _resolve()
+  })
 })
 
-const server = app.listen(port)
-
 module.exports = {
   ready: readyPromise,
   close: () => {
diff --git a/template/package.json b/template/package.json
index cadcae51f5..9c5841dde4 100644
--- a/template/package.json
+++ b/template/package.json
@@ -92,6 +92,7 @@
     "vue-loader": "^13.0.4",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.4.2",
+    "portfinder": "^1.0.13"
     "webpack": "^3.5.5",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-hot-middleware": "^2.18.2",

From 313ea41f1eaccb9ac2759fb64be280047b86df2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 30 Sep 2017 13:39:21 +0200
Subject: [PATCH 183/339] fix missing comma

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

diff --git a/template/package.json b/template/package.json
index 9c5841dde4..75176e1230 100644
--- a/template/package.json
+++ b/template/package.json
@@ -92,7 +92,7 @@
     "vue-loader": "^13.0.4",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.4.2",
-    "portfinder": "^1.0.13"
+    "portfinder": "^1.0.13",
     "webpack": "^3.5.5",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-hot-middleware": "^2.18.2",

From da3b38043a08b880082581e2f4efc34701804640 Mon Sep 17 00:00:00 2001
From: Rob Wierzbowski <rob.wierzbowski@gmail.com>
Date: Sat, 30 Sep 2017 07:44:39 -0400
Subject: [PATCH 184/339] Standardize base webpack module variable name (#912)

---
 template/build/webpack.test.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.test.conf.js b/template/build/webpack.test.conf.js
index 48f64cc319..3dcac7563c 100644
--- a/template/build/webpack.test.conf.js
+++ b/template/build/webpack.test.conf.js
@@ -3,9 +3,9 @@
 var utils = require('./utils')
 var webpack = require('webpack')
 var merge = require('webpack-merge')
-var baseConfig = require('./webpack.base.conf')
+var baseWebpackConfig = require('./webpack.base.conf')
 
-var webpackConfig = merge(baseConfig, {
+var webpackConfig = merge(baseWebpackConfig, {
   // use inline sourcemap for karma-sourcemap-loader
   module: {
     rules: utils.styleLoaders()

From 8150b73b1a4410087a13fba560bc41bcb63a9006 Mon Sep 17 00:00:00 2001
From: Rob Wierzbowski <rob.wierzbowski@gmail.com>
Date: Sat, 30 Sep 2017 07:48:08 -0400
Subject: [PATCH 185/339] Fix small errors in webpack.prod.conf (#897)

* Update vue-loader link (#886)

* Remove unused count variable in webpack.prod.conf.js
---
 docs/README.md                      | 2 +-
 template/build/webpack.prod.conf.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index dd31c1696f..0f139a4470 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # Introduction
 
-This boilerplate is targeted towards large, serious projects and assumes you are somewhat familiar with Webpack and `vue-loader`. Make sure to also read [`vue-loader`'s documentation](http://vuejs.github.io/vue-loader/index.html) for common workflow recipes.
+This boilerplate is targeted towards large, serious projects and assumes you are somewhat familiar with Webpack and `vue-loader`. Make sure to also read [`vue-loader`'s documentation](https://vue-loader.vuejs.org/) for common workflow recipes.
 
 If you just want to try out `vue-loader` or whip out a quick prototype, use the [webpack-simple](https://github.com/vuejs-templates/webpack-simple) template instead.
 
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 6a3a0bf207..1b91741c2d 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -74,7 +74,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
-      minChunks: function (module, count) {
+      minChunks: function (module) {
         // any required modules inside node_modules are extracted to vendor
         return (
           module.resource &&

From 8ac9bb90ab19c5f0845117f5bff1d82bf6fa9f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <gucong@gmail.com>
Date: Sat, 30 Sep 2017 06:48:47 -0500
Subject: [PATCH 186/339] update URL of ESLint to https (#927)

* Update vue-loader link (#886)

* Merge some small fixes (#900)

* Remove unused fs require from webpack.base.conf.js (#893)

* cleanup some leftover from reverting #688

* update URL of ESLint to https

* fix missing comma from conflict resolution
---
 docs/linter.md        | 4 ++--
 template/.eslintrc.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/linter.md b/docs/linter.md
index f5ad42f662..bff51c0119 100644
--- a/docs/linter.md
+++ b/docs/linter.md
@@ -1,6 +1,6 @@
 # Linter Configuration
 
-This boilerplate uses [ESLint](http://eslint.org/) as the linter, and uses the [Standard](https://github.com/feross/standard/blob/master/RULES.md) preset with some small customizations.
+This boilerplate uses [ESLint](https://eslint.org/) as the linter, and uses the [Standard](https://github.com/feross/standard/blob/master/RULES.md) preset with some small customizations.
 
 If you are not happy with the default linting rules, you have several options:
 
@@ -13,4 +13,4 @@ If you are not happy with the default linting rules, you have several options:
 
 2. Pick a different ESLint preset when generating the project, for example [eslint-config-airbnb](https://github.com/airbnb/javascript/tree/master/packages/eslint-config-airbnb).
 
-3. Pick "none" for ESLint preset when generating the project and define your own rules. See [ESLint documentation](http://eslint.org/docs/rules/) for more details.
+3. Pick "none" for ESLint preset when generating the project and define your own rules. See [ESLint documentation](https://eslint.org/docs/rules/) for more details.
diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index c10f039ffc..7844912865 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -1,4 +1,4 @@
-// http://eslint.org/docs/user-guide/configuring
+// https://eslint.org/docs/user-guide/configuring
 
 module.exports = {
   root: true,

From 5218c7b35f8c235195a37145eb655687deeebc6e Mon Sep 17 00:00:00 2001
From: Adam <davidatomhernandez@gmail.com>
Date: Sat, 30 Sep 2017 08:01:55 -0400
Subject: [PATCH 187/339] Add .vscode to gitignore (#845)

---
 template/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/.gitignore b/template/.gitignore
index 0ef2f13f49..5b21371edc 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -14,6 +14,7 @@ selenium-debug.log
 
 # Editor directories and files
 .idea
+.vscode
 *.suo
 *.ntvs*
 *.njsproj

From e9ed4c5ed0266c03d3132aa933c79ed9cc4085f5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Oct 2017 23:32:13 -0400
Subject: [PATCH 188/339] bump more deps

---
 template/package.json | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/template/package.json b/template/package.json
index 75176e1230..066405607e 100644
--- a/template/package.json
+++ b/template/package.json
@@ -32,27 +32,28 @@
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",
-    "cssnano": "^3.10.0",
     {{#lint}}
     "eslint": "^3.19.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
     "eslint-plugin-html": "^3.0.0",
     {{#if_eq lintConfig "standard"}}
-    "eslint-config-standard": "^6.2.1",
+    "eslint-config-standard": "^10.2.1",
     "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^2.0.1",
+    "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
-    "eslint-config-airbnb-base": "^11.1.3",
-    "eslint-import-resolver-webpack": "^0.8.1",
-    "eslint-plugin-import": "^2.2.0",
+    "eslint-config-airbnb-base": "^12.0.1",
+    "eslint-import-resolver-webpack": "^0.8.3",
+    "eslint-plugin-import": "^2.7.0",
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.14.1",
     "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^0.11.1",
+    "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "http-proxy-middleware": "^0.17.3",
@@ -69,8 +70,8 @@
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
     "mocha": "^3.2.0",
-    "chai": "^3.5.0",
-    "sinon": "^2.1.0",
+    "chai": "^4.1.2",
+    "sinon": "^4.0.0",
     "sinon-chai": "^2.8.0",
     "inject-loader": "^3.0.0",
     "babel-plugin-istanbul": "^4.1.1",
@@ -85,7 +86,7 @@
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "opn": "^5.1.0",
-    "optimize-css-assets-webpack-plugin": "^2.0.0",
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
@@ -93,7 +94,7 @@
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.4.2",
     "portfinder": "^1.0.13",
-    "webpack": "^3.5.5",
+    "webpack": "^3.6.0",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-hot-middleware": "^2.18.2",
     "webpack-merge": "^4.1.0"

From 69dbb3ed32a6aa6e3ce59a65f75478b903aa67c9 Mon Sep 17 00:00:00 2001
From: Alex Kyriakidis <hootlex@icloud.com>
Date: Tue, 3 Oct 2017 12:04:44 +0300
Subject: [PATCH 189/339] Rename Hello component to HelloWorld (#944)

Self-closing components
---
 template/src/App.vue                                  | 8 ++++----
 template/src/components/{Hello.vue => HelloWorld.vue} | 2 +-
 template/src/router/index.js                          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename template/src/components/{Hello.vue => HelloWorld.vue} (98%)

diff --git a/template/src/App.vue b/template/src/App.vue
index 74a25d1dfa..ebe5aba27d 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -2,22 +2,22 @@
   <div id="app">
     <img src="./assets/logo.png">
     {{#router}}
-    <router-view></router-view>
+    <router-view/>
     {{else}}
-    <hello></hello>
+    <hello-world/>
     {{/router}}
   </div>
 </template>
 
 <script>
 {{#unless router}}
-import Hello from './components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import HelloWorld from './components/HelloWorld'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 {{/unless}}
 export default {
   name: 'app'{{#router}}{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{else}},
   components: {
-    Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+    HelloWorld{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{/router}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 </script>
diff --git a/template/src/components/Hello.vue b/template/src/components/HelloWorld.vue
similarity index 98%
rename from template/src/components/Hello.vue
rename to template/src/components/HelloWorld.vue
index 2abf221cdb..29036fa0aa 100644
--- a/template/src/components/Hello.vue
+++ b/template/src/components/HelloWorld.vue
@@ -22,7 +22,7 @@
 
 <script>
 export default {
-  name: 'hello',
+  name: 'HelloWorld',
   data{{#unless_eq lintConfig "airbnb"}} {{/unless_eq}}() {
     return {
       msg: 'Welcome to Your Vue.js App'{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
diff --git a/template/src/router/index.js b/template/src/router/index.js
index 4443677ef4..9bdda48bd3 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 import Router from 'vue-router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import Hello from '@/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import HelloWorld from '@/components/HelloWorld'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
 Vue.use(Router){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
@@ -9,7 +9,7 @@ export default new Router({
     {
       path: '/',
       name: 'Hello',
-      component: Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+      component: HelloWorld{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
     }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   ]{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From d663e10f5536a430cf047a9eab86f434688ecfd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 3 Oct 2017 11:10:22 +0200
Subject: [PATCH 190/339] fix component filename

---
 template/test/unit/specs/Hello.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/test/unit/specs/Hello.spec.js b/template/test/unit/specs/Hello.spec.js
index 1b276f47dc..af36aff7bc 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/Hello.spec.js
@@ -1,9 +1,9 @@
 import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import Hello from '@/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import HelloWorld from '@/components/HelloWorld'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-describe('Hello.vue', () => {
+describe('HelloWorld.vue', () => {
   it('should render correct contents', () => {
-    const Constructor = Vue.extend(Hello){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    const Constructor = Vue.extend(HelloWorld){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     const vm = new Constructor().$mount(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     expect(vm.$el.querySelector('.hello h1').textContent)
       .to.equal('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 6477757ad42bec1aa8e8156cf3e4c4caf2f02400 Mon Sep 17 00:00:00 2001
From: Nick Baroni <nick@rhythnic.com>
Date: Tue, 3 Oct 2017 15:52:51 -0400
Subject: [PATCH 191/339] Put hotMiddleware before proxyMiddleware in dev
 server (#837)

---
 template/build/dev-server.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index af76f3e6a6..4c66d4dba9 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -45,6 +45,10 @@ const hotMiddleware = require('webpack-hot-middleware')(compiler, {
 //   })
 // })
 
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
   const options = proxyTable[context]
@@ -60,10 +64,6 @@ app.use(require('connect-history-api-fallback')())
 // serve webpack bundle output
 app.use(devMiddleware)
 
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
 // serve pure static assets
 const staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
 app.use(staticPath, express.static('./static'))

From 415caede51a361ec5d78c8ece008704eb78720d2 Mon Sep 17 00:00:00 2001
From: Rob Wierzbowski <rob.wierzbowski@gmail.com>
Date: Tue, 3 Oct 2017 16:47:32 -0400
Subject: [PATCH 192/339] Reference dev script in start script instead of copy
 pasting (#894)

Less duplication FTW.
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 7840f38186..8c0efa07dd 100644
--- a/template/package.json
+++ b/template/package.json
@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "dev": "node build/dev-server.js",
-    "start": "node build/dev-server.js",
+    "start": "npm run dev",
     "build": "node build/build.js"{{#unit}},
     "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
     "e2e": "node test/e2e/runner.js"{{/e2e}}{{#if_or unit e2e}},

From fa51a8194f48d98d9cdea9759b3ea45be8da12f9 Mon Sep 17 00:00:00 2001
From: Rob Wierzbowski <rob.wierzbowski@gmail.com>
Date: Tue, 3 Oct 2017 16:47:32 -0400
Subject: [PATCH 193/339] Reference dev script in start script instead of copy
 pasting (#894)

Less duplication FTW.
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 066405607e..cb4e6da094 100644
--- a/template/package.json
+++ b/template/package.json
@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "dev": "node build/dev-server.js",
-    "start": "node build/dev-server.js",
+    "start": "npm run dev",
     "build": "node build/build.js"{{#unit}},
     "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
     "e2e": "node test/e2e/runner.js"{{/e2e}}{{#if_or unit e2e}},

From 04185713a01b1f29718595fe4c256fe8f010ca8a Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 7 Oct 2017 18:56:02 +0200
Subject: [PATCH 194/339] add version tag to config/index.js

---
 template/config/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/template/config/index.js b/template/config/index.js
index da62ed3bb5..7e4b94c488 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,7 @@
-'use strict'
+'use stxrict'
+// Template version: 1.1.0
 // see http://vuejs-templates.github.io/webpack for documentation.
+
 const path = require('path')
 
 module.exports = {

From e52882f0d16e8815decd6def5a0e60d831f7c43c Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 7 Oct 2017 18:56:02 +0200
Subject: [PATCH 195/339] add version tag to config/index.js

---
 template/config/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/template/config/index.js b/template/config/index.js
index da62ed3bb5..7e4b94c488 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,7 @@
-'use strict'
+'use stxrict'
+// Template version: 1.1.0
 // see http://vuejs-templates.github.io/webpack for documentation.
+
 const path = require('path')
 
 module.exports = {

From 9bc35d46d315f1caf561ab8430ef18e6ce40a98a Mon Sep 17 00:00:00 2001
From: Eric Tran <EricTran5791@users.noreply.github.com>
Date: Sun, 8 Oct 2017 04:45:30 -0400
Subject: [PATCH 196/339] Revision of wording in the README docs (#958)

---
 README.md          | 4 ++--
 template/README.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ea4c750559..f53a217599 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ $ npm install
 $ npm run dev
 ```
 
-If port 8080 is already in use on your machine you must change the port number in `/config/index.js`. Otherwise `npm run dev` will fail.
+If port 8080 is already in use on your machine, then you must change the port number in `/config/index.js`. Otherwise `npm run dev` will fail.
 
 ## What's Included
 
@@ -36,7 +36,7 @@ If port 8080 is already in use on your machine you must change the port number i
   - JavaScript minified with [UglifyJS](https://github.com/mishoo/UglifyJS2).
   - HTML minified with [html-minifier](https://github.com/kangax/html-minifier).
   - CSS across all components extracted into a single file and minified with [cssnano](https://github.com/ben-eb/cssnano).
-  - All static assets compiled with version hashes for efficient long-term caching, and a production `index.html` is auto-generated with proper URLs to these generated assets.
+  - Static assets compiled with version hashes for efficient long-term caching, and an auto-generated production `index.html` with proper URLs to these generated assets.
   - Use `npm run build --report`to build with bundle size analytics.
 
 - `npm run unit`: Unit tests run in PhantomJS with [Karma](http://karma-runner.github.io/0.13/index.html) + [Mocha](http://mochajs.org/) + [karma-webpack](https://github.com/webpack/karma-webpack).
diff --git a/template/README.md b/template/README.md
index a69064231a..4b0258a35b 100644
--- a/template/README.md
+++ b/template/README.md
@@ -33,4 +33,4 @@ npm test
 {{/if_or}}
 ```
 
-For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

From dcd3a3ed6b594ae1d9ed980104f8b4e5d124c074 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 8 Oct 2017 10:48:48 +0200
Subject: [PATCH 197/339] We now have port-detection, so README should reflect
 that.

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

diff --git a/README.md b/README.md
index f53a217599..751a2ed6a2 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ $ npm install
 $ npm run dev
 ```
 
-If port 8080 is already in use on your machine, then you must change the port number in `/config/index.js`. Otherwise `npm run dev` will fail.
+The development server will run on port 8080 by default. If that port is already in use on your machine, the next free port will be used.
 
 ## What's Included
 

From fabe9117bb6102c3169dafe4d88920c5cee47059 Mon Sep 17 00:00:00 2001
From: Ruslan Gunawardana <mr.exarus@gmail.com>
Date: Sun, 8 Oct 2017 11:52:17 +0300
Subject: [PATCH 198/339] Typo fixed: 'use stxrict' -> 'use strict' (#955)

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

diff --git a/template/config/index.js b/template/config/index.js
index 7e4b94c488..661410c58a 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,4 +1,4 @@
-'use stxrict'
+'use strict'
 // Template version: 1.1.0
 // see http://vuejs-templates.github.io/webpack for documentation.
 

From 7ced14d25e47b8622e8d627fa72093b52a25f066 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 8 Oct 2017 11:10:31 +0200
Subject: [PATCH 199/339] downgrade airbnb config to ensure compaibility with
 eslint.

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

diff --git a/template/package.json b/template/package.json
index cb4e6da094..86921c4fa4 100644
--- a/template/package.json
+++ b/template/package.json
@@ -45,7 +45,7 @@
     "eslint-plugin-node": "^5.2.0",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
-    "eslint-config-airbnb-base": "^12.0.1",
+    "eslint-config-airbnb-base": "^11.3.0",
     "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-import": "^2.7.0",
     {{/if_eq}}

From 53e2118cff70e7b34ba5072fbadf8c14b594145f Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 8 Oct 2017 11:12:38 +0200
Subject: [PATCH 200/339] v1.1.1

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

diff --git a/template/config/index.js b/template/config/index.js
index 661410c58a..0bc0b6a7a6 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.1.0
+// Template version: 1.1.1
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 05148da1757f8fe64858f6bbaa8a3831b2276ed8 Mon Sep 17 00:00:00 2001
From: Alex Kyriakidis <hootlex@icloud.com>
Date: Mon, 9 Oct 2017 11:07:05 +0300
Subject: [PATCH 201/339] switch hello-world tag to PascalCase (#951)

---
 template/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/src/App.vue b/template/src/App.vue
index ebe5aba27d..2ef72e8cbc 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -4,7 +4,7 @@
     {{#router}}
     <router-view/>
     {{else}}
-    <hello-world/>
+    <HelloWorld/>
     {{/router}}
   </div>
 </template>

From 993717604d15b240e07d5da8d55b815452d11581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 11 Oct 2017 09:30:11 +0200
Subject: [PATCH 202/339] fix Es6 code issue.

This file is not transpiled, so we should stick to ES5
---
 template/build/dev-client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/dev-client.js b/template/build/dev-client.js
index 54693bd79b..2f75dd531f 100644
--- a/template/build/dev-client.js
+++ b/template/build/dev-client.js
@@ -1,7 +1,7 @@
 /* eslint-disable */
 'use strict'
 require('eventsource-polyfill')
-const hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
+var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
 
 hotClient.subscribe(function (event) {
   if (event.action === 'reload') {

From be3efc020a15a802f810647f69c45bf1bdef1773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 11 Oct 2017 09:31:01 +0200
Subject: [PATCH 203/339] stick to ES5

this file is not transpiled
---
 template/build/dev-client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/dev-client.js b/template/build/dev-client.js
index 54693bd79b..2f75dd531f 100644
--- a/template/build/dev-client.js
+++ b/template/build/dev-client.js
@@ -1,7 +1,7 @@
 /* eslint-disable */
 'use strict'
 require('eventsource-polyfill')
-const hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
+var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
 
 hotClient.subscribe(function (event) {
   if (event.action === 'reload') {

From 52a069cb54d27fc596a5f38f81244dde074d1015 Mon Sep 17 00:00:00 2001
From: eduardo naufel schettino <schettino72@gmail.com>
Date: Wed, 11 Oct 2017 13:50:29 +0200
Subject: [PATCH 204/339] Fix bug in dev-server when a proxyTable entry is a
 string (#965)

`options` can not be a `const` because it is modified if value is a string.
---
 template/build/dev-server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 4c66d4dba9..00d9efd144 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -51,7 +51,7 @@ app.use(hotMiddleware)
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  const options = proxyTable[context]
+  let options = proxyTable[context]
   if (typeof options === 'string') {
     options = { target: options }
   }

From 9befbfc28aea7e1313dc2418c78c58ed12aaeeee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 14 Oct 2017 16:09:56 +0200
Subject: [PATCH 205/339] Fix casing

---
 template/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/src/App.vue b/template/src/App.vue
index 2ef72e8cbc..07f5be83da 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -2,7 +2,7 @@
   <div id="app">
     <img src="./assets/logo.png">
     {{#router}}
-    <router-view/>
+    <RouterView/>
     {{else}}
     <HelloWorld/>
     {{/router}}

From b6a4694853899b8848b168fe190baf8f06f76a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 14 Oct 2017 17:31:31 +0200
Subject: [PATCH 206/339] Revert 9befbfc

---
 template/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/src/App.vue b/template/src/App.vue
index 07f5be83da..2ef72e8cbc 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -2,7 +2,7 @@
   <div id="app">
     <img src="./assets/logo.png">
     {{#router}}
-    <RouterView/>
+    <router-view/>
     {{else}}
     <HelloWorld/>
     {{/router}}

From 1a247415bde030ac94860db76efd3478198a5bed Mon Sep 17 00:00:00 2001
From: Ffloriel <Ffloriel@users.noreply.github.com>
Date: Mon, 16 Oct 2017 08:59:55 +0100
Subject: [PATCH 207/339] update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0
---
 template/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/package.json b/template/package.json
index 86921c4fa4..8642434dc4 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,8 +14,8 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.4.2"{{#router}},
-    "vue-router": "^2.7.0"{{/router}}
+    "vue": "^2.5.2"{{#router}},
+    "vue-router": "^3.0.1"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

From a355ee8584b969d701e005fc21dddf084b88b677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 16 Oct 2017 10:15:30 +0200
Subject: [PATCH 208/339] Bumping Vue+VueRouter versions, some minor fixes.
 (#986)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0
---
 template/build/dev-server.js | 2 +-
 template/package.json        | 4 ++--
 template/src/App.vue         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
index 4c66d4dba9..00d9efd144 100644
--- a/template/build/dev-server.js
+++ b/template/build/dev-server.js
@@ -51,7 +51,7 @@ app.use(hotMiddleware)
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  const options = proxyTable[context]
+  let options = proxyTable[context]
   if (typeof options === 'string') {
     options = { target: options }
   }
diff --git a/template/package.json b/template/package.json
index 86921c4fa4..8642434dc4 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,8 +14,8 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.4.2"{{#router}},
-    "vue-router": "^2.7.0"{{/router}}
+    "vue": "^2.5.2"{{#router}},
+    "vue-router": "^3.0.1"{{/router}}
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
diff --git a/template/src/App.vue b/template/src/App.vue
index ebe5aba27d..2ef72e8cbc 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -4,7 +4,7 @@
     {{#router}}
     <router-view/>
     {{else}}
-    <hello-world/>
+    <HelloWorld/>
     {{/router}}
   </div>
 </template>

From 7cddb2126aae7a5927b1a937225b01cfb695f3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 16 Oct 2017 13:15:26 +0200
Subject: [PATCH 209/339] fix missing dependency updates for

* vue-template compiler
* vue-loader
---
 template/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/package.json b/template/package.json
index 8642434dc4..7df054108d 100644
--- a/template/package.json
+++ b/template/package.json
@@ -90,9 +90,9 @@
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
-    "vue-loader": "^13.0.4",
+    "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.4.2",
+    "vue-template-compiler": "^2.5.2",
     "portfinder": "^1.0.13",
     "webpack": "^3.6.0",
     "webpack-dev-middleware": "^1.12.0",

From 476a6b84c7882889171355aa4ce83c5871aeadce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 16 Oct 2017 13:15:48 +0200
Subject: [PATCH 210/339] bump version string

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

diff --git a/template/config/index.js b/template/config/index.js
index 0bc0b6a7a6..14972462cc 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.1.1
+// Template version: 1.1.3
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 60431180770dd387fd92ce59f41096085c11768c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 16 Oct 2017 13:20:46 +0200
Subject: [PATCH 211/339] Fix missing dependency bumps (#987)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string
---
 template/config/index.js | 2 +-
 template/package.json    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/config/index.js b/template/config/index.js
index 9b91aafdde..2c458f6680 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,6 +1,6 @@
 
 'use strict'
-// Template version: 1.1.1
+// Template version: 1.1.3
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')
diff --git a/template/package.json b/template/package.json
index 8642434dc4..7df054108d 100644
--- a/template/package.json
+++ b/template/package.json
@@ -90,9 +90,9 @@
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
-    "vue-loader": "^13.0.4",
+    "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.4.2",
+    "vue-template-compiler": "^2.5.2",
     "portfinder": "^1.0.13",
     "webpack": "^3.6.0",
     "webpack-dev-middleware": "^1.12.0",

From b196679908eff9d4417a5328ce342d6052af8ed6 Mon Sep 17 00:00:00 2001
From: Ruslan Gunawardana <mr.exarus@gmail.com>
Date: Mon, 16 Oct 2017 22:57:15 +0300
Subject: [PATCH 212/339] Ignore files improvements (#953)

* .eslintignore covers paths that contain generated *.js files

* .gitignore doesn't ignore unnecassary paths

* root .js files are added to ESLint ignore list
---
 template/.eslintignore | 9 +++++++--
 template/.gitignore    | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/template/.eslintignore b/template/.eslintignore
index 34af3774f3..ef5bd37d05 100644
--- a/template/.eslintignore
+++ b/template/.eslintignore
@@ -1,2 +1,7 @@
-build/*.js
-config/*.js
+/build/
+/config/
+/dist/
+/*.js
+{{#unit}}
+/test/unit/coverage/
+{{/unit}}
diff --git a/template/.gitignore b/template/.gitignore
index 5b21371edc..c80b682e18 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -1,14 +1,14 @@
 .DS_Store
 node_modules/
-dist/
+/dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 {{#unit}}
-test/unit/coverage
+/test/unit/coverage/
 {{/unit}}
 {{#e2e}}
-test/e2e/reports
+/test/e2e/reports/
 selenium-debug.log
 {{/e2e}}
 

From 937ebe69d54f92482a8f3a728d7506bc6aeef072 Mon Sep 17 00:00:00 2001
From: Tyler Peterson <tylermpeterson36@gmail.com>
Date: Mon, 16 Oct 2017 13:57:50 -0600
Subject: [PATCH 213/339] Use multi-process parallel running and file cache to
 improve the build speed (#941)

---
 template/build/webpack.prod.conf.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 1b91741c2d..07e477bd82 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -37,7 +37,8 @@ const webpackConfig = merge(baseWebpackConfig, {
       compress: {
         warnings: false
       },
-      sourceMap: true
+      sourceMap: true,
+      parallel: true
     }),
     // extract css into its own file
     new ExtractTextPlugin({

From 6994826e9be57bb8b50e492b621cfdcc4f1998b8 Mon Sep 17 00:00:00 2001
From: Emanuele <my.burning@gmail.com>
Date: Mon, 30 Oct 2017 13:32:13 +0000
Subject: [PATCH 214/339] Updated standard package URL (#1012)

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

diff --git a/meta.js b/meta.js
index e2e2fdffa1..45d3acfb03 100644
--- a/meta.js
+++ b/meta.js
@@ -54,7 +54,7 @@ module.exports = {
       "message": "Pick an ESLint preset",
       "choices": [
         {
-          "name": "Standard (https://github.com/feross/standard)",
+          "name": "Standard (https://github.com/standard/standard)",
           "value": "standard",
           "short": "Standard"
         },

From d223cd822300092fc156d7dbb731aaffce795f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?=
 <hh_2013@foxmail.com>
Date: Mon, 30 Oct 2017 21:37:38 +0800
Subject: [PATCH 215/339] Update: add meta viewport. (#983)

---
 template/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/index.html b/template/index.html
index 60edbcf0d2..6cfaafc7a8 100644
--- a/template/index.html
+++ b/template/index.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title>{{ name }}</title>
   </head>
   <body>

From 0c52d3519e6e0b32dc1686e236663af7336bc31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Herrmann?= <rene@herrmannplatz.de>
Date: Mon, 30 Oct 2017 14:37:51 +0100
Subject: [PATCH 216/339] Ignore test folder (#991)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 80c45fbf35..a427247e75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 .DS_Store
 docs/_book
+test
\ No newline at end of file

From cf408f24bbbccdf374fef9d7a5bf4af5fae8a21c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C2=B7Lawliet?= <553867163@qq.com>
Date: Wed, 1 Nov 2017 19:51:52 +0800
Subject: [PATCH 217/339] fix the config contradiction (#1014)

---
 template/build/webpack.prod.conf.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 07e477bd82..a01b4454a2 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -47,9 +47,9 @@ const webpackConfig = merge(baseWebpackConfig, {
     // Compress extracted CSS. We are using this plugin so that possible
     // duplicated CSS from different components can be deduped.
     new OptimizeCSSPlugin({
-      cssProcessorOptions: {
-        safe: true
-      }
+      cssProcessorOptions: config.build.productionSourceMap
+      ? { safe: true, map: { inline: false } }
+      : { safe: true }
     }),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html

From 89c6fb18d4640afd6a5e89106b2493b4465d36a3 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Fri, 3 Nov 2017 00:18:35 +0900
Subject: [PATCH 218/339] docs(e2e): fix configration link (#1024)

---
 docs/e2e.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/e2e.md b/docs/e2e.md
index 1525fa4854..2c2f17341d 100644
--- a/docs/e2e.md
+++ b/docs/e2e.md
@@ -10,7 +10,7 @@ Let's take a look at the files in the `test/e2e` directory:
 
 - `nightwatch.conf.js`
 
-  Nightwatch configuration file. See [Nightwatch's docs on configuration](http://nightwatchjs.org/guide#settings-file) for more details.
+  Nightwatch configuration file. See [Nightwatch's docs on configuration](http://nightwatchjs.org/gettingstarted#settings-file) for more details.
 
 - `custom-assertions/`
 

From aba0f9c7b7903a5371469ecbd80b6f7df93fe536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 8 Nov 2017 21:24:44 +0100
Subject: [PATCH 219/339] Switch to webpack-dev-server (close #964) (#975)

* Finished testable version.

* close #960

* fix node-notifier version

* remove console.log

* moved general dependency out of unit test-only dependency block.

* fix typo

* ignore /test folder

* make HMR work correctly.

* improve console messages for HMR - now show filenames of replaced modules.

* fix typo in eslint-loader config

* move imports for the env files from /config/index.js directly into the webpack config.

Reasoning: thosen file imports are not configuration, so they don't belong inside of config/index.js

* fix wrong overlay config
---
 .gitignore                          |   2 +-
 template/build/dev-client.js        |  10 ---
 template/build/dev-server.js        | 107 ----------------------------
 template/build/logo.png             | Bin 0 -> 6849 bytes
 template/build/utils.js             |  20 ++++++
 template/build/webpack.base.conf.js |   7 +-
 template/build/webpack.dev.conf.js  |  58 ++++++++++++---
 template/build/webpack.prod.conf.js |   2 +-
 template/config/index.js            |  51 +++++++++----
 template/package.json               |  10 +--
 template/test/e2e/runner.js         |  25 +++++--
 11 files changed, 134 insertions(+), 158 deletions(-)
 delete mode 100644 template/build/dev-client.js
 delete mode 100644 template/build/dev-server.js
 create mode 100644 template/build/logo.png

diff --git a/.gitignore b/.gitignore
index a427247e75..38e1975447 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 node_modules
 .DS_Store
 docs/_book
-test
\ No newline at end of file
+test/
diff --git a/template/build/dev-client.js b/template/build/dev-client.js
deleted file mode 100644
index 2f75dd531f..0000000000
--- a/template/build/dev-client.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-disable */
-'use strict'
-require('eventsource-polyfill')
-var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
-
-hotClient.subscribe(function (event) {
-  if (event.action === 'reload') {
-    window.location.reload()
-  }
-})
diff --git a/template/build/dev-server.js b/template/build/dev-server.js
deleted file mode 100644
index 00d9efd144..0000000000
--- a/template/build/dev-server.js
+++ /dev/null
@@ -1,107 +0,0 @@
-'use strict'
-require('./check-versions')()
-
-const config = require('../config')
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
-}
-
-const opn = require('opn')
-const path = require('path')
-const express = require('express')
-const webpack = require('webpack')
-const proxyMiddleware = require('http-proxy-middleware')
-const webpackConfig = {{#if_or unit e2e}}(process.env.NODE_ENV === 'testing' || process.env.NODE_ENV === 'production')
-  ? require('./webpack.prod.conf')
-  : {{/if_or}}require('./webpack.dev.conf')
-
-// default port where dev server listens for incoming traffic
-const port = process.env.PORT || config.dev.port
-// automatically open browser, if not set will be false
-const autoOpenBrowser = !!config.dev.autoOpenBrowser
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-const proxyTable = config.dev.proxyTable
-
-const app = express()
-const compiler = webpack(webpackConfig)
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: webpackConfig.output.publicPath,
-  quiet: true
-})
-
-const hotMiddleware = require('webpack-hot-middleware')(compiler, {
-  log: false,
-  heartbeat: 2000
-})
-// force page reload when html-webpack-plugin template changes
-// currently disabled until this is resolved:
-// https://github.com/jantimon/html-webpack-plugin/issues/680
-// compiler.plugin('compilation', function (compilation) {
-//   compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-//     hotMiddleware.publish({ action: 'reload' })
-//     cb()
-//   })
-// })
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = { target: options }
-  }
-  app.use(proxyMiddleware(options.filter || context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// serve pure static assets
-const staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
-app.use(staticPath, express.static('./static'))
-
-const uri = 'http://localhost:' + port
-
-var _resolve
-var _reject
-var readyPromise = new Promise((resolve, reject) => {
-  _resolve = resolve
-  _reject = reject
-})
-
-var server
-var portfinder = require('portfinder')
-portfinder.basePort = port
-
-console.log('> Starting dev server...')
-devMiddleware.waitUntilValid(() => {
-  portfinder.getPort((err, port) => {
-    if (err) {
-      _reject(err)
-    }
-    process.env.PORT = port
-    var uri = 'http://localhost:' + port
-    console.log('> Listening at ' + uri + '\n')
-    // when env is testing, don't need open it
-    if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
-      opn(uri)
-    }
-    server = app.listen(port)
-    _resolve()
-  })
-})
-
-module.exports = {
-  ready: readyPromise,
-  close: () => {
-    server.close()
-  }
-}
diff --git a/template/build/logo.png b/template/build/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43
GIT binary patch
literal 6849
zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC&
zL0ag7$U(XW5YR7p&Ux?s<Na=)C)s<=p5LrlQ`Vj}i8j!?Lr2R_OGZXUr=_WGNV*Q3
zf2k=+zm;ZH`J@Y*r-qrQk(;BZj~xa<rsClC5CPOe**PH$5q1uK9)k!4GBOHYq_LT&
znXV4h-VG&gcg`d3i*hHS$;cFxeBJHrT@aqYhX^Mm8V1^F=>P$d4lvMt8C^+TcQu4F
zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}&
zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj
zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1
zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA
zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh
z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q
z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM
zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G
zwDA8AR)VCA#JOkxm#6<Fk;3Qv_CIk;8vG~n5ol7lV@Ppr$`vO}M#g$eOI^j-clMjL
zOPuv5uLtX1JFT#MwySH_RJ4r>oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G
zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%<lxjl%Ocl~M2y2lP|
zbFM`Z-*dEp9W{5_I?FqgKOqcjrGzul_KvvA0B9o^)C&!8LQLB95vnvr20|)KwER)3
zg@AiPX~4f9{zIy9K63eeK%_eUy<Xj$!il}`M9Aai_i>+_bCw_<t<K-?r^}*l>{<&~
zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj<EWM
zKtfCf^Zg1tRdj=Xm)|^7J1pa)+-CDvXj&R?416f(tgg8|WBR8cdxDx?*Yn+_9!KKY
zYfc;GQgX!L+9q}en#aZ8FKqby@Ji7SuT!4)GFKidFyC9wMywvB3c%^>1fo(ce4l-9
z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL
zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ
z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7<UU2Y^EpY^fzuq-h_rtLL
zw8{`NN~<)$oMx`|^gGr>sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P
zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4
z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m
zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^
zn$5}Q$G!@fTwD$e(x-~aWP0h+4N<q|;xEwzsU+0W)#|>Rz$Kln<bW)%U3n>O_H2c<
z(XX#lPuW_%H#Q+c&(nRyX1-Ia<yTsbNAz3PBfuh9@JU{>dKR-%$4FYC0fsCmL9ky3
zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#`
z2QhvH5w&V;wER?mopu+nqu*n8p~(%Q<o-E#HMmv_6Lr(S<y?zXl02$twV54+g=p_C
zbPW!;qljHcIPw~aX95_u!itzF%xKBH?y!MCRe^`1V@8<G!;_`~Q-@-mUm7r`3Jc*<
zW|jM!A9`X|osT!srEU-27h+^5j<OqNPj-EFHPokG&HB5WAG01lt!13`S9niUI^dz+
zrPE=GX-SXL@wqVGe*HT?V{#O~&~?uH#PoV2h;Vj@x`#d8)T&F})!(j^f1!z+l?Jjx
zylKosI<}}<nHbsk7I?v<<vXs6tPoozmJ}avD&{J7$vR$!Ni~Q@;tH>kwSs&*0eJwa
zMXR05`OSFpfyRb!<VB&Y0bEEVE$hSNXH(0mbzS-;?|O<AG)<R8gmLSuf>Y_+H@O%Y
z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL
zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY
z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W
zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6
zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o
z$=#_=aBkhe(ifX}MLT()@5?<tMQW)|T904`EDIN{(*~?7PZ%vrUEuUf@Om1Lh8V<U
zqvVYpe+tw_sKHyj#O-VCO5S%E1lshLO74De`Gk2E(7WE#<PpDtbvmnFnSOqG1oI3d
zYC<jZo_G~2KIE6{8;7bJFfC?E4zS>OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{
z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd
zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX
zoI=B}+$R22&IL`NCYUYjrdhwjnM<dIpta11b@>x_v=-Qcx-jmtN>!Zqf|n1^SWrHy
zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b
z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez
z={AM*r-bQs6*z$!*V<pNyBZpFi*F}aPuOZk!oD1sov}{rrxFZa@)!5H(|DKR-T0B*
zk=XmkSgqtSP+yWN@0aMgOdP>A4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd
zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz!
z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K
zXQr#6H}>a-GYs9^bG<C4b$CvneP46N2fi^kmcJjoTXRGgd^g1b&uQ5spV5+b#%y`#
zrU;H~D)utn!YWIi=j;?C-zcJ^D5xZF+#(?rMdp;)?KT1xBnMkmoV;zh&S;rXW6QQx
zWTQ2K14`6wG0eo+=1oSxjIHJc9Zkw+()XT69~5<`ZtDM}Z2bxUwYy3m%<I&~-0+^1
zYtu2vJf--MIxlG~PPDn;z8t5-=$6>P2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q
z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9
zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(<oDDN)6%Ctygl~O
zyPZcr9YCj-jDP7@YK23SJG!MDFZ1)E9`{R$R<J$u)%oUM9#k)$atlYczfhesFXL-4
zvsoG-9l@uTA8QI2Z$HsSvPZlMpB!@DV{4Bs(b)t!a<<4O@H~uuN{fO$vY>LgacooD
z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM
zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0
zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH;
zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK<ll>=t#
z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky
zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG
z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V
zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS
zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB
zHBol<PMLlw!1W2AX{4`0(aI-^)x1d_zq-0U*e!X=g^kk>OHYBas@&{PT=R+?d8pZu
zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ
zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86
z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q
z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1
zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX
zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~
zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T
z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC
z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0F<zVqs?Raxz=2A>B
z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb
zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o
zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c
z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se
zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M
z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y
z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh
zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem
zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72yd<aYLC-(YWFHR=3p2C;o@
zP>rFvm`R<qZaNijJ?9e0Ao@J0FQbg1c%wi*X&vhQIV{0-tqBevRs?R)1sbxUT&}HJ
z*KdKSzTFX7&Aa4>j-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc#
z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S<m;S)8!_N`GikUqEGHdRcGU-QPEbp3se
zE7LrqZLNv81NNuz!tDCc*XEM9tD}O}AA<wr-O|Mp0pzPgSb{6jitn>)4^*t8Va3HR
zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i
zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r
zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOM<s@Z}LbUcXA@TIG=Q@myo%l9hl^&h34x
zu6;dv<5;?t)>lK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C
z3HR9ssH7a&Vr<6waJrU<Uz3;wi7<=4xfd1VLN$2P7x}BBS2io@ltlrnmzyIDtt<yX
zAPcqxp4#$=Z%yky_m)4l_cnk`*u)Ahtuv8K{6vhAKMH6ow@c&kpm#&qGLE(Nu?A^>
zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N
zQUR>oadnG17#hNc$pkTp+9<O}Jes}mOYA)lX@8ntoYG-_HA4-;x|^l1dmnFbnH;3A
zo7RmzjAt!StB&)wt}}Vz$Tx7{+QOd#U@!|=V-Oy>lW+MBKHRZ~7<Tp{OpB;sNJVcO
zP9gJmH&Z2nt++Wk^~d|9`p`s~@#e4h2h+!@-1=fBDgb_osGReiQgZ>4XWUryd)4yd
zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR
zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T
z9rrj=?I<GKR}2`GsAAn<o<uOC`pid<%}8(c`p&zgnk&0rnZ{7Rb)^0-DfYcASTQ0s
zKO0S&yqP5xyM1crewennx~2nl$+FH?k$&4izqT?3*7J(SmJOw`dZb5FYs=|K5XN*~
z@!QVYGRE&)UH{eRL^>H*qI5{G@Rn&}^Z{+TW}mQe<Ew(X_9Cg%_)${IZP(Sf(i}}#
zbP^Uyd)|N;rJ4rvPkN0$CN?X?Bu3o`sBkNx9e)Hk<|kZoor>b9=8b<_a`&Cm#n%n~
zU47MvCBsdXFB1+adOO)03+nczfWa#vwk<X*p?NEOGFg@VXR_YfNi3ZWGup*ZMYLrd
zivdVFWx1f#$rH$D0S;+?%}dLVO}~LftMC3)E?;ORtVD#gO@_oLGdOsk#uT@)CP$RI
z#-#zp;&|vD_rYnvw~2N0Wp+nQ+xVJ$IH9kk(&N_Uad`)ORc-o<^o9v_z)$2HD4jGQ
zI}WMPN93Rji|(>#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A
zrRQ~(Ygh_ebltHo1VC<XI}!-0hb>bJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L
zFlJ_th0vxO7;-opU@WA<a+$A0VKV&CD~?Y9W`bM2k~*P|j8E*2CoV8)Cu!IV5;k=`
zm0lA9424u4MQ;9hkajM?rCu<5Nio0ru*d*6!O7wLB^>Fe;<}?!2q?RBrFK5U{<mA*
z;WN^+Hz{=MA9j{=Q!Qyy7=i0XTx(4nT94X=`8CIvSzRT*3@ox%j?(gLc30~Knc##R
z`(0eGu62$+sd#-(+!IS_v$FsA^Q8gK0r%Y15^&Pc`)3fzUE9X{;k8eN8;R}9b;E)`
zT8R>*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u
z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l
zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16
zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^<V!az}@c{ARa+_X}NO~a$=9p
za)_Ly?(LOnFWV{rQbS?1K7hP~fC?!$z}<pP%6*k1O(nj^MX2}V?0EMJUI;+4&As(@
zxYB>4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?-<xQqj`npk`D=fcL`B%EgjfC99(LE
z!z(C4-ap+uQYSIckaE<2uA^ag^t_eaYn_Jfq@U?vzOdv%t*)||aVad7PZ((`gpV!x
rZ$0M!)qwuD?ff?h#CY04MnNVFTnmG)-+p%fr;?V2o_dw4E$;sThR3J6

literal 0
HcmV?d00001

diff --git a/template/build/utils.js b/template/build/utils.js
index 4ac71cb2c9..b75c21502f 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -2,6 +2,7 @@
 const path = require('path')
 const config = require('../config')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const pkg = require('../package.json')
 
 exports.assetsPath = function (_path) {
   const assetsSubDirectory = process.env.NODE_ENV === 'production'
@@ -70,3 +71,22 @@ exports.styleLoaders = function (options) {
   }
   return output
 }
+
+exports.createNotifierCallback = function () {
+  const notifier = require('node-notifier')
+
+  return (severity, errors) => {
+    if (severity !== 'error') {
+      return
+    }
+    const error = errors[0]
+
+    const filename = error.file.split('!').pop()
+    notifier.notify({
+      title: pkg.name,
+      message: severity + ': ' + error.name,
+      subtitle: filename || '',
+      icon: path.join(__dirname, 'logo.png')
+    })
+  }
+}
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index f0f56c5115..89931abb7c 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -31,15 +31,16 @@ module.exports = {
   module: {
     rules: [
       {{#lint}}
-      {
+      ...(config.dev.useEslint? [{
         test: /\.(js|vue)$/,
         loader: 'eslint-loader',
         enforce: 'pre',
         include: [resolve('src'), resolve('test')],
         options: {
-          formatter: require('eslint-friendly-formatter')
+          formatter: require('eslint-friendly-formatter'),
+          emitWarning: !config.dev.showEslintErrorsInOverlay
         }
-      },
+      }] : []),
       {{/lint}}
       {
         test: /\.vue$/,
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 6f25d63458..9b2429a5e1 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -6,24 +6,38 @@ const merge = require('webpack-merge')
 const baseWebpackConfig = require('./webpack.base.conf')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+const portfinder = require('portfinder')
 
-// add hot-reload related code to entry chunks
-Object.keys(baseWebpackConfig.entry).forEach(function (name) {
-  baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
-})
-
-module.exports = merge(baseWebpackConfig, {
+const devWebpackConfig = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap })
   },
   // cheap-module-eval-source-map is faster for development
   devtool: '#cheap-module-eval-source-map',
+  
+  // these devServer options should be customized in /config/index.js
+  devServer: {
+    hot: true,
+    host: process.env.HOST || config.dev.host,
+    port: process.env.PORT || config.dev.port,
+    open: config.dev.autoOpenBrowser,
+    overlay: config.dev.errorOverlay ? {
+      warnings: false,
+      errors: true,
+    } : false,
+    publicPath: config.dev.assetsPublicPath,
+    proxy: config.dev.proxyTable,
+    quiet: true, // necessary for FriendlyErrorsPlugin
+    watchOptions: {
+      poll: config.dev.poll,
+    }
+  },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env': config.dev.env
-    }),
-    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+      'process.env': require('../config/dev.env')
+    }), 
     new webpack.HotModuleReplacementPlugin(),
+    new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
@@ -34,3 +48,29 @@ module.exports = merge(baseWebpackConfig, {
     new FriendlyErrorsPlugin()
   ]
 })
+
+module.exports = new Promise((resolve, reject) => {
+  portfinder.basePort = process.env.PORT || config.dev.port
+  portfinder.getPort((err, port) => {
+    if (err) {
+      reject(err)
+    } else {
+      // publish the new Port, necessary for e2e tests
+      process.env.PORT = port
+      // add port to devServer config
+      devWebpackConfig.devServer.port = port
+
+      // Add FriendlyErrorsPlugin
+      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
+        compilationSuccessInfo: {
+          messages: [`Your application is running here: http://${config.dev.host}:${port}`],
+        },
+        onErrors: config.dev.notifyOnErrors
+        ? utils.createNotifierCallback()
+        : undefined
+      }))
+
+      resolve(devWebpackConfig)
+    }
+  })
+})
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index a01b4454a2..0834cc12fb 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -12,7 +12,7 @@ const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 
 const env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('../config/test.env')
-  : {{/if_or}}config.build.env
+  : {{/if_or}}require('../config/prod.env')
 
 const webpackConfig = merge(baseWebpackConfig, {
   module: {
diff --git a/template/config/index.js b/template/config/index.js
index 14972462cc..09eaac1859 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -5,37 +5,58 @@
 const path = require('path')
 
 module.exports = {
+  dev: {
+    host: 'localhost', // can be overwritten by process.env.HOST
+    port: 8080, // can be overwritten by process.env.HOST, if port is in use, a free one will be determined
+
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {},
+
+    // Various Dev Server settings
+    autoOpenBrowser: false,
+    errorOverlay: true,
+    notifyOnErrors: true,
+    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+    // Use Eslint Loader?
+    // If true, your code will be linted during bundling and
+    // linting errors and warings will be shown in the console.
+    useEslint: true,
+    // If true, eslint errors and warings will also be shown in the error overlay
+    // in the browser.
+    showEslintErrorsInOverlay: false,
+
+    // CSS Sourcemaps off by default because relative paths are "buggy"
+    // with this option, according to the CSS-Loader README
+    // (https://github.com/webpack/css-loader#sourcemaps)
+    // In our experience, they generally work as expected,
+    // just be aware of this issue when enabling this option.
+    cssSourceMap: false
+  },
   build: {
-    env: require('./prod.env'),
+    // Template for index.html
     index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
+
     productionSourceMap: true,
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
+
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
     // `npm run build --report`
     // Set to `true` or `false` to always turn it on or off
+
     bundleAnalyzerReport: process.env.npm_config_report
-  },
-  dev: {
-    env: require('./dev.env'),
-    port: process.env.PORT || 8080,
-    autoOpenBrowser: true,
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {},
-    // CSS Sourcemaps off by default because relative paths are "buggy"
-    // with this option, according to the CSS-Loader README
-    // (https://github.com/webpack/css-loader#sourcemaps)
-    // In our experience, they generally work as expected,
-    // just be aware of this issue when enabling this option.
-    cssSourceMap: false
   }
 }
diff --git a/template/package.json b/template/package.json
index 7df054108d..d2578a8363 100644
--- a/template/package.json
+++ b/template/package.json
@@ -5,7 +5,7 @@
   "author": "{{ author }}",
   "private": true,
   "scripts": {
-    "dev": "node build/dev-server.js",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     "build": "node build/build.js"{{#unit}},
     "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
@@ -29,7 +29,6 @@
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
     "chalk": "^2.0.1",
-    "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",
     {{#lint}}
@@ -51,12 +50,10 @@
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.14.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
-    "http-proxy-middleware": "^0.17.3",
     "webpack-bundle-analyzer": "^2.9.0",
     {{#unit}}
     "cross-env": "^5.0.1",
@@ -77,6 +74,7 @@
     "babel-plugin-istanbul": "^4.1.1",
     "phantomjs-prebuilt": "^2.1.14",
     {{/unit}}
+    "node-notifier": "^5.1.2",
     {{#e2e}}
     "chromedriver": "^2.27.2",
     "cross-spawn": "^5.0.1",
@@ -85,7 +83,6 @@
     {{/e2e}}
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
-    "opn": "^5.1.0",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
@@ -95,8 +92,7 @@
     "vue-template-compiler": "^2.5.2",
     "portfinder": "^1.0.13",
     "webpack": "^3.6.0",
-    "webpack-dev-middleware": "^1.12.0",
-    "webpack-hot-middleware": "^2.18.2",
+    "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0"
   },
   "engines": {
diff --git a/template/test/e2e/runner.js b/template/test/e2e/runner.js
index 6b30c61e17..de22bfda22 100644
--- a/template/test/e2e/runner.js
+++ b/template/test/e2e/runner.js
@@ -1,8 +1,23 @@
 // 1. start the dev server using production config
 process.env.NODE_ENV = 'testing'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var server = require('../../build/dev-server.js'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
-server.ready.then(() => {
+const webpack = require('webpack'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const DevServer = require('webpack-dev-server'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
+const webpackConfig = require('../../build/webpack.prod.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const devConfigPromise = require('../../build/webpack.dev.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
+let server{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+
+devConfigPromise.then(devConfig => {
+  const devServerOptions = devConfig.devServer{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  const compiler = webpack(webpackConfig){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  server = new DevServer(compiler, devServerOptions){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  const port = devServerOptions.port{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  const host = devServerOptions.host{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  return server.listen(port, host){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+})
+.then(() => {
   // 2. run the nightwatch test suite against it
   // to run in additional browsers:
   //    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
@@ -10,7 +25,7 @@ server.ready.then(() => {
   // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
   // For more information on Nightwatch's config file, see
   // http://nightwatchjs.org/guide#settings-file
-  var opts = process.argv.slice(2){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  let opts = process.argv.slice(2){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   if (opts.indexOf('--config') === -1) {
     opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }
@@ -18,8 +33,8 @@ server.ready.then(() => {
     opts = opts.concat(['--env', 'chrome']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
   }
 
-  var spawn = require('cross-spawn'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  const spawn = require('cross-spawn'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  const runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 
   runner.on('exit', function (code) {
     server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}

From 41cb81117487e756311950185dd3508117a15591 Mon Sep 17 00:00:00 2001
From: anubhav mishra <anubhav.worklinux@gmail.com>
Date: Thu, 9 Nov 2017 01:55:43 +0530
Subject: [PATCH 220/339] remove uneccessary target.browsers (#1004)

options are already defined in package.json's "browserList" field.
---
 template/.babelrc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/template/.babelrc b/template/.babelrc
index c06df4d53a..d0f20ff4e7 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,10 +1,7 @@
 {
   "presets": [
     ["env", {
-      "modules": false,
-      "targets": {
-        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
-      }
+      "modules": false
     }],
     "stage-2"
   ],

From 583b6bb2c5a4d06333aeddb98ec77c28869bdeab Mon Sep 17 00:00:00 2001
From: yibuyisheng <yibuyisheng@163.com>
Date: Thu, 9 Nov 2017 04:27:25 +0800
Subject: [PATCH 221/339] fix postcss config (#890)

* Update vue-loader link (#886)

* Merge some small fixes (#900)

* Remove unused fs require from webpack.base.conf.js (#893)

* cleanup some leftover from reverting #688

* fix postcss config

* userPostCSS config
---
 template/build/utils.js             | 6 +++++-
 template/build/webpack.dev.conf.js  | 2 +-
 template/build/webpack.prod.conf.js | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index b75c21502f..a66d1d4ca7 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -22,9 +22,13 @@ exports.cssLoaders = function (options) {
     }
   }
 
+  var postcssLoader = {
+    loader: 'postcss-loader'
+  }
+
   // generate loader string to be used with extract text plugin
   function generateLoaders (loader, loaderOptions) {
-    const loaders = [cssLoader]
+    const loaders = options.usePostCSS !== false ? [cssLoader, postcssLoader] : [cssLoader]
     if (loader) {
       loaders.push({
         loader: loader + '-loader',
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 9b2429a5e1..1183918be9 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -10,7 +10,7 @@ const portfinder = require('portfinder')
 
 const devWebpackConfig = merge(baseWebpackConfig, {
   module: {
-    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap })
+    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
   },
   // cheap-module-eval-source-map is faster for development
   devtool: '#cheap-module-eval-source-map',
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 0834cc12fb..bf8ae1bc35 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -18,7 +18,8 @@ const webpackConfig = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({
       sourceMap: config.build.productionSourceMap,
-      extract: true
+      extract: true,
+      usePostCSS: true
     })
   },
   devtool: config.build.productionSourceMap ? '#source-map' : false,

From 14f2a92a64dcb5919a8adaf68fe763360b5999c3 Mon Sep 17 00:00:00 2001
From: Carson <huguangju@users.noreply.github.com>
Date: Thu, 9 Nov 2017 04:28:26 +0800
Subject: [PATCH 222/339] Fix Unknown plugin istanbul error when no unit test
 (#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.
---
 template/.babelrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index c06df4d53a..57107cc43d 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -11,8 +11,9 @@
   "plugins": ["transform-runtime"],
   "env": {
     "test": {
-      "presets": ["env", "stage-2"],
+      "presets": ["env", "stage-2"]{{#unit}},
       "plugins": ["istanbul"]
+      {{/unit}}
     }
   }
 }

From 504bcdabe287bfb337483f964a6632d3953c657d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 8 Nov 2017 21:28:48 +0100
Subject: [PATCH 223/339] Revert "Fix Unknown plugin istanbul error when no
 unit test (#785)" (#1035)

This reverts commit 14f2a92a64dcb5919a8adaf68fe763360b5999c3.
---
 template/.babelrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/.babelrc b/template/.babelrc
index 57107cc43d..c06df4d53a 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -11,9 +11,8 @@
   "plugins": ["transform-runtime"],
   "env": {
     "test": {
-      "presets": ["env", "stage-2"]{{#unit}},
+      "presets": ["env", "stage-2"],
       "plugins": ["istanbul"]
-      {{/unit}}
     }
   }
 }

From 883442b1f0d272b7a0592022fc7875d113ad2dbe Mon Sep 17 00:00:00 2001
From: Sid <oceankwok@hotmail.com>
Date: Thu, 9 Nov 2017 04:30:13 +0800
Subject: [PATCH 224/339] replace `id` with `name` in chunk files, Fix #996
 (#997)

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

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index bf8ae1bc35..1528eda913 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -26,7 +26,7 @@ const webpackConfig = merge(baseWebpackConfig, {
   output: {
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+    chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html

From f1d323b6e6840cf8f9c44cd894649ab82d0fea63 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Thu, 9 Nov 2017 02:00:40 +0530
Subject: [PATCH 225/339] Add scope hoisting in the prod config (#1013)

https://medium.com/webpack/brief-introduction-to-scope-hoisting-in-webpack-8435084c171f
---
 template/build/webpack.prod.conf.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 1528eda913..958c130abc 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -73,6 +73,8 @@ const webpackConfig = merge(baseWebpackConfig, {
     }),
     // keep module.id stable when vender modules does not change
     new webpack.HashedModuleIdsPlugin(),
+    // enable scope hoisting
+    new webpack.optimize.ModuleConcatenationPlugin(),
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',

From 844c8dded173f1e9ca15f8e42cd6f8c1528c2055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Fri, 10 Nov 2017 02:15:57 -0600
Subject: [PATCH 226/339] Add postcss-loader (#1038)

---
 template/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/package.json b/template/package.json
index d2578a8363..64e165d3f6 100644
--- a/template/package.json
+++ b/template/package.json
@@ -85,6 +85,7 @@
     "shelljs": "^0.7.6",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
+    "postcss-loader": "^2.0.8",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
     "vue-loader": "^13.3.0",

From 507819912bed26409e83200e863bf7fde64501da Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 11 Nov 2017 13:54:19 +0100
Subject: [PATCH 227/339] add cacheBusting option for vue-loader

---
 template/config/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/template/config/index.js b/template/config/index.js
index 09eaac1859..0a7260bb2f 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -33,7 +33,12 @@ module.exports = {
     // (https://github.com/webpack/css-loader#sourcemaps)
     // In our experience, they generally work as expected,
     // just be aware of this issue when enabling this option.
-    cssSourceMap: false
+    cssSourceMap: false,
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
   },
   build: {
     // Template for index.html

From 5b5909502f62e8b54f216bc03f65c315f373bf81 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 11 Nov 2017 13:54:56 +0100
Subject: [PATCH 228/339] make sourcemaps editable in config

also reorganize the config file a bit.
---
 template/build/webpack.dev.conf.js  |  2 +-
 template/build/webpack.prod.conf.js |  4 ++--
 template/config/index.js            | 33 ++++++++++++++++++++---------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 1183918be9..e47767d6fd 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -13,7 +13,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
   },
   // cheap-module-eval-source-map is faster for development
-  devtool: '#cheap-module-eval-source-map',
+  devtool: config.dev.devtool,
   
   // these devServer options should be customized in /config/index.js
   devServer: {
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 958c130abc..19cfe25ced 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -22,7 +22,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       usePostCSS: true
     })
   },
-  devtool: config.build.productionSourceMap ? '#source-map' : false,
+  devtool: config.build.productionSourceMap ? config.build.devtool : false,
   output: {
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
@@ -38,7 +38,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       compress: {
         warnings: false
       },
-      sourceMap: true,
+      sourceMap: config.build.productionSourceMap,
       parallel: true
     }),
     // extract css into its own file
diff --git a/template/config/index.js b/template/config/index.js
index 0a7260bb2f..a61e95b59d 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -6,8 +6,6 @@ const path = require('path')
 
 module.exports = {
   dev: {
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.HOST, if port is in use, a free one will be determined
 
     // Paths
     assetsSubDirectory: 'static',
@@ -15,6 +13,8 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
+    host: 'localhost', // can be overwritten by process.env.HOST
+    port: 8080, // can be overwritten by process.env.HOST, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,
@@ -28,18 +28,26 @@ module.exports = {
     // in the browser.
     showEslintErrorsInOverlay: false,
 
-    // CSS Sourcemaps off by default because relative paths are "buggy"
-    // with this option, according to the CSS-Loader README
-    // (https://github.com/webpack/css-loader#sourcemaps)
-    // In our experience, they generally work as expected,
-    // just be aware of this issue when enabling this option.
-    cssSourceMap: false,
+    /**
+     * Source Maps
+    */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: 'eval-source-map',
 
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help
     // https://vue-loader.vuejs.org/en/options.html#cachebusting
     cacheBusting: true,
+
+    // CSS Sourcemaps off by default because relative paths are "buggy"
+    // with this option, according to the CSS-Loader README
+    // (https://github.com/webpack/css-loader#sourcemaps)
+    // In our experience, they generally work as expected,
+    // just be aware of this issue when enabling this option.
+    cssSourceMap: false,    
   },
+  
   build: {
     // Template for index.html
     index: path.resolve(__dirname, '../dist/index.html'),
@@ -49,19 +57,24 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
 
+    /**
+     * SourceMap
+    */
     productionSourceMap: true,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: '#source-map',
+    
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
-
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
+    
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
     // `npm run build --report`
     // Set to `true` or `false` to always turn it on or off
-
     bundleAnalyzerReport: process.env.npm_config_report
   }
 }

From 1cbcde197445f91897d90567b405c0bf1e1e7d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 11 Nov 2017 14:12:27 +0100
Subject: [PATCH 229/339] Add sourcemap option to postCSS-loader options
 (#1039)

* Add sourcemap option to postCSS-loader options

* Update utils.js

* fix condition, should als fail on `undefined`
---
 template/build/utils.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index a66d1d4ca7..dfed56f424 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -23,12 +23,15 @@ exports.cssLoaders = function (options) {
   }
 
   var postcssLoader = {
-    loader: 'postcss-loader'
+    loader: 'postcss-loader',
+    options: {
+      sourceMap: options.sourceMap
+    }
   }
 
   // generate loader string to be used with extract text plugin
   function generateLoaders (loader, loaderOptions) {
-    const loaders = options.usePostCSS !== false ? [cssLoader, postcssLoader] : [cssLoader]
+    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
     if (loader) {
       loaders.push({
         loader: loader + '-loader',

From cdb3710377b8fbe5ad3df4d094acc77c174e41e1 Mon Sep 17 00:00:00 2001
From: Edd Yerburgh <edward.yerburgh@gmail.com>
Date: Sun, 12 Nov 2017 12:38:05 +0000
Subject: [PATCH 230/339] Add Jest  as new unit test runner, keep Karma + Mocha
 as a fallback (#824)

* refactor: replace karma and mocha with jest

* refactor: remove webpack.test.conf

* refactor: prompt jest instead of mocha and karma

* feat(jest): add coverage reporting

* docs(jest): update unit.md with details of jest

* docs(jest): remove karma files from structure.md

* docs(jest): replace details on Karma with details on Jest

* docs: add missing period

* docs(jest): replace karma with Jest in commands.md

* docs(jest): update npm run unit bullet points

* refactor: use module-resolver in place of jest moduleNameMapper

* refactor: remove .vue extension from Hello import

* test: include src files in test coverage

* test: only ignore router/index in coverage if router option selected

* chore: fix merge conflicts

* chore: add MIT free Jest

* Reference dev script in start script instead of copy pasting (#894)

Less duplication FTW.

* feat: add karma option

* refactor: use const in webpack.test.conf

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (#986)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (#987)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* refactor: use jest module mapping

* feat(jest): filter jest setup file

* fix: fix trailing comma

* docs: add Jest and Karma to unit section

* fix: add Jest options if jest option

* test: change env in .eslintrc

* fix: remove merge trace

* fix: merge package.json with develop

* docs: split unit test docs into Jest and Karma

* docs: add Karma and Jest to README

* docs: reimplement karma files in structure.md
---
 README.md                                     |  5 +-
 docs/commands.md                              |  5 +-
 docs/structure.md                             |  7 ++-
 docs/unit.md                                  | 26 +++++++--
 meta.js                                       | 29 +++++++++-
 template/.babelrc                             |  3 +-
 template/config/index.js                      |  1 +
 template/package.json                         | 57 ++++++++++++++++---
 template/src/components/HelloWorld.vue        |  3 -
 template/src/router/index.js                  |  2 +-
 template/test/unit/.eslintrc                  | 12 ++--
 template/test/unit/setup.js                   |  3 +
 .../{Hello.spec.js => HelloWorld.spec.js}     |  2 +-
 test.sh                                       |  0
 14 files changed, 121 insertions(+), 34 deletions(-)
 create mode 100644 template/test/unit/setup.js
 rename template/test/unit/specs/{Hello.spec.js => HelloWorld.spec.js} (70%)
 mode change 100644 => 100755 test.sh

diff --git a/README.md b/README.md
index 751a2ed6a2..a4b24503a5 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,9 @@ The development server will run on port 8080 by default. If that port is already
   - Static assets compiled with version hashes for efficient long-term caching, and an auto-generated production `index.html` with proper URLs to these generated assets.
   - Use `npm run build --report`to build with bundle size analytics.
 
-- `npm run unit`: Unit tests run in PhantomJS with [Karma](http://karma-runner.github.io/0.13/index.html) + [Mocha](http://mochajs.org/) + [karma-webpack](https://github.com/webpack/karma-webpack).
+- `npm run unit`: Unit tests run in [JSDOM](https://github.com/tmpvar/jsdom) with [Jest](https://facebook.github.io/jest/), or in PhantomJS with Karma + Mocha + karma-webpack.
   - Supports ES2015+ in test files.
-  - Supports all webpack loaders.
-  - Easy mock injection.
+  - Easy mocking.
 
 - `npm run e2e`: End-to-end tests with [Nightwatch](http://nightwatchjs.org/).
   - Run tests in multiple browsers in parallel.
diff --git a/docs/commands.md b/docs/commands.md
index 2a067d8ce0..29aa12c76e 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -23,11 +23,10 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 
 ### `npm run unit`
 
-> Run unit tests in PhantomJS with [Karma](https://karma-runner.github.io/). See [Unit Testing](unit.md) for more details.
+> Run unit tests in JSDOM with [Jest](https://facebook.github.io/jest/docs/getting-started.html). See [Unit Testing](unit.md) for more details.
 
 - Supports ES2015+ in test files.
-- Supports all webpack loaders.
-- Easy [mock injection](http://vuejs.github.io/vue-loader/en/workflow/testing-with-mocks.html).
+- Easy [mocking](https://facebook.github.io/jest/docs/mock-functions.html).
 
 ### `npm run e2e`
 
diff --git a/docs/structure.md b/docs/structure.md
index 8daf54301b..05d3a06a1a 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -17,9 +17,10 @@
 ├── static/                     # pure static assets (directly copied)
 ├── test/
 │   └── unit/                   # unit tests
-│   │   ├── specs/              # test spec files
-│   │   ├── index.js            # test build entry file
-│   │   └── karma.conf.js       # test runner config file
+│   │   ├── specs/              # test spec files
+│   │   ├── setup.js            # file that runs before Jest tests
+│   │   ├── index.js            # test build entry file
+│   │   └── karma.conf.js       # test runner config file
 │   └── e2e/                    # e2e tests
 │   │   ├── specs/              # test spec files
 │   │   ├── custom-assertions/  # custom assertions for e2e tests
diff --git a/docs/unit.md b/docs/unit.md
index faeb527c16..54a8d76cfd 100644
--- a/docs/unit.md
+++ b/docs/unit.md
@@ -1,7 +1,25 @@
 # Unit Testing
 
+This project offers two options for unit testing—Jest, and Karma and Mocha.
+
 An overview of the tools used by this boilerplate for unit testing:
 
+## Jest
+
+- [Jest](https://facebook.github.io/jest/): the test runner that launches JSDOM runs the tests and reports the results to us.
+
+### Files
+
+- `setup.js`
+
+  Jest runs this file before it runs the unit tests. It sets the Vue production tip to false.
+
+### Mocking Dependencies
+
+The Jest boilerplate comes with the ability to mock dependencies. See the [mock functions guide](https://facebook.github.io/jest/docs/mock-functions.html) for more details.
+
+## Karma and Mocha
+
 - [Karma](https://karma-runner.github.io/): the test runner that launches browsers, runs the tests and reports the results to us.
 - [karma-webpack](https://github.com/webpack/karma-webpack): the plugin for Karma that bundles our tests using Webpack.
 - [Mocha](https://mochajs.org/): the test framework that we write test specs with.
@@ -10,7 +28,7 @@ An overview of the tools used by this boilerplate for unit testing:
 
 Chai and Sinon are integrated using [karma-sinon-chai](https://github.com/kmees/karma-sinon-chai), so all Chai interfaces (`should`, `expect`, `assert`) and `sinon` are globally available in test files.
 
-And the files:
+### Files
 
 - `index.js`
 
@@ -24,10 +42,10 @@ And the files:
 
   This is the Karma configuration file. See [Karma docs](https://karma-runner.github.io/) for more details.
 
-## Running Tests in More Browsers
+### Running Tests in More Browsers
 
 You can run the tests in multiple real browsers by installing more [karma launchers](https://karma-runner.github.io/1.0/config/browsers.html) and adjusting the `browsers` field in `test/unit/karma.conf.js`.
 
-## Mocking Dependencies
+### Mocking Dependencies
 
-This boilerplate comes with [inject-loader](https://github.com/plasticine/inject-loader) installed by default. For usage with `*.vue` components, see [vue-loader docs on testing with mocks](http://vue-loader.vuejs.org/en/workflow/testing-with-mocks.html).
+The Karma unit test boilerplate comes with [inject-loader](https://github.com/plasticine/inject-loader) installed by default. For usage with `*.vue` components, see [vue-loader docs on testing with mocks](http://vue-loader.vuejs.org/en/workflow/testing-with-mocks.html).
diff --git a/meta.js b/meta.js
index 45d3acfb03..3ac83da625 100644
--- a/meta.js
+++ b/meta.js
@@ -72,7 +72,29 @@ module.exports = {
     },
     "unit": {
       "type": "confirm",
-      "message": "Setup unit tests with Karma + Mocha?"
+      "message": "Setup unit tests"
+    },
+    "runner": {
+      "when": "unit",
+      "type": "list",
+      "message": "Pick a test runner",
+      "choices": [
+        {
+          "name": "Jest",
+          "value": "jest",
+          "short": "jest"
+        },
+        {
+          "name": "Karma and Mocha",
+          "value": "karma",
+          "short": "karma"
+        },
+        {
+          "name": "none (configure it yourself)",
+          "value": "noTest",
+          "short": "noTest"
+        }
+      ]
     },
     "e2e": {
       "type": "confirm",
@@ -84,7 +106,10 @@ module.exports = {
     ".eslintignore": "lint",
     "config/test.env.js": "unit || e2e",
     "test/unit/**/*": "unit",
-    "build/webpack.test.conf.js": "unit",
+    "test/unit/index.js": "runner === 'karma'",
+    "test/unit/karma.conf.js": "runner === 'karma'",
+    "test/unit/specs/index.js": "runner === 'karma'",
+    "test/unit/setup.js": "runner === 'jest'",
     "test/e2e/**/*": "e2e",
     "src/router/**/*": "router"
   },
diff --git a/template/.babelrc b/template/.babelrc
index d0f20ff4e7..050e00e28c 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -8,8 +8,9 @@
   "plugins": ["transform-runtime"],
   "env": {
     "test": {
-      "presets": ["env", "stage-2"],
+      "presets": ["env", "stage-2"]{{#if_eq runner "karma"}},
       "plugins": ["istanbul"]
+      {{/if_eq}}
     }
   }
 }
diff --git a/template/config/index.js b/template/config/index.js
index a61e95b59d..08d68ec5ab 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,3 +1,4 @@
+
 'use strict'
 // Template version: 1.1.3
 // see http://vuejs-templates.github.io/webpack for documentation.
diff --git a/template/package.json b/template/package.json
index 64e165d3f6..fc75156633 100644
--- a/template/package.json
+++ b/template/package.json
@@ -7,11 +7,21 @@
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
-    "build": "node build/build.js"{{#unit}},
-    "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
-    "e2e": "node test/e2e/runner.js"{{/e2e}}{{#if_or unit e2e}},
-    "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}"{{/if_or}}{{#lint}},
-    "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
+    {{#if_eq runner "jest"}}
+    "unit": "jest test/unit/specs --coverage",
+    {{/if_eq}}
+    {{#if_eq runner "karma"}}
+    "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
+    {{/if_eq}}
+    {{#e2e}}
+    "e2e": "node test/e2e/runner.js",{{/e2e}}
+    {{#if_or unit e2e}}
+    "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}",
+    {{/if_or}}
+    {{#lint}}
+    "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}",
+    {{/lint}}
+    "build": "node build/build.js"
   },
   "dependencies": {
     "vue": "^2.5.2"{{#router}},
@@ -50,12 +60,18 @@
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
+    "express": "^4.14.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "webpack-bundle-analyzer": "^2.9.0",
-    {{#unit}}
+    {{#if_eq runner "jest"}}
+    "babel-jest": "^21.0.2",
+    "jest": "^21.2.0",
+    "vue-jest": "^1.0.2",
+    {{/if_eq}}
+    {{#if_eq runner "karma"}}
     "cross-env": "^5.0.1",
     "karma": "^1.4.1",
     "karma-coverage": "^1.1.1",
@@ -73,7 +89,7 @@
     "inject-loader": "^3.0.0",
     "babel-plugin-istanbul": "^4.1.1",
     "phantomjs-prebuilt": "^2.1.14",
-    {{/unit}}
+    {{/if_eq}}
     "node-notifier": "^5.1.2",
     {{#e2e}}
     "chromedriver": "^2.27.2",
@@ -85,7 +101,6 @@
     "shelljs": "^0.7.6",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
-    "postcss-loader": "^2.0.8",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
     "vue-loader": "^13.3.0",
@@ -96,6 +111,32 @@
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0"
   },
+  {{#if_eq runner "jest"}}
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "vue"
+    ],
+    "moduleNameMapper": {
+      "^@/(.*)$": "<rootDir>/src/$1"
+    },
+    "transform": {
+      "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
+      ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
+    },
+    "setupFiles": ["<rootDir>/test/unit/setup"],
+    "mapCoverage": true,
+    "collectCoverageFrom" : [
+      "src/**/*.{js,vue}",
+      "!src/main.js",
+      {{#router}}
+      "!src/router/index.js",
+      {{/router}}
+      "!**/node_modules/**"
+    ]
+  },
+  {{/if_eq}}
   "engines": {
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
diff --git a/template/src/components/HelloWorld.vue b/template/src/components/HelloWorld.vue
index 29036fa0aa..a87d5ead26 100644
--- a/template/src/components/HelloWorld.vue
+++ b/template/src/components/HelloWorld.vue
@@ -36,17 +36,14 @@ export default {
 h1, h2 {
   font-weight: normal;
 }
-
 ul {
   list-style-type: none;
   padding: 0;
 }
-
 li {
   display: inline-block;
   margin: 0 10px;
 }
-
 a {
   color: #42b983;
 }
diff --git a/template/src/router/index.js b/template/src/router/index.js
index 9bdda48bd3..89023c58a4 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -8,7 +8,7 @@ export default new Router({
   routes: [
     {
       path: '/',
-      name: 'Hello',
+      name: 'HelloWorld',
       component: HelloWorld{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
     }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   ]{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
diff --git a/template/test/unit/.eslintrc b/template/test/unit/.eslintrc
index 959a4f4b57..99ed4933ac 100644
--- a/template/test/unit/.eslintrc
+++ b/template/test/unit/.eslintrc
@@ -1,9 +1,11 @@
 {
-  "env": {
-    "mocha": true
-  },
+  "env": {{{#if_eq runner "karma"}}
+    "mocha": true{{/if_eq}}{{#if_eq runner "jest"}}
+    "jest"{{/if_eq}}
+  }{{#if_eq runner "karma"}},
   "globals": {
     "expect": true,
-    "sinon": true
-  }
+    "sinon": true,
+    "jest": true
+  }{{/if_eq}}
 }
diff --git a/template/test/unit/setup.js b/template/test/unit/setup.js
new file mode 100644
index 0000000000..edbdbae81e
--- /dev/null
+++ b/template/test/unit/setup.js
@@ -0,0 +1,3 @@
+import Vue from 'vue'
+
+Vue.config.productionTip = false
diff --git a/template/test/unit/specs/Hello.spec.js b/template/test/unit/specs/HelloWorld.spec.js
similarity index 70%
rename from template/test/unit/specs/Hello.spec.js
rename to template/test/unit/specs/HelloWorld.spec.js
index af36aff7bc..5e8f143967 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/HelloWorld.spec.js
@@ -6,6 +6,6 @@ describe('HelloWorld.vue', () => {
     const Constructor = Vue.extend(HelloWorld){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     const vm = new Constructor().$mount(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     expect(vm.$el.querySelector('.hello h1').textContent)
-      .to.equal('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    {{#if_eq runner "karma"}}.to.equal('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}{{/if_eq}}{{#if_eq runner "jest"}}.toEqual('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}{{/if_eq}}
   }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
diff --git a/test.sh b/test.sh
old mode 100644
new mode 100755

From dff87a88cbe1fce0a3d652cff63db39ad6edf5da Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 14:01:52 +0100
Subject: [PATCH 231/339] fix handlebars syntax error

---
 template/test/unit/.eslintrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/test/unit/.eslintrc b/template/test/unit/.eslintrc
index 99ed4933ac..3b01aee033 100644
--- a/template/test/unit/.eslintrc
+++ b/template/test/unit/.eslintrc
@@ -1,5 +1,5 @@
 {
-  "env": {{{#if_eq runner "karma"}}
+  "env": { {{#if_eq runner "karma"}}
     "mocha": true{{/if_eq}}{{#if_eq runner "jest"}}
     "jest"{{/if_eq}}
   }{{#if_eq runner "karma"}},

From 9a10ad78dbdb7e4fc70ec6856ff52ebd1db87a23 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 14:05:16 +0100
Subject: [PATCH 232/339] correct template version numbers

---
 package.json             | 2 +-
 template/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0d0a591880..a94b509e62 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "2.0.0",
+  "version": "1.2.0",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 08d68ec5ab..0cda76ec6c 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,6 +1,6 @@
 
 'use strict'
-// Template version: 1.1.3
+// Template version: 1.2.0
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From f8f3a09e2aded074abac2fb78562ca401c0b4bee Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 14:23:27 +0100
Subject: [PATCH 233/339] fix syntax error in test eslint file

---
 template/test/unit/.eslintrc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/template/test/unit/.eslintrc b/template/test/unit/.eslintrc
index 3b01aee033..74061c48b8 100644
--- a/template/test/unit/.eslintrc
+++ b/template/test/unit/.eslintrc
@@ -1,11 +1,10 @@
 {
   "env": { {{#if_eq runner "karma"}}
     "mocha": true{{/if_eq}}{{#if_eq runner "jest"}}
-    "jest"{{/if_eq}}
-  }{{#if_eq runner "karma"}},
-  "globals": {
+    "jest": true{{/if_eq}}
+  },
+  "globals": { {{#if_eq runner "karma"}}
     "expect": true,
-    "sinon": true,
-    "jest": true
-  }{{/if_eq}}
+    "sinon": true{{/if_eq}}
+  }
 }

From aeb594ad3ea456dc028ad38d113982d398c3d509 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 14:34:32 +0100
Subject: [PATCH 234/339] readjusting docs for unit testing a bit.

---
 docs/unit.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/unit.md b/docs/unit.md
index 54a8d76cfd..c14c46b4f9 100644
--- a/docs/unit.md
+++ b/docs/unit.md
@@ -1,8 +1,10 @@
 # Unit Testing
 
-This project offers two options for unit testing—Jest, and Karma and Mocha.
+This project offers two options for unit testing:
+
+1. Jest
+2. Karma and Mocha.
 
-An overview of the tools used by this boilerplate for unit testing:
 
 ## Jest
 

From be2cbed3f11698c086d76779e11e8251fba6dc36 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 14:41:29 +0100
Subject: [PATCH 235/339] fix meta.js when no unit AND e2e test option was
 selected

---
 meta.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta.js b/meta.js
index 3ac83da625..6f7b0f80d8 100644
--- a/meta.js
+++ b/meta.js
@@ -106,10 +106,10 @@ module.exports = {
     ".eslintignore": "lint",
     "config/test.env.js": "unit || e2e",
     "test/unit/**/*": "unit",
-    "test/unit/index.js": "runner === 'karma'",
-    "test/unit/karma.conf.js": "runner === 'karma'",
-    "test/unit/specs/index.js": "runner === 'karma'",
-    "test/unit/setup.js": "runner === 'jest'",
+    "test/unit/index.js": "unit && runner === 'karma'",
+    "test/unit/karma.conf.js": "unit && runner === 'karma'",
+    "test/unit/specs/index.js": "unit && runner === 'karma'",
+    "test/unit/setup.js": "unit && runner === 'jest'",
     "test/e2e/**/*": "e2e",
     "src/router/**/*": "router"
   },

From 19b89ebc3297f171014568ae5f32d870d5c4259f Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 12 Oct 2017 01:40:32 +0200
Subject: [PATCH 236/339] Barman!

---
 template/build/webpack.prod.conf.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 19cfe25ced..8a6aa88ae6 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -95,6 +95,15 @@ const webpackConfig = merge(baseWebpackConfig, {
       name: 'manifest',
       chunks: ['vendor']
     }),
+    // This instance extracts shared chunks from code splitted chunks and bundles them
+    // in a separate chunk, similar to the vendor chunk
+    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'app',
+      async: true,
+      children: true,
+      minChnks: 3,
+    }),
     // copy custom static assets
     new CopyWebpackPlugin([
       {

From 39f5853a980bffab5549c914f7a1e62fad6ec770 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 15:12:26 +0100
Subject: [PATCH 237/339] add async vendor chunk (+2 squashed commits) Squashed
 commits: [00b5ae6] small fixes [b125493] improve async vendor chunk settings.

small fixes
---
 template/build/webpack.prod.conf.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 8a6aa88ae6..f1cdf99b80 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -100,10 +100,11 @@ const webpackConfig = merge(baseWebpackConfig, {
     // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
     new webpack.optimize.CommonsChunkPlugin({
       name: 'app',
-      async: true,
+      async: 'vendor-async',
       children: true,
-      minChnks: 3,
+      minChunks: 3,
     }),
+
     // copy custom static assets
     new CopyWebpackPlugin([
       {

From 0a9c63d9ed516f2fc09b1ce90743c49e0e248cf0 Mon Sep 17 00:00:00 2001
From: Thomas Schersach <tschersach@gmail.com>
Date: Sun, 12 Nov 2017 15:21:45 +0100
Subject: [PATCH 238/339] Add historyApiFallback in dev-server config (#1044)

---
 template/build/webpack.dev.conf.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index e47767d6fd..cdab3636ef 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -17,6 +17,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   
   // these devServer options should be customized in /config/index.js
   devServer: {
+    historyApiFallback: true,
     hot: true,
     host: process.env.HOST || config.dev.host,
     port: process.env.PORT || config.dev.port,

From d4181af50684f863f94b287d4b02b2433231af1d Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 15:30:55 +0100
Subject: [PATCH 239/339] add context path to base config

---
 template/build/webpack.base.conf.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 89931abb7c..e2f09ecc61 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -9,6 +9,7 @@ function resolve (dir) {
 }
 
 module.exports = {
+  context: path.resolve(__dirname, '../'),
   entry: {
     app: './src/main.js'
   },

From 888a627a4e3b61b00c1bf4f0756c6b0f6524a3e9 Mon Sep 17 00:00:00 2001
From: Ryan Liu <m@mgenware.com>
Date: Sun, 12 Nov 2017 22:52:47 +0800
Subject: [PATCH 240/339] Use webpack 3's standard way to generate a manifest
 in CommonsChunkPlugin (#1028)

The doc URL: https://webpack.js.org/plugins/commons-chunk-plugin/#manifest-file
* `minChunks` is set to `Infinity` so that only webpack runtime is written to manifest file.
* `chunnks: ['vendor']` is removed as entry chunks are selected if `chunks` is omitted.
---
 template/build/webpack.prod.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index f1cdf99b80..aaff3f9e63 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -93,7 +93,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // prevent vendor hash from being updated whenever app bundle is updated
     new webpack.optimize.CommonsChunkPlugin({
       name: 'manifest',
-      chunks: ['vendor']
+      minChunks: Infinity,
     }),
     // This instance extracts shared chunks from code splitted chunks and bundles them
     // in a separate chunk, similar to the vendor chunk

From ac0ea0278bd9bc2dc1a13ff6284009b8252e323b Mon Sep 17 00:00:00 2001
From: Dave Woodall <dave@fakefarm.com>
Date: Sun, 12 Nov 2017 09:53:30 -0500
Subject: [PATCH 241/339] Grammar and typo fixes on docs (#992)

---
 docs/pre-processors.md | 2 +-
 docs/static.md         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/pre-processors.md b/docs/pre-processors.md
index 9d377dfe09..8611ef542f 100644
--- a/docs/pre-processors.md
+++ b/docs/pre-processors.md
@@ -1,6 +1,6 @@
 # Pre-Processors
 
-This boilerplate has pre-configured CSS extraction for most popular CSS pre-processors including LESS, SASS, Stylus, and PostCSS. To use a pre-processor, all you need to do is installing the appropriate webpack loader for it. For example, to use SASS:
+This boilerplate has pre-configured CSS extraction for most popular CSS pre-processors including LESS, SASS, Stylus, and PostCSS. To use a pre-processor, all you need to do is install the appropriate webpack loader for it. For example, to use SASS:
 
 ``` bash
 npm install sass-loader node-sass --save-dev
diff --git a/docs/static.md b/docs/static.md
index ab3c1fc4da..9987ec824e 100644
--- a/docs/static.md
+++ b/docs/static.md
@@ -6,9 +6,9 @@ You will notice in the project structure we have two directories for static asse
 
 To answer this question, we first need to understand how Webpack deals with static assets. In `*.vue` components, all your templates and CSS are parsed by `vue-html-loader` and `css-loader` to look for asset URLs. For example, in `<img src="./logo.png">` and `background: url(./logo.png)`, `"./logo.png"` is a relative asset path and will be **resolved by Webpack as a module dependency**.
 
-Because `logo.png` is not JavaScript, when treated as a module dependency, we need to use `url-loader` and `file-loader` to process it. This boilerplate has already configured these loaders for you, so you basically get features such as filename fingerprinting and conditional base64 inlining for free, while being able to use relative/module paths without worrying about deployment.
+Because `logo.png` is not JavaScript, when treated as a module dependency, we need to use `url-loader` and `file-loader` to process it. This template has already configured these loaders for you, so you get features such as filename fingerprinting and conditional base64 inlining for free, while being able to use relative/module paths without worrying about deployment.
 
-Since these assets may be inlined/copied/renamed during build, they are essentially part of your source code. This is why it is recommended to place Webpack-processed static assets inside `/src`, along side other source files. In fact, you don't even have to put them all in `/src/assets`: you can organize them based on the module/component using them. For example, you can put each component in its own directory, with its static assets right next to it.
+Since these assets may be inlined/copied/renamed during build, they are essentially part of your source code. This is why it is recommended to place Webpack-processed static assets inside `/src`, alongside other source files. In fact, you don't even have to put them all in `/src/assets`: you can organize them based on the module/component using them. For example, you can put each component in its own directory, with its static assets right next to it.
 
 ### Asset Resolving Rules
 

From db75f1fadb47507c36cb7e39cf1fc202a0eeae68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=8C=E3=81=BF?= <moe.pascal@gmail.com>
Date: Sun, 12 Nov 2017 22:59:11 +0800
Subject: [PATCH 242/339] pass cssSourceMap option to vue-loader (#756)

---
 template/build/vue-loader.conf.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index eece58fe1b..d2ece8f322 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -2,14 +2,17 @@
 const utils = require('./utils')
 const config = require('../config')
 const isProduction = process.env.NODE_ENV === 'production'
+const sourceMapEnabled = isProduction
+  ? config.build.productionSourceMap
+  : config.dev.cssSourceMap
+
 
 module.exports = {
   loaders: utils.cssLoaders({
-    sourceMap: isProduction
-      ? config.build.productionSourceMap
-      : config.dev.cssSourceMap,
+    sourceMap: sourceMapEnabled,
     extract: isProduction
   }),
+  cssSourceMap: sourceMapEnabled,
   transformToRequire: {
     video: 'src',
     source: 'src',

From 626bc9806a53d0bd33b5436af1df56155f5f26a6 Mon Sep 17 00:00:00 2001
From: Ryan Liu <m@mgenware.com>
Date: Mon, 13 Nov 2017 01:50:04 +0800
Subject: [PATCH 243/339] Set ExtractTextPlugin.allChunks to true (#1027)

* When using CommonsChunkPlugin and there are extracted chunks (from ExtractTextPlugin.extract) in the commons chunk, allChunks must be set to true
https://github.com/webpack-contrib/extract-text-webpack-plugin

* Explicitly set allChunks to false along with some useful info on codesplit chunks (credit to @LinusBorg)

* Update webpack.prod.conf.js
---
 template/build/webpack.prod.conf.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index aaff3f9e63..0d281189e6 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -43,7 +43,11 @@ const webpackConfig = merge(baseWebpackConfig, {
     }),
     // extract css into its own file
     new ExtractTextPlugin({
-      filename: utils.assetsPath('css/[name].[contenthash].css')
+      filename: utils.assetsPath('css/[name].[contenthash].css'),
+      // set the following option to `true` if you want to extract CSS from
+      // codesplit chunks into this main css file as well.
+      // This will result in *all* of your app's CSS being loaded upfront.
+      allChunks: false,
     }),
     // Compress extracted CSS. We are using this plugin so that possible
     // duplicated CSS from different components can be deduped.

From fa807df769b73468703ec499a49827d75432a43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sun, 12 Nov 2017 19:28:02 +0100
Subject: [PATCH 244/339] re-merge (#1045)

* Reference dev script in start script instead of copy pasting (#894)

Less duplication FTW.

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (#986)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (#987)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* Fix Unknown plugin istanbul error when no unit test (#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.

* Revert "Fix Unknown plugin istanbul error when no unit test (#785)" (#1035)

This reverts commit 14f2a92a64dcb5919a8adaf68fe763360b5999c3.

From 3d0ab09a3cc69bcf09e5d9a23d88a989df146ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Fontcuberta?= <adria@calidae.com>
Date: Sun, 12 Nov 2017 19:51:10 +0100
Subject: [PATCH 245/339] Remove unnecessary whitespaces (#1047)

---
 template/config/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/config/index.js b/template/config/index.js
index 0cda76ec6c..80affeec05 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,4 +1,3 @@
-
 'use strict'
 // Template version: 1.2.0
 // see http://vuejs-templates.github.io/webpack for documentation.
@@ -46,7 +45,7 @@ module.exports = {
     // (https://github.com/webpack/css-loader#sourcemaps)
     // In our experience, they generally work as expected,
     // just be aware of this issue when enabling this option.
-    cssSourceMap: false,    
+    cssSourceMap: false,
   },
   
   build: {

From 3c67b770e8bdc1f1b1ef849753a6e0482c60a02c Mon Sep 17 00:00:00 2001
From: Jarrod Davis <developer@jarrodldavis.com>
Date: Sun, 12 Nov 2017 12:51:35 -0600
Subject: [PATCH 246/339] fix(jest): fix Jest coverage directory (#1046)

Explicitly set the coverage directory to match Karma and .gitignore
---
 template/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/package.json b/template/package.json
index fc75156633..50d25cd584 100644
--- a/template/package.json
+++ b/template/package.json
@@ -127,6 +127,7 @@
     },
     "setupFiles": ["<rootDir>/test/unit/setup"],
     "mapCoverage": true,
+    "coverageDirectory": "<rootDir>/test/unit/coverage",
     "collectCoverageFrom" : [
       "src/**/*.{js,vue}",
       "!src/main.js",

From 664617f9245a30e61b87f9a439c611b223e6c17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Fontcuberta?= <adria@calidae.com>
Date: Sun, 12 Nov 2017 21:43:50 +0100
Subject: [PATCH 247/339] Fix typos and formatting (#1048)

---
 template/config/index.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/template/config/index.js b/template/config/index.js
index 80affeec05..0dc959eeab 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -22,15 +22,15 @@ module.exports = {
 
     // Use Eslint Loader?
     // If true, your code will be linted during bundling and
-    // linting errors and warings will be shown in the console.
+    // linting errors and warnings will be shown in the console.
     useEslint: true,
-    // If true, eslint errors and warings will also be shown in the error overlay
+    // If true, eslint errors and warnings will also be shown in the error overlay
     // in the browser.
     showEslintErrorsInOverlay: false,
 
     /**
      * Source Maps
-    */
+     */
 
     // https://webpack.js.org/configuration/devtool/#development
     devtool: 'eval-source-map',
@@ -58,8 +58,9 @@ module.exports = {
     assetsPublicPath: '/',
 
     /**
-     * SourceMap
-    */
+     * Source Maps
+     */
+
     productionSourceMap: true,
     // https://webpack.js.org/configuration/devtool/#production
     devtool: '#source-map',

From 73c80a9062f5cc2cb429bde45912a2e81ac02a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 13 Nov 2017 14:11:14 +0100
Subject: [PATCH 248/339] re-add postcss-loader

was mistakenly removed during merge of #824
---
 template/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/package.json b/template/package.json
index 50d25cd584..4c6d0cbcea 100644
--- a/template/package.json
+++ b/template/package.json
@@ -97,6 +97,7 @@
     "nightwatch": "^0.9.12",
     "selenium-server": "^3.0.1",
     {{/e2e}}
+    "postcss-loader": "^2.0.8",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "optimize-css-assets-webpack-plugin": "^3.2.0",

From 70eaed0c64700e58e3cc7d066d10fb01f8bffafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 13 Nov 2017 14:15:14 +0100
Subject: [PATCH 249/339] bumb version string in config

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

diff --git a/template/config/index.js b/template/config/index.js
index 0dc959eeab..51659f0c27 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.0
+// Template version: 1.2.1
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 657c98229e6fe06fdda83696ee2aa8e6455f7c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 13 Nov 2017 14:15:43 +0100
Subject: [PATCH 250/339] bumb version string in config in package.json

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

diff --git a/package.json b/package.json
index a94b509e62..17dd5ab662 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {

From ad2de3b3780846786f0475255ff3794d53ac7a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 13 Nov 2017 14:23:44 +0100
Subject: [PATCH 251/339] 1.2.1 - Bugfix release (#1052)

* re-merge (#1045)

* Reference dev script in start script instead of copy pasting (#894)

Less duplication FTW.

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (#986)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (#987)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* Fix Unknown plugin istanbul error when no unit test (#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.

* Revert "Fix Unknown plugin istanbul error when no unit test (#785)" (#1035)

This reverts commit 14f2a92a64dcb5919a8adaf68fe763360b5999c3.

* Remove unnecessary whitespaces (#1047)

* fix(jest): fix Jest coverage directory (#1046)

Explicitly set the coverage directory to match Karma and .gitignore

* Fix typos and formatting (#1048)

* re-add postcss-loader

was mistakenly removed during merge of #824

* bumb version string in config

* bumb version string in config in package.json
---
 package.json             |  2 +-
 template/config/index.js | 16 ++++++++--------
 template/package.json    |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index a94b509e62..17dd5ab662 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 0cda76ec6c..51659f0c27 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,6 +1,5 @@
-
 'use strict'
-// Template version: 1.2.0
+// Template version: 1.2.1
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')
@@ -23,15 +22,15 @@ module.exports = {
 
     // Use Eslint Loader?
     // If true, your code will be linted during bundling and
-    // linting errors and warings will be shown in the console.
+    // linting errors and warnings will be shown in the console.
     useEslint: true,
-    // If true, eslint errors and warings will also be shown in the error overlay
+    // If true, eslint errors and warnings will also be shown in the error overlay
     // in the browser.
     showEslintErrorsInOverlay: false,
 
     /**
      * Source Maps
-    */
+     */
 
     // https://webpack.js.org/configuration/devtool/#development
     devtool: 'eval-source-map',
@@ -46,7 +45,7 @@ module.exports = {
     // (https://github.com/webpack/css-loader#sourcemaps)
     // In our experience, they generally work as expected,
     // just be aware of this issue when enabling this option.
-    cssSourceMap: false,    
+    cssSourceMap: false,
   },
   
   build: {
@@ -59,8 +58,9 @@ module.exports = {
     assetsPublicPath: '/',
 
     /**
-     * SourceMap
-    */
+     * Source Maps
+     */
+
     productionSourceMap: true,
     // https://webpack.js.org/configuration/devtool/#production
     devtool: '#source-map',
diff --git a/template/package.json b/template/package.json
index fc75156633..4c6d0cbcea 100644
--- a/template/package.json
+++ b/template/package.json
@@ -97,6 +97,7 @@
     "nightwatch": "^0.9.12",
     "selenium-server": "^3.0.1",
     {{/e2e}}
+    "postcss-loader": "^2.0.8",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
@@ -127,6 +128,7 @@
     },
     "setupFiles": ["<rootDir>/test/unit/setup"],
     "mapCoverage": true,
+    "coverageDirectory": "<rootDir>/test/unit/coverage",
     "collectCoverageFrom" : [
       "src/**/*.{js,vue}",
       "!src/main.js",

From 86d4970b5a9ccdaaaf9f65eae3cb5570f629af74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Mon, 13 Nov 2017 15:23:13 -0600
Subject: [PATCH 252/339] Remove extra commas (#1050)

---
 template/build/webpack.prod.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 0d281189e6..64a90771f9 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -97,7 +97,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // prevent vendor hash from being updated whenever app bundle is updated
     new webpack.optimize.CommonsChunkPlugin({
       name: 'manifest',
-      minChunks: Infinity,
+      minChunks: Infinity
     }),
     // This instance extracts shared chunks from code splitted chunks and bundles them
     // in a separate chunk, similar to the vendor chunk
@@ -106,7 +106,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       name: 'app',
       async: 'vendor-async',
       children: true,
-      minChunks: 3,
+      minChunks: 3
     }),
 
     // copy custom static assets

From 27855e99587fc4ef4ee08cbfae07232bc0cfa171 Mon Sep 17 00:00:00 2001
From: Zhang Visper <i@zjy.name>
Date: Tue, 14 Nov 2017 04:11:43 -0600
Subject: [PATCH 253/339] remove `express` from package.json (#1060)

---
 template/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 4c6d0cbcea..30ecbe3f96 100644
--- a/template/package.json
+++ b/template/package.json
@@ -60,7 +60,6 @@
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.14.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",

From deb97b1c42b76aacd05628dc2c222fe7bf7f3761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 14 Nov 2017 21:07:17 +0100
Subject: [PATCH 254/339] reduce clientLogLevel

the default, 'info', is much too verbose
---
 template/build/webpack.dev.conf.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index cdab3636ef..64772364a4 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -17,6 +17,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   
   // these devServer options should be customized in /config/index.js
   devServer: {
+    clientLogLevel: 'warning',
     historyApiFallback: true,
     hot: true,
     host: process.env.HOST || config.dev.host,

From cc53d3e7dc85f9962f835705b4b74aea0b9039c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 14 Nov 2017 21:11:29 +0100
Subject: [PATCH 255/339] Make sure that imported css files in SFCs are
 autoprefixed, too (#1053)

using postcss-import
---
 template/.postcssrc.js | 1 +
 template/package.json  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/template/.postcssrc.js b/template/.postcssrc.js
index 09948d63e9..249472dab1 100644
--- a/template/.postcssrc.js
+++ b/template/.postcssrc.js
@@ -3,6 +3,7 @@
 module.exports = {
   "plugins": {
     // to edit target browsers: use "browserslist" field in package.json
+    "postcss-import": {},
     "autoprefixer": {}
   }
 }
diff --git a/template/package.json b/template/package.json
index 30ecbe3f96..c91e06c239 100644
--- a/template/package.json
+++ b/template/package.json
@@ -96,6 +96,7 @@
     "nightwatch": "^0.9.12",
     "selenium-server": "^3.0.1",
     {{/e2e}}
+    "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",

From 4484b6e82a33fb1f99f22b8c52f2bbe5ccc8521b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 14 Nov 2017 21:12:41 +0100
Subject: [PATCH 256/339] remove unnecessary minimize option (close #1056)

---
 template/build/utils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/build/utils.js b/template/build/utils.js
index dfed56f424..27f4bea66e 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -17,7 +17,6 @@ exports.cssLoaders = function (options) {
   const cssLoader = {
     loader: 'css-loader',
     options: {
-      minimize: process.env.NODE_ENV === 'production',
       sourceMap: options.sourceMap
     }
   }

From 26319f7ba4950d3feb8a62737f165a6534814d2f Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 14 Nov 2017 21:15:27 +0100
Subject: [PATCH 257/339] v 1.2.2

---
 package.json             | 2 +-
 template/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 17dd5ab662..eef6a9c687 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 51659f0c27..70eb1b60c4 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.1
+// Template version: 1.2.2
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 196fc6db06fd72251f2b686e2a3bf15847b31f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 14 Nov 2017 22:23:47 +0100
Subject: [PATCH 258/339] remove double FriendlyErrorsPlugin (fix #1064)

---
 template/build/webpack.dev.conf.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 64772364a4..d344b962b4 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -47,7 +47,6 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       template: 'index.html',
       inject: true
     }),
-    new FriendlyErrorsPlugin()
   ]
 })
 

From b366b8397e142e38d491246129c4fbc8e68fb213 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 14 Nov 2017 22:26:01 +0100
Subject: [PATCH 259/339] v1.2.3

---
 package.json             | 2 +-
 template/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index eef6a9c687..0fefd01e63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 70eb1b60c4..cb24cb81bb 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.2
+// Template version: 1.2.3
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 472c5614305e62f93b190dd18afdacf71ba96c96 Mon Sep 17 00:00:00 2001
From: Sid <oceankwok@hotmail.com>
Date: Fri, 17 Nov 2017 03:38:02 +0800
Subject: [PATCH 260/339] [enhancement]Remove useless files and performance
 enhancement in dev server. (#1072)

* replace `id` with `name` in chunk files, Fix #996

* fix typo

* remove env in `.babelrc` when not using unit or e2e

* remove `webpack.test.conf.js` when not using unit or e2e

* remove extra space in `.babelrc`

* enable `compress` in devServer by default

* remove `webpack.test.conf.js` when not using unit(karma) or e2e
---
 meta.js                            | 1 +
 template/.babelrc                  | 7 +++----
 template/build/webpack.dev.conf.js | 5 +++--
 template/config/index.js           | 8 ++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/meta.js b/meta.js
index 6f7b0f80d8..07d1b18303 100644
--- a/meta.js
+++ b/meta.js
@@ -105,6 +105,7 @@ module.exports = {
     ".eslintrc.js": "lint",
     ".eslintignore": "lint",
     "config/test.env.js": "unit || e2e",
+    "build/webpack.test.conf.js": "e2e || (unit && runner === 'karma')",
     "test/unit/**/*": "unit",
     "test/unit/index.js": "unit && runner === 'karma'",
     "test/unit/karma.conf.js": "unit && runner === 'karma'",
diff --git a/template/.babelrc b/template/.babelrc
index 050e00e28c..953e101125 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -5,12 +5,11 @@
     }],
     "stage-2"
   ],
-  "plugins": ["transform-runtime"],
+  "plugins": ["transform-runtime"]{{#if_or unit e2e}},
   "env": {
     "test": {
       "presets": ["env", "stage-2"]{{#if_eq runner "karma"}},
-      "plugins": ["istanbul"]
-      {{/if_eq}}
+      "plugins": ["istanbul"]{{/if_eq}}
     }
-  }
+  }{{/if_or}}
 }
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index d344b962b4..813a7b0ccd 100644
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -14,12 +14,13 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   },
   // cheap-module-eval-source-map is faster for development
   devtool: config.dev.devtool,
-  
+
   // these devServer options should be customized in /config/index.js
   devServer: {
     clientLogLevel: 'warning',
     historyApiFallback: true,
     hot: true,
+    compress: true,
     host: process.env.HOST || config.dev.host,
     port: process.env.PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
@@ -37,7 +38,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   plugins: [
     new webpack.DefinePlugin({
       'process.env': require('../config/dev.env')
-    }), 
+    }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
     new webpack.NoEmitOnErrorsPlugin(),
diff --git a/template/config/index.js b/template/config/index.js
index cb24cb81bb..964b4112c2 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -14,7 +14,7 @@ module.exports = {
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.HOST, if port is in use, a free one will be determined
+    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,
@@ -47,7 +47,7 @@ module.exports = {
     // just be aware of this issue when enabling this option.
     cssSourceMap: false,
   },
-  
+
   build: {
     // Template for index.html
     index: path.resolve(__dirname, '../dist/index.html'),
@@ -64,14 +64,14 @@ module.exports = {
     productionSourceMap: true,
     // https://webpack.js.org/configuration/devtool/#production
     devtool: '#source-map',
-    
+
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
-    
+
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
     // `npm run build --report`

From 096fe18314ad95662fb0320d63fe10c1d46b7a59 Mon Sep 17 00:00:00 2001
From: Daywatch <1038999405@qq.com>
Date: Fri, 17 Nov 2017 03:38:31 +0800
Subject: [PATCH 261/339] Fix # 1070 When index.html has a positional variable,
 the error can be printed correctly (#1071)

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

diff --git a/template/build/utils.js b/template/build/utils.js
index 27f4bea66e..55c301fe8d 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -87,7 +87,7 @@ exports.createNotifierCallback = function () {
     }
     const error = errors[0]
 
-    const filename = error.file.split('!').pop()
+    const filename = error.file && error.file.split('!').pop()
     notifier.notify({
       title: pkg.name,
       message: severity + ': ' + error.name,

From 7defca32cf5349d334bb5b8814cbcc7325525586 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Thu, 16 Nov 2017 20:39:03 +0100
Subject: [PATCH 262/339] Improved Jest config (#1074)

* Fix jest config for Windows

* Fix jest config file

* Removed unused Jest config
---
 meta.js                         |  1 +
 template/package.json           | 30 ++----------------------------
 template/test/unit/jest.conf.js | 29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 template/test/unit/jest.conf.js

diff --git a/meta.js b/meta.js
index 07d1b18303..19869a693a 100644
--- a/meta.js
+++ b/meta.js
@@ -108,6 +108,7 @@ module.exports = {
     "build/webpack.test.conf.js": "e2e || (unit && runner === 'karma')",
     "test/unit/**/*": "unit",
     "test/unit/index.js": "unit && runner === 'karma'",
+    "test/unit/jest.conf.js": "unit && runner === 'jest'",
     "test/unit/karma.conf.js": "unit && runner === 'karma'",
     "test/unit/specs/index.js": "unit && runner === 'karma'",
     "test/unit/setup.js": "unit && runner === 'jest'",
diff --git a/template/package.json b/template/package.json
index c91e06c239..7eb3d49163 100644
--- a/template/package.json
+++ b/template/package.json
@@ -8,7 +8,7 @@
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     {{#if_eq runner "jest"}}
-    "unit": "jest test/unit/specs --coverage",
+    "unit": "jest --config test/unit/jest.conf.js --coverage",
     {{/if_eq}}
     {{#if_eq runner "karma"}}
     "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
@@ -68,6 +68,7 @@
     {{#if_eq runner "jest"}}
     "babel-jest": "^21.0.2",
     "jest": "^21.2.0",
+    "jest-serializer-vue": "^0.3.0",
     "vue-jest": "^1.0.2",
     {{/if_eq}}
     {{#if_eq runner "karma"}}
@@ -112,33 +113,6 @@
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0"
   },
-  {{#if_eq runner "jest"}}
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "vue"
-    ],
-    "moduleNameMapper": {
-      "^@/(.*)$": "<rootDir>/src/$1"
-    },
-    "transform": {
-      "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
-      ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
-    },
-    "setupFiles": ["<rootDir>/test/unit/setup"],
-    "mapCoverage": true,
-    "coverageDirectory": "<rootDir>/test/unit/coverage",
-    "collectCoverageFrom" : [
-      "src/**/*.{js,vue}",
-      "!src/main.js",
-      {{#router}}
-      "!src/router/index.js",
-      {{/router}}
-      "!**/node_modules/**"
-    ]
-  },
-  {{/if_eq}}
   "engines": {
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
diff --git a/template/test/unit/jest.conf.js b/template/test/unit/jest.conf.js
new file mode 100644
index 0000000000..f591d90240
--- /dev/null
+++ b/template/test/unit/jest.conf.js
@@ -0,0 +1,29 @@
+const path = require('path')
+
+module.exports = {
+  rootDir: path.resolve(__dirname, '../../'),
+  moduleFileExtensions: [
+    'js',
+    'json',
+    'vue'
+  ],
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1'
+  },
+  transform: {
+    '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
+    '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest'
+  },
+  snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
+  setupFiles: ['<rootDir>/test/unit/setup'],
+  mapCoverage: true,
+  coverageDirectory: '<rootDir>/test/unit/coverage',
+  collectCoverageFrom: [
+    'src/**/*.{js,vue}',
+    '!src/main.js',
+    {{#router}}
+    '!src/router/index.js',
+    {{/router}}
+    '!**/node_modules/**'
+  ]
+}

From b14a70adc208837fd2953a9deeedabab64e40217 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 16 Nov 2017 22:37:20 +0100
Subject: [PATCH 263/339] make jest ignore the e2e test folder because its
 likely to contain files matching the jest's filename pattern

---
 template/test/unit/jest.conf.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/test/unit/jest.conf.js b/template/test/unit/jest.conf.js
index f591d90240..c524e9d7bd 100644
--- a/template/test/unit/jest.conf.js
+++ b/template/test/unit/jest.conf.js
@@ -13,7 +13,10 @@ module.exports = {
   transform: {
     '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
     '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest'
-  },
+  },{{#e2e}}
+  testPathIgnorePatterns: [
+    '<rootDir>/test/e2e'
+  ],{{/e2e}}
   snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
   setupFiles: ['<rootDir>/test/unit/setup'],
   mapCoverage: true,

From 9f51df915fcddeb4ecbe7901b2862ab0512573bc Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 16 Nov 2017 22:59:33 +0100
Subject: [PATCH 264/339] add missing cacheBusting option

---
 template/build/vue-loader.conf.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index d2ece8f322..847f7cf2b9 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -13,6 +13,7 @@ module.exports = {
     extract: isProduction
   }),
   cssSourceMap: sourceMapEnabled,
+  cacheBusting: config.dev.cacheBusting, 
   transformToRequire: {
     video: 'src',
     source: 'src',

From 9b4d4732b6eeb0b1e273b3ed6ebfe3ad00faefb6 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 16 Nov 2017 21:23:34 +0100
Subject: [PATCH 265/339] Batman!

---
 template/.babelrc     | 3 ++-
 template/package.json | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index 953e101125..6e0aaac99c 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -9,7 +9,8 @@
   "env": {
     "test": {
       "presets": ["env", "stage-2"]{{#if_eq runner "karma"}},
-      "plugins": ["istanbul"]{{/if_eq}}
+      "plugins": ["istanbul"]{{/if_eq}}{{#if_eq runner "jest"}},
+      "plugins": ["transform-es2015-modules-commonjs", "dynamic-import-node"]{{/if_eq}}
     }
   }{{/if_or}}
 }
diff --git a/template/package.json b/template/package.json
index 7eb3d49163..713cb4d576 100644
--- a/template/package.json
+++ b/template/package.json
@@ -67,6 +67,8 @@
     "webpack-bundle-analyzer": "^2.9.0",
     {{#if_eq runner "jest"}}
     "babel-jest": "^21.0.2",
+    "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0"
     "jest": "^21.2.0",
     "jest-serializer-vue": "^0.3.0",
     "vue-jest": "^1.0.2",

From f82de79644e91adf0ed7b310bfc7f606615b0c58 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 16 Nov 2017 22:54:38 +0100
Subject: [PATCH 266/339] fix missing comma

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

diff --git a/template/package.json b/template/package.json
index 713cb4d576..03d1efc5a8 100644
--- a/template/package.json
+++ b/template/package.json
@@ -68,7 +68,7 @@
     {{#if_eq runner "jest"}}
     "babel-jest": "^21.0.2",
     "babel-plugin-dynamic-import-node": "^1.2.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0"
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "jest": "^21.2.0",
     "jest-serializer-vue": "^0.3.0",
     "vue-jest": "^1.0.2",

From d232576a19a99d6212f16b7f69a709a6c057dc56 Mon Sep 17 00:00:00 2001
From: c0defre4k <c0defre4k@users.noreply.github.com>
Date: Mon, 20 Nov 2017 18:25:33 +0100
Subject: [PATCH 267/339] revert #996 chunk names to minify prodution JS
 (#1086)

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

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 64a90771f9..b8df87e647 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -26,7 +26,7 @@ const webpackConfig = merge(baseWebpackConfig, {
   output: {
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
+    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html

From 7ba65e8dae133f1a20f89abc250528f89e1ae716 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 21 Nov 2017 20:08:12 +0100
Subject: [PATCH 268/339] bump v1.2.4

---
 package.json             | 2 +-
 template/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0fefd01e63..92538abd00 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 964b4112c2..08d4d4d166 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.3
+// Template version: 1.2.4
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 7cf7d4134607348f296287b661dfa8764880c605 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Nov 2017 17:50:18 -0500
Subject: [PATCH 269/339] prevent webpack from injecting useless mocks

---
 template/build/webpack.base.conf.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index e2f09ecc61..939a4af0f9 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -78,5 +78,17 @@ module.exports = {
         }
       }
     ]
+  },
+  node: {
+    // prevent webpack from injecting useless setImmediate polyfill because Vue
+    // source contains it (although only uses it if it's native).
+    setImmediate: false,
+    // prevent webpack from injecting mocks to Node native modules
+    // that does not make sense for the client
+    dgram: 'empty',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty'
   }
 }

From 5b269817a7bbaa0fb605dabe8485e7d197324ce8 Mon Sep 17 00:00:00 2001
From: Tom <toms.seisums@gmail.com>
Date: Sun, 26 Nov 2017 13:29:35 +0200
Subject: [PATCH 270/339] Use actual host for notification (#1101). (#1103)

---
 template/build/webpack.dev.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 template/build/webpack.dev.conf.js

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
old mode 100644
new mode 100755
index 813a7b0ccd..0162189761
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -65,7 +65,7 @@ module.exports = new Promise((resolve, reject) => {
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${config.dev.host}:${port}`],
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
         },
         onErrors: config.dev.notifyOnErrors
         ? utils.createNotifierCallback()

From ecee1b756a6a924c29c7f9bf3726fb7bcf4f44bc Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sun, 26 Nov 2017 17:00:01 +0530
Subject: [PATCH 271/339] docs(README): Update usage to init from develop
 branch (#1092)

* docs(README): Update usage to init from develop branch

* docs(README): Add warning for init from develop
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index a4b24503a5..fcd1d46306 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,14 @@ $ npm install
 $ npm run dev
 ```
 
+This will scaffold the project using the `master` branch. If you wish to use the latest version of the webpack template, do the following instead:
+
+``` bash
+$ vue init webpack#develop my-project
+```
+
+:warning: **The develop branch is not considered stable and can contain bugs or not build at all, so use at your own risk.**
+
 The development server will run on port 8080 by default. If that port is already in use on your machine, the next free port will be used.
 
 ## What's Included

From c325e9fc91c35794a722bd60ad2f2578e4763b2a Mon Sep 17 00:00:00 2001
From: Robert Martin <rmartin@rmart.in>
Date: Sun, 26 Nov 2017 06:30:22 -0500
Subject: [PATCH 272/339] Update meta.js (#1091)

Minor style fix
---
 meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta.js b/meta.js
index 19869a693a..2d022a1b15 100644
--- a/meta.js
+++ b/meta.js
@@ -72,7 +72,7 @@ module.exports = {
     },
     "unit": {
       "type": "confirm",
-      "message": "Setup unit tests"
+      "message": "Set up unit tests"
     },
     "runner": {
       "when": "unit",

From 01a4b646dd4fd92605368070acc23e16e30c5714 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 26 Nov 2017 14:04:36 +0100
Subject: [PATCH 273/339] prevent empty line when unit = y & e2e = n

---
 template/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 03d1efc5a8..e36ce1dcd5 100644
--- a/template/package.json
+++ b/template/package.json
@@ -14,7 +14,8 @@
     "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
     {{/if_eq}}
     {{#e2e}}
-    "e2e": "node test/e2e/runner.js",{{/e2e}}
+    "e2e": "node test/e2e/runner.js",
+    {{/e2e}}
     {{#if_or unit e2e}}
     "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}",
     {{/if_or}}

From b4da89c2c108513caa74301a94733cc61138b6d6 Mon Sep 17 00:00:00 2001
From: Matthieu d'Oultremont <matthieu.doultremont@gmail.com>
Date: Sat, 2 Dec 2017 17:38:08 +0100
Subject: [PATCH 274/339] change bad spaces into normal spaces and removing
 trailing space (#1132)

---
 template/build/vue-loader.conf.js  | 2 +-
 template/build/webpack.dev.conf.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index 847f7cf2b9..6358084d27 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -13,7 +13,7 @@ module.exports = {
     extract: isProduction
   }),
   cssSourceMap: sourceMapEnabled,
-  cacheBusting: config.dev.cacheBusting, 
+  cacheBusting: config.dev.cacheBusting,
   transformToRequire: {
     video: 'src',
     source: 'src',
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 0162189761..d3ed6c42ee 100755
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -21,8 +21,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     historyApiFallback: true,
     hot: true,
     compress: true,
-    host: process.env.HOST || config.dev.host,
-    port: process.env.PORT || config.dev.port,
+    host: process.env.HOST || config.dev.host,
+    port: process.env.PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay ? {
       warnings: false,

From c408224093efd489aa37583f998a9da4e04b3428 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sat, 2 Dec 2017 22:11:20 +0530
Subject: [PATCH 275/339] Switch to uglifyjs-webpack-plugin (#1119)

---
 README.md                           |  2 +-
 docs/commands.md                    |  2 +-
 template/build/webpack.prod.conf.js | 10 ++++++----
 template/package.json               |  1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fcd1d46306..476c8224a2 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The development server will run on port 8080 by default. If that port is already
   - Source maps
 
 - `npm run build`: Production ready build.
-  - JavaScript minified with [UglifyJS](https://github.com/mishoo/UglifyJS2).
+  - JavaScript minified with [UglifyJS v3](https://github.com/mishoo/UglifyJS2/tree/harmony).
   - HTML minified with [html-minifier](https://github.com/kangax/html-minifier).
   - CSS across all components extracted into a single file and minified with [cssnano](https://github.com/ben-eb/cssnano).
   - Static assets compiled with version hashes for efficient long-term caching, and an auto-generated production `index.html` with proper URLs to these generated assets.
diff --git a/docs/commands.md b/docs/commands.md
index 29aa12c76e..9d456fff92 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -16,7 +16,7 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 
 > Build assets for production. See [Integrating with Backend Framework](backend.md) for more details.
 
-- JavaScript minified with [UglifyJS](https://github.com/mishoo/UglifyJS2).
+- JavaScript minified with [UglifyJS v3](https://github.com/mishoo/UglifyJS2/tree/harmony).
 - HTML minified with [html-minifier](https://github.com/kangax/html-minifier).
 - CSS across all components extracted into a single file and minified with [cssnano](https://github.com/ben-eb/cssnano).
 - All static assets compiled with version hashes for efficient long-term caching, and a production `index.html` is auto-generated with proper URLs to these generated assets.
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index b8df87e647..28ec050124 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -9,6 +9,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
 const env = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
   ? require('../config/test.env')
@@ -33,10 +34,11 @@ const webpackConfig = merge(baseWebpackConfig, {
     new webpack.DefinePlugin({
       'process.env': env
     }),
-    // UglifyJs do not support ES6+, you can also use babel-minify for better treeshaking: https://github.com/babel/minify
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
+    new UglifyJsPlugin({
+      uglifyOptions: {
+        compress: {
+          warnings: false
+        }
       },
       sourceMap: config.build.productionSourceMap,
       parallel: true
diff --git a/template/package.json b/template/package.json
index e36ce1dcd5..d79c8a0c0c 100644
--- a/template/package.json
+++ b/template/package.json
@@ -107,6 +107,7 @@
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
+    "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",

From 5ac6d6209096bd4e85cf92feb15868c3af812a26 Mon Sep 17 00:00:00 2001
From: Ruslan Gunawardana <mr.exarus@gmail.com>
Date: Sat, 2 Dec 2017 18:42:31 +0200
Subject: [PATCH 276/339] ESLint config clean up (#1093)

* Remove unnecessary quotes from .eslintrc.js

Since we're using .js config we are already abusing JS object literal brevity in other fields. Unquoting these fields brings consistency to ESLint config.

* ESLint config is more explicit

* Remove redundant rule for ESLint Standard JS
Remove ESLint 'arrow-parens' rule for StandardJS. StandardJS don't define this rule. So it's redundant to specify it's ignorance explicitly.
---
 template/.eslintrc.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 7844912865..8e8be20e8d 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -22,34 +22,32 @@ module.exports = {
   ],
   {{#if_eq lintConfig "airbnb"}}
   // check if imports actually resolve
-  'settings': {
+  settings: {
     'import/resolver': {
-      'webpack': {
-        'config': 'build/webpack.base.conf.js'
+      webpack: {
+        config: 'build/webpack.base.conf.js'
       }
     }
   },
   {{/if_eq}}
   // add your custom rules here
-  'rules': {
+  rules: {
     {{#if_eq lintConfig "standard"}}
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
     // allow async-await
-    'generator-star-spacing': 0,
+    'generator-star-spacing': 'off',
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
     // don't require .vue extension when importing
     'import/extensions': ['error', 'always', {
-      'js': 'never',
-      'vue': 'never'
+      js: 'never',
+      vue: 'never'
     }],
     // allow optionalDependencies
     'import/no-extraneous-dependencies': ['error', {
-      'optionalDependencies': ['test/unit/index.js']
+      optionalDependencies: ['test/unit/index.js']
     }],
     {{/if_eq}}
     // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   }
 }

From b237c0f84fcbf223566ca8e6127b6d437976fd16 Mon Sep 17 00:00:00 2001
From: Emil Valeev <emil.musician@gmail.com>
Date: Sat, 2 Dec 2017 19:43:33 +0300
Subject: [PATCH 277/339] Minor refactoring of build scripts (#1082)

* build: Replace regular function with the arrow one

* check-verstions: Add some line breaks to improve code readability

* utils: Minor refactoring

Replace 'var' with 'const' operator for 'postcssLoader' defenition;
Add some spaces to improve code readability;
Rename variable with package.json from 'pkg' to 'packageConfig';
Replace regular function stored in 'createNotifierCallback' with arrow.

* vue-loader: Remove extra line break and Add a helpful one

* base.conf: Add variable for linting rule to imprive code readability

* dev.conf: Update formatting

* prod.conf: Update formatting and Use ES6 short syntax for method
---
 template/build/build.js             |  2 +-
 template/build/check-versions.js    |  5 +++++
 template/build/utils.js             | 19 +++++++++++--------
 template/build/vue-loader.conf.js   |  1 -
 template/build/webpack.base.conf.js | 22 ++++++++++++----------
 template/build/webpack.dev.conf.js  |  7 +++----
 template/build/webpack.prod.conf.js |  6 +++---
 7 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/template/build/build.js b/template/build/build.js
index 30f036a180..955e9defca 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -16,7 +16,7 @@ spinner.start()
 
 rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
   if (err) throw err
-  webpack(webpackConfig, function (err, stats) {
+  webpack(webpackConfig, (err, stats) => {
     spinner.stop()
     if (err) throw err
     process.stdout.write(stats.toString({
diff --git a/template/build/check-versions.js b/template/build/check-versions.js
index ca407bb16f..3ef972a08d 100644
--- a/template/build/check-versions.js
+++ b/template/build/check-versions.js
@@ -3,6 +3,7 @@ const chalk = require('chalk')
 const semver = require('semver')
 const packageConfig = require('../package.json')
 const shell = require('shelljs')
+
 function exec (cmd) {
   return require('child_process').execSync(cmd).toString().trim()
 }
@@ -25,8 +26,10 @@ if (shell.which('npm')) {
 
 module.exports = function () {
   const warnings = []
+
   for (let i = 0; i < versionRequirements.length; i++) {
     const mod = versionRequirements[i]
+
     if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
       warnings.push(mod.name + ': ' +
         chalk.red(mod.currentVersion) + ' should be ' +
@@ -39,10 +42,12 @@ module.exports = function () {
     console.log('')
     console.log(chalk.yellow('To use this template, you must update following to modules:'))
     console.log()
+
     for (let i = 0; i < warnings.length; i++) {
       const warning = warnings[i]
       console.log('  ' + warning)
     }
+
     console.log()
     process.exit(1)
   }
diff --git a/template/build/utils.js b/template/build/utils.js
index 55c301fe8d..e534fb0fd6 100644
--- a/template/build/utils.js
+++ b/template/build/utils.js
@@ -2,12 +2,13 @@
 const path = require('path')
 const config = require('../config')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const pkg = require('../package.json')
+const packageConfig = require('../package.json')
 
 exports.assetsPath = function (_path) {
   const assetsSubDirectory = process.env.NODE_ENV === 'production'
     ? config.build.assetsSubDirectory
     : config.dev.assetsSubDirectory
+
   return path.posix.join(assetsSubDirectory, _path)
 }
 
@@ -21,7 +22,7 @@ exports.cssLoaders = function (options) {
     }
   }
 
-  var postcssLoader = {
+  const postcssLoader = {
     loader: 'postcss-loader',
     options: {
       sourceMap: options.sourceMap
@@ -31,6 +32,7 @@ exports.cssLoaders = function (options) {
   // generate loader string to be used with extract text plugin
   function generateLoaders (loader, loaderOptions) {
     const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+
     if (loader) {
       loaders.push({
         loader: loader + '-loader',
@@ -68,6 +70,7 @@ exports.cssLoaders = function (options) {
 exports.styleLoaders = function (options) {
   const output = []
   const loaders = exports.cssLoaders(options)
+
   for (const extension in loaders) {
     const loader = loaders[extension]
     output.push({
@@ -75,21 +78,21 @@ exports.styleLoaders = function (options) {
       use: loader
     })
   }
+
   return output
 }
 
-exports.createNotifierCallback = function () {
+exports.createNotifierCallback = () => {
   const notifier = require('node-notifier')
 
   return (severity, errors) => {
-    if (severity !== 'error') {
-      return
-    }
-    const error = errors[0]
+    if (severity !== 'error') return
 
+    const error = errors[0]
     const filename = error.file && error.file.split('!').pop()
+
     notifier.notify({
-      title: pkg.name,
+      title: packageConfig.name,
       message: severity + ': ' + error.name,
       subtitle: filename || '',
       icon: path.join(__dirname, 'logo.png')
diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index 6358084d27..181463c328 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -6,7 +6,6 @@ const sourceMapEnabled = isProduction
   ? config.build.productionSourceMap
   : config.dev.cssSourceMap
 
-
 module.exports = {
   loaders: utils.cssLoaders({
     sourceMap: sourceMapEnabled,
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 939a4af0f9..d665d36283 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -8,6 +8,17 @@ function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
 
+const lintingRule = {
+  test: /\.(js|vue)$/,
+  loader: 'eslint-loader',
+  enforce: 'pre',
+  include: [resolve('src'), resolve('test')],
+  options: {
+    formatter: require('eslint-friendly-formatter'),
+    emitWarning: !config.dev.showEslintErrorsInOverlay
+  }
+}
+
 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
@@ -32,16 +43,7 @@ module.exports = {
   module: {
     rules: [
       {{#lint}}
-      ...(config.dev.useEslint? [{
-        test: /\.(js|vue)$/,
-        loader: 'eslint-loader',
-        enforce: 'pre',
-        include: [resolve('src'), resolve('test')],
-        options: {
-          formatter: require('eslint-friendly-formatter'),
-          emitWarning: !config.dev.showEslintErrorsInOverlay
-        }
-      }] : []),
+      ...(config.dev.useEslint ? [lintingRule] : []),
       {{/lint}}
       {
         test: /\.vue$/,
diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index d3ed6c42ee..ab16c9b9da 100755
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -24,10 +24,9 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     host: process.env.HOST || config.dev.host,
     port: process.env.PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
-    overlay: config.dev.errorOverlay ? {
-      warnings: false,
-      errors: true,
-    } : false,
+    overlay: config.dev.errorOverlay
+      ? { warnings: false, errors: true }
+      : false,
     publicPath: config.dev.assetsPublicPath,
     proxy: config.dev.proxyTable,
     quiet: true, // necessary for FriendlyErrorsPlugin
diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index 28ec050124..d121faed35 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -55,8 +55,8 @@ const webpackConfig = merge(baseWebpackConfig, {
     // duplicated CSS from different components can be deduped.
     new OptimizeCSSPlugin({
       cssProcessorOptions: config.build.productionSourceMap
-      ? { safe: true, map: { inline: false } }
-      : { safe: true }
+        ? { safe: true, map: { inline: false } }
+        : { safe: true }
     }),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
@@ -84,7 +84,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
-      minChunks: function (module) {
+      minChunks (module) {
         // any required modules inside node_modules are extracted to vendor
         return (
           module.resource &&

From 17a0e5cab6582f6fd300fc4a202dbda32abfab6c Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 2 Dec 2017 17:49:29 +0100
Subject: [PATCH 278/339] FIX: convert env variable PORT to a number.

(close #1099)
---
 template/build/webpack.dev.conf.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index ab16c9b9da..03e94282ba 100755
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -8,6 +8,9 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const portfinder = require('portfinder')
 
+const HOST = process.env.HOST
+const PORT = process.env.PORT && Number(process.env.PORT)
+
 const devWebpackConfig = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
@@ -21,8 +24,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     historyApiFallback: true,
     hot: true,
     compress: true,
-    host: process.env.HOST || config.dev.host,
-    port: process.env.PORT || config.dev.port,
+    host: HOST || config.dev.host,
+    port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay
       ? { warnings: false, errors: true }

From ea6f6e9c549fd1b3628a1afa5bcd8490d825aeb5 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 2 Dec 2017 18:11:45 +0100
Subject: [PATCH 279/339] Fix bug from PR #1082

See: https://github.com/vuejs-templates/webpack/pull/1082/files#r154501049
---
 template/build/webpack.base.conf.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index d665d36283..1f6057d611 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -8,7 +8,7 @@ function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
 
-const lintingRule = {
+const createLintingRule = () => ({
   test: /\.(js|vue)$/,
   loader: 'eslint-loader',
   enforce: 'pre',
@@ -17,7 +17,7 @@ const lintingRule = {
     formatter: require('eslint-friendly-formatter'),
     emitWarning: !config.dev.showEslintErrorsInOverlay
   }
-}
+})
 
 module.exports = {
   context: path.resolve(__dirname, '../'),
@@ -43,7 +43,7 @@ module.exports = {
   module: {
     rules: [
       {{#lint}}
-      ...(config.dev.useEslint ? [lintingRule] : []),
+      ...(config.dev.useEslint ? [createLintingRule()] : []),
       {{/lint}}
       {
         test: /\.vue$/,

From 415cade5fb91d89e7a0569ad89b6562f8e094f42 Mon Sep 17 00:00:00 2001
From: Jakub Bogucki <610941+jakub300@users.noreply.github.com>
Date: Sat, 2 Dec 2017 18:31:30 +0100
Subject: [PATCH 280/339] Update project creation: sort dependencies in
 package.json (#1118)

* Sort dependencies in package.json

* Update package.json

* keep lint dependencies together
* don't mix confitional and non-confitional deps separated
---
 meta.js               | 29 ++++++++++++++++++++++++++++-
 template/package.json | 36 +++++++++++++++++-------------------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/meta.js b/meta.js
index 2d022a1b15..ed7a8b6a2d 100644
--- a/meta.js
+++ b/meta.js
@@ -1,3 +1,15 @@
+const path = require('path');
+const fs = require('fs');
+
+function sortObject(object) {
+  // Based on https://github.com/yarnpkg/yarn/blob/v1.3.2/src/config.js#L79-L85
+  const sortedObject = {};
+  Object.keys(object).sort().forEach(item => {
+    sortedObject[item] = object[item];
+  });
+  return sortedObject;
+}
+
 module.exports = {
   "helpers": {
     "if_or": function (v1, v2, options) {
@@ -115,5 +127,20 @@ module.exports = {
     "test/e2e/**/*": "e2e",
     "src/router/**/*": "router"
   },
-  "completeMessage": "To get started:\n\n  {{^inPlace}}cd {{destDirName}}\n  {{/inPlace}}npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack"
+  "complete": function (data) {
+    const packageJsonFile = path.join(
+      data.inPlace ? "" : data.destDirName,
+      "package.json"
+    );
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonFile));
+    packageJson.devDependencies = sortObject(packageJson.devDependencies);
+    packageJson.dependencies = sortObject(packageJson.dependencies);
+    fs.writeFileSync(
+      packageJsonFile,
+      JSON.stringify(packageJson, null, 2) + "\n"
+    );
+
+    const message = `To get started:\n\n  ${data.inPlace ? '' : `cd ${data.destDirName}\n  `}npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack`;
+    console.log("\n" + message.split(/\r?\n/g).map(line => "   " + line).join("\n"));
+  }
 };
diff --git a/template/package.json b/template/package.json
index d79c8a0c0c..919e742b16 100644
--- a/template/package.json
+++ b/template/package.json
@@ -29,20 +29,8 @@
     "vue-router": "^3.0.1"{{/router}}
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.2",
-    "babel-core": "^6.22.1",
     {{#lint}}
     "babel-eslint": "^7.1.1",
-    {{/lint}}
-    "babel-loader": "^7.1.1",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-env": "^1.3.2",
-    "babel-preset-stage-2": "^6.22.0",
-    "babel-register": "^6.22.0",
-    "chalk": "^2.0.1",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.0",
-    {{#lint}}
     "eslint": "^3.19.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
@@ -60,12 +48,6 @@
     "eslint-plugin-import": "^2.7.0",
     {{/if_eq}}
     {{/lint}}
-    "eventsource-polyfill": "^0.9.6",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^1.1.4",
-    "friendly-errors-webpack-plugin": "^1.6.1",
-    "html-webpack-plugin": "^2.30.1",
-    "webpack-bundle-analyzer": "^2.9.0",
     {{#if_eq runner "jest"}}
     "babel-jest": "^21.0.2",
     "babel-plugin-dynamic-import-node": "^1.2.0",
@@ -93,13 +75,29 @@
     "babel-plugin-istanbul": "^4.1.1",
     "phantomjs-prebuilt": "^2.1.14",
     {{/if_eq}}
-    "node-notifier": "^5.1.2",
     {{#e2e}}
     "chromedriver": "^2.27.2",
     "cross-spawn": "^5.0.1",
     "nightwatch": "^0.9.12",
     "selenium-server": "^3.0.1",
     {{/e2e}}
+    "autoprefixer": "^7.1.2",
+    "babel-core": "^6.22.1",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-preset-env": "^1.3.2",
+    "babel-preset-stage-2": "^6.22.0",
+    "babel-register": "^6.22.0",
+    "chalk": "^2.0.1",
+    "copy-webpack-plugin": "^4.0.1",
+    "css-loader": "^0.28.0",
+    "eventsource-polyfill": "^0.9.6",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^1.1.4",
+    "friendly-errors-webpack-plugin": "^1.6.1",
+    "html-webpack-plugin": "^2.30.1",
+    "webpack-bundle-analyzer": "^2.9.0",
+    "node-notifier": "^5.1.2",
     "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
     "semver": "^5.3.0",

From 9ee41013bb124ad0382e695136ee50588f6ebc2a Mon Sep 17 00:00:00 2001
From: Victor Zakharenko <ponymtb@gmail.com>
Date: Sat, 2 Dec 2017 20:40:41 +0300
Subject: [PATCH 281/339] babel-register use only for e2e tests (#1120)

* babel-register use only for tests e2e

single require here template/test/e2e/nightwatch.conf.js

* remove double dependency.
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 919e742b16..23ffeb6ccc 100644
--- a/template/package.json
+++ b/template/package.json
@@ -76,6 +76,7 @@
     "phantomjs-prebuilt": "^2.1.14",
     {{/if_eq}}
     {{#e2e}}
+    "babel-register": "^6.22.0",
     "chromedriver": "^2.27.2",
     "cross-spawn": "^5.0.1",
     "nightwatch": "^0.9.12",
@@ -87,7 +88,6 @@
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
-    "babel-register": "^6.22.0",
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",

From 13c88589ec47fd94af7198c298cb1723a7a5d0e4 Mon Sep 17 00:00:00 2001
From: Romans Bermans <romans.bermans@gmail.com>
Date: Sat, 2 Dec 2017 18:41:57 +0100
Subject: [PATCH 282/339] Adds support for the video poster attribute (#1123)

---
 template/build/vue-loader.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index 181463c328..33ed58bc0a 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -14,7 +14,7 @@ module.exports = {
   cssSourceMap: sourceMapEnabled,
   cacheBusting: config.dev.cacheBusting,
   transformToRequire: {
-    video: 'src',
+    video: ['src', 'poster'],
     source: 'src',
     img: 'src',
     image: 'xlink:href'

From d0b9007fadf2905423315a87543b8a0bb02f5464 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 2 Dec 2017 19:26:10 +0100
Subject: [PATCH 283/339] some small updates to the docs

---
 docs/backend.md        | 28 +++++++++++++++++++++-------
 docs/commands.md       |  4 ++++
 docs/linter.md         | 11 +++++++++++
 docs/pre-processors.md | 14 +++++++++-----
 docs/structure.md      | 15 ++++++++++-----
 5 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/docs/backend.md b/docs/backend.md
index fcc6611349..e7acadf7c5 100644
--- a/docs/backend.md
+++ b/docs/backend.md
@@ -10,17 +10,31 @@ Let's take a look at the default `config/index.js`:
 const path = require('path')
 
 module.exports = {
+  dev: {
+    / Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {},
+
+    // Various Dev Server settings
+    host: 'localhost',
+    port: 8080, 
+
+    // skipping other options as they are only convenience features
+  },
   build: {
-    index: path.resolve(__dirname, 'dist/index.html'),
-    assetsRoot: path.resolve(__dirname, 'dist'),
+    // Template for index.html
+    index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    productionSourceMap: true
+
+    productionSourceMap: true,
+    
+    // skipping the rest ...
   },
-  dev: {
-    port: 8080,
-    proxyTable: {}
-  }
 }
 ```
 
diff --git a/docs/commands.md b/docs/commands.md
index 9d456fff92..7a8d48963b 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -36,3 +36,7 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 - Works with one command out of the box:
   - Selenium and chromedriver dependencies automatically handled.
   - Automatically spawns the Selenium server.
+
+### `npm run lint`
+
+> Runs eslint and reports any linting errors in your code. See [Linter Configuration](linter.md)
diff --git a/docs/linter.md b/docs/linter.md
index bff51c0119..80d15c2b3c 100644
--- a/docs/linter.md
+++ b/docs/linter.md
@@ -14,3 +14,14 @@ If you are not happy with the default linting rules, you have several options:
 2. Pick a different ESLint preset when generating the project, for example [eslint-config-airbnb](https://github.com/airbnb/javascript/tree/master/packages/eslint-config-airbnb).
 
 3. Pick "none" for ESLint preset when generating the project and define your own rules. See [ESLint documentation](https://eslint.org/docs/rules/) for more details.
+
+## Fixing Linting Errors
+
+You can run the following command to let eslint fix any errors it finds (if it can - not all errors are fixable like this):
+
+```
+npm run lint -- --fix
+```
+
+*(The `--` in the middle is necessary to ensure the `--fix` option is passdd to `eslint`, not to `npm`)*
+
diff --git a/docs/pre-processors.md b/docs/pre-processors.md
index 8611ef542f..fa58751e32 100644
--- a/docs/pre-processors.md
+++ b/docs/pre-processors.md
@@ -25,14 +25,18 @@ Once installed, you can use the pre-processors inside your `*.vue` components us
 
 ### PostCSS
 
-Styles in `*.vue` files are piped through PostCSS by default, so you don't need to use a specific loader for it. You can simply add PostCSS plugins you want to use in `build/webpack.base.conf.js` under the `vue` block:
+Styles in `*.vue` files and style files (`*.css`, `*.scss` etc) are piped through PostCSS by default, so you don't need to use a specific loader for it.
+
+You can simply add PostCSS plugins you want to use to the `.postcssrc.js`file in your project's root directory:
 
 ``` js
-// build/webpack.base.conf.js
+// https://github.com/michael-ciniawsky/postcss-load-config
+
 module.exports = {
-  // ...
-  vue: {
-    postcss: [/* your plugins */]
+  "plugins": {
+    // to edit target browsers: use "browserslist" field in package.json
+    "postcss-import": {},
+    "autoprefixer": {}
   }
 }
 ```
diff --git a/docs/structure.md b/docs/structure.md
index 05d3a06a1a..33bec21d84 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -18,20 +18,25 @@
 ├── test/
 │   └── unit/                   # unit tests
 │   │   ├── specs/              # test spec files
-│   │   ├── setup.js            # file that runs before Jest tests
+│   │   ├── eslintrc            # config file for eslint with extra settings only for unit tests
 │   │   ├── index.js            # test build entry file
-│   │   └── karma.conf.js       # test runner config file
+│   │   ├── jest.conf.js        # Config file when using Jest for unit tests
+│   │   └── karma.conf.js       # test runner config file when using Karma for unit tests
+│   │   ├── setup.js            # file that runs before Jest runs your unit tests
 │   └── e2e/                    # e2e tests
 │   │   ├── specs/              # test spec files
 │   │   ├── custom-assertions/  # custom assertions for e2e tests
 │   │   ├── runner.js           # test runner script
 │   │   └── nightwatch.conf.js  # test runner config file
 ├── .babelrc                    # babel config
-├── .postcssrc.js               # postcss config
+├── .editorconfig               # indentation, spaces/tabs and similar settings for your editor
 ├── .eslintrc.js                # eslint config
-├── .editorconfig               # editor config
+├── .eslintignore.js            # eslint ignore rules
+├── .gitignore                  # sensible defaults for gitignore
+├── .postcssrc.js               # postcss config
 ├── index.html                  # index.html template
-└── package.json                # build scripts and dependencies
+├── package.json                # build scripts and dependencies
+└── README.md                   # Default README file
 ```
 
 ### `build/`

From 4133502ee5c2118cd4b02a5e66ac124bf6e08a7b Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 2 Dec 2017 19:43:08 +0100
Subject: [PATCH 284/339] bump version 1.2.5

---
 package.json             | 2 +-
 template/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 92538abd00..09951adace 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 08d4d4d166..0a7cfb43e1 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.4
+// Template version: 1.2.5
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 62e45aae80088963853e815d69e09fb359c65547 Mon Sep 17 00:00:00 2001
From: PENG WANG <gnaw.gnep@gmail.com>
Date: Mon, 4 Dec 2017 07:09:03 -0600
Subject: [PATCH 285/339] webpack.conf.js is not needed in jest and e2e (#1135)

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

diff --git a/meta.js b/meta.js
index ed7a8b6a2d..219d6096f8 100644
--- a/meta.js
+++ b/meta.js
@@ -117,7 +117,7 @@ module.exports = {
     ".eslintrc.js": "lint",
     ".eslintignore": "lint",
     "config/test.env.js": "unit || e2e",
-    "build/webpack.test.conf.js": "e2e || (unit && runner === 'karma')",
+    "build/webpack.test.conf.js": "unit && runner === 'karma'",
     "test/unit/**/*": "unit",
     "test/unit/index.js": "unit && runner === 'karma'",
     "test/unit/jest.conf.js": "unit && runner === 'jest'",

From 4cf9eb3c209829805618ce06dcbafeabae6ecb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <gucong@gmail.com>
Date: Mon, 4 Dec 2017 21:09:47 +0800
Subject: [PATCH 286/339] fix filename of `.eslintignore` (#1136)

---
 docs/structure.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/structure.md b/docs/structure.md
index 33bec21d84..75c958a42f 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -31,7 +31,7 @@
 ├── .babelrc                    # babel config
 ├── .editorconfig               # indentation, spaces/tabs and similar settings for your editor
 ├── .eslintrc.js                # eslint config
-├── .eslintignore.js            # eslint ignore rules
+├── .eslintignore               # eslint ignore rules
 ├── .gitignore                  # sensible defaults for gitignore
 ├── .postcssrc.js               # postcss config
 ├── index.html                  # index.html template

From d771d1e3902b7a0f05cafe43f9a6b03d1769a1d0 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sat, 9 Dec 2017 15:32:50 +0530
Subject: [PATCH 287/339] Revert "remove uneccessary target.browsers (#1004)"
 (#1083)

This reverts commit 41cb81117487e756311950185dd3508117a15591.
---
 template/.babelrc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/.babelrc b/template/.babelrc
index 6e0aaac99c..cd05be897b 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,7 +1,10 @@
 {
   "presets": [
     ["env", {
-      "modules": false
+      "modules": false,
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
     }],
     "stage-2"
   ],

From caa259a452010c8a2837e90400d4546dce15ff66 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sat, 9 Dec 2017 15:33:05 +0530
Subject: [PATCH 288/339] Document babel target env configuration (#1144)

---
 docs/SUMMARY.md |  1 +
 docs/babel.md   | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 docs/babel.md

diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 7dc38823cb..e0bd6ac2fb 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -2,6 +2,7 @@
 
 - [Project Structure](structure.md)
 - [Build Commands](commands.md)
+- [Babel Configuration](babel.md)
 - [Linter Configuration](linter.md)
 - [Pre-Processors](pre-processors.md)
 - [Handling Static Assets](static.md)
diff --git a/docs/babel.md b/docs/babel.md
new file mode 100644
index 0000000000..eaa0ca9d83
--- /dev/null
+++ b/docs/babel.md
@@ -0,0 +1,22 @@
+# Babel Configuration
+
+This boilerplate uses [`babel-preset-env`](https://www.npmjs.com/package/babel-preset-env) for configuring babel. You can read more about it here - http://2ality.com/2017/02/babel-preset-env.html.
+
+> A Babel preset that compiles ES2015+ down to ES5 by automatically determining the Babel plugins and polyfills you need based on your targeted browser or runtime environments.
+
+It uses [`browserslist`](https://github.com/ai/browserslist) to parse this information, so we can use any [valid query format supported by `browserslist`](https://github.com/ai/browserslist#queries).
+
+However there is a caveat. `browserslist` recommends defining the target in a common place like `package.json` or in a `.browserslistrc` config file. This allows tools like [`autoprefixer`](https://github.com/postcss/autoprefixer) and [`eslint-plugin-compat`](https://github.com/amilajack/eslint-plugin-compat) to share the config. For this template, `browserslist` is configured in the `package.json`:
+
+```json
+{
+  "...": "...",
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}
+```
+
+But the latest stable release of `babel-preset-env`, `v1.6.1` does not support loading the config from `package.json`. So the target environment is repeated in `.babelrc`. If you wish to change your target environment, please be sure to update both `package.json` and `.babelrc`. Note that this has been fixed in the beta version([`@babel/preset-env@7.0.0-beta.34`](https://github.com/babel/babel/tree/master/packages/babel-preset-env)) and the template will be updated once it is out of beta.

From 44ca39842f66548cac7b7292c8d932d59c4e70e3 Mon Sep 17 00:00:00 2001
From: anubhav mishra <anubhav.worklinux@gmail.com>
Date: Sat, 9 Dec 2017 15:34:23 +0530
Subject: [PATCH 289/339] airbnb eslint config compatibility with vuex (#1003)

---
 template/.eslintrc.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 8e8be20e8d..1f14f630f4 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -42,6 +42,22 @@ module.exports = {
       js: 'never',
       vue: 'never'
     }],
+    // disallow reassignment of function parameters
+    // disallow parameter object manipulation except for specific exclusions
+    'no-param-reassign': ['error', {
+      props: true,
+      ignorePropertyModificationsFor: [
+        'state', // for vuex state
+        'acc', // for reduce accumulators
+        'e', // for e.returnvalue
+        'ctx', // for Koa routing
+        'req', // for Express requests
+        'request', // for Express requests
+        'res', // for Express responses
+        'response', // for Express responses
+        '$scope', // for Angular 1 scopes
+      ]
+    }],
     // allow optionalDependencies
     'import/no-extraneous-dependencies': ['error', {
       optionalDependencies: ['test/unit/index.js']

From 57511316cc5db5bc28f94bfc9c1d8994782cdd1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 9 Dec 2017 11:04:59 +0100
Subject: [PATCH 290/339] Set `allChunks: true` by default (close #1110)
 (#1149)

* `allChunks: true` by default

close #1110

* update wording.
---
 template/build/webpack.prod.conf.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index d121faed35..bf613e8424 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -46,10 +46,11 @@ const webpackConfig = merge(baseWebpackConfig, {
     // extract css into its own file
     new ExtractTextPlugin({
       filename: utils.assetsPath('css/[name].[contenthash].css'),
-      // set the following option to `true` if you want to extract CSS from
-      // codesplit chunks into this main css file as well.
-      // This will result in *all* of your app's CSS being loaded upfront.
-      allChunks: false,
+      // Setting the following option to `false` will not extract CSS from codesplit chunks.
+      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, 
+      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
+      allChunks: true,
     }),
     // Compress extracted CSS. We are using this plugin so that possible
     // duplicated CSS from different components can be deduped.

From ecd68c4b72c0282bff1cd291ff9f91e30ce27d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 11 Dec 2017 13:28:59 +0100
Subject: [PATCH 291/339] Automatically install Dependencies and fix lint
 errors (#1133)

* Batman!

* removed special airbnb template strings since we can auto-fix them now.

* fix string bug

* remove last airbnb template string

* * Make autoinstall optional
* run lint-fix for airbnb AND standard
* print message if user has to manually lint-fix

* webpack.conf.js is not needed in jest and e2e (#1135)

* fix filename of `.eslintignore` (#1136)

* Batman!

* removed special airbnb template strings since we can auto-fix them now.

* fix string bug

* remove last airbnb template string

* * Make autoinstall optional
* run lint-fix for airbnb AND standard
* print message if user has to manually lint-fix

* used chalk to color up console logs

* add option for yarn

* change double quotes to single quotes, remove where possible

* generalize log message
---
 meta.js                                       | 225 ++++++++++--------
 template/src/App.vue                          |  10 +-
 template/src/components/HelloWorld.vue        |  10 +-
 template/src/main.js                          |  14 +-
 template/src/router/index.js                  |  16 +-
 .../e2e/custom-assertions/elementCount.js     |  16 +-
 template/test/e2e/runner.js                   |  48 ++--
 template/test/e2e/specs/test.js               |   8 +-
 template/test/unit/index.js                   |  12 +-
 template/test/unit/karma.conf.js              |  12 +-
 template/test/unit/specs/HelloWorld.spec.js   |  14 +-
 utils/index.js                                | 109 +++++++++
 12 files changed, 313 insertions(+), 181 deletions(-)
 create mode 100644 utils/index.js

diff --git a/meta.js b/meta.js
index 219d6096f8..1e0b798e20 100644
--- a/meta.js
+++ b/meta.js
@@ -1,18 +1,15 @@
 const path = require('path');
 const fs = require('fs');
-
-function sortObject(object) {
-  // Based on https://github.com/yarnpkg/yarn/blob/v1.3.2/src/config.js#L79-L85
-  const sortedObject = {};
-  Object.keys(object).sort().forEach(item => {
-    sortedObject[item] = object[item];
-  });
-  return sortedObject;
-}
+const {
+  sortDependencies,
+  installDependencies,
+  runLintFix,
+  printMessage
+} = require('./utils')
 
 module.exports = {
-  "helpers": {
-    "if_or": function (v1, v2, options) {
+  helpers: {
+    if_or: function (v1, v2, options) {
       if (v1 || v2) {
         return options.fn(this);
       }
@@ -20,127 +17,153 @@ module.exports = {
       return options.inverse(this);
     }
   },
-  "prompts": {
-    "name": {
-      "type": "string",
-      "required": true,
-      "message": "Project name"
+  prompts: {
+    name: {
+      type: 'string',
+      required: true,
+      message: 'Project name'
     },
-    "description": {
-      "type": "string",
-      "required": false,
-      "message": "Project description",
-      "default": "A Vue.js project"
+    description: {
+      type: 'string',
+      required: false,
+      message: 'Project description',
+      default: 'A Vue.js project'
     },
-    "author": {
-      "type": "string",
-      "message": "Author"
+    author: {
+      type: 'string',
+      message: 'Author'
     },
-    "build": {
-      "type": "list",
-      "message": "Vue build",
-      "choices": [
+    build: {
+      type: 'list',
+      message: 'Vue build',
+      choices: [
         {
-          "name": "Runtime + Compiler: recommended for most users",
-          "value": "standalone",
-          "short": "standalone"
+          name: 'Runtime + Compiler: recommended for most users',
+          value: 'standalone',
+          short: 'standalone'
         },
         {
-          "name": "Runtime-only: about 6KB lighter min+gzip, but templates (or any Vue-specific HTML) are ONLY allowed in .vue files - render functions are required elsewhere",
-          "value": "runtime",
-          "short": "runtime"
+          name: 'Runtime-only: about 6KB lighter min+gzip, but templates (or any Vue-specific HTML) are ONLY allowed in .vue files - render functions are required elsewhere',
+          value: 'runtime',
+          short: 'runtime'
         }
       ]
     },
-    "router": {
-      "type": "confirm",
-      "message": "Install vue-router?"
+    router: {
+      type: 'confirm',
+      message: 'Install vue-router?'
     },
-    "lint": {
-      "type": "confirm",
-      "message": "Use ESLint to lint your code?"
+    lint: {
+      type: 'confirm',
+      message: 'Use ESLint to lint your code?'
     },
-    "lintConfig": {
-      "when": "lint",
-      "type": "list",
-      "message": "Pick an ESLint preset",
-      "choices": [
+    lintConfig: {
+      when: 'lint',
+      type: 'list',
+      message: 'Pick an ESLint preset',
+      choices: [
         {
-          "name": "Standard (https://github.com/standard/standard)",
-          "value": "standard",
-          "short": "Standard"
+          name: 'Standard (https://github.com/standard/standard)',
+          value: 'standard',
+          short: 'Standard'
         },
         {
-          "name": "Airbnb (https://github.com/airbnb/javascript)",
-          "value": "airbnb",
-          "short": "Airbnb"
+          name: 'Airbnb (https://github.com/airbnb/javascript)',
+          value: 'airbnb',
+          short: 'Airbnb'
         },
         {
-          "name": "none (configure it yourself)",
-          "value": "none",
-          "short": "none"
+          name: 'none (configure it yourself)',
+          value: 'none',
+          short: 'none'
         }
       ]
     },
-    "unit": {
-      "type": "confirm",
-      "message": "Set up unit tests"
+    unit: {
+      type: 'confirm',
+      message: 'Set up unit tests'
     },
-    "runner": {
-      "when": "unit",
-      "type": "list",
-      "message": "Pick a test runner",
-      "choices": [
+    runner: {
+      when: 'unit',
+      type: 'list',
+      message: 'Pick a test runner',
+      choices: [
         {
-          "name": "Jest",
-          "value": "jest",
-          "short": "jest"
+          name: 'Jest',
+          value: 'jest',
+          short: 'jest'
         },
         {
-          "name": "Karma and Mocha",
-          "value": "karma",
-          "short": "karma"
+          name: 'Karma and Mocha',
+          value: 'karma',
+          short: 'karma'
         },
         {
-          "name": "none (configure it yourself)",
-          "value": "noTest",
-          "short": "noTest"
+          name: 'none (configure it yourself)',
+          value: 'noTest',
+          short: 'noTest'
         }
       ]
     },
-    "e2e": {
-      "type": "confirm",
-      "message": "Setup e2e tests with Nightwatch?"
+    e2e: {
+      type: 'confirm',
+      message: 'Setup e2e tests with Nightwatch?'
+    },
+    autoInstall: {
+      type: 'list',
+      message: 'Should we run `npm install` for you after the project has been created? (recommended)',
+      choices: [
+        {
+          name: 'Yes, use NPM',
+          value: 'npm',
+          short: 'npm'
+        },
+        {
+          name: 'Yes, use Yarn',
+          value: 'yarn',
+          short: 'yarn'
+        },
+        {
+          name: 'No, I will handle that myself',
+          value: false,
+          short: 'no'
+        }
+      ]
     }
   },
-  "filters": {
-    ".eslintrc.js": "lint",
-    ".eslintignore": "lint",
-    "config/test.env.js": "unit || e2e",
-    "build/webpack.test.conf.js": "unit && runner === 'karma'",
-    "test/unit/**/*": "unit",
-    "test/unit/index.js": "unit && runner === 'karma'",
-    "test/unit/jest.conf.js": "unit && runner === 'jest'",
-    "test/unit/karma.conf.js": "unit && runner === 'karma'",
-    "test/unit/specs/index.js": "unit && runner === 'karma'",
-    "test/unit/setup.js": "unit && runner === 'jest'",
-    "test/e2e/**/*": "e2e",
-    "src/router/**/*": "router"
+  filters: {
+    '.eslintrc.js': 'lint',
+    '.eslintignore': 'lint',
+    'config/test.env.js': 'unit || e2e',
+    'build/webpack.test.conf.js': "unit && runner === 'karma'",
+    'test/unit/**/*': 'unit',
+    'test/unit/index.js': "unit && runner === 'karma'",
+    'test/unit/jest.conf.js': "unit && runner === 'jest'",
+    'test/unit/karma.conf.js': "unit && runner === 'karma'",
+    'test/unit/specs/index.js': "unit && runner === 'karma'",
+    'test/unit/setup.js': "unit && runner === 'jest'",
+    'test/e2e/**/*': 'e2e',
+    'src/router/**/*': 'router'
   },
-  "complete": function (data) {
-    const packageJsonFile = path.join(
-      data.inPlace ? "" : data.destDirName,
-      "package.json"
-    );
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonFile));
-    packageJson.devDependencies = sortObject(packageJson.devDependencies);
-    packageJson.dependencies = sortObject(packageJson.dependencies);
-    fs.writeFileSync(
-      packageJsonFile,
-      JSON.stringify(packageJson, null, 2) + "\n"
-    );
+  'complete': function (data, { chalk }) {
+    
+    const green = chalk.green
 
-    const message = `To get started:\n\n  ${data.inPlace ? '' : `cd ${data.destDirName}\n  `}npm install\n  npm run dev\n\nDocumentation can be found at https://vuejs-templates.github.io/webpack`;
-    console.log("\n" + message.split(/\r?\n/g).map(line => "   " + line).join("\n"));
+    sortDependencies(data, green)
+
+    const cwd = path.join(process.cwd(), data.inPlace ? '' : data.destDirName)
+    
+    if (data.autoInstall) {
+      installDependencies(cwd, data.autoInstall, green)
+      .then(() => {
+        return runLintFix(cwd, data, green)
+      })
+      .then(() => {
+        printMessage(data, green)
+      })
+    } else {
+      printMessage(data, chalk)
+    }
+    
   }
 };
diff --git a/template/src/App.vue b/template/src/App.vue
index 2ef72e8cbc..03d5e7247d 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -11,15 +11,15 @@
 
 <script>
 {{#unless router}}
-import HelloWorld from './components/HelloWorld'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import HelloWorld from './components/HelloWorld'
 
 {{/unless}}
 export default {
-  name: 'app'{{#router}}{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{else}},
+  name: 'app'{{#router}}{{else}},
   components: {
-    HelloWorld{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-  }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{/router}}
-}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    HelloWorld
+  }{{/router}}
+}
 </script>
 
 <style>
diff --git a/template/src/components/HelloWorld.vue b/template/src/components/HelloWorld.vue
index a87d5ead26..6f18621654 100644
--- a/template/src/components/HelloWorld.vue
+++ b/template/src/components/HelloWorld.vue
@@ -23,12 +23,12 @@
 <script>
 export default {
   name: 'HelloWorld',
-  data{{#unless_eq lintConfig "airbnb"}} {{/unless_eq}}() {
+  data () {
     return {
-      msg: 'Welcome to Your Vue.js App'{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-    }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+      msg: 'Welcome to Your Vue.js App'
+    }
+  }
+}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/template/src/main.js b/template/src/main.js
index bd38d98ee4..17e5454ef9 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -2,13 +2,13 @@
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 {{/if_eq}}
-import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import App from './App'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Vue from 'vue'
+import App from './App'
 {{#router}}
-import router from './router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import router from './router'
 {{/router}}
 
-Vue.config.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+Vue.config.productionTip = false
 
 /* eslint-disable no-new */
 new Vue({
@@ -17,10 +17,10 @@ new Vue({
   router,
   {{/router}}
   {{#if_eq build "runtime"}}
-  render: h => h(App){{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  render: h => h(App)
   {{/if_eq}}
   {{#if_eq build "standalone"}}
   template: '<App/>',
-  components: { App }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+  components: { App }
   {{/if_eq}}
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+})
diff --git a/template/src/router/index.js b/template/src/router/index.js
index 89023c58a4..5fa7f9d319 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -1,15 +1,15 @@
-import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import Router from 'vue-router'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import HelloWorld from '@/components/HelloWorld'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Vue from 'vue'
+import Router from 'vue-router'
+import HelloWorld from '@/components/HelloWorld'
 
-Vue.use(Router){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+Vue.use(Router)
 
 export default new Router({
   routes: [
     {
       path: '/',
       name: 'HelloWorld',
-      component: HelloWorld{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-    }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-  ]{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+      component: HelloWorld
+    }
+  ]
+})
diff --git a/template/test/e2e/custom-assertions/elementCount.js b/template/test/e2e/custom-assertions/elementCount.js
index c0103f9431..c0d5fe00af 100644
--- a/template/test/e2e/custom-assertions/elementCount.js
+++ b/template/test/e2e/custom-assertions/elementCount.js
@@ -7,20 +7,20 @@
 // for how to write custom assertions see
 // http://nightwatchjs.org/guide#writing-custom-assertions
 exports.assertion = function (selector, count) {
-  this.message = 'Testing if element <' + selector + '> has count: ' + count{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  this.expected = count{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  this.message = 'Testing if element <' + selector + '> has count: ' + count
+  this.expected = count
   this.pass = function (val) {
-    return val === this.expected{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    return val === this.expected
   }
   this.value = function (res) {
-    return res.value{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    return res.value
   }
   this.command = function (cb) {
-    var self = this{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    var self = this
     return this.api.execute(function (selector) {
-      return document.querySelectorAll(selector).length{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+      return document.querySelectorAll(selector).length
     }, [selector], function (res) {
-      cb.call(self, res){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+      cb.call(self, res)
+    })
   }
 }
diff --git a/template/test/e2e/runner.js b/template/test/e2e/runner.js
index de22bfda22..3a02f8e96f 100644
--- a/template/test/e2e/runner.js
+++ b/template/test/e2e/runner.js
@@ -1,21 +1,21 @@
 // 1. start the dev server using production config
-process.env.NODE_ENV = 'testing'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+process.env.NODE_ENV = 'testing'
 
-const webpack = require('webpack'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-const DevServer = require('webpack-dev-server'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const webpack = require('webpack')
+const DevServer = require('webpack-dev-server')
 
-const webpackConfig = require('../../build/webpack.prod.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-const devConfigPromise = require('../../build/webpack.dev.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const webpackConfig = require('../../build/webpack.prod.conf')
+const devConfigPromise = require('../../build/webpack.dev.conf')
 
-let server{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+let server
 
 devConfigPromise.then(devConfig => {
-  const devServerOptions = devConfig.devServer{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  const compiler = webpack(webpackConfig){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  server = new DevServer(compiler, devServerOptions){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  const port = devServerOptions.port{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  const host = devServerOptions.host{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  return server.listen(port, host){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  const devServerOptions = devConfig.devServer
+  const compiler = webpack(webpackConfig)
+  server = new DevServer(compiler, devServerOptions)
+  const port = devServerOptions.port
+  const host = devServerOptions.host
+  return server.listen(port, host)
 })
 .then(() => {
   // 2. run the nightwatch test suite against it
@@ -25,24 +25,24 @@ devConfigPromise.then(devConfig => {
   // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
   // For more information on Nightwatch's config file, see
   // http://nightwatchjs.org/guide#settings-file
-  let opts = process.argv.slice(2){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  let opts = process.argv.slice(2)
   if (opts.indexOf('--config') === -1) {
-    opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js'])
   }
   if (opts.indexOf('--env') === -1) {
-    opts = opts.concat(['--env', 'chrome']){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    opts = opts.concat(['--env', 'chrome'])
   }
 
-  const spawn = require('cross-spawn'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  const runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+  const spawn = require('cross-spawn')
+  const runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' })
 
   runner.on('exit', function (code) {
-    server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    process.exit(code){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    server.close()
+    process.exit(code)
+  })
 
   runner.on('error', function (err) {
-    server.close(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    throw err{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    server.close()
+    throw err
+  })
+})
diff --git a/template/test/e2e/specs/test.js b/template/test/e2e/specs/test.js
index f619020098..92ecc1216d 100644
--- a/template/test/e2e/specs/test.js
+++ b/template/test/e2e/specs/test.js
@@ -6,7 +6,7 @@ module.exports = {
     // automatically uses dev Server port from /config.index.js
     // default: http://localhost:8080
     // see nightwatch.conf.js
-    const devServer = browser.globals.devServerURL{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    const devServer = browser.globals.devServerURL
 
     browser
       .url(devServer)
@@ -14,6 +14,6 @@ module.exports = {
       .assert.elementPresent('.hello')
       .assert.containsText('h1', 'Welcome to Your Vue.js App')
       .assert.elementCount('img', 1)
-      .end(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-  }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+      .end()
+  }
+}
diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index 9d1f7c2e3a..c69f33fd8a 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -1,13 +1,13 @@
-import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Vue from 'vue'
 
-Vue.config.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+Vue.config.productionTip = false
 
 // require all test files (files that ends with .spec.js)
-const testsContext = require.context('./specs', true, /\.spec$/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-testsContext.keys().forEach(testsContext){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const testsContext = require.context('./specs', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
 
 // require all src files except main.js for coverage.
 // you can also change this to match only the subset of files that
 // you want coverage for.
-const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-srcContext.keys().forEach(srcContext){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+const srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/)
+srcContext.keys().forEach(srcContext)
diff --git a/template/test/unit/karma.conf.js b/template/test/unit/karma.conf.js
index 591a22db83..8e4951c9e4 100644
--- a/template/test/unit/karma.conf.js
+++ b/template/test/unit/karma.conf.js
@@ -3,7 +3,7 @@
 // we are also using it with karma-webpack
 //   https://github.com/webpack/karma-webpack
 
-var webpackConfig = require('../../build/webpack.test.conf'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+var webpackConfig = require('../../build/webpack.test.conf')
 
 module.exports = function (config) {
   config.set({
@@ -20,14 +20,14 @@ module.exports = function (config) {
     },
     webpack: webpackConfig,
     webpackMiddleware: {
-      noInfo: true{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+      noInfo: true
     },
     coverageReporter: {
       dir: './coverage',
       reporters: [
         { type: 'lcov', subdir: '.' },
-        { type: 'text-summary' }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+        { type: 'text-summary' }
       ]
-    }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    }
+  })
+}
diff --git a/template/test/unit/specs/HelloWorld.spec.js b/template/test/unit/specs/HelloWorld.spec.js
index 5e8f143967..8951ac95b5 100644
--- a/template/test/unit/specs/HelloWorld.spec.js
+++ b/template/test/unit/specs/HelloWorld.spec.js
@@ -1,11 +1,11 @@
-import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import HelloWorld from '@/components/HelloWorld'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Vue from 'vue'
+import HelloWorld from '@/components/HelloWorld'
 
 describe('HelloWorld.vue', () => {
   it('should render correct contents', () => {
-    const Constructor = Vue.extend(HelloWorld){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    const vm = new Constructor().$mount(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    const Constructor = Vue.extend(HelloWorld)
+    const vm = new Constructor().$mount()
     expect(vm.$el.querySelector('.hello h1').textContent)
-    {{#if_eq runner "karma"}}.to.equal('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}{{/if_eq}}{{#if_eq runner "jest"}}.toEqual('Welcome to Your Vue.js App'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}{{/if_eq}}
-  }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-}){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    {{#if_eq runner "karma"}}.to.equal('Welcome to Your Vue.js App'){{/if_eq}}{{#if_eq runner "jest"}}.toEqual('Welcome to Your Vue.js App'){{/if_eq}}
+  })
+})
diff --git a/utils/index.js b/utils/index.js
new file mode 100644
index 0000000000..268cd5c714
--- /dev/null
+++ b/utils/index.js
@@ -0,0 +1,109 @@
+const path = require('path')
+const fs = require('fs')
+const spawn = require('child_process').spawn
+
+const lintStyles = ['standard', 'airbnb']
+
+/**
+ * Sorts dependencies in package.json alphabetically.
+ * They are unsorted because they were grouped for the handlebars helpers
+ * @param {object} data Data from questionnaire
+ */
+exports.sortDependencies = function sortDependencies(data) {
+  const packageJsonFile = path.join(
+    data.inPlace ? "" : data.destDirName,
+    "package.json"
+  )
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonFile))
+  packageJson.devDependencies = sortObject(packageJson.devDependencies)
+  packageJson.dependencies = sortObject(packageJson.dependencies)
+  fs.writeFileSync(
+    packageJsonFile,
+    JSON.stringify(packageJson, null, 2) + "\n"
+  );
+}
+
+/**
+ * Runs `npm install` in the project directory
+ * @param {string} cwd Path of the created project directory
+ * @param {object} data Data from questionnaire
+ */
+exports.installDependencies = function installDependencies(cwd, executable = 'npm', color) {
+  console.log(`\n\n# ${color('Installing project dependencies ...')}`)
+  console.log('# ========================\n')
+  return runCommand(executable, ['install'], {
+    cwd
+  })
+}
+
+/**
+ * Runs `npm run lint -- --fix` in the project directory
+ * @param {string} cwd Path of the created project directory
+ * @param {object} data Data from questionnaire
+ */
+exports.runLintFix = function runLintFix(cwd, data, color) {
+  if (data.lint && lintStyles.indexOf(data.lintConfig) !== -1) {
+    console.log(`\n\n${color('Running eslint --fix to comply with chosen preset rules...')}`)
+    console.log('# ========================\n')
+    return runCommand('npm', ['run', 'lint', '--', '--fix'], {
+      cwd
+    })
+  }
+  return Promise.resolve()
+}
+
+/**
+ * Prints the final message with instructions of necessary next steps.
+ * @param {Object} data Data from questionnaire.
+ */
+exports.printMessage = function printMessage(data, { green, yellow }) {
+  const message = `
+# ${green('Project initialization finished!')}
+# ========================
+
+To get started:
+
+  ${yellow(`${data.inPlace ? '' : `cd ${data.destDirName}\n  `}${requiresLint(data) ? 'npm run lint -- --fix\n  ' : ''}npm run dev`)}
+  
+Documentation can be found at https://vuejs-templates.github.io/webpack
+`
+  console.log(message)
+}
+
+/**
+ * Returns true if the user will have to run lint --fix themselves.
+ * @param {Object} data Data from questionnaire.
+ */
+function requiresLint(data) {
+  return !data.autoInstall && data.lint && lintStyles.indexOf(data.lintConfig) !== -1
+}
+
+/**
+ * Spawns a child process and runs the specified command
+ * By default, runs in the CWD and inherits stdio
+ * Options are the same as node's child_process.spawn
+ * @param {string} cmd 
+ * @param {array<string>} args 
+ * @param {object} options
+ */
+function runCommand(cmd, args, options) {
+  return new Promise((resolve, reject) => {
+    const spwan = spawn(cmd, args, Object.assign({
+      cwd: process.cwd(),
+      stdio: 'inherit',
+    }, options))
+
+    spwan.on('exit', () => {
+      resolve()
+    })
+  })
+}
+
+function sortObject(object) {
+  // Based on https://github.com/yarnpkg/yarn/blob/v1.3.2/src/config.js#L79-L85
+  const sortedObject = {};
+  Object.keys(object).sort().forEach(item => {
+    sortedObject[item] = object[item];
+  });
+  return sortedObject;
+}
\ No newline at end of file

From e982d47002614ceac1a6306a61493051c3251b2d Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Mon, 11 Dec 2017 17:06:58 +0100
Subject: [PATCH 292/339] Add JX support (close #1146)

---
 template/.babelrc     | 6 +++---
 template/package.json | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/template/.babelrc b/template/.babelrc
index cd05be897b..6646ce7f96 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -8,12 +8,12 @@
     }],
     "stage-2"
   ],
-  "plugins": ["transform-runtime"]{{#if_or unit e2e}},
+  "plugins": ["transform-vue-jsx", "transform-runtime"]{{#if_or unit e2e}},
   "env": {
     "test": {
       "presets": ["env", "stage-2"]{{#if_eq runner "karma"}},
-      "plugins": ["istanbul"]{{/if_eq}}{{#if_eq runner "jest"}},
-      "plugins": ["transform-es2015-modules-commonjs", "dynamic-import-node"]{{/if_eq}}
+      "plugins": ["transform-vue-jsx", "istanbul"]{{/if_eq}}{{#if_eq runner "jest"}},
+      "plugins": ["transform-vue-jsx", "transform-es2015-modules-commonjs", "dynamic-import-node"]{{/if_eq}}
     }
   }{{/if_or}}
 }
diff --git a/template/package.json b/template/package.json
index 23ffeb6ccc..e4e637e1d5 100644
--- a/template/package.json
+++ b/template/package.json
@@ -84,8 +84,11 @@
     {{/e2e}}
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "babel-loader": "^7.1.1",
+    "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
     "chalk": "^2.0.1",

From d8eccc4e9126eb119dc0e123e6588c7d3a46b7ac Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Mon, 11 Dec 2017 17:07:13 +0100
Subject: [PATCH 293/339] bump version to 1.2.6

---
 package.json             | 2 +-
 template/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 09951adace..a00df3c157 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 0a7cfb43e1..05c69c1620 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.5
+// Template version: 1.2.6
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From cc89353be444eee88e7e6480bf186a3cf5bd439f Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Mon, 11 Dec 2017 17:14:21 +0100
Subject: [PATCH 294/339] remove unnecessary exceptions

---
 template/.eslintrc.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 1f14f630f4..8624b369c5 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -49,13 +49,7 @@ module.exports = {
       ignorePropertyModificationsFor: [
         'state', // for vuex state
         'acc', // for reduce accumulators
-        'e', // for e.returnvalue
-        'ctx', // for Koa routing
-        'req', // for Express requests
-        'request', // for Express requests
-        'res', // for Express responses
-        'response', // for Express responses
-        '$scope', // for Angular 1 scopes
+        'e' // for e.returnvalue
       ]
     }],
     // allow optionalDependencies

From 513a0a0841137ad7a6689f1fd2d816a8c22383ed Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Wed, 13 Dec 2017 11:07:56 +0100
Subject: [PATCH 295/339] close #1155

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

diff --git a/template/build/build.js b/template/build/build.js
index 955e9defca..94a72bb051 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -22,7 +22,7 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
     process.stdout.write(stats.toString({
       colors: true,
       modules: false,
-      children: false,
+      children: false, // if you are using ts-loader, setting this to false will make tyescript errors show up during build
       chunks: false,
       chunkModules: false
     }) + '\n\n')

From 2e094c904b48ae98b9fa389aed49cfd8f623df98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 13 Dec 2017 11:09:10 +0100
Subject: [PATCH 296/339] [WIP] Accurate CompleteMsg when not using autoInstall
 (fix #1157) (#1158)

* try and fix #1157
---
 meta.js                                       | 101 +++++++++---------
 .../e2e/custom-assertions/elementCount.js     |   7 +-
 utils/index.js                                |  90 +++++++++++-----
 3 files changed, 119 insertions(+), 79 deletions(-)

diff --git a/meta.js b/meta.js
index 1e0b798e20..4371faac45 100644
--- a/meta.js
+++ b/meta.js
@@ -1,37 +1,37 @@
-const path = require('path');
-const fs = require('fs');
+const path = require('path')
+const fs = require('fs')
 const {
   sortDependencies,
   installDependencies,
   runLintFix,
-  printMessage
+  printMessage,
 } = require('./utils')
 
 module.exports = {
   helpers: {
-    if_or: function (v1, v2, options) {
+    if_or: function(v1, v2, options) {
       if (v1 || v2) {
-        return options.fn(this);
+        return options.fn(this)
       }
 
-      return options.inverse(this);
-    }
+      return options.inverse(this)
+    },
   },
   prompts: {
     name: {
       type: 'string',
       required: true,
-      message: 'Project name'
+      message: 'Project name',
     },
     description: {
       type: 'string',
       required: false,
       message: 'Project description',
-      default: 'A Vue.js project'
+      default: 'A Vue.js project',
     },
     author: {
       type: 'string',
-      message: 'Author'
+      message: 'Author',
     },
     build: {
       type: 'list',
@@ -40,22 +40,23 @@ module.exports = {
         {
           name: 'Runtime + Compiler: recommended for most users',
           value: 'standalone',
-          short: 'standalone'
+          short: 'standalone',
         },
         {
-          name: 'Runtime-only: about 6KB lighter min+gzip, but templates (or any Vue-specific HTML) are ONLY allowed in .vue files - render functions are required elsewhere',
+          name:
+            'Runtime-only: about 6KB lighter min+gzip, but templates (or any Vue-specific HTML) are ONLY allowed in .vue files - render functions are required elsewhere',
           value: 'runtime',
-          short: 'runtime'
-        }
-      ]
+          short: 'runtime',
+        },
+      ],
     },
     router: {
       type: 'confirm',
-      message: 'Install vue-router?'
+      message: 'Install vue-router?',
     },
     lint: {
       type: 'confirm',
-      message: 'Use ESLint to lint your code?'
+      message: 'Use ESLint to lint your code?',
     },
     lintConfig: {
       when: 'lint',
@@ -65,23 +66,23 @@ module.exports = {
         {
           name: 'Standard (https://github.com/standard/standard)',
           value: 'standard',
-          short: 'Standard'
+          short: 'Standard',
         },
         {
           name: 'Airbnb (https://github.com/airbnb/javascript)',
           value: 'airbnb',
-          short: 'Airbnb'
+          short: 'Airbnb',
         },
         {
           name: 'none (configure it yourself)',
           value: 'none',
-          short: 'none'
-        }
-      ]
+          short: 'none',
+        },
+      ],
     },
     unit: {
       type: 'confirm',
-      message: 'Set up unit tests'
+      message: 'Set up unit tests',
     },
     runner: {
       when: 'unit',
@@ -91,45 +92,46 @@ module.exports = {
         {
           name: 'Jest',
           value: 'jest',
-          short: 'jest'
+          short: 'jest',
         },
         {
           name: 'Karma and Mocha',
           value: 'karma',
-          short: 'karma'
+          short: 'karma',
         },
         {
           name: 'none (configure it yourself)',
           value: 'noTest',
-          short: 'noTest'
-        }
-      ]
+          short: 'noTest',
+        },
+      ],
     },
     e2e: {
       type: 'confirm',
-      message: 'Setup e2e tests with Nightwatch?'
+      message: 'Setup e2e tests with Nightwatch?',
     },
     autoInstall: {
       type: 'list',
-      message: 'Should we run `npm install` for you after the project has been created? (recommended)',
+      message:
+        'Should we run `npm install` for you after the project has been created? (recommended)',
       choices: [
         {
           name: 'Yes, use NPM',
           value: 'npm',
-          short: 'npm'
+          short: 'npm',
         },
         {
           name: 'Yes, use Yarn',
           value: 'yarn',
-          short: 'yarn'
+          short: 'yarn',
         },
         {
           name: 'No, I will handle that myself',
           value: false,
-          short: 'no'
-        }
-      ]
-    }
+          short: 'no',
+        },
+      ],
+    },
   },
   filters: {
     '.eslintrc.js': 'lint',
@@ -143,27 +145,28 @@ module.exports = {
     'test/unit/specs/index.js': "unit && runner === 'karma'",
     'test/unit/setup.js': "unit && runner === 'jest'",
     'test/e2e/**/*': 'e2e',
-    'src/router/**/*': 'router'
+    'src/router/**/*': 'router',
   },
-  'complete': function (data, { chalk }) {
-    
+  complete: function(data, { chalk }) {
     const green = chalk.green
 
     sortDependencies(data, green)
 
     const cwd = path.join(process.cwd(), data.inPlace ? '' : data.destDirName)
-    
+
     if (data.autoInstall) {
       installDependencies(cwd, data.autoInstall, green)
-      .then(() => {
-        return runLintFix(cwd, data, green)
-      })
-      .then(() => {
-        printMessage(data, green)
-      })
+        .then(() => {
+          return runLintFix(cwd, data, green)
+        })
+        .then(() => {
+          printMessage(data, green)
+        })
+        .catch(e => {
+          console.log(chalk.red('Error:'), e)
+        })
     } else {
       printMessage(data, chalk)
     }
-    
-  }
-};
+  },
+}
diff --git a/template/test/e2e/custom-assertions/elementCount.js b/template/test/e2e/custom-assertions/elementCount.js
index c0d5fe00af..818e602091 100644
--- a/template/test/e2e/custom-assertions/elementCount.js
+++ b/template/test/e2e/custom-assertions/elementCount.js
@@ -1,11 +1,12 @@
 // A custom Nightwatch assertion.
-// the name of the method is the filename.
-// can be used in tests like this:
+// The assertion name is the filename.
+// Example usage:
 //
 //   browser.assert.elementCount(selector, count)
 //
-// for how to write custom assertions see
+// For more information on custom assertions see:
 // http://nightwatchjs.org/guide#writing-custom-assertions
+
 exports.assertion = function (selector, count) {
   this.message = 'Testing if element <' + selector + '> has count: ' + count
   this.expected = count
diff --git a/utils/index.js b/utils/index.js
index 268cd5c714..a3de77c687 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -11,16 +11,13 @@ const lintStyles = ['standard', 'airbnb']
  */
 exports.sortDependencies = function sortDependencies(data) {
   const packageJsonFile = path.join(
-    data.inPlace ? "" : data.destDirName,
-    "package.json"
+    data.inPlace ? '' : data.destDirName,
+    'package.json'
   )
   const packageJson = JSON.parse(fs.readFileSync(packageJsonFile))
   packageJson.devDependencies = sortObject(packageJson.devDependencies)
   packageJson.dependencies = sortObject(packageJson.dependencies)
-  fs.writeFileSync(
-    packageJsonFile,
-    JSON.stringify(packageJson, null, 2) + "\n"
-  );
+  fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2) + '\n')
 }
 
 /**
@@ -28,11 +25,15 @@ exports.sortDependencies = function sortDependencies(data) {
  * @param {string} cwd Path of the created project directory
  * @param {object} data Data from questionnaire
  */
-exports.installDependencies = function installDependencies(cwd, executable = 'npm', color) {
+exports.installDependencies = function installDependencies(
+  cwd,
+  executable = 'npm',
+  color
+) {
   console.log(`\n\n# ${color('Installing project dependencies ...')}`)
   console.log('# ========================\n')
   return runCommand(executable, ['install'], {
-    cwd
+    cwd,
   })
 }
 
@@ -43,10 +44,18 @@ exports.installDependencies = function installDependencies(cwd, executable = 'np
  */
 exports.runLintFix = function runLintFix(cwd, data, color) {
   if (data.lint && lintStyles.indexOf(data.lintConfig) !== -1) {
-    console.log(`\n\n${color('Running eslint --fix to comply with chosen preset rules...')}`)
+    console.log(
+      `\n\n${color(
+        'Running eslint --fix to comply with chosen preset rules...'
+      )}`
+    )
     console.log('# ========================\n')
-    return runCommand('npm', ['run', 'lint', '--', '--fix'], {
-      cwd
+    const args =
+      data.autoInstall === 'npm'
+        ? ['run', 'lint', '--', '--fix']
+        : ['run', 'lint', '--fix']
+    return runCommand(data.autoInstall, args, {
+      cwd,
     })
   }
   return Promise.resolve()
@@ -63,7 +72,11 @@ exports.printMessage = function printMessage(data, { green, yellow }) {
 
 To get started:
 
-  ${yellow(`${data.inPlace ? '' : `cd ${data.destDirName}\n  `}${requiresLint(data) ? 'npm run lint -- --fix\n  ' : ''}npm run dev`)}
+  ${yellow(
+    `${data.inPlace ? '' : `cd ${data.destDirName}\n  `}${installMsg(
+      data
+    )}${lintMsg(data)}npm run dev`
+  )}
   
 Documentation can be found at https://vuejs-templates.github.io/webpack
 `
@@ -71,27 +84,48 @@ Documentation can be found at https://vuejs-templates.github.io/webpack
 }
 
 /**
- * Returns true if the user will have to run lint --fix themselves.
+ * If the user will have to run lint --fix themselves, it returns a string
+ * containing the instruction for this step.
  * @param {Object} data Data from questionnaire.
  */
-function requiresLint(data) {
-  return !data.autoInstall && data.lint && lintStyles.indexOf(data.lintConfig) !== -1
+function lintMsg(data) {
+  return !data.autoInstall &&
+    data.lint &&
+    lintStyles.indexOf(data.lintConfig) !== -1
+    ? 'npm run lint -- --fix (or for yarn: yarn run lint --fix)\n  '
+    : ''
+}
+
+/**
+ * If the user will have to run `npm install` or `yarn` themselves, it returns a string
+ * containing the instruction for this step.
+ * @param {Object} data Data from the questionnaire
+ */
+function installMsg(data) {
+  return !data.autoInstall ? 'npm install (or if using yarn: yarn)\n  ' : ''
 }
 
 /**
  * Spawns a child process and runs the specified command
  * By default, runs in the CWD and inherits stdio
  * Options are the same as node's child_process.spawn
- * @param {string} cmd 
- * @param {array<string>} args 
+ * @param {string} cmd
+ * @param {array<string>} args
  * @param {object} options
  */
 function runCommand(cmd, args, options) {
   return new Promise((resolve, reject) => {
-    const spwan = spawn(cmd, args, Object.assign({
-      cwd: process.cwd(),
-      stdio: 'inherit',
-    }, options))
+    const spwan = spawn(
+      cmd,
+      args,
+      Object.assign(
+        {
+          cwd: process.cwd(),
+          stdio: 'inherit',
+        },
+        options
+      )
+    )
 
     spwan.on('exit', () => {
       resolve()
@@ -101,9 +135,11 @@ function runCommand(cmd, args, options) {
 
 function sortObject(object) {
   // Based on https://github.com/yarnpkg/yarn/blob/v1.3.2/src/config.js#L79-L85
-  const sortedObject = {};
-  Object.keys(object).sort().forEach(item => {
-    sortedObject[item] = object[item];
-  });
-  return sortedObject;
-}
\ No newline at end of file
+  const sortedObject = {}
+  Object.keys(object)
+    .sort()
+    .forEach(item => {
+      sortedObject[item] = object[item]
+    })
+  return sortedObject
+}

From 8e0e190972a66d60437c8fe9657944da0dca3392 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Wed, 13 Dec 2017 12:04:11 +0100
Subject: [PATCH 297/339] restore gitignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 38e1975447..3f21839306 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@ node_modules
 .DS_Store
 docs/_book
 test/
+node_modules
+.DS_Store
+docs/_book
+test/
\ No newline at end of file

From 4f564a2715dd9ca39307c5603a3b91f0523f1f67 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Thu, 14 Dec 2017 17:33:51 +0530
Subject: [PATCH 298/339] Set spawn opt shell as true to avoid ENOENT (#1170)

---
 utils/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/index.js b/utils/index.js
index a3de77c687..fa8d8046f0 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -122,6 +122,7 @@ function runCommand(cmd, args, options) {
         {
           cwd: process.cwd(),
           stdio: 'inherit',
+          shell: true,
         },
         options
       )

From 98a8064297684fab87605468afa38a3a6c37ee53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= <toilal.dev@gmail.com>
Date: Thu, 14 Dec 2017 13:14:30 +0100
Subject: [PATCH 299/339] Remove useless code when lint is not chosen (#1165)

---
 template/build/webpack.base.conf.js | 4 ++--
 template/config/index.js            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 1f6057d611..16e6c0ca63 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -8,7 +8,7 @@ function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
 
-const createLintingRule = () => ({
+{{#lint}}const createLintingRule = () => ({
   test: /\.(js|vue)$/,
   loader: 'eslint-loader',
   enforce: 'pre',
@@ -17,7 +17,7 @@ const createLintingRule = () => ({
     formatter: require('eslint-friendly-formatter'),
     emitWarning: !config.dev.showEslintErrorsInOverlay
   }
-})
+}){{/lint}}
 
 module.exports = {
   context: path.resolve(__dirname, '../'),
diff --git a/template/config/index.js b/template/config/index.js
index 05c69c1620..2fc8572769 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -20,13 +20,14 @@ module.exports = {
     notifyOnErrors: true,
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
 
-    // Use Eslint Loader?
+    {{#lint}}// Use Eslint Loader?
     // If true, your code will be linted during bundling and
     // linting errors and warnings will be shown in the console.
     useEslint: true,
     // If true, eslint errors and warnings will also be shown in the error overlay
     // in the browser.
     showEslintErrorsInOverlay: false,
+    {{/lint}}
 
     /**
      * Source Maps

From 0d15f56dba5d6813ad53816acf9dfd046e863d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Thu, 14 Dec 2017 20:14:39 +0800
Subject: [PATCH 300/339] remove eventsource-polyfill (#1169)

---
 template/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index e4e637e1d5..1cadecc957 100644
--- a/template/package.json
+++ b/template/package.json
@@ -94,7 +94,6 @@
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",
-    "eventsource-polyfill": "^0.9.6",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",

From 76a76c5f39dccf5a36b44c07f10256e53db35968 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 14 Dec 2017 18:18:17 +0100
Subject: [PATCH 301/339] bump version to 1.2.7

---
 package.json             | 2 +-
 template/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a00df3c157..8dc8968321 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {
diff --git a/template/config/index.js b/template/config/index.js
index 2fc8572769..f0d536bf82 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.6
+// Template version: 1.2.7
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From 2d99f8ce9fa02b962d47cb5302ef2b42423ab6d6 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 14 Dec 2017 18:19:30 +0100
Subject: [PATCH 302/339] correct wording for #1155

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

diff --git a/template/build/build.js b/template/build/build.js
index 94a72bb051..2b648b810c 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -22,7 +22,7 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
     process.stdout.write(stats.toString({
       colors: true,
       modules: false,
-      children: false, // if you are using ts-loader, setting this to false will make tyescript errors show up during build
+      children: false, // if you are using ts-loader, setting this to true will make tyescript errors show up during build
       chunks: false,
       chunkModules: false
     }) + '\n\n')

From 549078351ef381e9b4cdd73d7aa7a4d57534e4a2 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Fri, 15 Dec 2017 17:04:44 +0100
Subject: [PATCH 303/339] fix #1140

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

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 16e6c0ca63..391160c571 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -53,7 +53,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
-        include: [resolve('src'), resolve('test')]
+        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
       },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

From cd4d7d957c9af3d37092c79bf490b56b8d88b108 Mon Sep 17 00:00:00 2001
From: Denny Biasiolli <dennybiasiolli@users.noreply.github.com>
Date: Sun, 17 Dec 2017 19:54:55 +0100
Subject: [PATCH 304/339] fix typo in a comment (#1183)

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

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
index bf613e8424..fc5d53fa3d 100644
--- a/template/build/webpack.prod.conf.js
+++ b/template/build/webpack.prod.conf.js
@@ -78,7 +78,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       // necessary to consistently work with multiple chunks via CommonsChunkPlugin
       chunksSortMode: 'dependency'
     }),
-    // keep module.id stable when vender modules does not change
+    // keep module.id stable when vendor modules does not change
     new webpack.HashedModuleIdsPlugin(),
     // enable scope hoisting
     new webpack.optimize.ModuleConcatenationPlugin(),

From 3f232bff489238a0b8c47165175168e229472512 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Wed, 27 Dec 2017 22:07:31 +0530
Subject: [PATCH 305/339] Load, render template version using helper (#1202)

---
 meta.js                  | 8 +++++++-
 template/config/index.js | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta.js b/meta.js
index 4371faac45..f318f2b2be 100644
--- a/meta.js
+++ b/meta.js
@@ -6,10 +6,13 @@ const {
   runLintFix,
   printMessage,
 } = require('./utils')
+const pkg = require('./package.json')
+
+const templateVersion = pkg.version
 
 module.exports = {
   helpers: {
-    if_or: function(v1, v2, options) {
+    if_or(v1, v2, options) {
       if (v1 || v2) {
         return options.fn(this)
       }
@@ -17,6 +20,9 @@ module.exports = {
       return options.inverse(this)
     },
   },
+  template_version() {
+    return templateVersion
+  },
   prompts: {
     name: {
       type: 'string',
diff --git a/template/config/index.js b/template/config/index.js
index f0d536bf82..9cb902fefe 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -1,5 +1,5 @@
 'use strict'
-// Template version: 1.2.7
+// Template version: {{ template_version }}
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')

From b30c4aadf736568fa37618c0437e1499887e0f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 27 Dec 2017 17:37:57 +0100
Subject: [PATCH 306/339] Fix static file serving for publicPath != `/`
 (fix#1176) (#1180)

* Batman!

* fix typo
---
 template/build/webpack.dev.conf.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 03e94282ba..11ce7d3958 100755
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -3,7 +3,9 @@ const utils = require('./utils')
 const webpack = require('webpack')
 const config = require('../config')
 const merge = require('webpack-merge')
+const path = require('path')
 const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const portfinder = require('portfinder')
@@ -23,6 +25,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     clientLogLevel: 'warning',
     historyApiFallback: true,
     hot: true,
+    contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
     host: HOST || config.dev.host,
     port: PORT || config.dev.port,
@@ -50,6 +53,14 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       template: 'index.html',
       inject: true
     }),
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.dev.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
   ]
 })
 

From c48c910eaf599537c81e75331f6309487c575695 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Thu, 28 Dec 2017 13:44:07 +0530
Subject: [PATCH 307/339] Change engine>node{4 => 6} for template (#1206)

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

diff --git a/template/package.json b/template/package.json
index 1cadecc957..ba2b702744 100644
--- a/template/package.json
+++ b/template/package.json
@@ -118,7 +118,7 @@
     "webpack-merge": "^4.1.0"
   },
   "engines": {
-    "node": ">= 4.0.0",
+    "node": ">= 6.0.0",
     "npm": ">= 3.0.0"
   },
   "browserslist": [

From a8ba91f494db5121c84a719ae8df81ddb7296eb0 Mon Sep 17 00:00:00 2001
From: z <sirm2zisv@gmail.com>
Date: Fri, 29 Dec 2017 22:53:48 +0800
Subject: [PATCH 308/339] Add postcss-url to match postcss-import (#1115)

---
 template/.postcssrc.js | 3 ++-
 template/package.json  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/template/.postcssrc.js b/template/.postcssrc.js
index 249472dab1..eee3e92d7f 100644
--- a/template/.postcssrc.js
+++ b/template/.postcssrc.js
@@ -2,8 +2,9 @@
 
 module.exports = {
   "plugins": {
-    // to edit target browsers: use "browserslist" field in package.json
     "postcss-import": {},
+    "postcss-url": {},
+    // to edit target browsers: use "browserslist" field in package.json
     "autoprefixer": {}
   }
 }
diff --git a/template/package.json b/template/package.json
index ba2b702744..a1359530ae 100644
--- a/template/package.json
+++ b/template/package.json
@@ -102,6 +102,7 @@
     "node-notifier": "^5.1.2",
     "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
+    "postcss-url": "^7.2.1",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "optimize-css-assets-webpack-plugin": "^3.2.0",

From 89998068807e71b674eeca51e91d55aa183adadc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 31 Dec 2017 00:04:25 -0500
Subject: [PATCH 309/339] use old sourcemap option

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

diff --git a/template/config/index.js b/template/config/index.js
index 9cb902fefe..fc20199543 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -34,7 +34,7 @@ module.exports = {
      */
 
     // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'eval-source-map',
+    devtool: 'cheap-module-eval-source-map',
 
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help

From 77f818fa7e1cad836d5d89164c2c93bccc4a5b96 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 31 Dec 2017 14:31:24 +0100
Subject: [PATCH 310/339] Ensure page reloads in history mode serve index.html

After the switch to CopyWebpackPlugin (#1176), historyAPIFallback had to be adjusted to still serve index.html from all catched paths correctly.
See: https://github.com/vuejs-templates/webpack/issues/1176#issuecomment-354347953
---
 template/build/webpack.dev.conf.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index 11ce7d3958..d950ba5a2e 100755
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -23,7 +23,11 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   // these devServer options should be customized in /config/index.js
   devServer: {
     clientLogLevel: 'warning',
-    historyApiFallback: true,
+    historyApiFallback: {
+      rewrites: [
+        { from: /.*/, to: path.join(config.dev.assetsPublicPath, 'index.html') },
+      ],
+    },
     hot: true,
     contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,

From 1b7687130ca22f7f8f77499aeeca49aa81eb4c1c Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 31 Dec 2017 14:33:14 +0100
Subject: [PATCH 311/339] Make CSS sourcemaps on by default

The problem described shouldn't even matter since it's a prob of style-loader, and we use vue-style-loader which had this fixed a long time ago
---
 template/config/index.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/template/config/index.js b/template/config/index.js
index fc20199543..d1ec13d12a 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -41,12 +41,7 @@ module.exports = {
     // https://vue-loader.vuejs.org/en/options.html#cachebusting
     cacheBusting: true,
 
-    // CSS Sourcemaps off by default because relative paths are "buggy"
-    // with this option, according to the CSS-Loader README
-    // (https://github.com/webpack/css-loader#sourcemaps)
-    // In our experience, they generally work as expected,
-    // just be aware of this issue when enabling this option.
-    cssSourceMap: false,
+    cssSourceMap: true,
   },
 
   build: {

From 834abb709518376f4f5366b6582d4d2fb6fc611a Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 31 Dec 2017 14:53:54 +0100
Subject: [PATCH 312/339] fix bug with #1202

helper function was outside of the helpe object where it would belong
---
 meta.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta.js b/meta.js
index f318f2b2be..0dc63e651b 100644
--- a/meta.js
+++ b/meta.js
@@ -19,10 +19,11 @@ module.exports = {
 
       return options.inverse(this)
     },
+    template_version() {
+      return templateVersion
+    },
   },
-  template_version() {
-    return templateVersion
-  },
+  
   prompts: {
     name: {
       type: 'string',

From 52003cd5971831decd5b20644641653b18982c28 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sun, 31 Dec 2017 14:54:33 +0100
Subject: [PATCH 313/339] bump template version

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

diff --git a/package.json b/package.json
index 8dc8968321..3b8c657646 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {

From 983f6ecbe9faba5d3da45636786612cc66c12933 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 2 Jan 2018 16:54:03 +0100
Subject: [PATCH 314/339] add eslint-plugin-vue

---
 package-lock.json     | 2209 +++++++++++++++++++++++++++++++++++++++++
 template/.eslintrc.js |   13 +-
 template/package.json |    2 +-
 3 files changed, 2219 insertions(+), 5 deletions(-)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..21209e981e
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,2209 @@
+{
+  "name": "vue-cli-template-webpack",
+  "version": "1.2.8",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "absolute": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz",
+      "integrity": "sha1-wigi+H4ck59XmIdQTZwQnEFzgp0=",
+      "dev": true
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
+      },
+      "dependencies": {
+        "co": {
+          "version": "4.6.0",
+          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+          "dev": true
+        }
+      }
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
+      "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==",
+      "dev": true
+    },
+    "ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+      "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+      "dev": true,
+      "requires": {
+        "color-convert": "1.9.1"
+      }
+    },
+    "ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+      "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "bl": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
+      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
+    },
+    "boom": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+      "dev": true,
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
+      "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
+      "dev": true,
+      "requires": {
+        "base64-js": "0.0.8",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+      "dev": true,
+      "optional": true
+    },
+    "capture-stack-trace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "caw": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+      "dev": true,
+      "requires": {
+        "get-proxy": "2.1.0",
+        "isurl": "1.0.0",
+        "tunnel-agent": "0.6.0",
+        "url-to-options": "1.0.1"
+      }
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
+    },
+    "chalk": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+      "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "3.2.0",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "4.5.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "2.0.0"
+      }
+    },
+    "cli-spinners": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz",
+      "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=",
+      "dev": true
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "center-align": "0.1.3",
+        "right-align": "0.1.3",
+        "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "clone": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
+      "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
+      "dev": true
+    },
+    "co": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
+      "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
+      "dev": true
+    },
+    "co-from-stream": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/co-from-stream/-/co-from-stream-0.0.0.tgz",
+      "integrity": "sha1-GlzYztdyY5RglPo58kmaYyl7yvk=",
+      "dev": true,
+      "requires": {
+        "co-read": "0.0.1"
+      }
+    },
+    "co-fs-extra": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/co-fs-extra/-/co-fs-extra-1.2.1.tgz",
+      "integrity": "sha1-O2rXfPJhRTD2d7HPYmZPW6dWtyI=",
+      "dev": true,
+      "requires": {
+        "co-from-stream": "0.0.0",
+        "fs-extra": "0.26.7",
+        "thunkify-wrap": "1.0.4"
+      }
+    },
+    "co-read": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/co-read/-/co-read-0.0.1.tgz",
+      "integrity": "sha1-+Bs+uKhmdf7FHj2IOn9WToc8k4k=",
+      "dev": true
+    },
+    "coffee-script": {
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
+      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
+      "dev": true
+    },
+    "color-convert": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+      "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "config-chain": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
+      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
+      "dev": true,
+      "requires": {
+        "ini": "1.3.5",
+        "proto-list": "1.2.4"
+      }
+    },
+    "consolidate": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz",
+      "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "dev": true,
+      "requires": {
+        "capture-stack-trace": "1.0.0"
+      }
+    },
+    "cryptiles": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "dev": true,
+      "requires": {
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "optional": true
+    },
+    "decompress": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz",
+      "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "4.1.1",
+        "decompress-tarbz2": "4.1.1",
+        "decompress-targz": "4.1.1",
+        "decompress-unzip": "4.0.1",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.1.0",
+        "pify": "2.3.0",
+        "strip-dirs": "2.1.0"
+      }
+    },
+    "decompress-tar": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+      "dev": true,
+      "requires": {
+        "file-type": "5.2.0",
+        "is-stream": "1.1.0",
+        "tar-stream": "1.5.5"
+      }
+    },
+    "decompress-tarbz2": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "4.1.1",
+        "file-type": "6.2.0",
+        "is-stream": "1.1.0",
+        "seek-bzip": "1.0.5",
+        "unbzip2-stream": "1.2.5"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+          "dev": true
+        }
+      }
+    },
+    "decompress-targz": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "4.1.1",
+        "file-type": "5.2.0",
+        "is-stream": "1.1.0"
+      }
+    },
+    "decompress-unzip": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+      "dev": true,
+      "requires": {
+        "file-type": "3.9.0",
+        "get-stream": "2.3.1",
+        "pify": "2.3.0",
+        "yauzl": "2.9.1"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+          "dev": true
+        },
+        "get-stream": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
+          "dev": true,
+          "requires": {
+            "object-assign": "4.1.1",
+            "pinkie-promise": "2.0.1"
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "download": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/download/-/download-5.0.3.tgz",
+      "integrity": "sha1-Y1N/l3+ZJmow64oqL70fILgAD3o=",
+      "dev": true,
+      "requires": {
+        "caw": "2.0.1",
+        "decompress": "4.2.0",
+        "filenamify": "2.0.0",
+        "get-stream": "3.0.0",
+        "got": "6.7.1",
+        "mkdirp": "0.5.1",
+        "pify": "2.3.0"
+      }
+    },
+    "download-git-repo": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.1.tgz",
+      "integrity": "sha1-1isHq+gpQx6f7JDVVDWXZkIo8wU=",
+      "dev": true,
+      "requires": {
+        "download": "5.0.3",
+        "git-clone": "0.1.0",
+        "rimraf": "2.6.2"
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "enable": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/enable/-/enable-1.3.2.tgz",
+      "integrity": "sha1-nrpoN9FtCYK1n4fYib91REPVKTE=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "requires": {
+        "is-extendable": "0.1.1"
+      }
+    },
+    "external-editor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
+      "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
+      "dev": true,
+      "requires": {
+        "chardet": "0.4.2",
+        "iconv-lite": "0.4.19",
+        "tmp": "0.0.33"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "dev": true,
+      "requires": {
+        "pend": "1.2.0"
+      }
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "file-type": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+      "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+      "dev": true
+    },
+    "filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz",
+      "integrity": "sha1-vRYiYsC26Uv7zc8Zo7uzdk94VpU=",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "2.0.0",
+        "strip-outer": "1.0.0",
+        "trim-repeated": "1.0.0"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "fs-extra": {
+      "version": "0.26.7",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
+      "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "2.4.0",
+        "klaw": "1.3.1",
+        "path-is-absolute": "1.0.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "get-proxy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+      "dev": true,
+      "requires": {
+        "npm-conf": "1.1.3"
+      }
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "git-clone": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz",
+      "integrity": "sha1-DXYWN3gJOu9/HDAjjyqe8/B6Lrk=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "got": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "dev": true,
+      "requires": {
+        "create-error-class": "3.0.2",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-redirect": "1.0.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "lowercase-keys": "1.0.0",
+        "safe-buffer": "5.1.1",
+        "timed-out": "4.0.1",
+        "unzip-response": "2.0.1",
+        "url-parse-lax": "1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "gray-matter": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz",
+      "integrity": "sha1-MELZrewqHe1qdwep7SOA+KF6Qw4=",
+      "dev": true,
+      "requires": {
+        "ansi-red": "0.1.1",
+        "coffee-script": "1.12.7",
+        "extend-shallow": "2.0.1",
+        "js-yaml": "3.10.0",
+        "toml": "2.3.3"
+      }
+    },
+    "handlebars": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
+      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "optimist": "0.6.1",
+        "source-map": "0.4.4",
+        "uglify-js": "2.8.29"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "dev": true,
+      "requires": {
+        "ajv": "5.5.2",
+        "har-schema": "2.0.0"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        }
+      }
+    },
+    "has-flag": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+      "dev": true
+    },
+    "has-generators": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz",
+      "integrity": "sha1-pqLlVIYBGUBILhPiyTeRxEms9Ek=",
+      "dev": true
+    },
+    "has-symbol-support-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
+      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==",
+      "dev": true
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "requires": {
+        "has-symbol-support-x": "1.4.1"
+      }
+    },
+    "hawk": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+      "dev": true,
+      "requires": {
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.1.0"
+      }
+    },
+    "hoek": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "3.0.0",
+        "chalk": "2.3.0",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.2.0",
+        "external-editor": "2.1.0",
+        "figures": "2.0.0",
+        "lodash": "4.17.4",
+        "mute-stream": "0.0.7",
+        "run-async": "2.3.0",
+        "rx-lite": "4.0.8",
+        "rx-lite-aggregates": "4.0.8",
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0",
+        "through": "2.3.8"
+      }
+    },
+    "is": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+      "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
+      "dev": true
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-natural-number": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+      "dev": true
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+      "dev": true
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "requires": {
+        "has-to-string-tag-x": "1.4.1",
+        "is-object": "1.0.1"
+      }
+    },
+    "js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.6"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true,
+      "optional": true
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "lowercase-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+      "dev": true
+    },
+    "make-dir": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
+      "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
+      "dev": true,
+      "requires": {
+        "pify": "3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "metalsmith": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz",
+      "integrity": "sha1-gzr7taKmOF4tmuPZNeOeM+rqUjE=",
+      "dev": true,
+      "requires": {
+        "absolute": "0.0.1",
+        "chalk": "1.1.3",
+        "clone": "1.0.3",
+        "co-fs-extra": "1.2.1",
+        "commander": "2.12.2",
+        "gray-matter": "2.1.1",
+        "has-generators": "1.0.1",
+        "is": "3.2.1",
+        "is-utf8": "0.2.1",
+        "recursive-readdir": "2.2.1",
+        "rimraf": "2.6.2",
+        "stat-mode": "0.2.2",
+        "thunkify": "2.1.2",
+        "unyield": "0.0.1",
+        "ware": "1.3.0",
+        "win-fork": "1.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "mime-db": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "multimatch": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
+      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
+      "dev": true,
+      "requires": {
+        "array-differ": "1.0.0",
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "minimatch": "3.0.4"
+      }
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "requires": {
+        "config-chain": "1.1.11",
+        "pify": "3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.1.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
+      }
+    },
+    "ora": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz",
+      "integrity": "sha1-gAeN0rkqk0r2ajrXKluRBpTt5Ro=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-cursor": "2.1.0",
+        "cli-spinners": "1.1.0",
+        "log-symbols": "1.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+      "dev": true
+    },
+    "read-metadata": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz",
+      "integrity": "sha1-bfnL5RGE6M630GaLQO5Rkebz2sY=",
+      "dev": true,
+      "requires": {
+        "yaml-js": "0.0.8"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "recursive-readdir": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
+      "integrity": "sha1-kO8jHQd4xc4JPJpI105cVCLROpk=",
+      "dev": true,
+      "requires": {
+        "minimatch": "3.0.3"
+      },
+      "dependencies": {
+        "minimatch": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+          "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
+        }
+      }
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "request": {
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "align-text": "0.1.4"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "2.1.0"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
+      "dev": true
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "dev": true,
+      "requires": {
+        "rx-lite": "4.0.8"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "dev": true
+    },
+    "seek-bzip": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
+      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
+      "dev": true,
+      "requires": {
+        "commander": "2.8.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.8.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": "1.0.1"
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "sntp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+      "dev": true,
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "source-map": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+      "dev": true,
+      "requires": {
+        "amdefine": "1.0.1"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dev": true,
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "stat-mode": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
+      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "3.0.0"
+      }
+    },
+    "strip-dirs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
+      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+      "dev": true,
+      "requires": {
+        "is-natural-number": "4.0.1"
+      }
+    },
+    "strip-outer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.0.tgz",
+      "integrity": "sha1-qsC6YNLpDF1PJ1/Yhp/ZotMQ/7g=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "supports-color": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+      "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+      "dev": true,
+      "requires": {
+        "has-flag": "2.0.0"
+      }
+    },
+    "tar-stream": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
+      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
+      "dev": true,
+      "requires": {
+        "bl": "1.2.1",
+        "end-of-stream": "1.4.0",
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "thunkify": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+      "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
+      "dev": true
+    },
+    "thunkify-wrap": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/thunkify-wrap/-/thunkify-wrap-1.0.4.tgz",
+      "integrity": "sha1-tSvlSN3+/aIOALWMYJZ2K0PdaIA=",
+      "dev": true,
+      "requires": {
+        "enable": "1.3.2"
+      }
+    },
+    "tildify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
+      "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2"
+      }
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "toml": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz",
+      "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "uglify-js": {
+      "version": "2.8.29",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "source-map": "0.5.7",
+        "uglify-to-browserify": "1.0.2",
+        "yargs": "3.10.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "uid": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz",
+      "integrity": "sha1-XkpdS3gTi09w+J/Tx2/FmqnS8QM=",
+      "dev": true
+    },
+    "unbzip2-stream": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz",
+      "integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==",
+      "dev": true,
+      "requires": {
+        "buffer": "3.6.0",
+        "through": "2.3.8"
+      }
+    },
+    "unyield": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/unyield/-/unyield-0.0.1.tgz",
+      "integrity": "sha1-FQ5l2kK/d0JEW5WKZOubhdHSsYA=",
+      "dev": true,
+      "requires": {
+        "co": "3.1.0"
+      }
+    },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+      "dev": true
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "1.0.4"
+      }
+    },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true
+    },
+    "user-home": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
+      "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "dev": true
+    },
+    "validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "dev": true,
+      "requires": {
+        "builtins": "1.0.3"
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      }
+    },
+    "vue-cli": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.2.tgz",
+      "integrity": "sha512-p0SP7fJKBSpA9BlgCSlJfKFjq0uGt7OJW0P7TVujQAr7kAgP9+rg8rNsF7U5TP/E+RjAe9LliCNf7M2O5G2USg==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.0",
+        "chalk": "2.3.0",
+        "coffee-script": "1.12.7",
+        "commander": "2.12.2",
+        "consolidate": "0.14.5",
+        "download-git-repo": "1.0.1",
+        "handlebars": "4.0.11",
+        "inquirer": "3.3.0",
+        "metalsmith": "2.3.0",
+        "minimatch": "3.0.4",
+        "multimatch": "2.1.0",
+        "ora": "1.3.0",
+        "read-metadata": "1.0.0",
+        "request": "2.83.0",
+        "rimraf": "2.6.2",
+        "semver": "5.4.1",
+        "tildify": "1.2.0",
+        "uid": "0.0.2",
+        "user-home": "2.0.0",
+        "validate-npm-package-name": "3.0.0"
+      }
+    },
+    "ware": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
+      "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
+      "dev": true,
+      "requires": {
+        "wrap-fn": "0.1.5"
+      }
+    },
+    "win-fork": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz",
+      "integrity": "sha1-j1jgZW/KAK3IyGoriePNLWotXl4=",
+      "dev": true
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true,
+      "optional": true
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "dev": true
+    },
+    "wrap-fn": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
+      "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
+      "dev": true,
+      "requires": {
+        "co": "3.1.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "yaml-js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/yaml-js/-/yaml-js-0.0.8.tgz",
+      "integrity": "sha1-h8+lqWE/SOJgBUINao7g2m/o2uw=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase": "1.2.1",
+        "cliui": "2.1.0",
+        "decamelize": "1.2.0",
+        "window-size": "0.1.0"
+      }
+    },
+    "yauzl": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "fd-slicer": "1.0.1"
+      }
+    }
+  }
+}
diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 8624b369c5..e2e0e9fe76 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -2,8 +2,8 @@
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
   parserOptions: {
+    parser: 'babel-eslint',
     sourceType: 'module'
   },
   env: {
@@ -11,14 +11,19 @@ module.exports = {
   },
   {{#if_eq lintConfig "standard"}}
   // https://github.com/standard/standard/blob/master/docs/RULES-en.md
-  extends: 'standard',
+  extends: ['plugin:vue/recommended', 'standard'],
   {{/if_eq}}
   {{#if_eq lintConfig "airbnb"}}
-  extends: 'airbnb-base',
+  // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
+  extends: ['plugin:vue/recommended', 'airbnb-base'],
+  {{/if_eq}}
+  {{#if_eq lintConfig "none"}}
+  // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
+  extends: ['plugin:vue/recommended'],
   {{/if_eq}}
   // required to lint *.vue files
   plugins: [
-    'html'
+    'vue'
   ],
   {{#if_eq lintConfig "airbnb"}}
   // check if imports actually resolve
diff --git a/template/package.json b/template/package.json
index a1359530ae..db5f9564d2 100644
--- a/template/package.json
+++ b/template/package.json
@@ -34,7 +34,7 @@
     "eslint": "^3.19.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-vue": "^4.0.0",
     {{#if_eq lintConfig "standard"}}
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-promise": "^3.4.0",

From aa9013f92582c1ccffb6fe3398616f5900855c2d Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 2 Jan 2018 17:07:26 +0100
Subject: [PATCH 315/339] switch to essential ruleset.

recommended might be too much to start with
---
 template/.eslintrc.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index e2e0e9fe76..618e75f588 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -11,15 +11,15 @@ module.exports = {
   },
   {{#if_eq lintConfig "standard"}}
   // https://github.com/standard/standard/blob/master/docs/RULES-en.md
-  extends: ['plugin:vue/recommended', 'standard'],
+  extends: ['plugin:vue/essential', 'standard'],
   {{/if_eq}}
   {{#if_eq lintConfig "airbnb"}}
   // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
-  extends: ['plugin:vue/recommended', 'airbnb-base'],
+  extends: ['plugin:vue/essential', 'airbnb-base'],
   {{/if_eq}}
   {{#if_eq lintConfig "none"}}
   // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
-  extends: ['plugin:vue/recommended'],
+  extends: ['plugin:vue/essential'],
   {{/if_eq}}
   // required to lint *.vue files
   plugins: [

From 16aed016b1e1c76278a4a0f918bbc8cabd8b4624 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 2 Jan 2018 17:07:46 +0100
Subject: [PATCH 316/339] respect eslint rule for order of options.

---
 template/src/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/src/main.js b/template/src/main.js
index 17e5454ef9..48833b5ab7 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -20,7 +20,7 @@ new Vue({
   render: h => h(App)
   {{/if_eq}}
   {{#if_eq build "standalone"}}
-  template: '<App/>',
-  components: { App }
+  components: { App },
+  template: '<App/>'
   {{/if_eq}}
 })

From 4ffbb283fbc1748a003c54bb6e5f99d2378b8b12 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 2 Jan 2018 17:21:48 +0100
Subject: [PATCH 317/339] updated linting docs.

---
 docs/linter.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/linter.md b/docs/linter.md
index 80d15c2b3c..478c1a111d 100644
--- a/docs/linter.md
+++ b/docs/linter.md
@@ -2,6 +2,14 @@
 
 This boilerplate uses [ESLint](https://eslint.org/) as the linter, and uses the [Standard](https://github.com/feross/standard/blob/master/RULES.md) preset with some small customizations.
 
+## eslint-plugin-vue
+
+We always add [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) as well, which comes with a whole bunch of helpful rules to write consistent Vue components - it can also lint templates!
+
+You can find an overview of all the available rules on [github](https://github.com/vuejs/eslint-plugin-vue#gear-configs). We chose to add the `essential` configs, but we recommend to switch to the bigger `strongly-recommended` or `recommended` rulesets once you are familiar with them.
+
+## Customizing
+
 If you are not happy with the default linting rules, you have several options:
 
 1. Overwrite individual rules in `.eslintrc.js`. For example, you can add the following rule to enforce semicolons instead of omitting them:
@@ -23,5 +31,5 @@ You can run the following command to let eslint fix any errors it finds (if it c
 npm run lint -- --fix
 ```
 
-*(The `--` in the middle is necessary to ensure the `--fix` option is passdd to `eslint`, not to `npm`)*
+*(The `--` in the middle is necessary to ensure the `--fix` option is passdd to `eslint`, not to `npm`. It can be omitted whne using yarn)*
 

From 8f0ef7aa43c7665b7959919794b3f3dc53ac7cec Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Tue, 2 Jan 2018 17:21:57 +0100
Subject: [PATCH 318/339] improved comments in eslintrc

---
 template/.eslintrc.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 618e75f588..68bf9a3767 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -10,15 +10,22 @@ module.exports = {
     browser: true,
   },
   {{#if_eq lintConfig "standard"}}
-  // https://github.com/standard/standard/blob/master/docs/RULES-en.md
-  extends: ['plugin:vue/essential', 'standard'],
+  extends: [
+    // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
+    // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
+    'plugin:vue/essential', 
+    // https://github.com/standard/standard/blob/master/docs/RULES-en.md
+    'standard'
+  ],
   {{/if_eq}}
   {{#if_eq lintConfig "airbnb"}}
   // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
+  // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
   extends: ['plugin:vue/essential', 'airbnb-base'],
   {{/if_eq}}
   {{#if_eq lintConfig "none"}}
   // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
+  // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
   extends: ['plugin:vue/essential'],
   {{/if_eq}}
   // required to lint *.vue files

From 42cd10c84c222422c10a8cadf62be6985b673c84 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 4 Jan 2018 15:22:30 +0100
Subject: [PATCH 319/339] fix historyFallback rewrite for Windows systems

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

diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js
index d950ba5a2e..070ae221f3 100755
--- a/template/build/webpack.dev.conf.js
+++ b/template/build/webpack.dev.conf.js
@@ -25,7 +25,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     clientLogLevel: 'warning',
     historyApiFallback: {
       rewrites: [
-        { from: /.*/, to: path.join(config.dev.assetsPublicPath, 'index.html') },
+        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
       ],
     },
     hot: true,

From 1d51244f2fbe27d0e071f8e24c524b818fb37abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honor=C3=A9=20Nintunze?= <nash403@outlook.fr>
Date: Fri, 5 Jan 2018 14:47:29 +0100
Subject: [PATCH 320/339] remove duplicate lines in gitignore (#1214)

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f21839306..38e1975447 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,3 @@ node_modules
 .DS_Store
 docs/_book
 test/
-node_modules
-.DS_Store
-docs/_book
-test/
\ No newline at end of file

From f4f59f5942ed1fa57b7d9e9e2a3315c58321e61e Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 11 Jan 2018 00:07:48 +0100
Subject: [PATCH 321/339] fix bad alias (fix #1239)

can lead to false matches with namespaced npm modules.
---
 template/build/webpack.base.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 391160c571..db661af323 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -37,7 +37,7 @@ module.exports = {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
-      '@': resolve('src'),
+      '@/': resolve('src'),
     }
   },
   module: {

From 7171e4c922b48f113e2d96a3c4a3cf77b9ca2d30 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 11 Jan 2018 00:14:57 +0100
Subject: [PATCH 322/339] bumping eslint dependencies

this make eslint --fix work again with eslint-plugin-vue
---
 template/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/package.json b/template/package.json
index db5f9564d2..9a7c0a4256 100644
--- a/template/package.json
+++ b/template/package.json
@@ -30,8 +30,8 @@
   },
   "devDependencies": {
     {{#lint}}
-    "babel-eslint": "^7.1.1",
-    "eslint": "^3.19.0",
+    "babel-eslint": "^8.2.1",
+    "eslint": "^4.15.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
     "eslint-plugin-vue": "^4.0.0",

From 111dc0da7a9a02f9fdb9c1cdd5c05c54d28ff99b Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 11 Jan 2018 00:15:22 +0100
Subject: [PATCH 323/339] remove unnecessary option.

eslint-plugin-vue sets this already for us.
---
 template/.eslintrc.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 68bf9a3767..30593179e2 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -3,8 +3,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    parser: 'babel-eslint',
-    sourceType: 'module'
+    parser: 'babel-eslint'
   },
   env: {
     browser: true,

From 4cbca09d3f2cc93b83197f0179e90d95fdbca3a7 Mon Sep 17 00:00:00 2001
From: benunternaehrer <benjamin.unternaehrer@gmail.com>
Date: Thu, 11 Jan 2018 00:17:20 +0100
Subject: [PATCH 324/339] Update runner.js (#1235)

Add correct file reference
---
 template/test/e2e/runner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/test/e2e/runner.js b/template/test/e2e/runner.js
index 3a02f8e96f..27220329fe 100644
--- a/template/test/e2e/runner.js
+++ b/template/test/e2e/runner.js
@@ -20,7 +20,7 @@ devConfigPromise.then(devConfig => {
 .then(() => {
   // 2. run the nightwatch test suite against it
   // to run in additional browsers:
-  //    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
+  //    1. add an entry in test/e2e/nightwatch.conf.js under "test_settings"
   //    2. add it to the --env flag below
   // or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
   // For more information on Nightwatch's config file, see

From 162a13ca74229b81abea6b92f63e458522ab9dea Mon Sep 17 00:00:00 2001
From: Ruslan Gunawardana <mr.exarus@gmail.com>
Date: Thu, 11 Jan 2018 01:17:45 +0200
Subject: [PATCH 325/339] Typo, whitespace and Style Guide fixes (#1231)

* Comment typo fixed in /build

TypeScript comment typo in file /build/build.js

* Whitespace refactoring in Unit tests

* App component name PascalCase
ESLint 'plugin:vue/recommended' detects this code style error. It violates the Style Guide rule: https://vuejs.org/v2/style-guide/#Component-name-casing-in-templates-strongly-recommended

* Style Guide refactoring: HelloWorld.vue
ESLint 'plugin:vue/recommended' detects the code style error in src/components/HelloWorld.js.
It violates the Style Guide Strongly Recommended Rule: https://vuejs.org/v2/style-guide/#Multi-attribute-elements-strongly-recommended
---
 template/build/build.js                     |  2 +-
 template/src/App.vue                        |  2 +-
 template/src/components/HelloWorld.vue      | 81 ++++++++++++++++++---
 template/test/unit/specs/HelloWorld.spec.js |  2 +-
 4 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/template/build/build.js b/template/build/build.js
index 2b648b810c..11eb43759c 100644
--- a/template/build/build.js
+++ b/template/build/build.js
@@ -22,7 +22,7 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
     process.stdout.write(stats.toString({
       colors: true,
       modules: false,
-      children: false, // if you are using ts-loader, setting this to true will make tyescript errors show up during build
+      children: false, // if you are using ts-loader, setting this to true will make typescript errors show up during build
       chunks: false,
       chunkModules: false
     }) + '\n\n')
diff --git a/template/src/App.vue b/template/src/App.vue
index 03d5e7247d..0156030e49 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -15,7 +15,7 @@ import HelloWorld from './components/HelloWorld'
 
 {{/unless}}
 export default {
-  name: 'app'{{#router}}{{else}},
+  name: 'App'{{#router}}{{else}},
   components: {
     HelloWorld
   }{{/router}}
diff --git a/template/src/components/HelloWorld.vue b/template/src/components/HelloWorld.vue
index 6f18621654..ce0edd8ac1 100644
--- a/template/src/components/HelloWorld.vue
+++ b/template/src/components/HelloWorld.vue
@@ -3,19 +3,82 @@
     <h1>\{{ msg }}</h1>
     <h2>Essential Links</h2>
     <ul>
-      <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
-      <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
-      <li><a href="https://chat.vuejs.org" target="_blank">Community Chat</a></li>
-      <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
+      <li>
+        <a
+          href="https://vuejs.org"
+          target="_blank"
+        >
+          Core Docs
+        </a>
+      </li>
+      <li>
+        <a
+          href="https://forum.vuejs.org"
+          target="_blank"
+        >
+          Forum
+        </a>
+      </li>
+      <li>
+        <a
+          href="https://chat.vuejs.org"
+          target="_blank"
+        >
+          Community Chat
+        </a>
+      </li>
+      <li>
+        <a
+          href="https://twitter.com/vuejs"
+          target="_blank"
+        >
+          Twitter
+        </a>
+      </li>
       <br>
-      <li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
+      <li>
+        <a
+          href="http://vuejs-templates.github.io/webpack/"
+          target="_blank"
+        >
+          Docs for This Template
+        </a>
+      </li>
     </ul>
     <h2>Ecosystem</h2>
     <ul>
-      <li><a href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
-      <li><a href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
-      <li><a href="http://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
-      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
+      <li>
+        <a
+          href="http://router.vuejs.org/"
+          target="_blank"
+        >
+          vue-router
+        </a>
+      </li>
+      <li>
+        <a
+          href="http://vuex.vuejs.org/"
+          target="_blank"
+        >
+          vuex
+        </a>
+      </li>
+      <li>
+        <a
+          href="http://vue-loader.vuejs.org/"
+          target="_blank"
+        >
+          vue-loader
+        </a>
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/awesome-vue"
+          target="_blank"
+        >
+          awesome-vue
+        </a>
+      </li>
     </ul>
   </div>
 </template>
diff --git a/template/test/unit/specs/HelloWorld.spec.js b/template/test/unit/specs/HelloWorld.spec.js
index 8951ac95b5..1c75ca64cd 100644
--- a/template/test/unit/specs/HelloWorld.spec.js
+++ b/template/test/unit/specs/HelloWorld.spec.js
@@ -6,6 +6,6 @@ describe('HelloWorld.vue', () => {
     const Constructor = Vue.extend(HelloWorld)
     const vm = new Constructor().$mount()
     expect(vm.$el.querySelector('.hello h1').textContent)
-    {{#if_eq runner "karma"}}.to.equal('Welcome to Your Vue.js App'){{/if_eq}}{{#if_eq runner "jest"}}.toEqual('Welcome to Your Vue.js App'){{/if_eq}}
+      {{#if_eq runner "karma"}}.to.equal('Welcome to Your Vue.js App'){{/if_eq}}{{#if_eq runner "jest"}}.toEqual('Welcome to Your Vue.js App'){{/if_eq}}
   })
 })

From f21376d6c3165a4cf6e5ae33f71b16dd47d213e3 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Thu, 11 Jan 2018 00:23:59 +0100
Subject: [PATCH 326/339] Revert "fix bad alias (fix #1239)"

This reverts commit f4f59f5942ed1fa57b7d9e9e2a3315c58321e61e.
---
 template/build/webpack.base.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index db661af323..391160c571 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -37,7 +37,7 @@ module.exports = {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
-      '@/': resolve('src'),
+      '@': resolve('src'),
     }
   },
   module: {

From fd65d24ad2ed5113dfb6790c600c51e6ea572cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Sat, 13 Jan 2018 16:23:51 +0100
Subject: [PATCH 327/339] Improve template CI tests (close #1218)

* Batman!

* fix wrong job name

* fix working dir paths

* fix node_modules path

* test other step order

* try other shell

* ...and another one

* rewrite test.sh

* try running a bash script instead

* and another attempt.

* make executable

* anpother try...

* fix workflow errors

* fix path

* Batman!

* added scenarios and made it work!!

* refactors and comments

* just fumbling around

* adfda

* adjust test scenarios for autoInstall

* x<vb<xb

* first try since a long time

* small fix

* fix path to vue-cli

* fix scenarios

* fix persist paths

* testing with quotes for the path

* removing unhelpful quotes

* New Test

* fixed indentation

* test with full setup

* 2nd full test

* bump jest version

* other docker image

* test with runinband

* test with airbnb/karma as well

* remove superfluous checkout

* run unit and e2e individually.

* fix eslint paths for test subdirs

* adjust for airbnb preset

* only lint e2e specs, config differences are unfixable.

* adding a small readme

* remove test.sh

not needed anymore
---
 .circleci/config.yml             | 137 +++++++++++++++++++++++++++++++
 circle.yml                       |  13 ---
 meta.js                          |  21 ++++-
 scenarios/README.md              |  27 ++++++
 scenarios/full-karma-airbnb.json |  14 ++++
 scenarios/full.json              |  14 ++++
 scenarios/index.js               |  19 +++++
 scenarios/minimal.json           |  14 ++++
 template/package.json            |   4 +-
 template/test/unit/karma.conf.js |   2 +-
 test.sh                          |   9 --
 11 files changed, 247 insertions(+), 27 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml
 create mode 100644 scenarios/README.md
 create mode 100644 scenarios/full-karma-airbnb.json
 create mode 100644 scenarios/full.json
 create mode 100644 scenarios/index.js
 create mode 100644 scenarios/minimal.json
 delete mode 100755 test.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..2d81538649
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,137 @@
+version: 2
+vm_settings: &vm_settings
+  docker:
+    - image: circleci/node:8.9.4-browsers
+
+jobs:
+  install_template_deps:
+    <<: *vm_settings
+    working_directory: ~/project/webpack-template
+    steps:
+      - checkout
+      - restore_cache:
+          key: template-cache-{{ checksum "package.json" }}
+      - run:
+          name: Install npm dependencies
+          command: npm install
+      - save_cache:
+          key: template-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run:
+          name: Rollout minimal scenario
+          command: VUE_TEMPL_TEST=minimal node_modules/.bin/vue init . test-minimal
+      - run:
+          name: Rollout full scenario
+          command: VUE_TEMPL_TEST=full node_modules/.bin/vue init . test-full
+      - run:
+          name: Rollout full-karma-airbnb scenario
+          command: VUE_TEMPL_TEST=full-karma-airbnb node_modules/.bin/vue init . test-full-karma-airbnb
+      - persist_to_workspace:
+          root: ~/project/webpack-template
+          paths:
+            - node_modules
+            - test-*
+
+  scenario_minimal:
+    <<: *vm_settings
+    environment:
+      - VUE_TEMPL_TEST: minimal
+    working_directory: ~/project/webpack-template/test-minimal
+    steps:
+      - attach_workspace:
+          at: '~/project/webpack-template'
+      - restore_cache:
+          key: template-cache-minimal-{{ checksum "package.json" }}
+      - run:
+          name: Install npm dependencies
+          command: npm install
+      - save_cache:
+          key: template-cache-minimal-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run:
+          name: Test build
+          command: npm run build
+
+  scenario_full:
+    <<: *vm_settings
+    working_directory: ~/project/webpack-template/test-full
+    environment:
+      - VUE_TEMPL_TEST: full
+    steps:
+      - attach_workspace:
+          at: '~/project/webpack-template'
+      - restore_cache:
+          key: template-cache-full-{{ checksum "package.json" }}
+      - run:
+          name: Install npm dependencies
+          command: npm install
+      - save_cache:
+          key: template-cache-full-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run:
+          name: Run Lint
+          command: npm run lint -- --fix
+      - run:
+          name: Run Unit tests
+          command: npm run unit
+          when: always
+      - run:
+          name: Run e2e tests
+          command: npm run e2e
+          when: always
+      - run:
+          name: Test build
+          command: npm run build
+          when: always
+
+  scenario_full-karma-airbnb:
+    <<: *vm_settings
+    working_directory: ~/project/webpack-template/test-full-karma-airbnb
+    environment:
+      - VUE_TEMPL_TEST: full-karma-airbnb
+    steps:
+      - attach_workspace:
+          at: '~/project/webpack-template'
+      - restore_cache:
+          key: template-cache-full-karma-airbnb-{{ checksum "package.json" }}
+      - run:
+          name: Install npm dependencies
+          command: npm install
+      - save_cache:
+          key: template-cache-full-karma-airbnb-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run:
+          name: Run Lint
+          command: npm run lint -- --fix
+      - run:
+          name: Run Unit tests
+          command: npm run unit
+          when: always
+      - run:
+          name: Run e2e tests
+          command: npm run e2e
+          when: always
+      - run:
+          name: Test build
+          command: npm run build
+          when: always
+
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - install_template_deps
+      - scenario_minimal:
+          requires:
+            - install_template_deps
+      - scenario_full:
+          requires:
+            - install_template_deps
+      - scenario_full-karma-airbnb:
+          requires:
+            - install_template_deps
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 8290c039d3..0000000000
--- a/circle.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-machine:
-  node:
-    version: stable
-
-dependencies:
-  pre:
-    - sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
-    - sudo apt-get update
-    - sudo apt-get install google-chrome-stable
-
-test:
-  override:
-    - bash test.sh
diff --git a/meta.js b/meta.js
index 0dc63e651b..a521f9bdd0 100644
--- a/meta.js
+++ b/meta.js
@@ -1,5 +1,6 @@
 const path = require('path')
 const fs = require('fs')
+
 const {
   sortDependencies,
   installDependencies,
@@ -10,9 +11,16 @@ const pkg = require('./package.json')
 
 const templateVersion = pkg.version
 
+const { addTestAnswers } = require('./scenarios')
+
 module.exports = {
+  metalsmith: {
+    // When running tests for the template, this adds answers for the selected scenario
+    before: addTestAnswers
+  },
   helpers: {
     if_or(v1, v2, options) {
+
       if (v1 || v2) {
         return options.fn(this)
       }
@@ -26,21 +34,25 @@ module.exports = {
   
   prompts: {
     name: {
+      when: 'isNotTest',
       type: 'string',
       required: true,
       message: 'Project name',
     },
     description: {
+      when: 'isNotTest',
       type: 'string',
       required: false,
       message: 'Project description',
       default: 'A Vue.js project',
     },
     author: {
+      when: 'isNotTest',
       type: 'string',
       message: 'Author',
     },
     build: {
+      when: 'isNotTest',
       type: 'list',
       message: 'Vue build',
       choices: [
@@ -58,15 +70,17 @@ module.exports = {
       ],
     },
     router: {
+      when: 'isNotTest',
       type: 'confirm',
       message: 'Install vue-router?',
     },
     lint: {
+      when: 'isNotTest',
       type: 'confirm',
       message: 'Use ESLint to lint your code?',
     },
     lintConfig: {
-      when: 'lint',
+      when: 'isNotTest && lint',
       type: 'list',
       message: 'Pick an ESLint preset',
       choices: [
@@ -88,11 +102,12 @@ module.exports = {
       ],
     },
     unit: {
+      when: 'isNotTest',
       type: 'confirm',
       message: 'Set up unit tests',
     },
     runner: {
-      when: 'unit',
+      when: 'isNotTest && unit',
       type: 'list',
       message: 'Pick a test runner',
       choices: [
@@ -114,10 +129,12 @@ module.exports = {
       ],
     },
     e2e: {
+      when: 'isNotTest',
       type: 'confirm',
       message: 'Setup e2e tests with Nightwatch?',
     },
     autoInstall: {
+      when: 'isNotTest',
       type: 'list',
       message:
         'Should we run `npm install` for you after the project has been created? (recommended)',
diff --git a/scenarios/README.md b/scenarios/README.md
new file mode 100644
index 0000000000..3ead3f9b8b
--- /dev/null
+++ b/scenarios/README.md
@@ -0,0 +1,27 @@
+## What is this folder?
+
+This folder contains test scenarios for the automated tests of the template on CircleCI.
+
+Each `.json`file contains an object that represents a set of answers to the questions that vue-cli asks the user when installing the template.
+
+With the code from `index.js`, we insert those answers into the metalsmith metadata and skip the inquirer questions, thus allowing us to run different test scenarios in CI without having to actually provide any answers to inquirer or to mock it.
+
+## The scenarios
+
+We currently have 3 scenrios set up:
+
+1. 'minimal': it basically answers "no" to ever choice, so no router, no elint, no tests
+2. 'full': It answers "yes" to every choice. With router, with linting (standard), with full tests (jest & e2e)
+3. 'full-airbnb-karma': like 'full', but using airbnb eslint config instead od standard and karma instead of jest for unnit tests.
+
+Other permutations might be worth testing to secure against edge cases, but this gives us a decent level of security over common combinations.
+
+## How to use it?
+
+Choosing a scenario is done through setting an ENV variable named `VUE_TEMPL_TEST`.
+
+You can run a scenario yourself by running this in your terminal:
+
+````
+VUE_TEMPL_TEST=minimal vue init webpack your-directory
+```
diff --git a/scenarios/full-karma-airbnb.json b/scenarios/full-karma-airbnb.json
new file mode 100644
index 0000000000..4e70e573b2
--- /dev/null
+++ b/scenarios/full-karma-airbnb.json
@@ -0,0 +1,14 @@
+{ 
+  "noEscape": true,
+  "name": "test",
+  "description": "A Vue.js project",
+  "author": "CircleCI",
+  "build": "standalone",
+  "router": false,
+  "lint": true,
+  "lintConfig": "airbnb",
+  "unit": true,
+  "runner": "karma",
+  "e2e": true,
+  "autoInstall": false
+}
diff --git a/scenarios/full.json b/scenarios/full.json
new file mode 100644
index 0000000000..f12d01e828
--- /dev/null
+++ b/scenarios/full.json
@@ -0,0 +1,14 @@
+{ 
+  "noEscape": true,
+  "name": "test",
+  "description": "A Vue.js project",
+  "author": "CircleCI",
+  "build": "runtime",
+  "router": false,
+  "lint": true,
+  "lintConfig": "standard",
+  "unit": true,
+  "runner": "jest",
+  "e2e": true,
+  "autoInstall": false
+}
diff --git a/scenarios/index.js b/scenarios/index.js
new file mode 100644
index 0000000000..c99a7cdc92
--- /dev/null
+++ b/scenarios/index.js
@@ -0,0 +1,19 @@
+const scenarios = [
+  'full', 
+  'full-karma-airbnb', 
+  'minimal'
+]
+
+const index = scenarios.indexOf(process.env.VUE_TEMPL_TEST)
+
+const isTest = exports.isTest = index !== -1
+
+const scenario = isTest && require(`./${scenarios[index]}.json`)
+
+exports.addTestAnswers = (metalsmith, options, helpers) => {
+  Object.assign(metalsmith.metadata(), {
+    isNotTest: !isTest,
+    ...(isTest ? scenario : undefined)
+  })
+  // console.log(metalsmith.metadata())
+}
\ No newline at end of file
diff --git a/scenarios/minimal.json b/scenarios/minimal.json
new file mode 100644
index 0000000000..abf2637541
--- /dev/null
+++ b/scenarios/minimal.json
@@ -0,0 +1,14 @@
+{ 
+  "noEscape": true,
+  "name": "test-minimal",
+  "description": "Testing the minimal template setup",
+  "author": "CircleCI",
+  "build": "standalone",
+  "router": false,
+  "lint": false,
+  "lintConfig": "standard",
+  "unit": false,
+  "runner": "jest",
+  "e2e": false,
+  "autoInstall": false
+}
diff --git a/template/package.json b/template/package.json
index 9a7c0a4256..60b5ee202a 100644
--- a/template/package.json
+++ b/template/package.json
@@ -20,7 +20,7 @@
     "test": "{{#unit}}npm run unit{{/unit}}{{#unit}}{{#e2e}} && {{/e2e}}{{/unit}}{{#e2e}}npm run e2e{{/e2e}}",
     {{/if_or}}
     {{#lint}}
-    "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}",
+    "lint": "eslint --ext .js,.vue src{{#unit}} test/unit{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}",
     {{/lint}}
     "build": "node build/build.js"
   },
@@ -52,7 +52,7 @@
     "babel-jest": "^21.0.2",
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
-    "jest": "^21.2.0",
+    "jest": "^22.0.4",
     "jest-serializer-vue": "^0.3.0",
     "vue-jest": "^1.0.2",
     {{/if_eq}}
diff --git a/template/test/unit/karma.conf.js b/template/test/unit/karma.conf.js
index 8e4951c9e4..5d3966d23e 100644
--- a/template/test/unit/karma.conf.js
+++ b/template/test/unit/karma.conf.js
@@ -5,7 +5,7 @@
 
 var webpackConfig = require('../../build/webpack.test.conf')
 
-module.exports = function (config) {
+module.exports = function karmaConfig (config) {
   config.set({
     // to run in additional browsers:
     // 1. install corresponding karma launcher
diff --git a/test.sh b/test.sh
deleted file mode 100755
index 5f0d4f119d..0000000000
--- a/test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-set -e
-
-yes "" | ./node_modules/.bin/vue init . test
-
-cd test
-npm install
-npm run lint
-npm test
-npm run build

From 464b638a52ffd27cb4e4b4e6ca4489fd53fdec7c Mon Sep 17 00:00:00 2001
From: Creeper <YangCreeper@hotmail.com>
Date: Sat, 13 Jan 2018 23:29:42 +0800
Subject: [PATCH 328/339] chore: remove extra comma (#1240)

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

diff --git a/template/config/index.js b/template/config/index.js
index d1ec13d12a..820109957f 100644
--- a/template/config/index.js
+++ b/template/config/index.js
@@ -41,7 +41,7 @@ module.exports = {
     // https://vue-loader.vuejs.org/en/options.html#cachebusting
     cacheBusting: true,
 
-    cssSourceMap: true,
+    cssSourceMap: true
   },
 
   build: {

From 177d73854a32a09cc8b3eca9cdc2e7e83e729aaa Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 13 Jan 2018 16:33:55 +0100
Subject: [PATCH 329/339] bump template version (1.3.0)

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

diff --git a/package.json b/package.json
index 3b8c657646..645c01b4dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {

From 8ce0da4945785873455c6c17cf01c9121a808360 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 13 Jan 2018 21:30:08 +0100
Subject: [PATCH 330/339] replace object rest spread with Object.assign for
 node6 compat. (fix #1245)

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

diff --git a/scenarios/index.js b/scenarios/index.js
index c99a7cdc92..662f16d8a3 100644
--- a/scenarios/index.js
+++ b/scenarios/index.js
@@ -11,9 +11,9 @@ const isTest = exports.isTest = index !== -1
 const scenario = isTest && require(`./${scenarios[index]}.json`)
 
 exports.addTestAnswers = (metalsmith, options, helpers) => {
-  Object.assign(metalsmith.metadata(), {
-    isNotTest: !isTest,
-    ...(isTest ? scenario : undefined)
-  })
-  // console.log(metalsmith.metadata())
+  Object.assign(
+    metalsmith.metadata(),
+    { isNotTest: !isTest },
+    isTest ? scenario : {}
+  )
 }
\ No newline at end of file

From e1ba1ea34fdd481508ef9289eeb85ecdcacfaca4 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 13 Jan 2018 21:34:14 +0100
Subject: [PATCH 331/339] change circleci node image to 6.12.3 to ensure node 6
 compat.

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d81538649..c5186160e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2
 vm_settings: &vm_settings
   docker:
-    - image: circleci/node:8.9.4-browsers
+    - image: circleci/node:6.12.3-browsers
 
 jobs:
   install_template_deps:

From d8fb86400e67be892208cb1d606a9681de949648 Mon Sep 17 00:00:00 2001
From: Thorsten <t.luenborg@googlemail.com>
Date: Sat, 13 Jan 2018 21:36:58 +0100
Subject: [PATCH 332/339] Bump template version (1.3.1)

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

diff --git a/package.json b/package.json
index 645c01b4dc..db88d649df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-template-webpack",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
   "scripts": {

From 073b02117aca71874e05f27a367a82eb24efa757 Mon Sep 17 00:00:00 2001
From: queteparece <queteparece@gmail.com>
Date: Mon, 5 Feb 2018 08:51:27 +0100
Subject: [PATCH 333/339] Fixing babel-eslint >=8 not working with babel 6 (at
 least on Windows) (#1283)

close #1273
---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 60b5ee202a..207322b98c 100644
--- a/template/package.json
+++ b/template/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     {{#lint}}
-    "babel-eslint": "^8.2.1",
+    "babel-eslint": "^7.2.3",
     "eslint": "^4.15.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",

From 50d01f9c1bf852d61ac151ff276ea35016de1d7c Mon Sep 17 00:00:00 2001
From: Nico Salvador <salvador.nico@gmail.com>
Date: Mon, 5 Feb 2018 15:51:57 +0800
Subject: [PATCH 334/339] Fixed typo in linter.md (#1263)

---
 docs/linter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/linter.md b/docs/linter.md
index 478c1a111d..da6ce6070d 100644
--- a/docs/linter.md
+++ b/docs/linter.md
@@ -31,5 +31,5 @@ You can run the following command to let eslint fix any errors it finds (if it c
 npm run lint -- --fix
 ```
 
-*(The `--` in the middle is necessary to ensure the `--fix` option is passdd to `eslint`, not to `npm`. It can be omitted whne using yarn)*
+*(The `--` in the middle is necessary to ensure the `--fix` option is passed to `eslint`, not to `npm`. It can be omitted whne using yarn)*
 

From b1c0f98ad4e428f5f91c29549e76c5b606fa1a6e Mon Sep 17 00:00:00 2001
From: David Keller <dev@davidkeller.me>
Date: Mon, 5 Feb 2018 08:55:58 +0100
Subject: [PATCH 335/339] Fix two documentation typos (#1248)

---
 docs/backend.md   | 2 +-
 docs/structure.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/backend.md b/docs/backend.md
index e7acadf7c5..ecbc99592a 100644
--- a/docs/backend.md
+++ b/docs/backend.md
@@ -11,7 +11,7 @@ const path = require('path')
 
 module.exports = {
   dev: {
-    / Paths
+    // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {},
diff --git a/docs/structure.md b/docs/structure.md
index 75c958a42f..341a51614b 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -21,8 +21,8 @@
 │   │   ├── eslintrc            # config file for eslint with extra settings only for unit tests
 │   │   ├── index.js            # test build entry file
 │   │   ├── jest.conf.js        # Config file when using Jest for unit tests
-│   │   └── karma.conf.js       # test runner config file when using Karma for unit tests
-│   │   ├── setup.js            # file that runs before Jest runs your unit tests
+│   │   ├── karma.conf.js       # test runner config file when using Karma for unit tests
+│   │   └── setup.js            # file that runs before Jest runs your unit tests
 │   └── e2e/                    # e2e tests
 │   │   ├── specs/              # test spec files
 │   │   ├── custom-assertions/  # custom assertions for e2e tests

From b65484714b660aff66eb9f70b6a32487de44b78d Mon Sep 17 00:00:00 2001
From: Cristian Lorsson <cristianl@users.noreply.github.com>
Date: Mon, 5 Feb 2018 06:01:57 -0200
Subject: [PATCH 336/339] Docs: formatting/typo fixes (#1254)

---
 docs/env.md            | 8 ++++----
 docs/linter.md         | 3 ++-
 docs/pre-processors.md | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/env.md b/docs/env.md
index 600ddb94f6..076d2a0636 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -42,10 +42,10 @@ So, the environment variables are:
 
 As we can see, `test.env` inherits the `dev.env` and the `dev.env` inherits the `prod.env`.
 
-### Usage		
+### Usage
 
-It is simple to use the environment variables in your code. For example:		
+It is simple to use the environment variables in your code. For example:
 
-```js		
-Vue.config.productionTip = process.env.NODE_ENV === 'production'		
+```js
+Vue.config.productionTip = process.env.NODE_ENV === 'production'
 ```
diff --git a/docs/linter.md b/docs/linter.md
index da6ce6070d..9bc51a1061 100644
--- a/docs/linter.md
+++ b/docs/linter.md
@@ -31,5 +31,6 @@ You can run the following command to let eslint fix any errors it finds (if it c
 npm run lint -- --fix
 ```
 
-*(The `--` in the middle is necessary to ensure the `--fix` option is passed to `eslint`, not to `npm`. It can be omitted whne using yarn)*
+*(The `--` in the middle is necessary to ensure the `--fix` option is passed to `eslint`, not to `npm`. It can be omitted when using yarn)*
+
 
diff --git a/docs/pre-processors.md b/docs/pre-processors.md
index fa58751e32..c99604e5a5 100644
--- a/docs/pre-processors.md
+++ b/docs/pre-processors.md
@@ -1,6 +1,6 @@
 # Pre-Processors
 
-This boilerplate has pre-configured CSS extraction for most popular CSS pre-processors including LESS, SASS, Stylus, and PostCSS. To use a pre-processor, all you need to do is install the appropriate webpack loader for it. For example, to use SASS:
+This boilerplate has pre-configured CSS extraction for most popular CSS pre-processors including LESS, Sass, Stylus, and PostCSS. To use a pre-processor, all you need to do is install the appropriate webpack loader for it. For example, to use Sass:
 
 ``` bash
 npm install sass-loader node-sass --save-dev
@@ -14,11 +14,11 @@ Once installed, you can use the pre-processors inside your `*.vue` components us
 
 ``` html
 <style lang="scss">
-/* write SASS! */
+/* write Sass! */
 </style>
 ```
 
-### A note on SASS syntax
+### A note on Sass syntax
 
 - `lang="scss"` corresponds to the CSS-superset syntax (with curly braces and semicolons).
 - `lang="sass"` corresponds to the indentation-based syntax.
@@ -27,7 +27,7 @@ Once installed, you can use the pre-processors inside your `*.vue` components us
 
 Styles in `*.vue` files and style files (`*.css`, `*.scss` etc) are piped through PostCSS by default, so you don't need to use a specific loader for it.
 
-You can simply add PostCSS plugins you want to use to the `.postcssrc.js`file in your project's root directory:
+You can simply add PostCSS plugins you want to use to the `.postcssrc.js` file in your project's root directory:
 
 ``` js
 // https://github.com/michael-ciniawsky/postcss-load-config

From 4ffcccb2e3b5c8f18ac5c28023ed983bb183ef96 Mon Sep 17 00:00:00 2001
From: diogosalazar <diogosalazar@gmail.com>
Date: Wed, 28 Feb 2018 22:48:09 -0800
Subject: [PATCH 337/339] Fix typos (#1312)

---
 scenarios/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scenarios/README.md b/scenarios/README.md
index 3ead3f9b8b..2fcacaf077 100644
--- a/scenarios/README.md
+++ b/scenarios/README.md
@@ -8,11 +8,11 @@ With the code from `index.js`, we insert those answers into the metalsmith metad
 
 ## The scenarios
 
-We currently have 3 scenrios set up:
+We currently have 3 scenarios set up:
 
-1. 'minimal': it basically answers "no" to ever choice, so no router, no elint, no tests
+1. 'minimal': it basically answers "no" to ever choice, so no router, no eslint, no tests
 2. 'full': It answers "yes" to every choice. With router, with linting (standard), with full tests (jest & e2e)
-3. 'full-airbnb-karma': like 'full', but using airbnb eslint config instead od standard and karma instead of jest for unnit tests.
+3. 'full-airbnb-karma': like 'full', but using airbnb eslint config instead of standard and karma instead of jest for unit tests.
 
 Other permutations might be worth testing to secure against edge cases, but this gives us a decent level of security over common combinations.
 

From 3473bb1122e7186dca6003c7e79bab266525ccf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 19 Sep 2018 10:27:27 +0200
Subject: [PATCH 338/339] Update README.md

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

diff --git a/README.md b/README.md
index 476c8224a2..d1947117b1 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,17 @@
 
 > This template is Vue 2.0 compatible. For Vue 1.x use this command: `vue init webpack#1.0 my-project`
 
+
+# Vue-cli 3 is here, so this template is not considered deprecated.
+
+This template was the main template for vue-cli verison 2.*.
+
+Now that we have released a [stable version of vue-cli 3](https://cli.vuejs.org), which incorporates all features that this template offers (and much more), we think that this template doesn't have any significant use for the future, so we won't put much resource in developing it further.
+
+We will try and fix major issues should they arise, but not much more.
+
+Feel free to fork this template if you want to keep it alive.
+
 ## Documentation
 
 - [For this template](http://vuejs-templates.github.io/webpack): common questions specific to this template are answered and each part is described in greater detail

From 298503082f1ff758ef8ec5dbf5f91f5d8bdd0333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 19 Sep 2018 10:27:39 +0200
Subject: [PATCH 339/339] Update README.md

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

diff --git a/README.md b/README.md
index d1947117b1..6b4fea47e6 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 > This template is Vue 2.0 compatible. For Vue 1.x use this command: `vue init webpack#1.0 my-project`
 
 
-# Vue-cli 3 is here, so this template is not considered deprecated.
+# Vue-cli 3 is here, so this template is now considered deprecated.
 
 This template was the main template for vue-cli verison 2.*.