Merge remote-tracking branch 'origin/dev' into dev

Author: Akryum

packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js

@@ -72,15 +72,17 @@ test('should work', async () => {
   let isFirstMsg = true
   server.stdout.on('data', data => {
     data = data.toString()
-    if (data.match(/Compiled with \d warning/)) {
+    if (isFirstMsg) {
       // should fail on start
-      expect(isFirstMsg).toBe(true)
+      expect(data).toMatch(/Compiled with \d warning/)
       isFirstMsg = false
+
       // fix it
       write('src/App.vue', app)
     } else if (data.match(/Compiled successfully/)) {
-      // should compile on 2nd update
-      expect(isFirstMsg).toBe(false)
+      // should compile on the subsequent update
+      // (note: in CI environment this may not be the exact 2nd update,
+      // so we use data.match as a termination condition rather than a test case)
       server.stdin.write('close')
       done()
     }

packages/@vue/cli-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "bin": {
@@ -30,7 +30,7 @@
     "acorn-walk": "^6.1.0",
     "address": "^1.0.3",
     "autoprefixer": "^8.6.5",
-    "cache-loader": "1.2.2",
+    "cache-loader": "^1.2.5",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "chalk": "^2.4.1",
     "clipboardy": "^1.2.3",
@@ -65,7 +65,7 @@
     "thread-loader": "^1.2.0",
     "url-loader": "^1.1.2",
     "vue-loader": "^15.4.2",
-    "webpack": "^4.23.1",
+    "webpack": "^4.18.1",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-chain": "^4.11.0",
     "webpack-dev-server": "^3.1.10",