From 7c05bf766bf3ff3383aadda7f0e92afdf63bc38b Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Thu, 25 May 2017 16:47:34 +0300
Subject: [PATCH 01/11] UPDATE settings

---
 meta.js                             | 16 ++++++----
 template/.babelrc                   |  4 +--
 template/.eslintrc.js               | 46 ++++++++++-------------------
 template/.postcssrc.js              | 10 ++++++-
 template/build/webpack.base.conf.js | 40 +++++++++++++++----------
 template/config/index.js            |  4 +--
 template/package.json               | 36 +++++++++++-----------
 7 files changed, 82 insertions(+), 74 deletions(-)

diff --git a/meta.js b/meta.js
index e2e2fdffa1..57a819db7a 100644
--- a/meta.js
+++ b/meta.js
@@ -40,10 +40,19 @@ module.exports = {
         }
       ]
     },
+    "port": {
+      "type": "string",
+      "message": "What port for localhost (http://localhost:8080) do you want to use? ",
+      "default": 8080
+    },
     "router": {
       "type": "confirm",
       "message": "Install vue-router?"
     },
+    "vuex": {
+      "type": "confirm",
+      "message": "Install vuex?"
+    },
     "lint": {
       "type": "confirm",
       "message": "Use ESLint to lint your code?"
@@ -54,15 +63,10 @@ module.exports = {
       "message": "Pick an ESLint preset",
       "choices": [
         {
-          "name": "Standard (https://github.com/feross/standard)",
+          "name": "EAHT Standard",
           "value": "standard",
           "short": "Standard"
         },
-        {
-          "name": "Airbnb (https://github.com/airbnb/javascript)",
-          "value": "airbnb",
-          "short": "Airbnb"
-        },
         {
           "name": "none (configure it yourself)",
           "value": "none",
diff --git a/template/.babelrc b/template/.babelrc
index 13f0e47164..871bee763a 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,13 +1,13 @@
 {
   "presets": [
     ["env", { "modules": false }],
-    "stage-2"
+    "stage-3"
   ],
   "plugins": ["transform-runtime"],
   "comments": false,
   "env": {
     "test": {
-      "presets": ["env", "stage-2"],
+      "presets": ["env", "stage-3"],
       "plugins": [ "istanbul" ]
     }
   }
diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 00b5b5717a..01ec478daf 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -4,51 +4,37 @@ module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
+    ecmaVersion: 2016,
     sourceType: 'module'
   },
   env: {
+    es6: true,
     browser: true,
   },
   {{#if_eq lintConfig "standard"}}
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  {{/if_eq}}
-  {{#if_eq lintConfig "airbnb"}}
-  extends: 'airbnb-base',
+  extends: 'prettier',
   {{/if_eq}}
   // required to lint *.vue files
   plugins: [
-    'html'
+    'html',
+    'vue'
+    {{#if_eq lintConfig "standard"}},
+    'prettier'
+    {{/if_eq}}
   ],
-  {{#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"}}
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // 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'
-    }],
-    // allow optionalDependencies
-    'import/no-extraneous-dependencies': ['error', {
-      'optionalDependencies': ['test/unit/index.js']
+    "prettier/prettier": ["error", {
+      "tabWidth": 2,
+      "semi": true,
+      "singleQuote": true,
+      "trailingComma": "none",
+      "bracketSpacing": true,
+      "jsxBracketSameLine": true
     }],
     {{/if_eq}}
+    'vue/jsx-uses-vars': 2,
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
   }
diff --git a/template/.postcssrc.js b/template/.postcssrc.js
index ea9a5ab875..5e88c064b0 100644
--- a/template/.postcssrc.js
+++ b/template/.postcssrc.js
@@ -3,6 +3,14 @@
 module.exports = {
   "plugins": {
     // to edit target browsers: use "browserlist" field in package.json
-    "autoprefixer": {}
+    "postcss-import": {
+      path: ['src/assets/css/']
+    },
+    "postcss-cssnext": {
+      features: {
+        colorRgba: false,
+        rem: false
+      }
+    }
   }
 }
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 0f161198d4..6c0dae9fb8 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -32,12 +32,14 @@ module.exports = {
       {{#lint}}
       {
         test: /\.(js|vue)$/,
-        loader: 'eslint-loader',
         enforce: 'pre',
         include: [resolve('src'), resolve('test')],
-        options: {
-          formatter: require('eslint-friendly-formatter')
-        }
+        use: [{
+          loader: 'eslint-loader',
+          options: {
+            formatter: require('eslint-friendly-formatter')
+          }
+        }]
       },
       {{/lint}}
       {
@@ -47,24 +49,30 @@ module.exports = {
       },
       {
         test: /\.js$/,
-        loader: 'babel-loader',
-        include: [resolve('src'), resolve('test')]
+        include: [resolve('src'), resolve('test')],
+        use: [{
+          loader: 'babel-loader'
+        }]
       },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
-        }
+        use: [{
+          loader: 'url-loader',
+          options: {
+            limit: 10000,
+            name: utils.assetsPath('img/[name].[hash:7].[ext]')
+          }
+        }]
       },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
-        }
+        use: [{
+          loader: 'url-loader',
+          options: {
+            limit: 10000,
+            name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+          }
+        }]
       }
     ]
   }
diff --git a/template/config/index.js b/template/config/index.js
index 196da1fa7d..d974cfb1f1 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: {{ port }},
     autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
@@ -33,6 +33,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: true
   }
 }
diff --git a/template/package.json b/template/package.json
index ae104e7928..8b01750405 100644
--- a/template/package.json
+++ b/template/package.json
@@ -11,14 +11,18 @@
     "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}}
+    "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}",
+    "fixJs": "eslint --fix .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "vue": "^2.2.6"{{#router}},
-    "vue-router": "^2.3.1"{{/router}}
+    "vue": "^2.3.3"{{#router}},
+    "vue-router": "^2.3.1"{{/router}}{{vuex}},
+    "vuex": "^2.3.1",
+    "vuex-persistedstate": "^1.1.0",
+    "vuex-router-sync": "^4.1.2"{{/vuex}}
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.2",
+    "autoprefixer": "^7.0.0",
     "babel-core": "^6.22.1",
     {{#lint}}
     "babel-eslint": "^7.1.1",
@@ -26,26 +30,24 @@
     "babel-loader": "^6.2.10",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-preset-env": "^1.3.2",
-    "babel-preset-stage-2": "^6.22.0",
+    "babel-preset-stage-3": "^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.28.0",
+    "postcss-cssnext": "^2.11.0",
+    "postcss-import": "^10.0.0",
     {{#lint}}
     "eslint": "^3.19.0",
     "eslint-friendly-formatter": "^2.0.7",
     "eslint-loader": "^1.7.1",
     "eslint-plugin-html": "^2.0.0",
+    "eslint-plugin-vue": "^2.0.1",
     {{#if_eq lintConfig "standard"}}
-    "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": "^11.1.3",
-    "eslint-import-resolver-webpack": "^0.8.1",
-    "eslint-plugin-import": "^2.2.0",
+    "eslint-config-prettier": "^2.1.1",
+    "eslint-plugin-prettier": "^2.1.1",
+    "prettier": "^1.3.1",
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
@@ -57,7 +59,10 @@
     "http-proxy-middleware": "^0.17.3",
     "webpack-bundle-analyzer": "^2.2.1",
     {{#unit}}
+    "babel-plugin-istanbul": "^4.1.1",
+    "chai": "^3.5.0",
     "cross-env": "^4.0.0",
+    "inject-loader": "^3.0.0",
     "karma": "^1.4.1",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
@@ -69,12 +74,9 @@
     "karma-webpack": "^2.0.2",
     "lolex": "^1.5.2",
     "mocha": "^3.2.0",
-    "chai": "^3.5.0",
+    "phantomjs-prebuilt": "^2.1.14",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
-    "inject-loader": "^3.0.0",
-    "babel-plugin-istanbul": "^4.1.1",
-    "phantomjs-prebuilt": "^2.1.14",
     {{/unit}}
     {{#e2e}}
     "chromedriver": "^2.27.2",

From 82957d39f75f677e2f65ef16a8a05fdf0939c326 Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Thu, 25 May 2017 17:14:14 +0300
Subject: [PATCH 02/11] UPDATE start bundle

---
 template/src/App.vue                          | 10 ++---
 template/src/components/Hello.vue             | 24 ++++++++---
 template/src/main.js                          | 18 +++++----
 template/src/router/index.js                  | 16 ++++----
 template/src/store/index.js                   | 40 +++++++++++++++++++
 .../e2e/custom-assertions/elementCount.js     | 16 ++++----
 template/test/e2e/runner.js                   | 28 ++++++-------
 template/test/e2e/specs/test.js               |  8 ++--
 template/test/unit/index.js                   | 12 +++---
 template/test/unit/karma.conf.js              | 12 +++---
 template/test/unit/specs/Hello.spec.js        | 14 +++----
 11 files changed, 128 insertions(+), 70 deletions(-)
 create mode 100644 template/src/store/index.js

diff --git a/template/src/App.vue b/template/src/App.vue
index 74a25d1dfa..9c20a41d17 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -11,15 +11,15 @@
 
 <script>
 {{#unless router}}
-import Hello from './components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Hello from './components/Hello';
 
 {{/unless}}
 export default {
-  name: 'app'{{#router}}{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{else}},
+  name: 'app'{{#router}},
   components: {
-    Hello{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
-  }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}{{/router}}
-}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    Hello,
+  }{{/router}}
+};
 </script>
 
 <style>
diff --git a/template/src/components/Hello.vue b/template/src/components/Hello.vue
index dc7251a0f2..9700d013bc 100644
--- a/template/src/components/Hello.vue
+++ b/template/src/components/Hello.vue
@@ -17,18 +17,32 @@
       <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>
+    {{#vuex}}
+    <button v-on:click="onClick">Click Me!</button>
+    <div v-if="doSomething">Vuex works!</div>
+    {{/vuex}}
   </div>
 </template>
 
 <script>
 export default {
   name: 'hello',
-  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',
+    };
+  }{{#vuex}},
+  computed: {
+    doSomething () {
+      return this.$store.doSomething;
+    }
+  },
+  methods: {
+    onClick () {
+      this.$store.dispatch('doSomething');
+    }
+  }{{/vuex}}
+};
 </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..1890f5b85a 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -2,13 +2,17 @@
 // 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}}
+import App from './App';
+{{#vuex}}
+import store from './store';
+{{/vuex}}
 
-Vue.config.productionTip = false{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+Vue.config.productionTip = false;
 
 /* eslint-disable no-new */
 new Vue({
@@ -17,10 +21,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 4443677ef4..00d0036a75 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 Hello from '@/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Vue from 'vue';
+import Router from 'vue-router';
+import Hello from '@/components/Hello';
 
-Vue.use(Router){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+Vue.use(Router);
 
 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}}
+      component: Hello,
+    }
+  ]
+});
diff --git a/template/src/store/index.js b/template/src/store/index.js
new file mode 100644
index 0000000000..0a7da3a0ae
--- /dev/null
+++ b/template/src/store/index.js
@@ -0,0 +1,40 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import createPersistedState from 'vuex-persistedstate';
+
+Vue.use(Vuex);
+
+const state = {
+  doSomething: false
+};
+
+const getters = {
+};
+
+const mutations = {
+  DO_SOMETHING(state) {
+    state.doSomething = !state.doSomething;
+  },
+};
+
+const actions = {
+  doSomething({ commit }) {
+    commit('DO_SOMETHING');
+  },
+};
+
+const store = new Vuex.Store({
+  state,
+  getters,
+  mutations,
+  actions,
+  strict: true, // process.env.NODE_ENV === 'production',
+  plugins: [
+    createPersistedState({
+      key: '{{name}}-storage'
+      // paths: [] // If you want to save special paths in storage
+    })
+  ]
+});
+
+export default store;
diff --git a/template/test/e2e/custom-assertions/elementCount.js b/template/test/e2e/custom-assertions/elementCount.js
index c0103f9431..696a367191 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 6b30c61e17..2702f50774 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'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-var server = require('../../build/dev-server.js'){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+process.env.NODE_ENV = 'testing';
+var server = require('../../build/dev-server.js');
 
 server.ready.then(() => {
   // 2. run the nightwatch test suite against it
@@ -10,24 +10,24 @@ 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}}
+  var 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']);
   }
 
-  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');
+  var 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..50e328fb0b 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..b31d3a068f 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..ec3379c59d 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/Hello.spec.js b/template/test/unit/specs/Hello.spec.js
index 1b276f47dc..d660a5a8be 100644
--- a/template/test/unit/specs/Hello.spec.js
+++ b/template/test/unit/specs/Hello.spec.js
@@ -1,11 +1,11 @@
-import Vue from 'vue'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-import Hello from '@/components/Hello'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+import Vue from 'vue';
+import Hello from '@/components/Hello';
 
 describe('Hello.vue', () => {
   it('should render correct contents', () => {
-    const Constructor = Vue.extend(Hello){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-    const vm = new Constructor().$mount(){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+    const Constructor = Vue.extend(Hello);
+    const vm = new Constructor().$mount();
     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}}
+      .to.equal('Welcome to Your Vue.js App');
+  });
+});

From 08387683b0bd7dbf94dcfcc0005a233aebccc946 Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Thu, 25 May 2017 17:15:34 +0300
Subject: [PATCH 03/11] ADD vuex cleanup

---
 meta.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta.js b/meta.js
index 57a819db7a..f96bd259f3 100644
--- a/meta.js
+++ b/meta.js
@@ -90,7 +90,9 @@ module.exports = {
     "test/unit/**/*": "unit",
     "build/webpack.test.conf.js": "unit",
     "test/e2e/**/*": "e2e",
-    "src/router/**/*": "router"
+    "src/router/**/*": "router",
+    "src/store/**/*": "vuex",
+    "test/e2e/**/*": "e2e"
   },
   "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 23da75866bf484309440d6a2922eeb6015cddae7 Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Thu, 25 May 2017 17:17:23 +0300
Subject: [PATCH 04/11] FIX unopened if for vuex

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

diff --git a/template/package.json b/template/package.json
index 8b01750405..41af6ec996 100644
--- a/template/package.json
+++ b/template/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "vue": "^2.3.3"{{#router}},
-    "vue-router": "^2.3.1"{{/router}}{{vuex}},
+    "vue-router": "^2.3.1"{{/router}}{{#vuex}},
     "vuex": "^2.3.1",
     "vuex-persistedstate": "^1.1.0",
     "vuex-router-sync": "^4.1.2"{{/vuex}}

From 7ab0d1ea1bc82a13dff6fc9ddcd8de2d442b9f25 Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Thu, 25 May 2017 17:36:53 +0300
Subject: [PATCH 05/11] FIX errors

---
 template/src/App.vue              |  7 +++----
 template/src/components/Hello.vue | 10 +++++-----
 template/src/main.js              | 10 +++++++++-
 template/src/router/index.js      |  2 +-
 template/src/store/index.js       |  7 +++----
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/template/src/App.vue b/template/src/App.vue
index 9c20a41d17..aecff930d2 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -12,13 +12,12 @@
 <script>
 {{#unless router}}
 import Hello from './components/Hello';
-
 {{/unless}}
 export default {
-  name: 'app'{{#router}},
+  name: 'app'{{#unless router}},
   components: {
-    Hello,
-  }{{/router}}
+    Hello
+  }{{/unless}}
 };
 </script>
 
diff --git a/template/src/components/Hello.vue b/template/src/components/Hello.vue
index 9700d013bc..6559144f39 100644
--- a/template/src/components/Hello.vue
+++ b/template/src/components/Hello.vue
@@ -27,18 +27,18 @@
 <script>
 export default {
   name: 'hello',
-  data () {
+  data() {
     return {
-      msg: 'Welcome to Your Vue.js App',
+      msg: 'Welcome to Your Vue.js App'
     };
   }{{#vuex}},
   computed: {
-    doSomething () {
-      return this.$store.doSomething;
+    doSomething() {
+      return this.$store.state.doSomething;
     }
   },
   methods: {
-    onClick () {
+    onClick() {
       this.$store.dispatch('doSomething');
     }
   }{{/vuex}}
diff --git a/template/src/main.js b/template/src/main.js
index 1890f5b85a..9a41205e23 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -3,23 +3,31 @@
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 {{/if_eq}}
 import Vue from 'vue';
+{{#vuex}}
+import { sync } from 'vuex-router-sync';
+{{/vuex}}
 import App from './App';
 {{#router}}
 import router from './router';
 {{/router}}
-import App from './App';
 {{#vuex}}
 import store from './store';
 {{/vuex}}
 
 Vue.config.productionTip = false;
 
+sync(store, router);
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
   {{#router}}
   router,
   {{/router}}
+  el: '#app',
+  {{#vuex}}
+  store,
+  {{/vuex}}
   {{#if_eq build "runtime"}}
   render: h => h(App)
   {{/if_eq}}
diff --git a/template/src/router/index.js b/template/src/router/index.js
index 00d0036a75..d05810b3cb 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -9,7 +9,7 @@ export default new Router({
     {
       path: '/',
       name: 'Hello',
-      component: Hello,
+      component: Hello
     }
   ]
 });
diff --git a/template/src/store/index.js b/template/src/store/index.js
index 0a7da3a0ae..04be150c79 100644
--- a/template/src/store/index.js
+++ b/template/src/store/index.js
@@ -8,19 +8,18 @@ const state = {
   doSomething: false
 };
 
-const getters = {
-};
+const getters = {};
 
 const mutations = {
   DO_SOMETHING(state) {
     state.doSomething = !state.doSomething;
-  },
+  }
 };
 
 const actions = {
   doSomething({ commit }) {
     commit('DO_SOMETHING');
-  },
+  }
 };
 
 const store = new Vuex.Store({

From 6af28021b90604998905b38f1fc0a12409929567 Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Thu, 25 May 2017 17:53:14 +0300
Subject: [PATCH 06/11] UPDATE command for init

---
 README.md      | 2 +-
 docs/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ea4c750559..dd7b3a08fd 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 my-project
+$ vue init Seigiard/vue-webpack-eaht my-project
 $ cd my-project
 $ npm install
 $ npm run dev
diff --git a/docs/README.md b/docs/README.md
index dd31c1696f..e869e5df3c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -10,7 +10,7 @@ To use this template, scaffold a project with [vue-cli](https://github.com/vuejs
 
 ``` bash
 $ npm install -g vue-cli
-$ vue init webpack my-project
+$ vue init Seigiard/vue-webpack-eaht my-project
 $ cd my-project
 $ npm install
 $ npm run dev

From a33ad8820f60a75273fc1fc878056609a52dc5cc Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Fri, 26 May 2017 13:13:34 +0300
Subject: [PATCH 07/11] UPDATE eslint settings

---
 package.json          |  2 +-
 template/.eslintrc.js | 15 +--------------
 template/package.json |  4 +---
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 0d0a591880..410933b83a 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "vue-cli-template-webpack",
+  "name": "vue-cli-template-eaht",
   "version": "2.0.0",
   "license": "MIT",
   "description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 01ec478daf..3b2b5efb24 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -12,28 +12,15 @@ module.exports = {
     browser: true,
   },
   {{#if_eq lintConfig "standard"}}
-  extends: 'prettier',
+  extends: 'eaht',
   {{/if_eq}}
   // required to lint *.vue files
   plugins: [
     'html',
     'vue'
-    {{#if_eq lintConfig "standard"}},
-    'prettier'
-    {{/if_eq}}
   ],
   // add your custom rules here
   'rules': {
-    {{#if_eq lintConfig "standard"}}
-    "prettier/prettier": ["error", {
-      "tabWidth": 2,
-      "semi": true,
-      "singleQuote": true,
-      "trailingComma": "none",
-      "bracketSpacing": true,
-      "jsxBracketSameLine": true
-    }],
-    {{/if_eq}}
     'vue/jsx-uses-vars': 2,
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
diff --git a/template/package.json b/template/package.json
index 41af6ec996..8470e8bb76 100644
--- a/template/package.json
+++ b/template/package.json
@@ -45,9 +45,7 @@
     "eslint-plugin-html": "^2.0.0",
     "eslint-plugin-vue": "^2.0.1",
     {{#if_eq lintConfig "standard"}}
-    "eslint-config-prettier": "^2.1.1",
-    "eslint-plugin-prettier": "^2.1.1",
-    "prettier": "^1.3.1",
+    "eslint-config-eaht": "git+https://github.com/Seigiard/eslint-config-eaht.git",
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",

From 895dbbf831adc7ccda77d1c045851e40a98ed60b Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Fri, 26 May 2017 18:57:51 +0300
Subject: [PATCH 08/11] UPDATE eslint config

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

diff --git a/template/.eslintrc.js b/template/.eslintrc.js
index 3b2b5efb24..1d83823804 100644
--- a/template/.eslintrc.js
+++ b/template/.eslintrc.js
@@ -12,7 +12,9 @@ module.exports = {
     browser: true,
   },
   {{#if_eq lintConfig "standard"}}
-  extends: 'eaht',
+  extends: [
+    'eaht'
+  ],
   {{/if_eq}}
   // required to lint *.vue files
   plugins: [

From cb75e0fe36411ef3c1eba8dc846a9b9bb2e27dd0 Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Mon, 29 May 2017 13:17:43 +0300
Subject: [PATCH 09/11] UPDATE package

---
 docs/structure.md                   | 2 +-
 template/build/webpack.base.conf.js | 2 +-
 template/package.json               | 2 +-
 template/test/unit/index.js         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/structure.md b/docs/structure.md
index 8daf54301b..9c49004e7d 100644
--- a/docs/structure.md
+++ b/docs/structure.md
@@ -8,7 +8,7 @@
 │   ├── index.js                # main project config
 │   └── ...
 ├── src/
-│   ├── main.js                 # app entry file
+│   ├── index.js                 # app entry file
 │   ├── App.vue                 # main app component
 │   ├── components/             # ui components
 │   │   └── ...
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 6c0dae9fb8..7e94ffe846 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -9,7 +9,7 @@ function resolve (dir) {
 
 module.exports = {
   entry: {
-    app: './src/main.js'
+    app: './src/index.js'
   },
   output: {
     path: config.build.assetsRoot,
diff --git a/template/package.json b/template/package.json
index 8470e8bb76..570c6e58ae 100644
--- a/template/package.json
+++ b/template/package.json
@@ -12,7 +12,7 @@
     "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}}",
-    "fixJs": "eslint --fix .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
+    "fixJs": "eslint --fix --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
     "vue": "^2.3.3"{{#router}},
diff --git a/template/test/unit/index.js b/template/test/unit/index.js
index b31d3a068f..b7b544a627 100644
--- a/template/test/unit/index.js
+++ b/template/test/unit/index.js
@@ -6,8 +6,8 @@ Vue.config.productionTip = false;
 const testsContext = require.context('./specs', true, /\.spec$/);
 testsContext.keys().forEach(testsContext);
 
-// require all src files except main.js for coverage.
+// require all src files except index.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)?$)/);
+const srcContext = require.context('../../src', true, /^\.\/(?!index(\.js)?$)/);
 srcContext.keys().forEach(srcContext);

From f0ca4a0c00d83834cfe59dd3b19f3257f2783d08 Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Mon, 29 May 2017 13:28:36 +0300
Subject: [PATCH 10/11] ADD .idea to .gitignore

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

diff --git a/template/.gitignore b/template/.gitignore
index 1ecac1d283..894766dd44 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.idea/
 node_modules/
 dist/
 npm-debug.log*

From 9c73ff0fd1490923e247fe55e98534c11612fc1a Mon Sep 17 00:00:00 2001
From: Andrew Borisenko <seigiard@gmail.com>
Date: Mon, 29 May 2017 16:34:17 +0300
Subject: [PATCH 11/11] RENAME main to index

---
 template/src/{main.js => index.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename template/src/{main.js => index.js} (100%)

diff --git a/template/src/main.js b/template/src/index.js
similarity index 100%
rename from template/src/main.js
rename to template/src/index.js