Merge branch 'develop'

* develop:
  Bump template version (1.3.1)
  change circleci node image to 6.12.3 to ensure node 6 compat.
  replace object rest spread with Object.assign for node6 compat. (fix #1245)

.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:

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": {

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 : {}
+ )
 }