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] 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",