chore: merge branch 'v4' into dev

tony19-contrib · Oct 19, 2020 · 25a89c6 · 25a89c6
2 parents 825e983 + d06a1e8
commit 25a89c6
Show file tree

Hide file tree

Showing 25 changed files with 76 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,20 @@
 
+## 4.5.8 (2020-10-19)
+
+#### :bug: Bug Fix
+* `@vue/cli-plugin-typescript`
+  * [#5975](https://github.com/vuejs/vue-cli/pull/5975) fix: update vue-shims for Vue v3.0.1 ([@cexbrayat](https://github.com/cexbrayat))
+* `@vue/cli`
+  * [#5961](https://github.com/vuejs/vue-cli/pull/5961) fix: npm 7 compat by turning on `legacy-peer-deps` flag ([@sodatea](https://github.com/sodatea))
+* `@vue/cli-plugin-eslint`
+  * [#5962](https://github.com/vuejs/vue-cli/pull/5962) fix: narrow the eslint peer dep version range, avoiding npm 7 error ([@sodatea](https://github.com/sodatea))
+
+#### Committers: 2
+- Cédric Exbrayat ([@cexbrayat](https://github.com/cexbrayat))
+- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
+
+
+
 ## 4.5.7 (2020-10-07)
 
 #### :bug: Bug Fix

diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.5.7",
+  "version": "4.5.8",
   "packages": [
     "packages/@vue/babel-preset-app",
     "packages/@vue/cli*",

diff --git a/packages/@vue/babel-preset-app/package.json b/packages/@vue/babel-preset-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/babel-preset-app",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "babel-preset-app for vue-cli",
   "main": "index.js",
   "publishConfig": {

diff --git a/packages/@vue/cli-init/package.json b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "init addon for vue-cli",
   "main": "index.js",
   "publishConfig": {

diff --git a/packages/@vue/cli-overlay/package.json b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "error overlay & dev server middleware for vue-cli",
   "main": "dist/client.js",
   "files": [

diff --git a/packages/@vue/cli-plugin-babel/package.json b/packages/@vue/cli-plugin-babel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-babel",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "babel plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
   "dependencies": {
     "@babel/core": "^7.11.6",
-    "@vue/babel-preset-app": "^4.5.7",
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/babel-preset-app": "^4.5.8",
+    "@vue/cli-shared-utils": "^4.5.8",
     "babel-loader": "^8.1.0",
     "cache-loader": "^4.1.0",
     "thread-loader": "^3.0.0",

diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-cypress",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "cypress": "^5.2.0",
     "eslint-plugin-cypress": "^2.10.3"
   },

diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-nightwatch",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "deepmerge": "^4.2.2",
     "nightwatch": "^1.4.1"
   },

diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-webdriverio",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.0.1",
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "@wdio/cli": "^6.4.6",
     "@wdio/local-runner": "^6.4.6",
     "@wdio/mocha-framework": "^6.4.0",

diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-eslint",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "eslint-loader": "^4.0.2",
     "globby": "^9.2.0",
     "inquirer": "^7.1.0",

diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-pwa",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "webpack": "^4.0.0",
     "workbox-webpack-plugin": "^4.3.1"
   },

diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-router",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.5.7"
+    "@vue/cli-shared-utils": "^4.5.8"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^4.5.7"
+    "@vue/cli-test-utils": "^4.5.8"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0-0"

diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-typescript",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "cache-loader": "^4.1.0",
     "fork-ts-checker-webpack-plugin": "^5.0.11",
     "globby": "^9.2.0",

diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-jest",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.11.6",
     "@babel/plugin-transform-modules-commonjs": "^7.9.6",
     "@types/jest": "^24.0.19",
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.9.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",

diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-mocha",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "mocha unit testing plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-unit-mocha#readme",
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "jsdom": "^16.4.0",
     "jsdom-global": "^3.0.2",
     "mocha": "^7.2.0",

diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-vuex",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^4.5.7"
+    "@vue/cli-test-utils": "^4.5.8"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0-0"

diff --git a/packages/@vue/cli-service-global/package.json b/packages/@vue/cli-service-global/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service-global",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "vue-cli-service global addon for vue-cli",
   "main": "index.js",
   "publishConfig": {
@@ -22,9 +22,9 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-service-global#readme",
   "dependencies": {
-    "@vue/cli-plugin-babel": "^4.5.7",
-    "@vue/cli-plugin-eslint": "^4.5.7",
-    "@vue/cli-service": "^4.5.7",
+    "@vue/cli-plugin-babel": "^4.5.8",
+    "@vue/cli-plugin-eslint": "^4.5.8",
+    "@vue/cli-service": "^4.5.8",
     "babel-eslint": "^10.1.0",
     "chalk": "^4.1.0",
     "core-js": "^3.6.5",

diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -29,10 +29,10 @@
     "@types/minimist": "^1.2.0",
     "@types/webpack": "^4.0.0",
     "@types/webpack-dev-server": "^3.11.0",
-    "@vue/cli-overlay": "^4.5.7",
-    "@vue/cli-plugin-router": "^4.5.7",
-    "@vue/cli-plugin-vuex": "^4.5.7",
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-overlay": "^4.5.8",
+    "@vue/cli-plugin-router": "^4.5.8",
+    "@vue/cli-plugin-vuex": "^4.5.8",
+    "@vue/cli-shared-utils": "^4.5.8",
     "@vue/component-compiler-utils": "^3.1.2",
     "@vue/preload-webpack-plugin": "^1.1.0",
     "@vue/web-component-wrapper": "^1.2.0",

diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-shared-utils",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "shared utilities for vue-cli packages",
   "main": "index.js",
   "repository": {

diff --git a/packages/@vue/cli-test-utils/package.json b/packages/@vue/cli-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-test-utils",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "description": "test utilities for vue-cli packages",
   "repository": {
     "type": "git",

diff --git a/packages/@vue/cli-ui-addon-webpack/package.json b/packages/@vue/cli-ui-addon-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-webpack",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.7",
-    "@vue/cli-plugin-eslint": "^4.5.7",
-    "@vue/cli-service": "^4.5.7",
+    "@vue/cli-plugin-babel": "^4.5.8",
+    "@vue/cli-plugin-eslint": "^4.5.8",
+    "@vue/cli-service": "^4.5.8",
     "@vue/eslint-config-standard": "^5.1.2",
     "core-js": "^3.6.5",
     "eslint": "^6.7.2",

diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-widgets",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.7",
-    "@vue/cli-plugin-eslint": "^4.5.7",
-    "@vue/cli-service": "^4.5.7",
+    "@vue/cli-plugin-babel": "^4.5.8",
+    "@vue/cli-plugin-eslint": "^4.5.8",
+    "@vue/cli-service": "^4.5.8",
     "@vue/eslint-config-standard": "^5.1.2",
     "core-js": "^3.6.5",
     "eslint": "^6.7.2",

diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@akryum/winattr": "^3.0.0",
-    "@vue/cli-shared-utils": "^4.5.7",
+    "@vue/cli-shared-utils": "^4.5.8",
     "apollo-server-express": "^2.17.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -65,10 +65,10 @@
     "watch": "^1.0.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.7",
-    "@vue/cli-plugin-e2e-cypress": "^4.5.7",
-    "@vue/cli-plugin-eslint": "^4.5.7",
-    "@vue/cli-service": "^4.5.7",
+    "@vue/cli-plugin-babel": "^4.5.8",
+    "@vue/cli-plugin-e2e-cypress": "^4.5.8",
+    "@vue/cli-plugin-eslint": "^4.5.8",
+    "@vue/cli-service": "^4.5.8",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/ui": "^0.11.6",
     "ansi_up": "^4.0.4",