bump deps + disable firendlyErrorPlugin during test

yyx990803 · yyx990803 · commit 0a900acf402b · 2017-05-30T15:14:07.000+08:00
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.1.1",
     "url-loader": "^0.5.6",
-    "vue-loader": "^11.0.0",
+    "vue-loader": "^12.2.0",
     "vue-template-compiler": "^2.0.0",
     "webpack": "^2.2.0",
     "webpack-dev-server": "^2.2.0"
diff --git a/shells/dev/webpack.config.js b/shells/dev/webpack.config.js
@@ -54,7 +54,5 @@ module.exports = {
   devServer: {
     quiet: true
   },
-  plugins: [
-    new FriendlyErrorsPlugin()
-  ]
+  plugins: process.env.VUE_DEVTOOL_TEST ? [] :[new FriendlyErrorsPlugin()]
 }
diff --git a/test/test.sh b/test/test.sh
@@ -1,3 +1,4 @@
+export VUE_DEVTOOL_TEST=true
 DEV_SERVER_BIN=`pwd`/node_modules/.bin/webpack-dev-server
 cd shells/dev
 $DEV_SERVER_BIN --inline --no-info --port 8081 &
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,5 @@ module.exports = {`
`54`	`54`	`devServer: {`
`55`	`55`	`quiet: true`
`56`	`56`	`},`
`57`		`- plugins: [`
`58`		`- new FriendlyErrorsPlugin()`
`59`		`- ]`
	`57`	`+ plugins: process.env.VUE_DEVTOOL_TEST ? [] :[new FriendlyErrorsPlugin()]`
`60`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+export VUE_DEVTOOL_TEST=true`
`1`	`2`	DEV_SERVER_BIN=`pwd`/node_modules/.bin/webpack-dev-server
`2`	`3`	`cd shells/dev`
`3`	`4`	`$DEV_SERVER_BIN --inline --no-info --port 8081 &`