Merge branch 'develop' into feature/webpack-dev-server(#964)

LinusBorg · web-flow · commit 6d943acb3031 · 2017-11-01T17:32:58.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 node_modules
 .DS_Store
 docs/_book
-test/
+test/
diff --git 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"
         },
diff --git 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
@@ -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}}
 
diff --git 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({
@@ -46,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
diff --git 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')
diff --git 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>
diff --git 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",
@@ -87,9 +87,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-server": "^2.9.1",

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ module.exports = {`
`54`	`54`	`"message": "Pick an ESLint preset",`
`55`	`55`	`"choices": [`
`56`	`56`	`{`
`57`		`- "name": "Standard (https://github.com/feross/standard)",`
	`57`	`+ "name": "Standard (https://github.com/standard/standard)",`
`58`	`58`	`"value": "standard",`
`59`	`59`	`"short": "Standard"`
`60`	`60`	`},`